Move stack package to go-sdk

alexellis · alexellis · commit bda863db5f98 · 2025-08-22T15:12:29.000+01:00
The stack package moved to go-sdk for lightweight imports for
clients and programs that need to load/parse stack.yaml into
memory.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) &lt;alexellis2@gmail.com&gt;
diff --git a/builder/build.go b/builder/build.go
@@ -21,9 +21,9 @@ import (
 
 	v2execute "github.com/alexellis/go-execute/v2"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
 	vcs "github.com/openfaas/faas-cli/versioncontrol"
 	"github.com/openfaas/go-sdk/builder"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 // AdditionalPackageBuildArg holds the special build-arg keyname for use with build-opts.
diff --git a/builder/build_test.go b/builder/build_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 func Test_getDockerBuildCommand_NoOpts(t *testing.T) {
diff --git a/builder/copy.go b/builder/copy.go
@@ -84,7 +84,7 @@ func copyFile(src, dest string) error {
 
 	_, err = io.Copy(f, s)
 	if err != nil {
-		return fmt.Errorf("Error copying dest file: %s\n" + err.Error())
+		return fmt.Errorf("Error copying dest file: %s", err.Error())
 	}
 
 	return nil
diff --git a/builder/publish.go b/builder/publish.go
@@ -16,8 +16,8 @@ import (
 
 	v2execute "github.com/alexellis/go-execute/v2"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/go-sdk/builder"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 // PublishImage will publish images as multi-arch
diff --git a/commands/build.go b/commands/build.go
@@ -13,8 +13,8 @@ import (
 	"github.com/morikuni/aec"
 	"github.com/openfaas/faas-cli/builder"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/util"
+	"github.com/openfaas/go-sdk/stack"
 
 	"github.com/openfaas/faas-cli/versioncontrol"
 	"github.com/spf13/cobra"
diff --git a/commands/deploy.go b/commands/deploy.go
@@ -14,8 +14,8 @@ import (
 	"github.com/openfaas/faas-cli/builder"
 	"github.com/openfaas/faas-cli/proxy"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/util"
+	"github.com/openfaas/go-sdk/stack"
 
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v3"
@@ -492,7 +492,7 @@ func deployFailed(status map[string]int) error {
 		err := fmt.Errorf("function '%s' failed to deploy with status code: %d", funcName, funcStatus)
 		allErrors = append(allErrors, err.Error())
 	}
-	return fmt.Errorf(strings.Join(allErrors, "\n"))
+	return fmt.Errorf("%s", strings.Join(allErrors, "\n"))
 }
 
 func badStatusCode(statusCode int) bool {
diff --git a/commands/describe.go b/commands/describe.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/openfaas/faas-cli/proxy"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-provider/types"
+	"github.com/openfaas/go-sdk/stack"
 
 	"github.com/spf13/cobra"
 )
diff --git a/commands/faas.go b/commands/faas.go
@@ -15,8 +15,8 @@ import (
 	"syscall"
 
 	"github.com/moby/term"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/version"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/generate.go b/commands/generate.go
@@ -16,8 +16,8 @@ import (
 	"github.com/openfaas/faas-cli/schema"
 	knativev1 "github.com/openfaas/faas-cli/schema/knative/v1"
 	openfaasv1 "github.com/openfaas/faas-cli/schema/openfaas/v1"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/util"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
diff --git a/commands/generate_test.go b/commands/generate_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/openfaas/faas-cli/schema"
 
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 var generateTestcases = []struct {
diff --git a/commands/invoke.go b/commands/invoke.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 
 	"github.com/alexellis/hmac/v2"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/version"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/list.go b/commands/list.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 
 	"github.com/openfaas/faas-cli/proxy"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-provider/types"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/local_run.go b/commands/local_run.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/openfaas/faas-cli/builder"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/commands/new_function.go b/commands/new_function.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/openfaas/faas-cli/builder"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/new_function_test.go b/commands/new_function_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/test"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 const (
diff --git a/commands/publish.go b/commands/publish.go
@@ -14,7 +14,7 @@ import (
 	"github.com/openfaas/faas-cli/util"
 
 	"github.com/openfaas/faas-cli/builder"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/push.go b/commands/push.go
@@ -14,7 +14,7 @@ import (
 	"github.com/morikuni/aec"
 	"github.com/openfaas/faas-cli/builder"
 	"github.com/openfaas/faas-cli/schema"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
@@ -67,9 +67,9 @@ func runPush(cmd *cobra.Command, args []string) error {
 			imageList := strings.Join(invalidImages, "\n- ")
 			return fmt.Errorf(`
 Unable to push one or more of your functions to Docker Hub:
-- ` + imageList + `
+- %s
 
-You must provide a username or registry prefix to the Function's image such as user1/function1`)
+You must provide a username or registry prefix to the Function's image such as user1/function1`, imageList)
 		}
 
 		pushStack(&services, parallel, tagFormat)
diff --git a/commands/push_test.go b/commands/push_test.go
@@ -6,7 +6,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 func Test_PushValidation(t *testing.T) {
diff --git a/commands/ready.go b/commands/ready.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/openfaas/faas-cli/proxy"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/remove.go b/commands/remove.go
@@ -9,7 +9,7 @@ import (
 	"os"
 
 	"github.com/openfaas/faas-cli/proxy"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/secret_update.go b/commands/secret_update.go
@@ -113,7 +113,7 @@ func runSecretUpdate(cmd *cobra.Command, args []string) error {
 
 	fmt.Println("Updating secret: " + secret.Name)
 	_, output := client.UpdateSecret(context.Background(), secret)
-	fmt.Printf(output)
+	fmt.Printf("%s", output)
 
 	return nil
 }
diff --git a/commands/store_test.go b/commands/store_test.go
@@ -69,7 +69,7 @@ func getInputStoreFunctions(t *testing.T) []storeV2.StoreFunction {
 	var inputFunctions []storeV2.StoreFunction
 	err := json.Unmarshal(inputJSONBytes, &inputFunctions)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("error: %s", err.Error())
 	}
 
 	return inputFunctions
@@ -104,7 +104,7 @@ func Test_filterStoreList_x86_64(t *testing.T) {
 	var expectedOuputFunctions []storeV2.StoreFunction
 	err := json.Unmarshal(outputJSONBytes, &expectedOuputFunctions)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("error: %s", err.Error())
 	}
 
 	filteredFunctions := filterStoreList(inputFunctions, "x86_64")
@@ -141,7 +141,7 @@ func Test_filterStoreList_armhf(t *testing.T) {
 	var expectedOuputFunctions []storeV2.StoreFunction
 	err := json.Unmarshal(outputJSONBytes, &expectedOuputFunctions)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("error: %s", err.Error())
 	}
 
 	filteredFunctions := filterStoreList(inputFunctions, "armhf")
@@ -178,7 +178,7 @@ func Test_filterStoreList_arm64(t *testing.T) {
 	var expectedOuputFunctions []storeV2.StoreFunction
 	err := json.Unmarshal(outputJSONBytes, &expectedOuputFunctions)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("error: %s", err.Error())
 	}
 
 	filteredFunctions := filterStoreList(inputFunctions, "arm64")
@@ -193,7 +193,7 @@ func Test_filterStoreList_other(t *testing.T) {
 	var expectedOuputFunctions []storeV2.StoreFunction
 	err := json.Unmarshal(outputJSONBytes, &expectedOuputFunctions)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("error: %s", err.Error())
 	}
 
 	filteredFunctions := filterStoreList(inputFunctions, "other")
diff --git a/commands/template_pull_stack.go b/commands/template_pull_stack.go
@@ -6,7 +6,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/template_pull_stack_test.go b/commands/template_pull_stack_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/openfaas/faas-cli/builder"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 )
 
 func Test_pullAllTemplates(t *testing.T) {
diff --git a/commands/version.go b/commands/version.go
@@ -14,8 +14,8 @@ import (
 	"github.com/alexellis/arkade/pkg/get"
 	"github.com/morikuni/aec"
 	"github.com/openfaas/faas-cli/proxy"
-	"github.com/openfaas/faas-cli/stack"
 	"github.com/openfaas/faas-cli/version"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
@@ -141,7 +141,7 @@ func printLogo() {
 	if runtime.GOOS == "windows" {
 		figletColoured = aec.GreenF.Apply(figletStr)
 	}
-	fmt.Printf(figletColoured)
+	fmt.Printf("%s", figletColoured)
 }
 
 const figletStr = `  ___                   _____           ____
diff --git a/commands/watch.go b/commands/watch.go
@@ -15,7 +15,7 @@ import (
 	"github.com/bep/debounce"
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
-	"github.com/openfaas/faas-cli/stack"
+	"github.com/openfaas/go-sdk/stack"
 	"github.com/spf13/cobra"
 )
 
diff --git a/config/config_file_test.go b/config/config_file_test.go
@@ -102,7 +102,7 @@ func Test_UpdateAuthConfig_Insert(t *testing.T) {
 	authConfig, err := LookupAuthConfig(gatewayURL)
 	if err != nil {
 		t.Errorf("got error %s", err.Error())
-		t.Errorf(authConfig.Token)
+		t.Errorf("token: %s", authConfig.Token)
 	}
 
 	user, pass, err := DecodeAuth(authConfig.Token)
@@ -389,7 +389,7 @@ func Test_UpdateAuthConfig_Oauth2Insert(t *testing.T) {
 	authConfig, err := LookupAuthConfig(gatewayURL)
 	if err != nil {
 		t.Errorf("got error %s", err.Error())
-		t.Errorf(authConfig.Token)
+		t.Errorf("token: %s", authConfig.Token)
 	}
 
 	if authConfig.Token != token {
diff --git a/exec/exec.go b/exec/exec.go
@@ -23,7 +23,7 @@ func Command(tempPath string, builder []string) {
 	err := targetCmd.Wait()
 	if err != nil {
 		errString := fmt.Sprintf("ERROR - Could not execute command: %s", builder)
-		log.Fatalf(aec.RedF.Apply(errString))
+		log.Fatal(aec.RedF.Apply(errString))
 	}
 }
 
@@ -32,7 +32,8 @@ func CommandWithOutput(builder []string, skipFailure bool) string {
 	output, err := osexec.Command(builder[0], builder[1:]...).CombinedOutput()
 	if err != nil && !skipFailure {
 		errString := fmt.Sprintf("ERROR - Could not execute command: %s", builder)
-		log.Fatalf(aec.RedF.Apply(errString))
+		log.Fatal(aec.RedF.Apply(errString))
 	}
+
 	return string(output)
 }
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/openfaas/faas-cli
 
-go 1.23.0
-
-toolchain go1.23.3
+go 1.24
 
 require (
 	github.com/Masterminds/semver v1.5.0
@@ -13,15 +11,15 @@ require (
 	github.com/drone/envsubst v1.0.3
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-git/go-git/v5 v5.13.2
-	github.com/google/go-cmp v0.6.0
+	github.com/google/go-cmp v0.7.0
 	github.com/google/go-containerregistry v0.20.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/moby/term v0.5.2
 	github.com/morikuni/aec v1.0.0
-	github.com/openfaas/faas-provider v0.25.7
+	github.com/openfaas/faas-provider v0.25.8
 	github.com/openfaas/faas/gateway v0.0.0-20241209094132-4e20249bc070
-	github.com/openfaas/go-sdk v0.2.18
+	github.com/openfaas/go-sdk v0.2.19
 	github.com/pkg/errors v0.9.1
 	github.com/ryanuber/go-glob v1.0.0
 	github.com/spf13/cobra v1.8.1
diff --git a/go.sum b/go.sum
diff --git a/proxy/client_test.go b/proxy/client_test.go
diff --git a/proxy/deploy.go b/proxy/deploy.go
diff --git a/schema/openfaas/v1/crd.go b/schema/openfaas/v1/crd.go
diff --git a/stack/language_template_test.go b/stack/language_template_test.go
diff --git a/stack/stack_test.go b/stack/stack_test.go
diff --git a/vendor/github.com/google/go-cmp/cmp/internal/function/func.go b/vendor/github.com/google/go-cmp/cmp/internal/function/func.go
diff --git a/vendor/github.com/google/go-cmp/cmp/options.go b/vendor/github.com/google/go-cmp/cmp/options.go
diff --git a/vendor/github.com/openfaas/go-sdk/builder/copy.go b/vendor/github.com/openfaas/go-sdk/builder/copy.go
diff --git a/vendor/github.com/openfaas/go-sdk/stack/language_template.go b/vendor/github.com/openfaas/go-sdk/stack/language_template.go
diff --git a/vendor/github.com/openfaas/go-sdk/stack/schema.go b/vendor/github.com/openfaas/go-sdk/stack/schema.go
diff --git a/vendor/github.com/openfaas/go-sdk/stack/stack.go b/vendor/github.com/openfaas/go-sdk/stack/stack.go
diff --git a/vendor/modules.txt b/vendor/modules.txt

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import (`
`21`	`21`
`22`	`22`	`v2execute "github.com/alexellis/go-execute/v2"`
`23`	`23`	`"github.com/openfaas/faas-cli/schema"`
`24`		`- "github.com/openfaas/faas-cli/stack"`
`25`	`24`	`vcs "github.com/openfaas/faas-cli/versioncontrol"`
`26`	`25`	`"github.com/openfaas/go-sdk/builder"`
	`26`	`+ "github.com/openfaas/go-sdk/stack"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// AdditionalPackageBuildArg holds the special build-arg keyname for use with build-opts.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/openfaas/faas-cli/stack"`
	`10`	`+ "github.com/openfaas/go-sdk/stack"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func Test_getDockerBuildCommand_NoOpts(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func copyFile(src, dest string) error {`
`84`	`84`
`85`	`85`	`_, err = io.Copy(f, s)`
`86`	`86`	`if err != nil {`
`87`		`- return fmt.Errorf("Error copying dest file: %s\n" + err.Error())`
	`87`	`+ return fmt.Errorf("Error copying dest file: %s", err.Error())`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ import (`
`16`	`16`
`17`	`17`	`v2execute "github.com/alexellis/go-execute/v2"`
`18`	`18`	`"github.com/openfaas/faas-cli/schema"`
`19`		`- "github.com/openfaas/faas-cli/stack"`
`20`	`19`	`"github.com/openfaas/go-sdk/builder"`
	`20`	`+ "github.com/openfaas/go-sdk/stack"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`// PublishImage will publish images as multi-arch`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ import (`
`15`	`15`	`"syscall"`
`16`	`16`
`17`	`17`	`"github.com/moby/term"`
`18`		`- "github.com/openfaas/faas-cli/stack"`
`19`	`18`	`"github.com/openfaas/faas-cli/version"`
	`19`	`+ "github.com/openfaas/go-sdk/stack"`
`20`	`20`	`"github.com/spf13/cobra"`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/openfaas/faas-cli/schema"`
`11`	`11`
`12`		`- "github.com/openfaas/faas-cli/stack"`
	`12`	`+ "github.com/openfaas/go-sdk/stack"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var generateTestcases = []struct {`