feat(resources): add domain methods

This change adds several domain methods to the resources domain. It adds: - StoreResource - StoreResourceAndIncrementCharmModifiedVersion - OpenResource - SetApplicationResource - SetUnitResource 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.
SimonRichardson · Dec 18, 2024 · 6f35cff · 6f35cff
1 parent 6a04a0e
commit 6f35cff
Show file tree

Hide file tree

Showing 12 changed files with 2,450 additions and 664 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
@@ -53,4 +53,8 @@ const (
 	// 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)