Use arn for manifest cache instead of ambiguous input package name

cr https://code.amazon.com/reviews/CR-822478
aws · Oct 23, 2017 · a95a8fb · a95a8fb
1 parent 52ac3ff
commit a95a8fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/agent/plugins/configurepackage/birdwatcher/birdwatcher.go b/agent/plugins/configurepackage/birdwatcher/birdwatcher.go
@@ -205,7 +205,7 @@ func downloadManifest(ds *PackageService, packageName string, version string) (*
 		return nil, err
 	}
 
-	err = ds.manifestCache.WriteManifest(packageName, manifest.Version, byteManifest)
+	err = ds.manifestCache.WriteManifest(manifest.PackageArn, manifest.Version, byteManifest)
 	if err != nil {
 		return nil, fmt.Errorf("failed to write manifest to file: %v", err)
 	}

diff --git a/agent/plugins/configurepackage/birdwatcher/birdwatcher_test.go b/agent/plugins/configurepackage/birdwatcher/birdwatcher_test.go
@@ -318,7 +318,7 @@ func TestReportResult(t *testing.T) {
 
 func TestDownloadManifest(t *testing.T) {
 	manifestStrErr := "xkj]{}["
-	manifestStr := "{\"version\": \"1234\"}"
+	manifestStr := "{\"version\": \"1234\",\"packageArn\":\"packagearn\"}"
 	tracer := trace.NewTracer(log.NewMockLog())
 
 	data := []struct {
@@ -396,7 +396,7 @@ func TestDownloadManifest(t *testing.T) {
 				assert.Equal(t, "1234", result)
 				assert.NoError(t, err)
 				// verify cache
-				cachedManifest, cacheErr := cache.ReadManifest(testdata.packageName, "1234")
+				cachedManifest, cacheErr := cache.ReadManifest("packagearn", "1234")
 				assert.Equal(t, []byte(manifestStr), cachedManifest)
 				assert.NoError(t, cacheErr)
 			}