Merge pull request #23235 from kamilturek/aws-imagebuilder-image-reci…

…pe-update-validations r/aws_imagebuilder_image_recipe - update plan time validations
hashicorp · Feb 17, 2022 · 2a8a08f · 2a8a08f
2 parents f2e6cf1 + a4539d1
commit 2a8a08f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/.changelog/23235.txt b/.changelog/23235.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_imagebuilder_image_recipe: Update plan time validation of `block_device_mapping.ebs.kms_key_id`, `block_device_mapping.ebs.snapshot_id`, `block_device_mapping.ebs.volume_type`, `name`, `parent_image`.
+```
diff --git a/internal/service/imagebuilder/image_recipe.go b/internal/service/imagebuilder/image_recipe.go
@@ -82,12 +82,13 @@ func ResourceImageRecipe() *schema.Resource {
 										Type:         schema.TypeString,
 										Optional:     true,
 										ForceNew:     true,
-										ValidateFunc: verify.ValidARN,
+										ValidateFunc: validation.StringLenBetween(1, 1024),
 									},
 									"snapshot_id": {
-										Type:     schema.TypeString,
-										Optional: true,
-										ForceNew: true,
+										Type:         schema.TypeString,
+										Optional:     true,
+										ForceNew:     true,
+										ValidateFunc: validation.StringLenBetween(1, 1024),
 									},
 									"volume_size": {
 										Type:         schema.TypeInt,
@@ -96,11 +97,10 @@ func ResourceImageRecipe() *schema.Resource {
 										ValidateFunc: validation.IntBetween(1, 16000),
 									},
 									"volume_type": {
-										Type:     schema.TypeString,
-										Optional: true,
-										ForceNew: true,
-										// https://github.com/hashicorp/terraform-provider-aws/issues/17274.
-										ValidateFunc: validation.StringInSlice(append(imagebuilder.EbsVolumeType_Values(), EBSVolumeTypeGP3), false),
+										Type:         schema.TypeString,
+										Optional:     true,
+										ForceNew:     true,
+										ValidateFunc: validation.StringInSlice(imagebuilder.EbsVolumeType_Values(), false),
 									},
 								},
 							},
@@ -167,7 +167,7 @@ func ResourceImageRecipe() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringLenBetween(1, 126),
+				ValidateFunc: validation.StringLenBetween(1, 128),
 			},
 			"owner": {
 				Type:     schema.TypeString,
@@ -177,7 +177,7 @@ func ResourceImageRecipe() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringLenBetween(1, 126),
+				ValidateFunc: validation.StringLenBetween(1, 1024),
 			},
 			"platform": {
 				Type:     schema.TypeString,