Update CreateInstanceKey to use tags.

Use Application and Model tags as args to ensure content and order.
sdg0919 · Oct 8, 2021 · 1a97e13 · 1a97e13
1 parent 1990ea5
commit 1a97e13
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 142 deletions.
diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go
@@ -1489,7 +1489,7 @@ func (api *APIBase) GetCharmURLOrigin(args params.ApplicationGet) (params.CharmU
 		return result, nil
 	}
 	result.Origin = makeParamsCharmOrigin(chOrigin)
-	result.Origin.InstanceKey = charmhub.CreateInstanceKey(api.model.UUID(), args.ApplicationName)
+	result.Origin.InstanceKey = charmhub.CreateInstanceKey(oneApplication.ApplicationTag(), api.model.ModelTag())
 	return result, nil
 }
 

diff --git a/apiserver/facades/client/application/application_test.go b/apiserver/facades/client/application/application_test.go
@@ -1001,7 +1001,7 @@ func (s *applicationSuite) TestApplicationGetCharmURLOrigin(c *gc.C) {
 		Architecture: "amd64",
 		OS:           "ubuntu",
 		Series:       "focal",
-		InstanceKey:  charmhub.CreateInstanceKey(s.Model.UUID(), app.Name()),
+		InstanceKey:  charmhub.CreateInstanceKey(app.ApplicationTag(), s.Model.ModelTag()),
 	})
 }
 

diff --git a/apiserver/facades/client/application/backend.go b/apiserver/facades/client/application/backend.go
@@ -72,6 +72,7 @@ type Application interface {
 	AddUnit(state.AddUnitParams) (Unit, error)
 	AllUnits() ([]Unit, error)
 	ApplicationConfig() (application.ConfigAttributes, error)
+	ApplicationTag() names.ApplicationTag
 	Charm() (Charm, bool, error)
 	CharmURL() (*charm.URL, bool)
 	Channel() csparams.Channel