fixed a potential conflict

hashicorp · Jan 28, 2021 · 26a9df7 · 26a9df7
1 parent 1a18635
commit 26a9df7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/aws/configservice.go b/aws/configservice.go
@@ -233,3 +233,21 @@ func configDescribeConformancePackStatus(conn *configservice.ConfigService, name
 
 	return nil, nil
 }
+
+func expandConfigConformancePackParameters(m map[string]interface{}) (params []*configservice.ConformancePackInputParameter) {
+	for k, v := range m {
+		params = append(params, &configservice.ConformancePackInputParameter{
+			ParameterName:  aws.String(k),
+			ParameterValue: aws.String(v.(string)),
+		})
+	}
+	return
+}
+
+func flattenConformancePackInputParameters(parameters []*configservice.ConformancePackInputParameter) (m map[string]string) {
+	m = make(map[string]string)
+	for _, p := range parameters {
+		m[*p.ParameterName] = *p.ParameterValue
+	}
+	return
+}
diff --git a/aws/resource_aws_config_conformance_pack.go b/aws/resource_aws_config_conformance_pack.go
@@ -122,16 +122,6 @@ func resourceAwsConfigConformancePackPut(d *schema.ResourceData, meta interface{
 	return resourceAwsConfigConformancePackRead(d, meta)
 }
 
-func expandConfigConformancePackParameters(m map[string]interface{}) (params []*configservice.ConformancePackInputParameter) {
-	for k, v := range m {
-		params = append(params, &configservice.ConformancePackInputParameter{
-			ParameterName:  aws.String(k),
-			ParameterValue: aws.String(v.(string)),
-		})
-	}
-	return
-}
-
 func refreshConformancePackStatus(d *schema.ResourceData, conn *configservice.ConfigService) func() (interface{}, string, error) {
 	return func() (interface{}, string, error) {
 		out, err := conn.DescribeConformancePackStatus(&configservice.DescribeConformancePackStatusInput{
@@ -203,14 +193,6 @@ func resourceAwsConfigConformancePackRead(d *schema.ResourceData, meta interface
 	return nil
 }
 
-func flattenConformancePackInputParameters(parameters []*configservice.ConformancePackInputParameter) (m map[string]string) {
-	m = make(map[string]string)
-	for _, p := range parameters {
-		m[*p.ParameterName] = *p.ParameterValue
-	}
-	return
-}
-
 func resourceAwsConfigConformancePackDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).configconn