feat: Add -s <stack> option to "stack describe"

Some other minor things:
- "ctx" is used very widely for context.Context, seeing it in the code for a path is confusing
- allow stderr when running the collection to help see errors
- use the output.Print() function
- add license headers
- rename codeconfig.Stack to codeconfig.CodeConfig
- store the function and stack names

Author: asalkeld

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/google/go-github/v41 v41.0.0
 	github.com/hashicorp/consul/sdk v0.8.0
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
+	github.com/imdario/mergo v0.3.12
 	github.com/jhoonb/archivex v0.0.0-20201016144719-6a343cdae81d
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mitchellh/mapstructure v1.4.2

go.sum

@@ -662,6 +662,7 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

pkg/build/build.go

@@ -21,9 +21,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"strings"
 
-	"github.com/nitrictech/newcli/pkg/codeconfig"
 	"github.com/nitrictech/newcli/pkg/containerengine"
 	"github.com/nitrictech/newcli/pkg/functiondockerfile"
 	"github.com/nitrictech/newcli/pkg/stack"
@@ -83,18 +81,12 @@ func Create(s *stack.Stack, t *target.Target) error {
 }
 
 // CreateBaseDev builds images for code-as-config
-func CreateBaseDev(handlers []string) error {
+func CreateBaseDev(stackPath string, imagesToBuild map[string]string) error {
 	ce, err := containerengine.Discover()
 	if err != nil {
 		return err
 	}
 
-	imagesToBuild := map[string]string{}
-	for _, h := range handlers {
-		lang := strings.Replace(path.Ext(h), ".", "", 1)
-		imagesToBuild[lang] = codeconfig.ImageNameFromExt(path.Ext(h))
-	}
-
 	for lang, imageTag := range imagesToBuild {
 		f, err := os.CreateTemp("", fmt.Sprintf("%s.*.dockerfile", lang))
 		if err != nil {
@@ -110,7 +102,7 @@ func CreateBaseDev(handlers []string) error {
 			return err
 		}
 
-		if err := ce.Build(f.Name(), ".", imageTag, map[string]string{}); err != nil {
+		if err := ce.Build(f.Name(), stackPath, imageTag, map[string]string{}); err != nil {
 			return err
 		}
 	}

pkg/build/build_test.go

@@ -28,11 +28,11 @@ import (
 func TestCreateBaseDev(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	me := mock_containerengine.NewMockContainerEngine(ctrl)
-	me.EXPECT().Build(gomock.Any(), ".", "nitric-ts-dev", map[string]string{})
+	me.EXPECT().Build(gomock.Any(), "path/to/stack", "nitric-ts-dev", map[string]string{})
 
 	containerengine.MockEngine = me
 
-	if err := CreateBaseDev([]string{"foo.ts"}); err != nil {
+	if err := CreateBaseDev("path/to/stack", map[string]string{"ts": "nitric-ts-dev"}); err != nil {
 		t.Errorf("CreateBaseDev() error = %v", err)
 	}
 }

pkg/cmd/stack/root.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/nitrictech/newcli/pkg/build"
 	"github.com/nitrictech/newcli/pkg/codeconfig"
+	"github.com/nitrictech/newcli/pkg/output"
 	"github.com/nitrictech/newcli/pkg/stack"
 	"github.com/nitrictech/newcli/pkg/templates"
 )
@@ -117,37 +118,33 @@ var stackDescribeCmd = &cobra.Command{
 	Short: "describe stack dependencies",
 	Long:  `Describes stack dependencies`,
 	Run: func(cmd *cobra.Command, args []string) {
-		// Run collection on each of the files
-		ctx, _ := filepath.Abs(".")
+		stackPath, err := filepath.Abs(stack.StackPath())
+		if err != nil {
+			cobra.CheckErr(err)
+		}
 
-		files, err := filepath.Glob(filepath.Join(ctx, args[0]))
+		cc, err := codeconfig.New(stackPath, args[0])
 		cobra.CheckErr(err)
 
-		fmt.Printf("found files: %v\n", files)
-
 		// Generate dev images to run on
-		err = build.CreateBaseDev(files)
+		err = build.CreateBaseDev(stackPath, cc.ImagesToBuild())
 		cobra.CheckErr(err)
 
-		// Create a new stack
-		stack := codeconfig.NewStack()
-
-		for _, f := range files {
-			rel, _ := filepath.Rel(ctx, f)
-
-			if err := codeconfig.Collect(ctx, rel, stack); err != nil {
-				fmt.Println(err)
-			}
-		}
+		err = cc.Collect()
+		cobra.CheckErr(err)
 
-		fmt.Println("stack:" + stack.String())
+		s, err := cc.ToStack()
+		cobra.CheckErr(err)
+		output.Print(s)
 	},
 	Args: cobra.ExactArgs(1),
 }
 
 func RootCommand() *cobra.Command {
 	stackCreateCmd.Flags().BoolVarP(&force, "force", "f", false, "force stack creation, even in non-empty directories.")
 	stackCmd.AddCommand(stackCreateCmd)
+
+	stack.AddOptions(stackDescribeCmd)
 	stackCmd.AddCommand(stackDescribeCmd)
 	return stackCmd
 }