Merge branch 'f-add-additional-property-to-imagebuilder' of ssh://git…

…hub.com/schabert/terraform-provider-aws into schabert-f-add-additional-property-to-imagebuilder
hashicorp · Jan 4, 2021 · 0f51b3e · 0f51b3e
2 parents 1a65888 + 1dbf3b9
commit 0f51b3e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/aws/data_source_aws_imagebuilder_image_recipe.go b/aws/data_source_aws_imagebuilder_image_recipe.go
@@ -116,6 +116,10 @@ func dataSourceAwsImageBuilderImageRecipe() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"working_directory": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -154,6 +158,7 @@ func dataSourceAwsImageBuilderImageRecipeRead(d *schema.ResourceData, meta inter
 	d.Set("platform", imageRecipe.Platform)
 	d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(imageRecipe.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map())
 	d.Set("version", imageRecipe.Version)
+	d.Set("working_directory", imageRecipe.WorkingDirectory)
 
 	return nil
 }
diff --git a/aws/data_source_aws_imagebuilder_image_recipe_test.go b/aws/data_source_aws_imagebuilder_image_recipe_test.go
@@ -59,6 +59,7 @@ resource "aws_imagebuilder_component" "test" {
     }]
     schemaVersion = 1.0
   })
+  working_directory = "/tmp"
   name     = %[1]q
   platform = "Linux"
   version  = "1.0.0"

diff --git a/aws/resource_aws_imagebuilder_image_recipe.go b/aws/resource_aws_imagebuilder_image_recipe.go
@@ -170,6 +170,12 @@ func resourceAwsImageBuilderImageRecipe() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validation.StringLenBetween(1, 128),
 			},
+			"working_directory": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringLenBetween(1, 1024),
+			},
 		},
 	}
 }
@@ -208,6 +214,9 @@ func resourceAwsImageBuilderImageRecipeCreate(d *schema.ResourceData, meta inter
 	if v, ok := d.GetOk("version"); ok {
 		input.SemanticVersion = aws.String(v.(string))
 	}
+	if v, ok := d.GetOk("working_directory"); ok {
+		input.WorkingDirectory = aws.String(v.(string))
+	}
 
 	output, err := conn.CreateImageRecipe(input)
 
@@ -261,6 +270,7 @@ func resourceAwsImageBuilderImageRecipeRead(d *schema.ResourceData, meta interfa
 	d.Set("platform", imageRecipe.Platform)
 	d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(imageRecipe.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map())
 	d.Set("version", imageRecipe.Version)
+	d.Set("working_directory", imageRecipe.WorkingDirectory)
 
 	return nil
 }

diff --git a/website/docs/r/imagebuilder_image_recipe.html.markdown b/website/docs/r/imagebuilder_image_recipe.html.markdown
@@ -48,6 +48,7 @@ The following attributes are optional:
 * `block_device_mapping` - (Optional) Configuration block(s) with block device mappings for the the image recipe. Detailed below.
 * `description` - (Optional) Description of the image recipe.
 * `tags` - (Optional) Key-value map of resource tags for the image recipe.
+* `working_directory` - (Optional) The working directory to be used during build and test workflows.
 
 ### block_device_mapping