fix: add validation checks for aws_glue_catalog_table resource proper…

…ties
hashicorp · Mar 25, 2020 · 583639f · 583639f
1 parent 81c55de
commit 583639f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/aws/resource_aws_glue_catalog_table.go b/aws/resource_aws_glue_catalog_table.go
@@ -137,17 +137,19 @@ func resourceAwsGlueCatalogTable() *schema.Resource {
  Elem: &schema.Resource{
  Schema: map[string]*schema.Schema{
  "name": {
- Type: schema.TypeString,
- Optional: true,
+ Type: schema.TypeString,
+ Optional: true,
+ ValidateFunc: validateGlueCatalogSerdeInfoProperty,
  },
  "parameters": {
  Type: schema.TypeMap,
  Optional: true,
  Elem: &schema.Schema{Type: schema.TypeString},
  },
  "serialization_library": {
- Type: schema.TypeString,
- Optional: true,
+ Type: schema.TypeString,
+ Optional: true,
+ ValidateFunc: validateGlueCatalogSerdeInfoProperty,
  },
  },
  },
@@ -630,9 +632,15 @@ func flattenGlueSerDeInfo(s *glue.SerDeInfo) []map[string]interface{} {
  serDeInfos := make([]map[string]interface{}, 1)
  serDeInfo := make(map[string]interface{})
 
- serDeInfo["name"] = aws.StringValue(s.Name)
+ if v := aws.StringValue(s.Name); v != "" {
+ serDeInfo["name"] = v
+ }
+
  serDeInfo["parameters"] = aws.StringValueMap(s.Parameters)
- serDeInfo["serialization_library"] = aws.StringValue(s.SerializationLibrary)
+
+ if v := aws.StringValue(s.SerializationLibrary); v != "" {
+ serDeInfo["serialization_library"] = v
+ }
 
  serDeInfos[0] = serDeInfo
  return serDeInfos

diff --git a/aws/validators.go b/aws/validators.go
@@ -2369,3 +2369,11 @@ func validateRoute53ResolverName(v interface{}, k string) (ws []string, errors [
 
  return
 }
+
+func validateGlueCatalogSerdeInfoProperty(v interface{}, k string) (ws []string, errors []error) {
+ value := v.(string)
+ if len(value) < 1 {
+ errors = append(errors, fmt.Errorf("%q cannot be less than 1 character", k))
+ }
+ return
+}
diff --git a/aws/validators_test.go b/aws/validators_test.go
@@ -3018,3 +3018,29 @@ func TestValidateRoute53ResolverName(t *testing.T) {
  }
  }
 }
+
+func TestValidateGlueCatalogSerdeInfoProperty(t *testing.T) {
+ validValues := []string{
+ "Name",
+ "Na",
+ "n",
+ }
+
+ for _, s := range validValues {
+ _, errors := validateGlueCatalogSerdeInfoProperty(s, "aws_glue_catalog_table")
+ if len(errors) > 0 {
+ t.Fatalf("%q should be a valid AWS Glue Catalog table storage descriptor: %v", s, errors)
+ }
+ }
+
+ invalidValues := []string{
+ "",
+ }
+
+ for _, s := range invalidValues {
+ _, errors := validateGlueCatalogSerdeInfoProperty(s, "aws_glue_catalog_table")
+ if len(errors) == 0 {
+ t.Fatalf("%q should not be a valid AWS Glue Catalog table storage descriptor: %v", s, errors)
+ }
+ }
+}