simplify

Signed-off-by: David Fridrich <fridrich.david19@gmail.com>
knative · Nov 26, 2024 · 0c162c3 · 0c162c3
1 parent f10328b
commit 0c162c3
Show file tree

Hide file tree

Showing 6 changed files with 11,849 additions and 11,809 deletions.
diff --git a/cmd/prompt/prompt.go b/cmd/prompt/prompt.go
@@ -13,18 +13,17 @@ import (
 
 	"knative.dev/func/pkg/docker"
 	"knative.dev/func/pkg/docker/creds"
-	fn "knative.dev/func/pkg/functions"
 )
 
-func NewPromptForCredentials(in io.Reader, out, errOut io.Writer) func(f fn.Function, registry string) (docker.Credentials, error) {
+func NewPromptForCredentials(in io.Reader, out, errOut io.Writer) func(registryWithRepo string) (docker.Credentials, error) {
 	firstTime := true
-	return func(f fn.Function, registry string) (docker.Credentials, error) {
+	return func(registryWithRepo string) (docker.Credentials, error) {
 		var result docker.Credentials
 		if firstTime {
 			firstTime = false
-			fmt.Fprintf(out, "Please provide credentials for image '%s'.\n", f.Build.Image)
+			fmt.Fprintf(out, "Please provide credentials for repository '%s'.\n", registryWithRepo)
 		} else {
-			fmt.Fprintf(out, "Incorrect credentials for image '%s'. Please make sure the image name is correct and try again.\n", f.Build.Image)
+			fmt.Fprintf(out, "Incorrect credentials for repository '%s'. Please make sure the image name is correct and try again.\n", registryWithRepo)
 		}
 
 		var qs = []*survey.Question{

diff --git a/cmd/prompt/prompt_test.go b/cmd/prompt/prompt_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/hinshun/vt10x"
 
 	"knative.dev/func/pkg/docker"
-	fn "knative.dev/func/pkg/functions"
 )
 
 const (
@@ -72,7 +71,7 @@ func Test_NewPromptForCredentials(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			credPrompt := NewPromptForCredentials(tt.in, tt.out, tt.errOut)
-			cred, err := credPrompt(fn.Function{}, "example.com")
+			cred, err := credPrompt("example.com")
 			if err != nil {
 				t.Fatal(err)
 			}