Update Dataproc WorkflowTemplate, rename REQUIRED_OVERRIDE (#5249)

GoogleCloudPlatform · Sep 28, 2021 · bfe21aa · bfe21aa
1 parent c3f4192
commit bfe21aa
Show file tree

Hide file tree

Showing 9 changed files with 1,748 additions and 1,465 deletions.
diff --git a/tpgtools/api/dataproc/beta/workflow_template.yaml b/tpgtools/api/dataproc/beta/workflow_template.yaml
diff --git a/tpgtools/api/dataproc/workflow_template.yaml b/tpgtools/api/dataproc/workflow_template.yaml
diff --git a/tpgtools/override.go b/tpgtools/override.go
@@ -74,7 +74,7 @@ const (
 	GenerateIfNotSet                  = "GENERATE_IF_NOT_SET"
 	CustomListSize                    = "CUSTOM_LIST_SIZE_CONSTRAINT"
 	CustomDefault                     = "CUSTOM_DEFAULT"
-	CustomRequired                    = "REQUIRED_OVERRIDE"
+	CustomSchemaValues                = "CUSTOM_SCHEMA_VALUES"
 )
 
 // Overrides represents the type a resource's override file can be marshalled

diff --git a/tpgtools/override_details.go b/tpgtools/override_details.go
@@ -141,11 +141,10 @@ type CustomListSizeConstraintDetails struct {
 	Max int64
 }
 
-type CustomRequiredDetails struct {
+type CustomSchemaValuesDetails struct {
 	Required bool
 	Optional bool
 	Computed bool
-	ForceNew bool
 }
 
 type ImportFormatDetails struct {

diff --git a/tpgtools/overrides/compute/beta/forwarding_rule.yaml b/tpgtools/overrides/compute/beta/forwarding_rule.yaml
@@ -9,7 +9,7 @@
   details:
     title: forwarding_rule
   location: region
-- type: REQUIRED_OVERRIDE
+- type: CUSTOM_SCHEMA_VALUES
   location: global
   field: target
   details:

diff --git a/tpgtools/overrides/compute/forwarding_rule.yaml b/tpgtools/overrides/compute/forwarding_rule.yaml
@@ -9,7 +9,7 @@
   details:
     title: forwarding_rule
   location: region
-- type: REQUIRED_OVERRIDE
+- type: CUSTOM_SCHEMA_VALUES
   location: global
   field: target
   details:

diff --git a/tpgtools/overrides/dataproc/beta/workflow_template.yaml b/tpgtools/overrides/dataproc/beta/workflow_template.yaml
@@ -0,0 +1,11 @@
+- type: CUSTOM_SCHEMA_VALUES
+  field: version
+  details:
+    required: false
+    optional: true
+    computed: true
+- type: DEPRECATED
+  field: version
+  details:
+    message: >-
+      version is not useful as a configurable field, and will be removed in the future.
diff --git a/tpgtools/overrides/dataproc/workflow_template.yaml b/tpgtools/overrides/dataproc/workflow_template.yaml
@@ -0,0 +1,11 @@
+- type: CUSTOM_SCHEMA_VALUES
+  field: version
+  details:
+    required: false
+    optional: true
+    computed: true
+- type: DEPRECATED
+  field: version
+  details:
+    message: >-
+      version is not useful as a configurable field, and will be removed in the future.
diff --git a/tpgtools/property.go b/tpgtools/property.go
@@ -632,17 +632,21 @@ func createPropertiesFromSchema(schema *openapi.Schema, typeFetcher *TypeFetcher
 			} else {
 				p.Optional = true
 			}
-			cr := CustomRequiredDetails{}
-			crOk, err := overrides.PropertyOverrideWithDetails(CustomRequired, p, &cr, location)
-			if err != nil {
-				return nil, fmt.Errorf("failed to decode custom required details")
-			}
-			if crOk {
-				p.Required = cr.Required
-				p.Optional = cr.Optional
-				p.Computed = cr.Computed
-			}
+		}
+		cr := CustomSchemaValuesDetails{}
+		crOk, err := overrides.PropertyOverrideWithDetails(CustomSchemaValues, p, &cr, location)
+		if err != nil {
+			return nil, fmt.Errorf("failed to decode custom required details")
+		}
+		if crOk {
+			p.Required = cr.Required
+			p.Optional = cr.Optional
+			p.Computed = cr.Computed
+		}
 
+		// Handle settable fields. If the field is computed it's not settable but
+		// if it's also optional (O+C), it is.
+		if !p.Computed || (p.Optional) {
 			p.Settable = true
 
 			// NOTE: x-kubernetes-immmutable implies that all children of a field