fix some tests using .Image and create new test

Signed-off-by: gauron99 <fridrich.david19@gmail.com>

cmd/.func/built

@@ -0,0 +1 @@
+b61d586d291fdb296d942a12d58159099e20dd590c77ed40e85d83178310d719

cmd/deploy.go

@@ -296,6 +296,7 @@ func runDeploy(cmd *cobra.Command, newClient ClientFactory) (err error) {
 			f.Deploy.Image = f.Build.Image
 			// write .func/built-name as running metadata which is not persisted in yaml
 			if err = f.WriteBuiltImageOnChange(cfg.Verbose); err != nil {
+				return
 			}
 		}
 
@@ -540,18 +541,6 @@ func (c deployConfig) Configure(f fn.Function) (fn.Function, error) {
 		f.Build.PVCSize = c.PVCSize
 	}
 
-	// TODO: gauron99 parse --image if provided:
-	// image with digest == i want to skip everything and just deploy
-	// image without digest == if building as well - use THIS image name
-
-	// // ImageDigest
-	// // Parsed off f.Build.Image if provided. Deploying adds the ability to specify a
-	// // digest on the associated image (not available on build as nonsensical).
-	// hasDigest, err := hasDigest(f.Build.Image)
-	// if err != nil {
-	// 	return f, err
-	// }
-
 	// Envs
 	// Preprocesses any Envs provided (which may include removals) into a final
 	// set
@@ -700,36 +689,11 @@ func (c deployConfig) Validate(cmd *cobra.Command) (err error) {
 	return
 }
 
