init

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

cmd/deploy.go

@@ -775,7 +775,8 @@ func printDeployMessages(out io.Writer, f fn.Function) {
 	}
 }
 
-// isUndigested returns true if provided image string 'v' has valid tag and false if
+// isUndigested returns true if provided image string 'v' is valid ( by
+// by acceptable standards -- tagged, untagged -> assuming :latest) and false if
 // not. It is lenient in validating - does not always throw an error, just
 // returning false in some scenarios.
 func isUndigested(v string) (validTag bool, err error) {

cmd/run.go

@@ -172,14 +172,23 @@ func runRun(cmd *cobra.Command, newClient ClientFactory) (err error) {
 	client, done := newClient(ClientConfig{Verbose: cfg.Verbose}, clientOptions...)
 	defer done()
 
-	f, digested, err := processImageName(f, cfg.Image)
+	// check for digested image first
+	var digested bool
+	digested, err = isDigested(cfg.Image)
 	if err != nil {
-		return
-	}
-	if digested {
-		f.Deploy.Image = cfg.Image
+		return err
 	}
 
+	// if !digested {
+	// 	valid, err := isUndigested(cfg.Image)
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// 	if valid {
+	// 		f.Run.Image = cfg.Image //assign image to be potentially run
+	// 	}
+	// }
+
 	// Build
 	//
 	// If requesting to run via the container, build the container if it is
@@ -189,8 +198,19 @@ func runRun(cmd *cobra.Command, newClient ClientFactory) (err error) {
 		if err != nil {
 			return err
 		}
-		if f, _, err = build(cmd, cfg.Build, f, client, buildOptions); err != nil {
-			return err
+
+		if digested {
+			// run cmd takes f.Build.Image - see newContainerConfig in docker/runner.go
+			// it doesnt get saved, just runtime image
+			f.Build.Image = cfg.Image
+		} else {
+			if f, _, err = build(cmd, cfg.Build, f, client, buildOptions); err != nil {
+				return err
+			}
+		}
+	} else { // dont run digested image without a container
+		if digested {
+			return fmt.Errorf("cannot use digested image with --container=false")
 		}
 	}
 

cmd/run_test.go

@@ -192,24 +192,19 @@ func TestRun_Images(t *testing.T) {
 			args:         []string{"--image", "exampleimage@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"},
 			runInvoked:   true,
 			buildInvoked: false,
-			runError:     nil,
-			buildError:   nil,
 		},
 		{
 			name:         "image with tag direct deploy",
 			args:         []string{"--image", "exampleimage:latest", "--build=false"},
 			runInvoked:   true,
 			buildInvoked: false,
-			runError:     nil,
-			buildError:   nil,
 		},
 		{
-			name:         "image without tag direct deploy",
-			args:         []string{"--image", "exampleimage", "--build=false"},
-			runInvoked:   true,
+			name:         "digested image without container should fail",
+			args:         []string{"--container=false", "--image", "exampleimage@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"},
+			runInvoked:   false,
 			buildInvoked: false,
-			runError:     nil,
-			buildError:   nil,
+			buildError:   fmt.Errorf("cannot use digested image with --container=false"),
 		},
 	}