Fix: manage_storage_classes should be nullable (#1050) (#1051)

Co-authored-by: Martin Kulich <[email protected]> Co-authored-by: Charles-Edouard Brétéché <[email protected]>
eddycharly · Jun 28, 2023 · 1f9eb24 · 1f9eb24
1 parent 5a8f333
commit 1f9eb24
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 36 deletions.
diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
@@ -1134,7 +1134,7 @@ CloudConfiguration defines the cloud provider configuration.
 
 The following arguments are supported:
 
-- `manage_storage_classes` - (Computed) - Bool - ManageStorageClasses specifies whether kOps should create and maintain a set of<br />StorageClasses, one of which it nominates as the default class for the cluster.
+- `manage_storage_classes` - (Computed) - Bool([Nullable](#nullable-arguments)) - ManageStorageClasses specifies whether kOps should create and maintain a set of<br />StorageClasses, one of which it nominates as the default class for the cluster.
 - `multizone` - (Computed) - Bool - GCE cloud-config options.
 - `node_tags` - (Computed) - String
 - `node_instance_prefix` - (Computed) - String

diff --git a/docs/resources/cluster.md b/docs/resources/cluster.md
@@ -1220,7 +1220,7 @@ CloudConfiguration defines the cloud provider configuration.
 
 The following arguments are supported:
 
-- `manage_storage_classes` - (Optional) - Bool - ManageStorageClasses specifies whether kOps should create and maintain a set of<br />StorageClasses, one of which it nominates as the default class for the cluster.
+- `manage_storage_classes` - (Optional) - Bool([Nullable](#nullable-arguments)) - ManageStorageClasses specifies whether kOps should create and maintain a set of<br />StorageClasses, one of which it nominates as the default class for the cluster.
 - `multizone` - (Optional) - Bool - GCE cloud-config options.
 - `node_tags` - (Optional) - String
 - `node_instance_prefix` - (Optional) - String

diff --git a/hack/gen-tf-code/main.go b/hack/gen-tf-code/main.go
@@ -174,7 +174,9 @@ func main() {
 		generate(kops.KubeletConfigSpec{},
 			nullable("AnonymousAuth", "CPUCFSQuota"),
 		),
-		generate(kops.CloudConfiguration{}),
+		generate(kops.CloudConfiguration{},
+			nullable("ManageStorageClasses"),
+		),
 		generate(kops.ExternalDNSConfig{}),
 		generate(kops.OpenstackLoadbalancerConfig{}),
 		generate(kops.OpenstackMonitor{}),
@@ -415,7 +417,9 @@ func main() {
 		generate(kops.CloudControllerManagerConfig{}),
 		generate(kops.KubeSchedulerConfig{}),
 		generate(kops.KubeProxyConfig{}),
-		generate(kops.CloudConfiguration{}),
+		generate(kops.CloudConfiguration{},
+			nullable("ManageStorageClasses"),
+		),
 		generate(kops.ExternalDNSConfig{}),
 		generate(kops.NetworkingSpec{},
 			rename("Subnets", "Subnet"),

diff --git a/pkg/schemas/kops/DataSource_CloudConfiguration.generated.go b/pkg/schemas/kops/DataSource_CloudConfiguration.generated.go
@@ -13,7 +13,7 @@ var _ = Schema
 func DataSourceCloudConfiguration() *schema.Resource {
 	res := &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"manage_storage_classes":         ComputedBool(),
+			"manage_storage_classes":         Nullable(ComputedBool()),
 			"multizone":                      ComputedBool(),
 			"node_tags":                      ComputedString(),
 			"node_instance_prefix":           ComputedString(),
@@ -37,20 +37,22 @@ func ExpandDataSourceCloudConfiguration(in map[string]interface{}) kops.CloudCon
 			if in == nil {
 				return nil
 			}
-			if reflect.DeepEqual(in, reflect.Zero(reflect.TypeOf(in)).Interface()) {
-				return nil
+			if in, ok := in.([]interface{}); ok && len(in) == 1 {
+				return func(in interface{}) *bool {
+					return func(in interface{}) *bool {
+						if in == nil {
+							return nil
+						}
+						if _, ok := in.([]interface{}); ok && len(in.([]interface{})) == 0 {
+							return nil
+						}
+						return func(in bool) *bool {
+							return &in
+						}(bool(ExpandBool(in)))
+					}(in)
+				}(in[0].(map[string]interface{})["value"])
 			}
-			return func(in interface{}) *bool {
-				if in == nil {
-					return nil
-				}
-				if _, ok := in.([]interface{}); ok && len(in.([]interface{})) == 0 {
-					return nil
-				}
-				return func(in bool) *bool {
-					return &in
-				}(bool(ExpandBool(in)))
-			}(in)
+			return nil
 		}(in["manage_storage_classes"]),
 		Multizone: func(in interface{}) *bool {
 			if in == nil {
@@ -202,14 +204,17 @@ func ExpandDataSourceCloudConfiguration(in map[string]interface{}) kops.CloudCon
 
 func FlattenDataSourceCloudConfigurationInto(in kops.CloudConfiguration, out map[string]interface{}) {
 	out["manage_storage_classes"] = func(in *bool) interface{} {
-		return func(in *bool) interface{} {
+		if in == nil {
+			return nil
+		}
+		return []interface{}{map[string]interface{}{"value": func(in *bool) interface{} {
 			if in == nil {
 				return nil
 			}
 			return func(in bool) interface{} {
 				return FlattenBool(bool(in))
 			}(*in)
-		}(in)
+		}(in)}}
 	}(in.ManageStorageClasses)
 	out["multizone"] = func(in *bool) interface{} {
 		return func(in *bool) interface{} {

diff --git a/pkg/schemas/kops/Resource_CloudConfiguration.generated.go b/pkg/schemas/kops/Resource_CloudConfiguration.generated.go
@@ -13,7 +13,7 @@ var _ = Schema
 func ResourceCloudConfiguration() *schema.Resource {
 	res := &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"manage_storage_classes":         OptionalBool(),
+			"manage_storage_classes":         Nullable(OptionalBool()),
 			"multizone":                      OptionalBool(),
 			"node_tags":                      OptionalString(),
 			"node_instance_prefix":           OptionalString(),
@@ -37,20 +37,22 @@ func ExpandResourceCloudConfiguration(in map[string]interface{}) kops.CloudConfi
 			if in == nil {
 				return nil
 			}
-			if reflect.DeepEqual(in, reflect.Zero(reflect.TypeOf(in)).Interface()) {
-				return nil
+			if in, ok := in.([]interface{}); ok && len(in) == 1 {
+				return func(in interface{}) *bool {
+					return func(in interface{}) *bool {
+						if in == nil {
+							return nil
+						}
+						if _, ok := in.([]interface{}); ok && len(in.([]interface{})) == 0 {
+							return nil
+						}
+						return func(in bool) *bool {
+							return &in
+						}(bool(ExpandBool(in)))
+					}(in)
+				}(in[0].(map[string]interface{})["value"])
 			}
-			return func(in interface{}) *bool {
-				if in == nil {
-					return nil
-				}
-				if _, ok := in.([]interface{}); ok && len(in.([]interface{})) == 0 {
-					return nil
-				}
-				return func(in bool) *bool {
-					return &in
-				}(bool(ExpandBool(in)))
-			}(in)
+			return nil
 		}(in["manage_storage_classes"]),
 		Multizone: func(in interface{}) *bool {
 			if in == nil {
@@ -202,14 +204,17 @@ func ExpandResourceCloudConfiguration(in map[string]interface{}) kops.CloudConfi
 
 func FlattenResourceCloudConfigurationInto(in kops.CloudConfiguration, out map[string]interface{}) {
 	out["manage_storage_classes"] = func(in *bool) interface{} {
-		return func(in *bool) interface{} {
+		if in == nil {
+			return nil
+		}
+		return []interface{}{map[string]interface{}{"value": func(in *bool) interface{} {
 			if in == nil {
 				return nil
 			}
 			return func(in bool) interface{} {
 				return FlattenBool(bool(in))
 			}(*in)
-		}(in)
+		}(in)}}
 	}(in.ManageStorageClasses)
 	out["multizone"] = func(in *bool) interface{} {
 		return func(in *bool) interface{} {