Updating templates and moving tests

Author: bfoley13

pkg/config/draftconfig.go

@@ -37,6 +37,7 @@ type BuilderVar struct {
 	Default        BuilderVarDefault              `yaml:"default"`
 	Description    string                         `yaml:"description"`
 	ExampleValues  []string                       `yaml:"exampleValues"`
+	AllowedValues  []string                       `yaml:"allowedValues"`
 	Type           string                         `yaml:"type"`
 	Kind           string                         `yaml:"kind"`
 	Value          string                         `yaml:"value"`
@@ -50,9 +51,10 @@ type BuilderVarDefault struct {
 	Value            string `yaml:"value"`
 }
 
-// BuilderVarConditionalReference holds a reference to a variable thats value can effect validation/transformation of the associated variable
+// BuilderVarConditionalReference holds a reference to a variable thats value can effect usage/validation/transformation of the associated variable
 type BuilderVarConditionalReference struct {
-	ReferenceVar string `yaml:"referenceVar"`
+	ReferenceVar   string `yaml:"referenceVar"`
+	ConditionValue string `yaml:"conditionValue"`
 }
 
 func NewConfigFromFS(fileSys fs.FS, path string) (*DraftConfig, error) {

pkg/config/draftconfig_template_test.go

@@ -44,11 +44,14 @@ var validVariableKinds = map[string]bool{
 	"filePath":                   true,
 	"flag":                       true,
 	"helmChartOverrides":         true,
+	"imagePullPolicy":            true,
 	"ingressHostName":            true,
 	"kubernetesNamespace":        true,
+	"kubernetesProbeHttpPath":    true,
 	"kubernetesProbePeriod":      true,
 	"kubernetesProbeTimeout":     true,
 	"kubernetesProbeThreshold":   true,
+	"kubernetesProbeType":        true,
 	"kubernetesProbeDelay":       true,
 	"kubernetesResourceLimit":    true,
 	"kubernetesResourceName":     true,

pkg/config/validators/validators.go

@@ -8,19 +8,52 @@ import (
 func GetValidator(variableKind string) func(string) error {
 	switch variableKind {
 	case "envVarMap":
-		return KeyValueMapValidator
+		return keyValueMapValidator
+	case "imagePullPolicy":
+		return imagePullPolicyValidator
+	case "kubernetesProbeType":
+		return kubernetesProbeTypeValidator
+	case "scalingResourceType":
+		return scalingResourceTypeValidator
 	default:
-		return DefaultValidator
+		return defaultValidator
 	}
 }
 
-func KeyValueMapValidator(input string) error {
+func imagePullPolicyValidator(input string) error {
+	switch input {
+	case "Always", "IfNotPresent", "Never":
+		return nil
+	default:
+		return fmt.Errorf("invalid image pull policy: %s", input)
+	}
+}
+
+func scalingResourceTypeValidator(input string) error {
+	switch input {
+	case "cpu", "memory":
+		return nil
+	default:
+		return fmt.Errorf("invalid scaling resource type: %s", input)
+	}
+}
+
+func kubernetesProbeTypeValidator(input string) error {
+	switch input {
+	case "httpGet", "tcpSocket":
+		return nil
+	default:
+		return fmt.Errorf("invalid probe type: %s", input)
+	}
+}
+
+func keyValueMapValidator(input string) error {
 	if err := json.Unmarshal([]byte(input), &map[string]string{}); err != nil {
 		return fmt.Errorf("failed to unmarshal variable as map[string]string: %s", err)
 	}
 	return nil
 }
 
-func DefaultValidator(input string) error {
+func defaultValidator(input string) error {
 	return nil
 }

pkg/config/validators/validators_test.go

@@ -11,5 +11,29 @@ func TestGetValidator(t *testing.T) {
 }
 
 func TestDefaultValidator(t *testing.T) {
-	assert.Nil(t, DefaultValidator("test"))
+	assert.Nil(t, defaultValidator("test"))
+}
+
+func TestKubernetesProbeTypeValidator(t *testing.T) {
+	assert.Nil(t, kubernetesProbeTypeValidator("httpGet"))
+	assert.Nil(t, kubernetesProbeTypeValidator("tcpSocket"))
+	assert.NotNil(t, kubernetesProbeTypeValidator("exec"))
+}
+
+func TestKeyValueMapValidator(t *testing.T) {
+	assert.Nil(t, keyValueMapValidator(`{"key": "value"}`))
+	assert.NotNil(t, keyValueMapValidator(`{"key": "value"`))
+}
+
+func TestScalingResourceTypeValidator(t *testing.T) {
+	assert.Nil(t, scalingResourceTypeValidator("cpu"))
+	assert.Nil(t, scalingResourceTypeValidator("memory"))
+	assert.NotNil(t, scalingResourceTypeValidator("disk"))
+}
+
+func TestImagePullPolicyValidator(t *testing.T) {
+	assert.Nil(t, imagePullPolicyValidator("Always"))
+	assert.Nil(t, imagePullPolicyValidator("IfNotPresent"))
+	assert.Nil(t, imagePullPolicyValidator("Never"))
+	assert.NotNil(t, imagePullPolicyValidator("Sometimes"))
 }

pkg/fixtures/deployments/helm/charts/templates/deployment.yaml

@@ -42,6 +42,8 @@ spec:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
+          startupProbe:
+            {{- toYaml .Values.startupProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           envFrom:

pkg/fixtures/deployments/helm/charts/values.yaml

@@ -31,11 +31,11 @@ resources:
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
-    cpu: "2"
+    cpu: "1"
     memory: "1Gi"
   requests:
     cpu: "1"
-    memory: "512Mi"
+    memory: "1Gi"
 
 autoscaling:
   enabled: false
@@ -55,6 +55,14 @@ readinessProbe:
   failureThreshold: 1
   successThreshold: 1
   initialDelaySeconds: 3
+startupProbe:
+  tcpSocket:
+    port: 80
+  periodSeconds: 1
+  timeoutSeconds: 3
+  failureThreshold: 1
+  successThreshold: 1
+  initialDelaySeconds: 1
 
 nodeSelector: {}
 

pkg/fixtures/deployments/kustomize/base/deployment.yaml

@@ -25,9 +25,9 @@ spec:
           resources:
             requests:
               cpu: "1"
-              memory: "512Mi"
+              memory: "1Gi"
             limits:
-              cpu: "2"
+              cpu: "1"
               memory: "1Gi"
           envFrom:
             - configMapRef:
@@ -43,6 +43,14 @@ spec:
             failureThreshold: 1
             successThreshold: 1
             initialDelaySeconds: 3
+          startupProbe:
+            tcpSocket:
+              port: 80
+            periodSeconds: 1
+            timeoutSeconds: 3
+            failureThreshold: 1
+            successThreshold: 1
+            initialDelaySeconds: 1
           securityContext:
             seccompProfile:
               type: RuntimeDefault

pkg/fixtures/deployments/manifest/manifests/deployment.yaml

@@ -25,9 +25,9 @@ spec:
           resources:
             requests:
               cpu: "1"
-              memory: "512Mi"
+              memory: "1Gi"
             limits:
-              cpu: "2"
+              cpu: "1"
               memory: "1Gi"
           envFrom:
             - configMapRef:
@@ -43,6 +43,14 @@ spec:
             failureThreshold: 1
             successThreshold: 1
             initialDelaySeconds: 3
+          startupProbe:
+            tcpSocket:
+              port: 80
+            periodSeconds: 1
+            timeoutSeconds: 3
+            failureThreshold: 1
+            successThreshold: 1
+            initialDelaySeconds: 1
           securityContext:
             seccompProfile:
               type: RuntimeDefault

pkg/fixtures/manifests/hpa/hpa-memory.yaml

@@ -0,0 +1,22 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: test-app
+  labels:
+    app.kubernetes.io/name: test-app
+    app.kubernetes.io/part-of: test-app-project
+    kubernetes.azure.com/generator: draft
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: test-app
+  minReplicas: 2
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: 80