fixed a potential conflict

hashicorp · Jan 28, 2021 · c66efc4 · c66efc4
1 parent 95bd1ae
commit c66efc4
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
@@ -257,3 +257,21 @@ func configDescribeOrganizationConformancePackDetailedStatus(conn *configservice
 
 	return ret, 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_organization_conformance_pack.go b/aws/resource_aws_config_organization_conformance_pack.go
@@ -142,16 +142,6 @@ func expandConfigConformancePackExcludedAccounts(i []interface{}) (ret []*string
 	return
 }
 
-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 refreshOrganizationConformancePackStatus(d *schema.ResourceData, conn *configservice.ConfigService) func() (interface{}, string, error) {
 	return func() (interface{}, string, error) {
 		out, err := conn.DescribeOrganizationConformancePackStatuses(&configservice.DescribeOrganizationConformancePackStatusesInput{
@@ -226,14 +216,6 @@ func resourceAwsConfigOrganizationConformancePackRead(d *schema.ResourceData, me
 	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 resourceAwsConfigOrganizationConformancePackDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).configconn