Use ArrayMap for Parameter and Credential Sets

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

Author: carolynvs

pkg/cnab/config-adapter/adapter.go

@@ -540,11 +540,11 @@ func (c *ManifestConverter) generateParameterSources(b *cnab.ExtendedBundle) cna
 	ps["porter-state"] = c.generateOutputParameterSource("porter-state")
 
 	// bundle.outputs.OUTPUT
+	if b.Parameters == nil {
+		b.Parameters = make(map[string]bundle.Parameter)
+	}
 	for _, outputDef := range c.Manifest.GetTemplatedOutputs() {
 		wiringName, p, def := c.generateOutputWiringParameter(*b, outputDef.Name)
-		if b.Parameters == nil {
-			b.Parameters = make(map[string]bundle.Parameter, 1)
-		}
 		b.Parameters[wiringName] = p
 		b.Definitions[wiringName] = &def
 
@@ -555,9 +555,6 @@ func (c *ManifestConverter) generateParameterSources(b *cnab.ExtendedBundle) cna
 	// bundle.dependencies.DEP.outputs.OUTPUT
 	for _, ref := range c.Manifest.GetTemplatedDependencyOutputs() {
 		wiringName, p, def := c.generateDependencyOutputWiringParameter(ref)
-		if b.Parameters == nil {
-			b.Parameters = make(map[string]bundle.Parameter, 1)
-		}
 		b.Parameters[wiringName] = p
 		b.Definitions[wiringName] = &def
 

pkg/cnab/provider/credentials_test.go

@@ -23,12 +23,10 @@ func TestRuntime_loadCredentials(t *testing.T) {
 
 	r.TestConfig.TestContext.AddTestFile("testdata/db-creds.json", "/db-creds.json")
 
-	cs1 := storage.NewCredentialSet("", "mycreds", secrets.SourceMap{
-		Name: "password",
-		Source: secrets.Source{
-			Strategy: secrets.SourceSecret,
-			Hint:     "password",
-		},
+	cs1 := storage.NewCredentialSet("", "mycreds")
+	cs1.SetStrategy("password", secrets.Source{
+		Strategy: secrets.SourceSecret,
+		Hint:     "password",
 	})
 
 	err := r.credentials.InsertCredentialSet(context.Background(), cs1)
@@ -135,12 +133,10 @@ func TestRuntime_loadCredentials_WithApplyTo(t *testing.T) {
 
 		r.TestCredentials.AddSecret("password", "mypassword")
 
-		cs1 := storage.NewCredentialSet("", "mycreds", secrets.SourceMap{
-			Name: "password",
-			Source: secrets.Source{
-				Strategy: secrets.SourceSecret,
-				Hint:     "password",
-			},
+		cs1 := storage.NewCredentialSet("", "mycreds")
+		cs1.SetStrategy("password", secrets.Source{
+			Strategy: secrets.SourceSecret,
+			Hint:     "password",
 		})
 
 		err := r.credentials.InsertCredentialSet(context.Background(), cs1)