Merge branch 'master' into top

cmd/cnbBuild.go

@@ -455,6 +455,10 @@ func runCnbBuild(config *cnbBuildOptions, telemetry *buildpacks.Telemetry, image
 	}
 	commonPipelineEnvironment.container.imageNames = append(commonPipelineEnvironment.container.imageNames, imageNameAlias)
 
+	if config.ExpandBuildEnvVars {
+		config.BuildEnvVars = expandEnvVars(config.BuildEnvVars)
+	}
+
 	if config.BuildEnvVars != nil && len(config.BuildEnvVars) > 0 {
 		log.Entry().Infof("Setting custom environment variables: '%v'", config.BuildEnvVars)
 		imageSummary.AddEnv(config.BuildEnvVars)
@@ -619,6 +623,19 @@ func runCnbBuild(config *cnbBuildOptions, telemetry *buildpacks.Telemetry, image
 	return nil
 }
 
+func expandEnvVars(envVars map[string]any) map[string]any {
+	expandedEnvVars := map[string]any{}
+	for key, value := range envVars {
+		valueString, valueIsString := value.(string)
+		if valueIsString {
+			expandedEnvVars[key] = os.ExpandEnv(valueString)
+		} else {
+			expandedEnvVars[key] = value
+		}
+	}
+	return expandedEnvVars
+}
+
 func createInitialTelemetrySegment(config *cnbBuildOptions, utils cnbutils.BuildUtils) *buildpacks.Segment {
 	telemetrySegment := buildpacks.NewSegment()
 	projectPath, _, _ := config.resolvePath(utils)          // ignore error here, telemetry problems should not fail the build

cmd/cnbBuild_test.go

@@ -238,16 +238,17 @@ func TestRunCnbBuild(t *testing.T) {
 		assert.Equal(t, "my-image:0.0.1", commonPipelineEnvironment.container.imageNameTag)
 	})
 
-	t.Run("success case (custom buildpacks and custom env variables, renaming docker conf file, additional tag)", func(t *testing.T) {
-		t.Parallel()
+	t.Run("success case (custom buildpacks and custom env variables with expand, renaming docker conf file, additional tag)", func(t *testing.T) {
+		t.Setenv("BAR", "BAZZ")
 		config := cnbBuildOptions{
 			ContainerImageName:   "my-image",
 			ContainerImageTag:    "0.0.1",
 			ContainerRegistryURL: imageRegistry,
 			DockerConfigJSON:     "/path/to/test.json",
 			Buildpacks:           []string{"test"},
+			ExpandBuildEnvVars:   true,
 			BuildEnvVars: map[string]interface{}{
-				"FOO": "BAR",
+				"FOO": "${BAR}",
 			},
 			AdditionalTags: []string{"latest"},
 		}
@@ -269,6 +270,8 @@ func TestRunCnbBuild(t *testing.T) {
 
 		copiedFileExists, _ := utils.FileExists("/tmp/config.json")
 		assert.True(t, copiedFileExists)
+
+		assetBuildEnv(t, utils, "FOO", "BAZZ")
 	})
 
 	t.Run("success case (custom buildpacks, pre and post buildpacks and custom env variables, renaming docker conf file, additional tag)", func(t *testing.T) {
@@ -281,8 +284,9 @@ func TestRunCnbBuild(t *testing.T) {
 			PreBuildpacks:        []string{"pre-test"},
 			PostBuildpacks:       []string{"post-test"},
 			Buildpacks:           []string{"test"},
+			ExpandBuildEnvVars:   false,
 			BuildEnvVars: map[string]interface{}{
-				"FOO": "BAR",
+				"FOO": "${BAR}",
 			},
 			AdditionalTags: []string{"latest"},
 		}
@@ -304,6 +308,8 @@ func TestRunCnbBuild(t *testing.T) {
 
 		copiedFileExists, _ := utils.FileExists("/tmp/config.json")
 		assert.True(t, copiedFileExists)
+
+		assetBuildEnv(t, utils, "FOO", "${BAR}")
 	})
 
 	t.Run("success case (custom pre and post buildpacks and custom env variables, renaming docker conf file, additional tag)", func(t *testing.T) {

cmd/whitesourceExecuteScan.go

@@ -134,9 +134,10 @@ func newWhitesourceUtils(config *ScanOptions, client *github.Client) *whitesourc
 
 func newWhitesourceScan(config *ScanOptions) *ws.Scan {
 	return &ws.Scan{
-		AggregateProjectName: config.ProjectName,
-		ProductVersion:       config.Version,
-		BuildTool:            config.BuildTool,
+		AggregateProjectName:        config.ProjectName,
+		ProductVersion:              config.Version,
+		BuildTool:                   config.BuildTool,
+		SkipProjectsWithEmptyTokens: config.SkipProjectsWithEmptyTokens,
 	}
 }