-// hasDigest returns the image digest from a full image string if it exists,
-// and includes basic validation that a provided digest is correctly formatted.
-func hasDigest(v string) (hasDigest bool, err error) {
-	var digest string
-	vv := strings.Split(v, "@")
-	if len(vv) < 2 {
-		return // has no digest
-	} else if len(vv) > 2 {
-		err = fmt.Errorf("image '%v' contains an invalid digest (extra '@')", v)
-		return
-	}
-	digest = vv[1]
-
-	if !strings.HasPrefix(digest, "sha256:") {
-		err = fmt.Errorf("image digest '%s' requires 'sha256:' prefix", digest)
-		return
-	}
-
-	if len(digest[7:]) != 64 {
-		err = fmt.Errorf("image digest '%v' has an invalid sha256 hash length of %v when it should be 64", digest, len(digest[7:]))
-	}
-
-	hasDigest = true
-	return
-}
-
 // printDeployMessages to the output.  Non-error deployment messages.
 func printDeployMessages(out io.Writer, cfg deployConfig, f fn.Function) {
+	// TODO: gauron check
 	digest, err := hasDigest(cfg.Image)
-	if err != nil && digest {
+	if err == nil && digest {
 		fmt.Fprintf(out, "Deploying image '%v', which has a digest. Build and push are disabled.\n", cfg.Image)
 	}
 
@@ -776,3 +740,29 @@ func printDeployMessages(out io.Writer, cfg deployConfig, f fn.Function) {
 		fmt.Fprintf(out, "Warning: git settings are only applicable when running with --remote.  Local source code will be used.")
 	}
 }
+
+// hasDigest returns the image digest from a full image string if it exists,
+// and includes basic validation that a provided digest is correctly formatted.
+func hasDigest(v string) (hasDigest bool, err error) {
+	var digest string
+	vv := strings.Split(v, "@")
+	if len(vv) < 2 {
+		return // has no digest
+	} else if len(vv) > 2 {
+		err = fmt.Errorf("image '%v' contains an invalid digest (extra '@')", v)
+		return
+	}
+	digest = vv[1]
+
+	if !strings.HasPrefix(digest, "sha256:") {
+		err = fmt.Errorf("image digest '%s' requires 'sha256:' prefix", digest)
+		return
+	}
+
+	if len(digest[7:]) != 64 {
+		err = fmt.Errorf("image digest '%v' has an invalid sha256 hash length of %v when it should be 64", digest, len(digest[7:]))
+	}
+
+	hasDigest = true
+	return
+}

cmd/deploy_test.go

@@ -195,8 +195,8 @@ func testConfigApplied(cmdFn commandConstructor, t *testing.T) {
 	if f, err = fn.NewFunction(root); err != nil {
 		t.Fatal(err)
 	}
-	if f.Image != "registry.example.com/charlie/f:latest" {
-		t.Fatalf("expected image 'registry.example.com/charlie/f:latest' got '%v'", f.Image)
+	if f.Build.Image != "registry.example.com/charlie/f:latest" {
+		t.Fatalf("expected image 'registry.example.com/charlie/f:latest' got '%v'", f.Build.Image)
 	}
 
 	// Ensure environment variables loaded: Push
@@ -1124,7 +1124,9 @@ func testRegistry(cmdFn commandConstructor, t *testing.T) {
 			name: "registry member mismatch",
 			f: fn.Function{
 				Registry: "registry.example.com/alice",
-				Image:    "registry.example.com/bob/f:latest",
+				Build: fn.BuildSpec{
+					Image: "registry.example.com/bob/f:latest",
+				},
 			},
 			args:             []string{},
 			expectedRegistry: "registry.example.com/alice",
@@ -1137,7 +1139,9 @@ func testRegistry(cmdFn commandConstructor, t *testing.T) {
 			name: "registry flag updates",
 			f: fn.Function{
 				Registry: "registry.example.com/alice",
-				Image:    "registry.example.com/bob/f:latest",
+				Build: fn.BuildSpec{
+					Image: "registry.example.com/bob/f:latest",
+				},
 			},
 			args:             []string{"--registry=registry.example.com/charlie"},
 			expectedRegistry: "registry.example.com/charlie",
@@ -1150,7 +1154,9 @@ func testRegistry(cmdFn commandConstructor, t *testing.T) {
 			name: "image flag overrides",
 			f: fn.Function{
 				Registry: "registry.example.com/alice",
-				Image:    "registry.example.com/bob/f:latest",
+				Build: fn.BuildSpec{
+					Image: "registry.example.com/bob/f:latest",
+				},
 			},
 			args:             []string{"--image=registry.example.com/charlie/f:latest"},
 			expectedRegistry: "registry.example.com/alice",            // not updated
@@ -1178,8 +1184,8 @@ func testRegistry(cmdFn commandConstructor, t *testing.T) {
 			if f.Registry != test.expectedRegistry {
 				t.Fatalf("expected registry '%v', got '%v'", test.expectedRegistry, f.Registry)
 			}
-			if f.Image != test.expectedImage {
-				t.Fatalf("expected image '%v', got '%v'", test.expectedImage, f.Image)
+			if f.Build.Image != test.expectedImage {
+				t.Fatalf("expected image '%v', got '%v'", test.expectedImage, f.Build.Image)
 			}
 		})
 	}
@@ -1220,8 +1226,8 @@ func testRegistryLoads(cmdFn commandConstructor, t *testing.T) {
 	}
 
 	expected := "example.com/alice/my-func:latest"
-	if f.Image != expected {
-		t.Fatalf("expected image name '%v'. got %v", expected, f.Image)
+	if f.Build.Image != expected {
+		t.Fatalf("expected image name '%v'. got %v", expected, f.Build.Image)
 	}
 }
 

cmd/my_super_test.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"testing"
+
+	fn "knative.dev/func/pkg/functions"
+)
+
+func TestDebugger(t *testing.T) {
+	// CD into a new tmp directory
+	root := fromTempDirectory(t)
+
+	// Create a new default function in Go
+	if _, err := fn.New().Init(fn.Function{Runtime: "go", Root: root}); err != nil {
+		t.Fatal(err)
+	}
+
+	// cmd := NewDeployCmd(NewTestClient(fn.WithRegistry("docker.io/4114gauron3268")))
+	cmd := NewBuildCmd(NewTestClient(fn.WithRegistry("docker.io/4114gauron3268")))
+	// cmd.SetArgs([]string{"--builder=pack", "--verbose"}) // Or whatever you're testing
+	cmd.SetArgs([]string{"--verbose"}) // Or whatever you're testing
+
+	if err := cmd.Execute(); err != nil {
+		t.Fatal(err)
+	}
+}

pkg/docker/pusher_test.go

@@ -113,7 +113,9 @@ func TestDaemonPush(t *testing.T) {
 	)
 
 	f := fn.Function{
-		Image: functionImageLocal,
+		Build: fn.BuildSpec{
+			Image: functionImageLocal,
+		},
 	}
 
 	digest, err := pusher.Push(ctx, f)
@@ -196,15 +198,17 @@ func TestNonDaemonPush(t *testing.T) {
 	)
 
 	f := fn.Function{
-		Image: functionImageRemote,
+		Build: fn.BuildSpec{
+			Image: functionImageRemote,
+		},
 	}
 
 	actualDigest, err := pusher.Push(ctx, f)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if !reflect.DeepEqual(imagesPassedToMock, []string{f.Image}) {
+	if !reflect.DeepEqual(imagesPassedToMock, []string{f.Build.Image}) {
 		t.Errorf("Bad image name passed to the Docker API Client: %q.", imagesPassedToMock)
 	}
 

pkg/functions/client.go

@@ -759,20 +759,29 @@ func (c *Client) Deploy(ctx context.Context, f Function, opts ...DeployOption) (
 // Returned function contains applicable registry and deployed image name.
 func (c *Client) RunPipeline(ctx context.Context, f Function) (Function, error) {
 	var err error
-
 	// Default function registry to the client's global registry
 	if f.Registry == "" {
 		f.Registry = c.registry
 	}
 
-	// If no image name has been yet defined (not yet built/deployed), calculate.
-	// Image name is stored on the function for later use by deploy, etc.
-	if f.Deploy.Image == "" {
-		if f.Deploy.Image, err = f.ImageName(); err != nil {
+	// If no image name has been yet defined (not yet built/deployed), calculate
+	// unless f.Image was specified - user defined image name to be used
+	// Image name is stored on the function for later use by deploy.
+	// TODO: gauron99-should this be stored somewhere else as well? like
+	// .Build.Image since the Function is going to be built(&deployed) on cluster
+	// under the f.Deploy.Image name. In scenario Init -> Deploy with remote,
+	// f.Build.Image is not gonna be populated
+	if f.Image != "" {
+		// if user specified an image, use it
+		f.Deploy.Image = f.Image
+	} else if f.Deploy.Image == "" {
+		f.Deploy.Image, err = f.ImageName()
+		if err != nil {
 			return f, err
 		}
 	}
 
+	fmt.Printf("-- deploy: %s| f.Image: %s\n", f.Deploy.Image, f.Image)
 	// Build and deploy function using Pipeline
 	if _, err := c.pipelinesProvider.Run(ctx, f); err != nil {
 		return f, fmt.Errorf("failed to run pipeline: %w", err)