Send controller UUID when checking charm revisions

sinanawad · Mar 14, 2017 · 7063f69 · 7063f69
1 parent 8c8aa39
commit 7063f69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/apiserver/charmrevisionupdater/updater.go b/apiserver/charmrevisionupdater/updater.go
@@ -126,7 +126,6 @@ func retrieveLatestCharmInfo(st *state.State) ([]latestCharmInfo, error) {
 		if curl.Schema == "local" {
 			continue
 		}
-
 		cid := charmstore.CharmID{
 			URL:     curl,
 			Channel: application.Channel(),
@@ -137,6 +136,7 @@ func retrieveLatestCharmInfo(st *state.State) ([]latestCharmInfo, error) {
 
 	metadata := map[string]string{
 		"environment_uuid": model.UUID(),
+		"controller_uuid":  st.ControllerUUID(),
 		"cloud":            model.Cloud(),
 		"cloud_region":     model.CloudRegion(),
 	}

diff --git a/apiserver/charmrevisionupdater/updater_test.go b/apiserver/charmrevisionupdater/updater_test.go
@@ -188,6 +188,7 @@ func (s *charmVersionSuite) TestJujuMetadataHeaderIsSent(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	expected_header := []string{
 		"environment_uuid=" + model.UUID(),
+		"controller_uuid=" + s.State.ControllerUUID(),
 		"cloud=" + model.Cloud(),
 		"cloud_region=" + model.CloudRegion(),
 		"provider=" + cloud.Type,

diff --git a/charmstore/latest.go b/charmstore/latest.go
@@ -27,6 +27,7 @@ func LatestCharmInfo(client Client, charms []CharmID, metadata map[string]string
 	revResults, err := client.LatestRevisions(charms, map[string][]string{
 		jujuMetadataHTTPHeader: []string{
 			"environment_uuid=" + metadata["environment_uuid"],
+			"controller_uuid=" + metadata["controller_uuid"],
 			"cloud=" + metadata["cloud"],
 			"cloud_region=" + metadata["cloud_region"],
 			"provider=" + metadata["provider"],

diff --git a/charmstore/latest_test.go b/charmstore/latest_test.go
@@ -71,14 +71,22 @@ func (s *LatestCharmInfoSuite) TestSuccess(c *gc.C) {
 
 	metadata := map[string]string{
 		"environment_uuid": "foouuid",
+		"controller_uuid":  "controlleruuid",
 		"cloud":            "foocloud",
 		"cloud_region":     "fooregion",
 		"provider":         "fooprovider",
 	}
 	results, err := LatestCharmInfo(client, charms, metadata)
 	c.Assert(err, jc.ErrorIsNil)
 
-	header := []string{"environment_uuid=foouuid", "cloud=foocloud", "cloud_region=fooregion", "provider=fooprovider", "controller_version=" + version.Current.String()}
+	header := []string{
+		"environment_uuid=foouuid",
+		"controller_uuid=controlleruuid",
+		"cloud=foocloud",
+		"cloud_region=fooregion",
+		"provider=fooprovider",
+		"controller_version=" + version.Current.String(),
+	}
 	s.lowLevel.stableStub.CheckCall(c, 0, "Latest", params.StableChannel, []*charm.URL{spam}, map[string][]string{"Juju-Metadata": header})
 	s.lowLevel.stableStub.CheckCall(c, 1, "Latest", params.StableChannel, []*charm.URL{eggs}, map[string][]string{"Juju-Metadata": header})
 	s.lowLevel.stableStub.CheckCall(c, 2, "Latest", params.StableChannel, []*charm.URL{ham}, map[string][]string{"Juju-Metadata": header})