From da9a71d569a1651e6397a7d040b163c0ab1f2cf9 Mon Sep 17 00:00:00 2001 From: Hans Schabert Date: Mon, 4 Jan 2021 12:40:00 +0000 Subject: [PATCH 1/3] feature: Add working_directory to ImageBuilder --- aws/data_source_aws_imagebuilder_image_recipe.go | 5 +++++ aws/data_source_aws_imagebuilder_image_recipe_test.go | 1 + aws/resource_aws_imagebuilder_image_recipe.go | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/aws/data_source_aws_imagebuilder_image_recipe.go b/aws/data_source_aws_imagebuilder_image_recipe.go index 252490c2883b..996f531a222e 100644 --- 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 index 80ef8941dccd..73cde70f0b16 100644 --- 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 index acfff669805a..45f9e106a645 100644 --- 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, 128), + }, }, } } @@ -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 } From af637ff235bed1444533a38d8e8123ca70fc3175 Mon Sep 17 00:00:00 2001 From: Hans Schabert Date: Mon, 4 Jan 2021 12:54:34 +0000 Subject: [PATCH 2/3] docs: Update aws_imagebuilder_image_recipe new property working_directory --- website/docs/r/imagebuilder_image_recipe.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/imagebuilder_image_recipe.html.markdown b/website/docs/r/imagebuilder_image_recipe.html.markdown index c86e180bce79..82f402dec051 100644 --- 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 From 1dbf3b9a8ecc1d6abfb6cc07e49f728bf486c7d8 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 4 Jan 2021 11:13:15 -0500 Subject: [PATCH 3/3] Update aws/resource_aws_imagebuilder_image_recipe.go --- aws/resource_aws_imagebuilder_image_recipe.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_imagebuilder_image_recipe.go b/aws/resource_aws_imagebuilder_image_recipe.go index 45f9e106a645..d37b44cc2c0c 100644 --- a/aws/resource_aws_imagebuilder_image_recipe.go +++ b/aws/resource_aws_imagebuilder_image_recipe.go @@ -174,7 +174,7 @@ func resourceAwsImageBuilderImageRecipe() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: true, - ValidateFunc: validation.StringLenBetween(1, 128), + ValidateFunc: validation.StringLenBetween(1, 1024), }, }, }