change fs_group, run_as_user, run_as_group to strings (#1093)

Author: jrhouston

kubernetes/schema_container.go

@@ -636,19 +636,21 @@ func securityContextSchema() *schema.Resource {
 			Description: "Whether this container has a read-only root filesystem. Default is false.",
 		},
 		"run_as_group": {
-			Type:        schema.TypeInt,
-			Description: "The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
-			Optional:    true,
+			Type:         schema.TypeString,
+			Description:  "The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
+			Optional:     true,
+			ValidateFunc: validateTypeStringNullableInt,
 		},
 		"run_as_non_root": {
 			Type:        schema.TypeBool,
 			Description: "Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
 			Optional:    true,
 		},
 		"run_as_user": {
-			Type:        schema.TypeInt,
-			Description: "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
-			Optional:    true,
+			Type:         schema.TypeString,
+			Description:  "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
+			Optional:     true,
+			ValidateFunc: validateTypeStringNullableInt,
 		},
 		"se_linux_options": {
 			Type:        schema.TypeList,

kubernetes/schema_pod_spec.go

@@ -247,24 +247,27 @@ func podSpecFields(isUpdatable, isDeprecated, isComputed bool) map[string]*schem
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"fs_group": {
-						Type:        schema.TypeInt,
-						Description: "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- If unset, the Kubelet will not modify the ownership and permissions of any volume.",
-						Optional:    true,
+						Type:         schema.TypeString,
+						Description:  "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- If unset, the Kubelet will not modify the ownership and permissions of any volume.",
+						Optional:     true,
+						ValidateFunc: validateTypeStringNullableInt,
 					},
 					"run_as_group": {
-						Type:        schema.TypeInt,
-						Description: "The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container.",
-						Optional:    true,
+						Type:         schema.TypeString,
+						Description:  "The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container.",
+						Optional:     true,
+						ValidateFunc: validateTypeStringNullableInt,
 					},
 					"run_as_non_root": {
 						Type:        schema.TypeBool,
 						Description: "Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.",
 						Optional:    true,
 					},
 					"run_as_user": {
-						Type:        schema.TypeInt,
-						Description: "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container.",
-						Optional:    true,
+						Type:         schema.TypeString,
+						Description:  "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container.",
+						Optional:     true,
+						ValidateFunc: validateTypeStringNullableInt,
 					},
 					"se_linux_options": {
 						Type:        schema.TypeList,

kubernetes/structures_container.go

@@ -1,7 +1,9 @@
 package kubernetes
 
 import (
-	"k8s.io/api/core/v1"
+	"strconv"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -30,13 +32,13 @@ func flattenContainerSecurityContext(in *v1.SecurityContext) []interface{} {
 		att["read_only_root_filesystem"] = *in.ReadOnlyRootFilesystem
 	}
 	if in.RunAsGroup != nil {
-		att["run_as_group"] = *in.RunAsGroup
+		att["run_as_group"] = strconv.Itoa(int(*in.RunAsGroup))
 	}
 	if in.RunAsNonRoot != nil {
 		att["run_as_non_root"] = *in.RunAsNonRoot
 	}
 	if in.RunAsUser != nil {
-		att["run_as_user"] = *in.RunAsUser
+		att["run_as_user"] = strconv.Itoa(int(*in.RunAsUser))
 	}
 	if in.SELinuxOptions != nil {
 		att["se_linux_options"] = flattenSeLinuxOptions(in.SELinuxOptions)
@@ -504,7 +506,11 @@ func expandContainers(ctrs []interface{}) ([]v1.Container, error) {
 			cs[i].TTY = v.(bool)
 		}
 		if v, ok := ctr["security_context"].([]interface{}); ok && len(v) > 0 {
-			cs[i].SecurityContext = expandContainerSecurityContext(v)
+			ctx, err := expandContainerSecurityContext(v)
+			if err != nil {
+				return cs, err
+			}
+			cs[i].SecurityContext = ctx
 		}
 
 		if v, ok := ctr["volume_mount"].([]interface{}); ok && len(v) > 0 {
@@ -550,9 +556,9 @@ func expandHTTPHeaders(l []interface{}) []v1.HTTPHeader {
 	}
 	return headers
 }
-func expandContainerSecurityContext(l []interface{}) *v1.SecurityContext {
+func expandContainerSecurityContext(l []interface{}) (*v1.SecurityContext, error) {
 	if len(l) == 0 || l[0] == nil {
-		return &v1.SecurityContext{}
+		return &v1.SecurityContext{}, nil
 	}
 	in := l[0].(map[string]interface{})
 	obj := v1.SecurityContext{}
@@ -568,20 +574,28 @@ func expandContainerSecurityContext(l []interface{}) *v1.SecurityContext {
 	if v, ok := in["read_only_root_filesystem"]; ok {
 		obj.ReadOnlyRootFilesystem = ptrToBool(v.(bool))
 	}
-	if v, ok := in["run_as_group"]; ok {
-		obj.RunAsGroup = ptrToInt64(int64(v.(int)))
+	if v, ok := in["run_as_group"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return &obj, err
+		}
+		obj.RunAsGroup = ptrToInt64(int64(i))
 	}
 	if v, ok := in["run_as_non_root"]; ok {
 		obj.RunAsNonRoot = ptrToBool(v.(bool))
 	}
-	if v, ok := in["run_as_user"]; ok {
-		obj.RunAsUser = ptrToInt64(int64(v.(int)))
+	if v, ok := in["run_as_user"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return &obj, err
+		}
+		obj.RunAsUser = ptrToInt64(int64(i))
 	}
 	if v, ok := in["se_linux_options"].([]interface{}); ok && len(v) > 0 {
 		obj.SELinuxOptions = expandSeLinuxOptions(v)
 	}
 
-	return &obj
+	return &obj, nil
 }
 
 func expandCapabilitySlice(s []interface{}) []v1.Capability {

kubernetes/structures_pod.go

@@ -159,16 +159,16 @@ func flattenPodSecurityContext(in *v1.PodSecurityContext) []interface{} {
 	att := make(map[string]interface{})
 
 	if in.FSGroup != nil {
-		att["fs_group"] = *in.FSGroup
+		att["fs_group"] = strconv.Itoa(int(*in.FSGroup))
 	}
 	if in.RunAsGroup != nil {
-		att["run_as_group"] = *in.RunAsGroup
+		att["run_as_group"] = strconv.Itoa(int(*in.RunAsGroup))
 	}
 	if in.RunAsNonRoot != nil {
 		att["run_as_non_root"] = *in.RunAsNonRoot
 	}
 	if in.RunAsUser != nil {
-		att["run_as_user"] = *in.RunAsUser
+		att["run_as_user"] = strconv.Itoa(int(*in.RunAsUser))
 	}
 	if len(in.SupplementalGroups) > 0 {
 		att["supplemental_groups"] = newInt64Set(schema.HashSchema(&schema.Schema{
@@ -682,7 +682,11 @@ func expandPodSpec(p []interface{}) (*v1.PodSpec, error) {
 	}
 
 	if v, ok := in["security_context"].([]interface{}); ok && len(v) > 0 {
-		obj.SecurityContext = expandPodSecurityContext(v)
+		ctx, err := expandPodSecurityContext(v)
+		if err != nil {
+			return obj, err
+		}
+		obj.SecurityContext = ctx
 	}
 
 	if v, ok := in["service_account_name"].(string); ok {
@@ -763,23 +767,35 @@ func expandDNSConfigOptions(options []interface{}) ([]v1.PodDNSConfigOption, err
 	return opts, nil
 }
 
-func expandPodSecurityContext(l []interface{}) *v1.PodSecurityContext {
+func expandPodSecurityContext(l []interface{}) (*v1.PodSecurityContext, error) {
+	obj := &v1.PodSecurityContext{}
 	if len(l) == 0 || l[0] == nil {
-		return &v1.PodSecurityContext{}
+		return obj, nil
 	}
 	in := l[0].(map[string]interface{})
-	obj := &v1.PodSecurityContext{}
-	if v, ok := in["fs_group"].(int); ok {
-		obj.FSGroup = ptrToInt64(int64(v))
+	if v, ok := in["fs_group"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return obj, err
+		}
+		obj.FSGroup = ptrToInt64(int64(i))
 	}
-	if v, ok := in["run_as_group"].(int); ok {
-		obj.RunAsGroup = ptrToInt64(int64(v))
+	if v, ok := in["run_as_group"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return obj, err
+		}
+		obj.RunAsGroup = ptrToInt64(int64(i))
 	}
 	if v, ok := in["run_as_non_root"].(bool); ok {
 		obj.RunAsNonRoot = ptrToBool(v)
 	}
-	if v, ok := in["run_as_user"].(int); ok {
-		obj.RunAsUser = ptrToInt64(int64(v))
+	if v, ok := in["run_as_user"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 64)
+		if err != nil {
+			return obj, err
+		}
+		obj.RunAsUser = ptrToInt64(int64(i))
 	}
 	if v, ok := in["se_linux_options"].([]interface{}); ok && len(v) > 0 {
 		obj.SELinuxOptions = expandSeLinuxOptions(v)
@@ -791,7 +807,7 @@ func expandPodSecurityContext(l []interface{}) *v1.PodSecurityContext {
 		obj.Sysctls = expandSysctls(v)
 	}
 
-	return obj
+	return obj, nil
 }
 
 func expandSysctls(l []interface{}) []v1.Sysctl {