build-config-env layer oly added when it is not empty

Signed-off-by: WYGIN <[email protected]>
buildpacks · Oct 12, 2023 · 5e9ce4c · 5e9ce4c
1 parent 6e085ae
commit 5e9ce4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -536,15 +536,14 @@ func (b *Builder) Save(logger logging.Logger, creatorMetadata CreatorMetadata) e
 
 	if len(b.buildConfigEnv) > 0 {
 		logger.Debugf("Provided Build Config Environment Variables\n  %s", style.Map(b.env, "  ", "\n"))
-	}
-
-	buildConfigEnvTar, err := b.buildConfigEnvLayer(tmpDir, b.buildConfigEnv)
-	if err != nil {
-		return errors.Wrap(err, "retrieving build-config-env layer")
-	}
+		buildConfigEnvTar, err := b.buildConfigEnvLayer(tmpDir, b.buildConfigEnv)
+		if err != nil {
+			return errors.Wrap(err, "retrieving build-config-env layer")
+		}
 
-	if err := b.image.AddLayer(buildConfigEnvTar); err != nil {
-		return errors.Wrap(err, "adding build-config-env layer")
+		if err := b.image.AddLayer(buildConfigEnvTar); err != nil {
+			return errors.Wrap(err, "adding build-config-env layer")
+		}
 	}
 
 	if len(b.env) > 0 {

diff --git a/pkg/client/create_builder.go b/pkg/client/create_builder.go
@@ -82,11 +82,7 @@ func (c *Client) CreateBuilder(ctx context.Context, opts CreateBuilderOptions) e
 		bldr.SetStack(opts.Config.Stack)
 	}
 	bldr.SetRunImage(opts.Config.Run)
-	if opts.BuildConfigEnv == nil || len(opts.BuildConfigEnv) == 0 {
-		bldr.SetBuildConfigEnv(make(map[string]string))
-	} else {
-		bldr.SetBuildConfigEnv(opts.BuildConfigEnv)
-	}
+	bldr.SetBuildConfigEnv(opts.BuildConfigEnv)
 
 	return bldr.Save(c.logger, builder.CreatorMetadata{Version: c.version})
 }