Added packages to support render/save/apply kubernetes manifests

cmd/shore/shore.go

@@ -4,11 +4,15 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/Autodesk/shore/pkg/backend"
+	"github.com/Autodesk/shore/pkg/backend/k8sbackend"
 	"github.com/Autodesk/shore/pkg/backend/spinnaker"
 	"github.com/Autodesk/shore/pkg/cleanup_command"
 	"github.com/Autodesk/shore/pkg/command"
 	"github.com/Autodesk/shore/pkg/project"
+	"github.com/Autodesk/shore/pkg/renderer"
 	"github.com/Autodesk/shore/pkg/renderer/jsonnet"
+	"github.com/Autodesk/shore/pkg/renderer/k8srender"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
@@ -21,6 +25,11 @@ var version = "local"
 
 var logVerbosity int
 var logger *logrus.Logger
+var rendererInstance renderer.Renderer
+var backendInstance backend.Backend
+
+var commonDependencies *command.Dependencies
+var fs afero.Fs = afero.NewOsFs()
 
 var rootCmd = &cobra.Command{
 	Use:           "shore",
@@ -37,6 +46,31 @@ var rootCmd = &cobra.Command{
 		profileName := GetProfileName(cmd)
 		ExecConfigName := GetExecutorConfigName(cmd)
 
+		// Check if the command is "render"
+		rendererType := GetRendererType(cmd)
+
+		// Initialize the Renderer based on the flag
+		if rendererType == "k" {
+			logger.Infof("Using Kubernetes Renderer (k8srender)")
+			rendererInstance = k8srender.NewRenderer(fs, logger)
+		} else {
+			logger.Infof("Using Jsonnet Renderer (jsonnet)")
+			rendererInstance = jsonnet.NewRenderer(fs, logger)
+		}
+		// Use executorType for other commands
+		executorType := GetExecutorType(cmd)
+		if executorType == "d" {
+			logger.Infof("Using Kubernetes Backend (k8sbackend)")
+			backendInstance = k8sbackend.NewClient(logger)
+		} else {
+			logger.Infof("Using Spinnaker Backend (spinnaker)")
+			backendInstance = spinnaker.NewClient(logger)
+		}
+
+		// Pass the rendererInstance to commonDependencies
+		commonDependencies.Renderer = rendererInstance
+		commonDependencies.Backend = backendInstance
+
 		logger.Debug("Profile set to - ", profileName)
 		logger.Debug("Executor configuration set to - ", ExecConfigName)
 	},
@@ -67,26 +101,38 @@ func getConfigName(cmd *cobra.Command, flagName string, envVar string) string {
 	return configName
 }
 
+func GetRendererType(cmd *cobra.Command) string {
+	return getConfigName(cmd, "renderer", "SHORE_RENDERER")
+}
+
+func GetExecutorType(cmd *cobra.Command) string {
+	return getConfigName(cmd, "executor", "SHORE_EXECUTOR")
+}
+
 func init() {
 	// TODO: Add global validations to init.
 	// cobra.OnInitialize()
 	fs := afero.NewOsFs()
 	logger = logrus.New()
 
-	commonDependencies := &command.Dependencies{
-		Project:  project.NewShoreProject(fs, logger),
-		Renderer: jsonnet.NewRenderer(fs, logger),
-		Backend:  spinnaker.NewClient(logger),
-		Logger:   logger,
-	}
-
 	rootCmd.PersistentFlags().CountVarP(&logVerbosity, "verbose", "v", "Logging verbosity")
 	// "default" should not be set explicitly on the command - it will be set in getConfigName.
 	rootCmd.PersistentFlags().StringP("executor-config", "X", os.Getenv("SHORE_EXECUTOR_CONFIG"),
 		"The backend configuration name to use. Can also be set by $SHORE_EXECUTOR_CONFIG environment variable. Priority is: env variable, cli args, default.")
 	//'p' is used for 'payload' used by exec command. 'l' for load profile?
 	rootCmd.PersistentFlags().StringP("profile", "P", os.Getenv("SHORE_PROFILE"),
 		"The profile to use. Can also be set by $SHORE_PROFILE environment variable. Priority is: env variable, cli args, default.")
+	rootCmd.PersistentFlags().StringP("renderer", "k", os.Getenv("SHORE_RENDERER"),
+		"Which render to use (eg. k for k8s, jsonnet). Can also be set by $SHORE_RENDERER environment variable. Priority is: env variable, cli args, default.")
+	rootCmd.PersistentFlags().StringP("executor", "e", os.Getenv("SHORE_EXECUTOR"),
+		"Which executor to use (eg. spinnaker, d for k8sbackend). Can also be set by $SHORE_EXECUTOR environment variable. Priority is: env variable, cli args, default.")
+
+	commonDependencies = &command.Dependencies{
+		Project:  project.NewShoreProject(fs, logger),
+		Renderer: nil,
+		Backend:  nil,
+		Logger:   logger,
+	}
 
 	rootCmd.AddCommand(command.NewProjectCommand(commonDependencies))
 	rootCmd.AddCommand(command.NewRenderCommand(commonDependencies))

go.mod

@@ -1,23 +1,28 @@
 module github.com/Autodesk/shore
 
-go 1.20
+go 1.23.0
+
+toolchain go1.23.8
 
 require (
 	github.com/briandowns/spinner v1.23.0
 	github.com/fatih/color v1.15.0
 	github.com/google/go-jsonnet v0.19.1
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/json-iterator/go v1.1.12
 	github.com/jsonnet-bundler/jsonnet-bundler v0.5.1
 	github.com/manifoldco/promptui v0.9.0
 	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/afero v1.9.5
-	github.com/spf13/cobra v1.6.1
+	github.com/spf13/cobra v1.8.1
 	github.com/spinnaker/spin v1.27.1
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.9.0
 	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/apimachinery v0.32.3
+	k8s.io/client-go v0.32.3
+	sigs.k8s.io/controller-runtime v0.20.4
 )
 
 require (
@@ -30,12 +35,25 @@ require (
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/chzyer/readline v1.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mitchellh/cli v1.1.4 // indirect
@@ -44,23 +62,32 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
-	golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
-	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/term v0.1.0 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/client-go v11.0.0+incompatible // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/api v0.32.3 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )