Merge pull request juju#18533 from Aflynn50/resource-state-methods

juju#18533 This change adds several domain methods to the resources domain. It adds: - StoreResource - StoreResourceAndIncrementCharmModifiedVersion - OpenResource - SetApplicationResource - SetUnitResource (this one already existed but its behvaiour changes a lot) These methods complete the foundation of the resource domain. These methods differ from their state counterparts in several ways. In state, most equivilents of these methods also returned the resource record, even if they were only setting a resource. Here they do not. They are designed to each do only one thing, the thing that their name describes. In state there was an OpenResource and OpenResourceForUniter. This seperate method also set the unit resource doc. In the new domain methods, this linking should be done via the SetUnitResource instead. In state, the SetResource method did several things. It has now been factored out into the StoreResource, StoreResourceAndIncremenetCharmModifiedVersion and SetApplicationResource. This is to make it clearer what each method does. > [!NOTE] > As a flyby, make the verbiage in resource domain errors consistent.   ## Checklist  - [x] Code style: imports ordered, good names, simple structure, etc - [x] Comments saying why design decisions were made - [x] Go unit tests, with comments saying what you're testing - [ ] [Integration tests](https://github.com/juju/juju/tree/main/tests), with comments saying what you're testing - [x] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages ## QA steps Run unit tests, none of this has been wired up yet.  ## Links  **Jira card:** [JUJU-6397](https://warthogs.atlassian.net/browse/JUJU-6397) [JUJU-6397]: https://warthogs.atlassian.net/browse/JUJU-6397?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
SimonRichardson · Dec 18, 2024 · 896a608 · 896a608
2 parents 8b2ff92 + f0bfacf
commit 896a608
Show file tree

Hide file tree

Showing 12 changed files with 2,320 additions and 673 deletions.
diff --git a/domain/application/state/application_test.go b/domain/application/state/application_test.go
@@ -1316,6 +1316,14 @@ func (s *applicationStateSuite) TestGetCharmModifiedVersion(c *gc.C) {
 	c.Assert(charmModifiedVersion, gc.Equals, 7)
 }
 
+func (s *applicationStateSuite) TestGetCharmModifiedVersionNull(c *gc.C) {
+	appUUID := s.createApplication(c, "foo", life.Alive)
+
+	charmModifiedVersion, err := s.state.GetCharmModifiedVersion(context.Background(), appUUID)
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(charmModifiedVersion, gc.Equals, 0)
+}
+
 func (s *applicationStateSuite) TestGetCharmModifiedVersionApplicationNotFound(c *gc.C) {
 	_, err := s.state.GetCharmModifiedVersion(context.Background(), applicationtesting.GenApplicationUUID(c))
 	c.Assert(err, jc.ErrorIs, applicationerrors.ApplicationNotFound)

diff --git a/domain/resource/errors/errors.go b/domain/resource/errors/errors.go
@@ -24,9 +24,9 @@ const (
 	// not found.
 	ResourceNotFound = errors.ConstError("resource not found")
 
-	// UnknownRetrievedByType describes an error where the retrieved by type is
+	// RetrievedByTypeNotValid describes an error where the retrieved by type is
 	// neither user, unit nor application.
-	UnknownRetrievedByType = errors.ConstError("unknown retrieved by type")
+	RetrievedByTypeNotValid = errors.ConstError("retrieved by type not valid")
 
 	// ResourceNameNotValid describes an error where the resource name is not
 	// valid, usually because it's empty.
@@ -44,8 +44,17 @@ const (
 	// valid.
 	ResourceStateNotValid = errors.ConstError("resource state not valid")
 
-	// InvalidCleanUpState describes an error where the application state is
+	// CleanUpStateNotValid describes an error where the application state is
 	// during cleanup. It means that application dependencies are deleted in
 	// an incorrect order.
-	InvalidCleanUpState = errors.ConstError("invalid cleanup state")
+	CleanUpStateNotValid = errors.ConstError("cleanup state not valid")
+
+	// StoredResourceNotFound describes an error where the stored resource
+	// cannot be found in the relevant resource persistence layer for its
+	// resource type.
+	StoredResourceNotFound = errors.ConstError("stored resource not found")
+
+	// ResourceAlreadyStored describes an errors where the resource has already
+	// been stored.
+	ResourceAlreadyStored = errors.ConstError("resource already found in storage")
 )
diff --git a/domain/resource/service/package_mock_test.go b/domain/resource/service/package_mock_test.go
diff --git a/domain/resource/service/package_test.go b/domain/resource/service/package_test.go
@@ -10,6 +10,7 @@ import (
 )
 
 //go:generate go run go.uber.org/mock/mockgen -typed -package service -destination package_mock_test.go github.com/juju/juju/domain/resource/service State,ResourceStoreGetter
+//go:generate go run go.uber.org/mock/mockgen -typed -package service -destination resource_store_mock_test.go github.com/juju/juju/core/resource/store ResourceStore
 
 func TestPackage(t *testing.T) {
 	gc.TestingT(t)