Refactor labelSelector schema and its flatteners/expanders functions for reuse

kubernetes/resource_kubernetes_persistent_volume_claim.go

@@ -80,44 +80,7 @@ func resourceKubernetesPersistentVolumeClaim() *schema.Resource {
 							ForceNew:    true,
 							MaxItems:    1,
 							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"match_expressions": {
-										Type:        schema.TypeList,
-										Description: "A list of label selector requirements. The requirements are ANDed.",
-										Optional:    true,
-										ForceNew:    true,
-										Elem: &schema.Resource{
-											Schema: map[string]*schema.Schema{
-												"key": {
-													Type:        schema.TypeString,
-													Description: "The label key that the selector applies to.",
-													Optional:    true,
-													ForceNew:    true,
-												},
-												"operator": {
-													Type:        schema.TypeString,
-													Description: "A key's relationship to a set of values. Valid operators ard `In`, `NotIn`, `Exists` and `DoesNotExist`.",
-													Optional:    true,
-													ForceNew:    true,
-												},
-												"values": {
-													Type:        schema.TypeSet,
-													Description: "An array of string values. If the operator is `In` or `NotIn`, the values array must be non-empty. If the operator is `Exists` or `DoesNotExist`, the values array must be empty. This array is replaced during a strategic merge patch.",
-													Optional:    true,
-													ForceNew:    true,
-													Elem:        &schema.Schema{Type: schema.TypeString},
-													Set:         schema.HashString,
-												},
-											},
-										},
-									},
-									"match_labels": {
-										Type:        schema.TypeMap,
-										Description: "A map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of `match_expressions`, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
-										Optional:    true,
-										ForceNew:    true,
-									},
-								},
+								Schema: labelSelectorFields(),
 							},
 						},
 						"volume_name": {

kubernetes/schema_label_selector.go

@@ -0,0 +1,46 @@
+package kubernetes
+
+import (
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func labelSelectorFields() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"match_expressions": {
+			Type:        schema.TypeList,
+			Description: "A list of label selector requirements. The requirements are ANDed.",
+			Optional:    true,
+			ForceNew:    true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"key": {
+						Type:        schema.TypeString,
+						Description: "The label key that the selector applies to.",
+						Optional:    true,
+						ForceNew:    true,
+					},
+					"operator": {
+						Type:        schema.TypeString,
+						Description: "A key's relationship to a set of values. Valid operators ard `In`, `NotIn`, `Exists` and `DoesNotExist`.",
+						Optional:    true,
+						ForceNew:    true,
+					},
+					"values": {
+						Type:        schema.TypeSet,
+						Description: "An array of string values. If the operator is `In` or `NotIn`, the values array must be non-empty. If the operator is `Exists` or `DoesNotExist`, the values array must be empty. This array is replaced during a strategic merge patch.",
+						Optional:    true,
+						ForceNew:    true,
+						Elem:        &schema.Schema{Type: schema.TypeString},
+						Set:         schema.HashString,
+					},
+				},
+			},
+		},
+		"match_labels": {
+			Type:        schema.TypeMap,
+			Description: "A map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of `match_expressions`, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
+			Optional:    true,
+			ForceNew:    true,
+		},
+	}
+}

kubernetes/structure_label_selector.go

