Allow empty values in provisioning parameters

Remove check for empty value in order to allow an empty string to pass through to the CloudFormation template. Update tests to use provisioning parameters in order to exercise this functionality. Fixes hashicorp#21349
wedge-jarrad · Nov 8, 2021 · 2b041e4 · 2b041e4
1 parent de17e73
commit 2b041e4
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go
@@ -547,7 +547,7 @@ func expandServiceCatalogProvisioningParameter(tfMap map[string]interface{}) *se
 		apiObject.Key = aws.String(v)
 	}
 
-	if v, ok := tfMap["value"].(string); ok && v != "" {
+	if v, ok := tfMap["value"].(string); ok {
 		apiObject.Value = aws.String(v)
 	}
 
@@ -629,7 +629,7 @@ func expandServiceCatalogUpdateProvisioningParameter(tfMap map[string]interface{
 		apiObject.UsePreviousValue = aws.Bool(v)
 	}
 
-	if v, ok := tfMap["value"].(string); ok && v != "" {
+	if v, ok := tfMap["value"].(string); ok {
 		apiObject.Value = aws.String(v)
 	}
 

diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go
@@ -55,6 +55,7 @@ func TestAccServiceCatalogProvisionedProduct_basic(t *testing.T) {
 					"accept_language",
 					"ignore_errors",
 					"provisioning_artifact_name",
+					"provisioning_parameters",
 					"retain_physical_resources",
 				},
 			},
@@ -175,11 +176,33 @@ resource "aws_s3_bucket_object" "test" {
   content = jsonencode({
     AWSTemplateFormatVersion = "2010-09-09"
 
+    Parameters = {
+      VPCPrimaryCIDR = {
+        Type = "String"
+      }
+      LeaveMeEmpty = {
+        Type        = "String"
+        Description = "Make sure that empty values come through. Issue #21349"
+      }
+    }
+
+    "Conditions" = {
+      "IsEmptyParameter" = {
+        "Fn::Equals" = [
+          {
+            "Ref" = "LeaveMeEmpty"
+          },
+          "",
+        ]
+      }
+    }
+
     Resources = {
       MyVPC = {
         Type = "AWS::EC2::VPC"
+        Condition = "IsEmptyParameter"
         Properties = {
-          CidrBlock = "10.1.0.0/16"
+          CidrBlock = { Ref = "VPCPrimaryCIDR" }
         }
       }
     }
@@ -268,6 +291,16 @@ resource "aws_servicecatalog_provisioned_product" "test" {
   product_id                 = aws_servicecatalog_product.test.id
   provisioning_artifact_name = %[1]q
   path_id                    = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id
+
+  provisioning_parameters {
+    key   = "VPCPrimaryCIDR"
+    value = "10.1.0.0/16"
+  }
+
+  provisioning_parameters {
+    key   = "LeaveMeEmpty"
+    value = ""
+  }
 }
 `, rName))
 }
@@ -281,6 +314,16 @@ resource "aws_servicecatalog_provisioned_product" "test" {
   provisioning_artifact_name = %[1]q
   path_id                    = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id
 
+  provisioning_parameters {
+    key   = "VPCPrimaryCIDR"
+    value = "10.2.0.0/16"
+  }
+
+  provisioning_parameters {
+    key   = "LeaveMeEmpty"
+    value = ""
+  }
+
   tags = {
     %[2]q = %[3]q
   }