Custom Prompts/Validators for Resource Types

cmd/create.go

@@ -261,14 +261,14 @@ func (cc *createCmd) generateDockerfile(langConfig *config.DraftConfig, lowerLan
 		for i, variable := range langConfig.Variables {
 			if k == variable.Name {
 				variableExists = true
-				langConfig.Variables[i].Default.Value = v
+				langConfig.Variables[i].SetDefaultValue(v)
 				break
 			}
 		}
 		if !variableExists {
 			langConfig.Variables = append(langConfig.Variables, &config.BuilderVar{
 				Name: k,
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					Value: v,
 				},
 			})

cmd/create_test.go

@@ -152,7 +152,7 @@ func TestValidateConfigInputsToPromptsPass(t *testing.T) {
 			},
 			{
 				Name: "REQUIRED_DEFAULTED",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					Value: "DEFAULT_VALUE",
 				},
 			},
@@ -210,7 +210,7 @@ func (mcc *createCmd) mockDetectLanguage() (*config.DraftConfig, string, error)
 			mcc.createConfig.LanguageType = mcc.lang
 		} else {
 			langs, err = linguist.ProcessDir(mcc.dest)
-			log.Debugf("linguist.ProcessDir(%v) result:\n\nError: %v", mcc.dest, err)
+			log.Debugf("linguist.ProcessDir(%v) result:\n", mcc.dest)
 			if err != nil {
 				return nil, "", fmt.Errorf("there was an error detecting the language: %s", err)
 			}

cmd/generate-workflow.go

@@ -37,7 +37,7 @@ with draft on AKS. This command assumes the 'setup-gh' command has been run prop
 				return err
 			}
 
-			log.Info("Draft has successfully generated a Github workflow for your project 😃")
+			log.Info("Draft has successfully generated a Github workflow for your project under directory \".github/workflows/\" 😃")
 
 			return nil
 		},
@@ -47,7 +47,7 @@ with draft on AKS. This command assumes the 'setup-gh' command has been run prop
 
 	f.StringVarP(&gwCmd.dest, "destination", "d", currentDirDefaultFlagValue, "specify the path to the project directory")
 	f.StringVarP(&gwCmd.deployType, "deploy-type", "", "", "specify the k8s deployment type (helm, kustomize, manifests)")
-	f.StringArrayVarP(&gwCmd.flagVariables, "variable", "", []string{}, "pass template variables (e.g. --variable CLUSTERNAME=testCluster --variable DOCKERFILE=./Dockerfile)")
+	f.StringArrayVarP(&gwCmd.flagVariables, "variable", "", []string{}, "pass template variables (e.g. --variable CLUSTERNAME=testCluster --variable DOCKERFILEPATH=./Dockerfile)")
 	gwCmd.templateWriter = &writers.LocalFSWriter{}
 	return cmd
 }
@@ -86,7 +86,7 @@ func (gwc *generateWorkflowCmd) generateWorkflows() error {
 	}
 
 	if err := workflows.UpdateProductionDeployments(gwc.deployType, gwc.dest, draftConfig, gwc.templateWriter); err != nil {
-		return fmt.Errorf("update production deployments: %w", err)
+		return fmt.Errorf("failed to update production deployments: %w", err)
 	}
 
 	return workflow.CreateWorkflowFiles(gwc.deployType, draftConfig, gwc.templateWriter)

example/deployment.go

@@ -39,7 +39,7 @@ func WriteDeploymentFilesExample() error {
 		Variables: []*config.BuilderVar{
 			{
 				Name: "PORT",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					Value: "80",
 				},
 				Description: "the port exposed in the application",
@@ -52,23 +52,23 @@ func WriteDeploymentFilesExample() error {
 			},
 			{
 				Name: "SERVICEPORT",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					ReferenceVar: "PORT",
 				},
 				Description: "the port the service uses to make the application accessible from outside the cluster",
 				Value:       "8080",
 			},
 			{
 				Name: "NAMESPACE",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					Value: "default",
 				},
 				Description: "the name of the image to use in the deployment",
 				Value:       "example-namespace",
 			},
 			{
 				Name: "IMAGENAME",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					IsPromptDisabled: true,
 					Value:            "the name of the image to use in the deployment",
 				},
@@ -77,7 +77,7 @@ func WriteDeploymentFilesExample() error {
 			},
 			{
 				Name: "IMAGETAG",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					IsPromptDisabled: true,
 					Value:            "latest",
 				},
