building

knative · Oct 10, 2023 · ef82418 · ef82418
1 parent 38ff02e
commit ef82418
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -261,9 +261,6 @@ func runDeploy(cmd *cobra.Command, newClient ClientFactory) (err error) {
 		defer doneOld()
 		oldClient.Remove(cmd.Context(), oldF, true)
 
-		// TODO: this has to be done in image re-calculation
-		// f.Image = ""
-		// f.Registry = ""
 	}
 
 	// Deploy
@@ -472,7 +469,7 @@ type deployConfig struct {
 // environment variables; in that precedence.
 func newDeployConfig(cmd *cobra.Command) (c deployConfig) {
 	c = deployConfig{
-		buildConfig:        newBuildConfig(cmd),
+		buildConfig:        newBuildConfig(),
 		Build:              viper.GetString("build"),
 		Env:                viper.GetStringSlice("env"),
 		Domain:             viper.GetString("domain"),
@@ -530,12 +527,12 @@ func (c deployConfig) Configure(f fn.Function) (fn.Function, error) {
 	// ImageDigest
 	// Parsed off f.Image if provided.  Deploying adds the ability to specify a
 	// digest on the associated image (not available on build as nonsensical).
-	newDigest, err := imageDigest(f.Image)
+	newDigest, err := imageDigest(f.Deploy.Image)
 	if err != nil {
 		return f, err
 	}
 	if newDigest != "" {
-		f.ImageDigest = newDigest
+		f.Deploy.ImageDigest = newDigest
 	}
 
 	// Envs

diff --git a/pkg/functions/function_unit_test.go b/pkg/functions/function_unit_test.go
@@ -119,8 +119,10 @@ func TestFunction_ImageWithDigest(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			f := Function{
-				Image:       tt.fields.Image,
-				ImageDigest: tt.fields.ImageDigest,
+				Image: tt.fields.Image,
+				Deploy: DeploySpec{
+					ImageDigest: tt.fields.ImageDigest,
+				},
 			}
 			if got := f.ImageWithDigest(); got != tt.want {
 				t.Errorf("ImageWithDigest() = %v, want %v", got, tt.want)