Merge pull request #838 from imjasonh/package-replace

apply substitutions to .environment.contents.packages

pkg/config/config.go

@@ -155,21 +155,33 @@ func (cfg *Configuration) applySubstitutionsForRuntime() error {
 		var err error
 		cfg.Package.Dependencies.Runtime[i], err = util.MutateStringFromMap(nw, runtime)
 		if err != nil {
-			return fmt.Errorf("failed to apply replacement to provides %q: %w", runtime, err)
+			return fmt.Errorf("failed to apply replacement to runtime %q: %w", runtime, err)
 		}
 	}
 	for _, srt := range cfg.Subpackages {
 		for i, prov := range srt.Dependencies.Runtime {
 			var err error
 			srt.Dependencies.Runtime[i], err = util.MutateStringFromMap(nw, prov)
 			if err != nil {
-				return fmt.Errorf("failed to apply replacement to provides %q: %w", prov, err)
+				return fmt.Errorf("failed to apply replacement to runtime %q: %w", prov, err)
 			}
 		}
 	}
 	return nil
 }
 
+func (cfg *Configuration) applySubstitutionsForPackages() error {
+	nw := buildConfigMap(cfg)
+	for i, runtime := range cfg.Environment.Contents.Packages {
+		var err error
+		cfg.Environment.Contents.Packages[i], err = util.MutateStringFromMap(nw, runtime)
+		if err != nil {
+			return fmt.Errorf("failed to apply replacement to package %q: %w", runtime, err)
+		}
+	}
+	return nil
+}
+
 type Copyright struct {
 	// Optional: The license paths, typically '*'
 	Paths []string `json:"paths,omitempty" yaml:"paths,omitempty"`
@@ -814,6 +826,9 @@ func ParseConfiguration(configurationFilePath string, opts ...ConfigurationParsi
 	if err := cfg.applySubstitutionsForRuntime(); err != nil {
 		return nil, err
 	}
+	if err := cfg.applySubstitutionsForPackages(); err != nil {
+		return nil, err
+	}
 
 	// Propagate all child pipelines
 	cfg.propagatePipelines()

pkg/config/config_test.go

@@ -27,6 +27,11 @@ package:
       - replacement-provides-bar=${{vars.bar}}
       - replacement-provides=${{package.full-version}}
 
+environment:
+  contents:
+    packages:
+      - dep~${{package.version}}
+
 vars:
   foo: FOO
   bar: BAR
@@ -73,6 +78,10 @@ subpackages:
 		"FOO",
 		"other-package=0.0.1",
 	}, cfg.Subpackages[0].Dependencies.Runtime)
+
+	require.Equal(t, []string{
+		"dep~0.0.1",
+	}, cfg.Environment.Contents.Packages)
 }
 
 func Test_rangeSubstitutions(t *testing.T) {