@@ -86,7 +86,7 @@ func WriteDeploymentFilesExample() error {
 			},
 			{
 				Name: "GENERATORLABEL",
-				Default: config.BuilderVarDefault{
+				Default: &config.BuilderVarDefault{
 					IsPromptDisabled: true,
 					Value:            "draft",
 				},

example/deployment_test.go

@@ -24,7 +24,7 @@ func TestWriteDeploymentFiles(t *testing.T) {
 				Variables: []*config.BuilderVar{
 					{
 						Name: "PORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "80",
 						},
 						Description: "the port exposed in the application",
@@ -37,23 +37,23 @@ func TestWriteDeploymentFiles(t *testing.T) {
 					},
 					{
 						Name: "SERVICEPORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							ReferenceVar: "PORT",
 						},
 						Description: "the port the service uses to make the application accessible from outside the cluster",
 						Value:       "8080",
 					},
 					{
 						Name: "NAMESPACE",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "default",
 						},
 						Description: "the name of the image to use in the deployment",
 						Value:       "testnamespace",
 					},
 					{
 						Name: "IMAGENAME",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "the name of the image to use in the deployment",
 						},
@@ -62,7 +62,7 @@ func TestWriteDeploymentFiles(t *testing.T) {
 					},
 					{
 						Name: "IMAGETAG",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "latest",
 						},
@@ -71,7 +71,7 @@ func TestWriteDeploymentFiles(t *testing.T) {
 					},
 					{
 						Name: "GENERATORLABEL",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "draft",
 						},
@@ -88,7 +88,7 @@ func TestWriteDeploymentFiles(t *testing.T) {
 				Variables: []*config.BuilderVar{
 					{
 						Name: "PORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "80",
 						},
 						Description: "the port exposed in the application",
@@ -100,37 +100,37 @@ func TestWriteDeploymentFiles(t *testing.T) {
 					},
 					{
 						Name: "SERVICEPORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							ReferenceVar: "PORT",
 						},
 						Description: "the port the service uses to make the application accessible from outside the cluster",
 					},
 					{
 						Name: "NAMESPACE",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "default",
 						},
 						Description: "the name of the image to use in the deployment",
 					},
 					{
 						Name: "IMAGENAME",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "the name of the image to use in the deployment",
 						},
 						Description: "the name of the image to use in the deployment",
 					},
 					{
 						Name: "IMAGETAG",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "latest",
 						},
 						Description: "the tag of the image to use in the deployment",
 					},
 					{
 						Name: "GENERATORLABEL",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							IsPromptDisabled: true,
 							Value:            "draft",
 						},

example/dockerfile_test.go

@@ -25,7 +25,7 @@ func TestWriteDockerfile(t *testing.T) {
 				Variables: []*config.BuilderVar{
 					{
 						Name: "PORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "80",
 						},
 						Description: "the port exposed in the application",
@@ -34,7 +34,7 @@ func TestWriteDockerfile(t *testing.T) {
 					},
 					{
 						Name: "VERSION",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "1.18",
 						},
 						Description:   "the version of go used by the application",
@@ -52,7 +52,7 @@ func TestWriteDockerfile(t *testing.T) {
 				Variables: []*config.BuilderVar{
 					{
 						Name: "PORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "80",
 						},
 						Description: "the port exposed in the application",
@@ -61,7 +61,7 @@ func TestWriteDockerfile(t *testing.T) {
 					},
 					{
 						Name: "VERSION",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "1.18",
 						},
 						Description:   "the version of go used by the application",
@@ -78,7 +78,7 @@ func TestWriteDockerfile(t *testing.T) {
 				Variables: []*config.BuilderVar{
 					{
 						Name: "PORT",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "80",
 						},
 						Description: "the port exposed in the application",
@@ -87,7 +87,7 @@ func TestWriteDockerfile(t *testing.T) {
 					},
 					{
 						Name: "VERSION",
-						Default: config.BuilderVarDefault{
+						Default: &config.BuilderVarDefault{
 							Value: "1.18",
 						},
 						Description:   "the version of go used by the application",

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/fatih/color v1.16.0
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-git/go-git/v5 v5.12.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/instrumenta/kubeval v0.16.0
 	github.com/ivanpirog/coloredcobra v1.0.1
@@ -23,7 +24,6 @@ require (
 	go.uber.org/mock v0.4.0
 	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
 	golang.org/x/mod v0.17.0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.14.4
 	k8s.io/api v0.29.3
@@ -35,6 +35,7 @@ require (
 )
 
 require (
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -43,15 +44,18 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/containerd/containerd v1.7.14 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
@@ -64,10 +68,13 @@ require (
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -78,6 +85,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/glog v1.2.1 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/cel-go v0.17.7 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
@@ -92,8 +100,10 @@ require (
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
@@ -111,6 +121,7 @@ require (
 	github.com/open-policy-agent/opa v0.63.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -119,11 +130,14 @@ require (
 	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/tchap/go-patricia/v2 v2.3.1 // indirect
+	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -146,6 +160,7 @@ require (
 	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
@@ -154,6 +169,8 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiextensions-apiserver v0.29.3 // indirect
 	k8s.io/apiserver v0.29.3 // indirect
 	k8s.io/component-base v0.29.3 // indirect