Merge pull request #32071 from hashicorp/b-fix-map-elem-types

[Bug]: Fix map arguments with incorrect `Elem` types
hashicorp · Jun 20, 2023 · 56c2361 · 56c2361
2 parents 0165c2a + 7a5a08e
commit 56c2361
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml
@@ -67,6 +67,19 @@ rules:
           - pattern: var $VAR = fmt.Sprintf(..., <... acctest.RandomWithPrefix(...) ...>, ...)
     severity: WARNING
 
+  - id: helper-schema-Elem-check-valid-type
+    languages: [go]
+    message: Elem must be either a *schema.Schema or *schema.Resource type
+    paths:
+      include:
+        - internal/service/**/*.go
+      exclude:
+        - internal/service/**/*_data_source.go
+    patterns:
+      - pattern-inside: "Schema: map[string]*schema.Schema{ ... }"
+      - pattern-regex: "Elem:[ ]*schema.Type[a-zA-Z]*,"
+    severity: WARNING
+
   - id: helper-schema-Set-extraneous-NewSet-with-flattenStringList
     languages: [go]
     message: Prefer `flex.FlattenStringSet()` or `flex.FlattenStringValueSet()`

diff --git a/internal/service/apigateway/stage.go b/internal/service/apigateway/stage.go
@@ -92,7 +92,7 @@ func ResourceStage() *schema.Resource {
 						},
 						"stage_variable_overrides": {
 							Type:     schema.TypeMap,
-							Elem:     schema.TypeString,
+							Elem:     &schema.Schema{Type: schema.TypeString},
 							Optional: true,
 						},
 						"use_stage_cache": {

diff --git a/internal/service/emr/cluster.go b/internal/service/emr/cluster.go
@@ -621,7 +621,7 @@ func instanceFleetConfigSchema() *schema.Resource {
 										Type:     schema.TypeMap,
 										Optional: true,
 										ForceNew: true,
-										Elem:     schema.TypeString,
+										Elem:     &schema.Schema{Type: schema.TypeString},
 									},
 								},
 							},

diff --git a/internal/service/emr/instance_fleet.go b/internal/service/emr/instance_fleet.go
@@ -79,7 +79,7 @@ func ResourceInstanceFleet() *schema.Resource {
 										Type:     schema.TypeMap,
 										Optional: true,
 										ForceNew: true,
-										Elem:     schema.TypeString,
+										Elem:     &schema.Schema{Type: schema.TypeString},
 									},
 								},
 							},

diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go
@@ -43,7 +43,7 @@ func ResourceDevEndpoint() *schema.Resource {
 			"arguments": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Elem:     schema.TypeString,
+				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"arn": {
 				Type:     schema.TypeString,

diff --git a/internal/service/glue/workflow.go b/internal/service/glue/workflow.go
@@ -42,7 +42,7 @@ func ResourceWorkflow() *schema.Resource {
 			"default_run_properties": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Elem:     schema.TypeString,
+				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"description": {
 				Type:     schema.TypeString,