@@ -0,0 +1,67 @@
+package kubernetes
+
+import (
+	"github.com/hashicorp/terraform/helper/schema"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Flatteners
+
+func flattenLabelSelector(in *metav1.LabelSelector) []interface{} {
+	att := make(map[string]interface{})
+	if len(in.MatchLabels) > 0 {
+		att["match_labels"] = in.MatchLabels
+	}
+	if len(in.MatchExpressions) > 0 {
+		att["match_expressions"] = flattenLabelSelectorRequirement(in.MatchExpressions)
+	}
+	if len(att) > 0 {
+		return []interface{}{att}
+	}
+	return []interface{}{}
+}
+
+func flattenLabelSelectorRequirement(in []metav1.LabelSelectorRequirement) []interface{} {
+	att := make([]interface{}, len(in), len(in))
+	for i, n := range in {
+		m := make(map[string]interface{})
+		m["key"] = n.Key
+		m["operator"] = n.Operator
+		m["values"] = newStringSet(schema.HashString, n.Values)
+		att[i] = m
+	}
+	return att
+}
+
+// Expanders
+
+func expandLabelSelector(l []interface{}) *metav1.LabelSelector {
+	if len(l) == 0 || l[0] == nil {
+		return &metav1.LabelSelector{}
+	}
+	in := l[0].(map[string]interface{})
+	obj := &metav1.LabelSelector{}
+	if v, ok := in["match_labels"].(map[string]interface{}); ok && len(v) > 0 {
+		obj.MatchLabels = expandStringMap(v)
+	}
+	if v, ok := in["match_expressions"].([]interface{}); ok && len(v) > 0 {
+		obj.MatchExpressions = expandLabelSelectorRequirement(v)
+	}
+	return obj
+}
+
+func expandLabelSelectorRequirement(l []interface{}) []metav1.LabelSelectorRequirement {
+	if len(l) == 0 || l[0] == nil {
+		return []metav1.LabelSelectorRequirement{}
+	}
+	obj := make([]metav1.LabelSelectorRequirement, len(l), len(l))
+	for i, n := range l {
+		in := n.(map[string]interface{})
+		obj[i] = metav1.LabelSelectorRequirement{
+			Key:      in["key"].(string),
+			Operator: metav1.LabelSelectorOperator(in["operator"].(string)),
+			Values:   sliceOfString(in["values"].(*schema.Set).List()),
+		}
+	}
+	return obj
+}

kubernetes/structure_persistent_volume_claim.go

@@ -2,38 +2,11 @@ package kubernetes
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/pkg/api/v1"
 )
 
 // Flatteners
 
-func flattenLabelSelector(in *metav1.LabelSelector) []interface{} {
-	att := make(map[string]interface{})
-	if len(in.MatchLabels) > 0 {
-		att["match_labels"] = in.MatchLabels
-	}
-	if len(in.MatchExpressions) > 0 {
-		att["match_expressions"] = flattenLabelSelectorRequirement(in.MatchExpressions)
-	}
-	if len(att) > 0 {
-		return []interface{}{att}
-	}
-	return []interface{}{}
-}
-
-func flattenLabelSelectorRequirement(in []metav1.LabelSelectorRequirement) []interface{} {
-	att := make([]interface{}, len(in), len(in))
-	for i, n := range in {
-		m := make(map[string]interface{})
-		m["key"] = n.Key
-		m["operator"] = n.Operator
-		m["values"] = newStringSet(schema.HashString, n.Values)
-		att[i] = m
-	}
-	return att
-}
-
 func flattenPersistentVolumeClaimSpec(in v1.PersistentVolumeClaimSpec) []interface{} {
 	att := make(map[string]interface{})
 	att["access_modes"] = flattenPersistentVolumeAccessModes(in.AccessModes)
@@ -63,37 +36,6 @@ func flattenResourceRequirements(in v1.ResourceRequirements) []interface{} {
 
 // Expanders
 
-func expandLabelSelector(l []interface{}) *metav1.LabelSelector {
-	if len(l) == 0 || l[0] == nil {
-		return &metav1.LabelSelector{}
-	}
-	in := l[0].(map[string]interface{})
-	obj := &metav1.LabelSelector{}
-	if v, ok := in["match_labels"].(map[string]interface{}); ok && len(v) > 0 {
-		obj.MatchLabels = expandStringMap(v)
-	}
-	if v, ok := in["match_expressions"].([]interface{}); ok && len(v) > 0 {
-		obj.MatchExpressions = expandLabelSelectorRequirement(v)
-	}
-	return obj
-}
-
-func expandLabelSelectorRequirement(l []interface{}) []metav1.LabelSelectorRequirement {
-	if len(l) == 0 || l[0] == nil {
-		return []metav1.LabelSelectorRequirement{}
-	}
-	obj := make([]metav1.LabelSelectorRequirement, len(l), len(l))
-	for i, n := range l {
-		in := n.(map[string]interface{})
-		obj[i] = metav1.LabelSelectorRequirement{
-			Key:      in["key"].(string),
-			Operator: metav1.LabelSelectorOperator(in["operator"].(string)),
-			Values:   sliceOfString(in["values"].(*schema.Set).List()),
-		}
-	}
-	return obj
-}
-
 func expandPersistentVolumeClaimSpec(l []interface{}) (v1.PersistentVolumeClaimSpec, error) {
 	if len(l) == 0 || l[0] == nil {
 		return v1.PersistentVolumeClaimSpec{}, nil