Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

imagebuilder: Allow image recipe to be updated/replaced #21884

Merged
merged 7 commits into from
Nov 23, 2021
Merged

imagebuilder: Allow image recipe to be updated/replaced #21884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7842e5
Allow image recipe to be replaced
YakDriver Nov 23, 2021
7b9a52c
tests/imagebuilder: Test image recipe replacement
YakDriver Nov 23, 2021
b98fc82
Get imagebuilder out of func names
YakDriver Nov 23, 2021
f4fb9a2
Get imagebuilder out of func names
YakDriver Nov 23, 2021
d4a5bcf
Switch bad parallel test to serial
YakDriver Nov 23, 2021
44c6c97
Clean up initialisms
YakDriver Nov 23, 2021
943b7d6
Restore setting recipe ARN
YakDriver Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions internal/service/imagebuilder/distribution_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func resourceDistributionConfigurationCreate(d *schema.ResourceData, meta interf
}

if v, ok := d.GetOk("distribution"); ok && v.(*schema.Set).Len() > 0 {
input.Distributions = expandImageBuilderDistributions(v.(*schema.Set).List())
input.Distributions = expandDistributions(v.(*schema.Set).List())
}

if v, ok := d.GetOk("name"); ok {
Expand Down Expand Up @@ -212,7 +212,7 @@ func resourceDistributionConfigurationRead(d *schema.ResourceData, meta interfac
d.Set("date_created", distributionConfiguration.DateCreated)
d.Set("date_updated", distributionConfiguration.DateUpdated)
d.Set("description", distributionConfiguration.Description)
d.Set("distribution", flattenImageBuilderDistributions(distributionConfiguration.Distributions))
d.Set("distribution", flattenDistributions(distributionConfiguration.Distributions))
d.Set("name", distributionConfiguration.Name)
tags := KeyValueTags(distributionConfiguration.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)

Expand Down Expand Up @@ -241,7 +241,7 @@ func resourceDistributionConfigurationUpdate(d *schema.ResourceData, meta interf
}

if v, ok := d.GetOk("distribution"); ok && v.(*schema.Set).Len() > 0 {
input.Distributions = expandImageBuilderDistributions(v.(*schema.Set).List())
input.Distributions = expandDistributions(v.(*schema.Set).List())
}

log.Printf("[DEBUG] UpdateDistributionConfiguration: %#v", input)
Expand Down Expand Up @@ -283,7 +283,7 @@ func resourceDistributionConfigurationDelete(d *schema.ResourceData, meta interf
return nil
}

func expandImageBuilderAmiDistributionConfiguration(tfMap map[string]interface{}) *imagebuilder.AmiDistributionConfiguration {
func expandAMIDistributionConfiguration(tfMap map[string]interface{}) *imagebuilder.AmiDistributionConfiguration {
if tfMap == nil {
return nil
}
Expand All @@ -303,7 +303,7 @@ func expandImageBuilderAmiDistributionConfiguration(tfMap map[string]interface{}
}

if v, ok := tfMap["launch_permission"].([]interface{}); ok && len(v) > 0 && v[0] != nil {
apiObject.LaunchPermission = expandImageBuilderLaunchPermissionConfiguration(v[0].(map[string]interface{}))
apiObject.LaunchPermission = expandLaunchPermissionConfiguration(v[0].(map[string]interface{}))
}

if v, ok := tfMap["name"].(string); ok && v != "" {
Expand All @@ -317,15 +317,15 @@ func expandImageBuilderAmiDistributionConfiguration(tfMap map[string]interface{}
return apiObject
}

func expandImageBuilderDistribution(tfMap map[string]interface{}) *imagebuilder.Distribution {
func expandDistribution(tfMap map[string]interface{}) *imagebuilder.Distribution {
if tfMap == nil {
return nil
}

apiObject := &imagebuilder.Distribution{}

if v, ok := tfMap["ami_distribution_configuration"].([]interface{}); ok && len(v) > 0 && v[0] != nil {
apiObject.AmiDistributionConfiguration = expandImageBuilderAmiDistributionConfiguration(v[0].(map[string]interface{}))
apiObject.AmiDistributionConfiguration = expandAMIDistributionConfiguration(v[0].(map[string]interface{}))
}

if v, ok := tfMap["license_configuration_arns"].(*schema.Set); ok && v.Len() > 0 {
Expand All @@ -339,7 +339,7 @@ func expandImageBuilderDistribution(tfMap map[string]interface{}) *imagebuilder.
return apiObject
}

func expandImageBuilderDistributions(tfList []interface{}) []*imagebuilder.Distribution {
func expandDistributions(tfList []interface{}) []*imagebuilder.Distribution {
if len(tfList) == 0 {
return nil
}
Expand All @@ -353,7 +353,7 @@ func expandImageBuilderDistributions(tfList []interface{}) []*imagebuilder.Distr
continue
}

apiObject := expandImageBuilderDistribution(tfMap)
apiObject := expandDistribution(tfMap)

if apiObject == nil {
continue
Expand All @@ -372,7 +372,7 @@ func expandImageBuilderDistributions(tfList []interface{}) []*imagebuilder.Distr
return apiObjects
}

func expandImageBuilderLaunchPermissionConfiguration(tfMap map[string]interface{}) *imagebuilder.LaunchPermissionConfiguration {
func expandLaunchPermissionConfiguration(tfMap map[string]interface{}) *imagebuilder.LaunchPermissionConfiguration {
if tfMap == nil {
return nil
}
Expand All @@ -390,7 +390,7 @@ func expandImageBuilderLaunchPermissionConfiguration(tfMap map[string]interface{
return apiObject
}

func flattenImageBuilderAmiDistributionConfiguration(apiObject *imagebuilder.AmiDistributionConfiguration) map[string]interface{} {
func flattenAMIDistributionConfiguration(apiObject *imagebuilder.AmiDistributionConfiguration) map[string]interface{} {
if apiObject == nil {
return nil
}
Expand All @@ -410,7 +410,7 @@ func flattenImageBuilderAmiDistributionConfiguration(apiObject *imagebuilder.Ami
}

if v := apiObject.LaunchPermission; v != nil {
tfMap["launch_permission"] = []interface{}{flattenImageBuilderLaunchPermissionConfiguration(v)}
tfMap["launch_permission"] = []interface{}{flattenLaunchPermissionConfiguration(v)}
}

if v := apiObject.Name; v != nil {
Expand All @@ -424,15 +424,15 @@ func flattenImageBuilderAmiDistributionConfiguration(apiObject *imagebuilder.Ami
return tfMap
}

func flattenImageBuilderDistribution(apiObject *imagebuilder.Distribution) map[string]interface{} {
func flattenDistribution(apiObject *imagebuilder.Distribution) map[string]interface{} {
if apiObject == nil {
return nil
}

tfMap := map[string]interface{}{}

if v := apiObject.AmiDistributionConfiguration; v != nil {
tfMap["ami_distribution_configuration"] = []interface{}{flattenImageBuilderAmiDistributionConfiguration(v)}
tfMap["ami_distribution_configuration"] = []interface{}{flattenAMIDistributionConfiguration(v)}
}

if v := apiObject.LicenseConfigurationArns; v != nil {
Expand All @@ -446,7 +446,7 @@ func flattenImageBuilderDistribution(apiObject *imagebuilder.Distribution) map[s
return tfMap
}

func flattenImageBuilderDistributions(apiObjects []*imagebuilder.Distribution) []interface{} {
func flattenDistributions(apiObjects []*imagebuilder.Distribution) []interface{} {
if len(apiObjects) == 0 {
return nil
}
Expand All @@ -458,13 +458,13 @@ func flattenImageBuilderDistributions(apiObjects []*imagebuilder.Distribution) [
continue
}

tfList = append(tfList, flattenImageBuilderDistribution(apiObject))
tfList = append(tfList, flattenDistribution(apiObject))
}

return tfList
}

func flattenImageBuilderLaunchPermissionConfiguration(apiObject *imagebuilder.LaunchPermissionConfiguration) map[string]interface{} {
func flattenLaunchPermissionConfiguration(apiObject *imagebuilder.LaunchPermissionConfiguration) map[string]interface{} {
if apiObject == nil {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/service/imagebuilder/distribution_configuration_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func dataSourceDistributionConfigurationRead(d *schema.ResourceData, meta interf
d.Set("date_created", distributionConfiguration.DateCreated)
d.Set("date_updated", distributionConfiguration.DateUpdated)
d.Set("description", distributionConfiguration.Description)
d.Set("distribution", flattenImageBuilderDistributions(distributionConfiguration.Distributions))
d.Set("distribution", flattenDistributions(distributionConfiguration.Distributions))
d.Set("name", distributionConfiguration.Name)
d.Set("tags", KeyValueTags(distributionConfiguration.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map())

Expand Down
6 changes: 3 additions & 3 deletions internal/service/imagebuilder/distribution_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_am
CheckDestroy: testAccCheckDistributionConfigurationDestroy,
Steps: []resource.TestStep{
{
Config: testAccDistributionConfigurationDistributionAMIDistributionConfigurationAmiTagsConfig(rName, "key1", "value1"),
Config: testAccDistributionConfigurationDistributionAMIDistributionConfigurationAMITagsConfig(rName, "key1", "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionConfigurationExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "distribution.#", "1"),
Expand All @@ -159,7 +159,7 @@ func TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_am
ImportStateVerify: true,
},
{
Config: testAccDistributionConfigurationDistributionAMIDistributionConfigurationAmiTagsConfig(rName, "key2", "value2"),
Config: testAccDistributionConfigurationDistributionAMIDistributionConfigurationAMITagsConfig(rName, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionConfigurationExists(resourceName),
acctest.CheckResourceAttrRFC3339(resourceName, "date_updated"),
Expand Down Expand Up @@ -582,7 +582,7 @@ resource "aws_imagebuilder_distribution_configuration" "test" {
`, rName))
}

func testAccDistributionConfigurationDistributionAMIDistributionConfigurationAmiTagsConfig(rName string, amiTagKey string, amiTagValue string) string {
func testAccDistributionConfigurationDistributionAMIDistributionConfigurationAMITagsConfig(rName string, amiTagKey string, amiTagValue string) string {
return fmt.Sprintf(`
data "aws_region" "current" {}

Expand Down
16 changes: 8 additions & 8 deletions internal/service/imagebuilder/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func resourceImageCreate(d *schema.ResourceData, meta interface{}) error {
}

if v, ok := d.GetOk("image_tests_configuration"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.ImageTestsConfiguration = expandImageBuilderImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
input.ImageTestsConfiguration = expandImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("infrastructure_configuration_arn"); ok {
Expand Down Expand Up @@ -237,7 +237,7 @@ func resourceImageRead(d *schema.ResourceData, meta interface{}) error {
}

if image.ImageTestsConfiguration != nil {
d.Set("image_tests_configuration", []interface{}{flattenImageBuilderImageTestsConfiguration(image.ImageTestsConfiguration)})
d.Set("image_tests_configuration", []interface{}{flattenImageTestsConfiguration(image.ImageTestsConfiguration)})
} else {
d.Set("image_tests_configuration", nil)
}
Expand All @@ -251,7 +251,7 @@ func resourceImageRead(d *schema.ResourceData, meta interface{}) error {
d.Set("os_version", image.OsVersion)

if image.OutputResources != nil {
d.Set("output_resources", []interface{}{flattenImageBuilderOutputResources(image.OutputResources)})
d.Set("output_resources", []interface{}{flattenOutputResources(image.OutputResources)})
} else {
d.Set("output_resources", nil)
}
Expand Down Expand Up @@ -306,21 +306,21 @@ func resourceImageDelete(d *schema.ResourceData, meta interface{}) error {
return nil
}

func flattenImageBuilderOutputResources(apiObject *imagebuilder.OutputResources) map[string]interface{} {
func flattenOutputResources(apiObject *imagebuilder.OutputResources) map[string]interface{} {
if apiObject == nil {
return nil
}

tfMap := map[string]interface{}{}

if v := apiObject.Amis; v != nil {
tfMap["amis"] = flattenImageBuilderAmis(v)
tfMap["amis"] = flattenAMIs(v)
}

return tfMap
}

func flattenImageBuilderAmi(apiObject *imagebuilder.Ami) map[string]interface{} {
func flattenAMI(apiObject *imagebuilder.Ami) map[string]interface{} {
if apiObject == nil {
return nil
}
Expand Down Expand Up @@ -350,7 +350,7 @@ func flattenImageBuilderAmi(apiObject *imagebuilder.Ami) map[string]interface{}
return tfMap
}

func flattenImageBuilderAmis(apiObjects []*imagebuilder.Ami) []interface{} {
func flattenAMIs(apiObjects []*imagebuilder.Ami) []interface{} {
if len(apiObjects) == 0 {
return nil
}
Expand All @@ -362,7 +362,7 @@ func flattenImageBuilderAmis(apiObjects []*imagebuilder.Ami) []interface{} {
continue
}

tfList = append(tfList, flattenImageBuilderAmi(apiObject))
tfList = append(tfList, flattenAMI(apiObject))
}

return tfList
Expand Down
4 changes: 2 additions & 2 deletions internal/service/imagebuilder/image_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func dataSourceImageRead(d *schema.ResourceData, meta interface{}) error {
}

if image.ImageTestsConfiguration != nil {
d.Set("image_tests_configuration", []interface{}{flattenImageBuilderImageTestsConfiguration(image.ImageTestsConfiguration)})
d.Set("image_tests_configuration", []interface{}{flattenImageTestsConfiguration(image.ImageTestsConfiguration)})
} else {
d.Set("image_tests_configuration", nil)
}
Expand All @@ -176,7 +176,7 @@ func dataSourceImageRead(d *schema.ResourceData, meta interface{}) error {
d.Set("os_version", image.OsVersion)

if image.OutputResources != nil {
d.Set("output_resources", []interface{}{flattenImageBuilderOutputResources(image.OutputResources)})
d.Set("output_resources", []interface{}{flattenOutputResources(image.OutputResources)})
} else {
d.Set("output_resources", nil)
}
Expand Down
22 changes: 11 additions & 11 deletions internal/service/imagebuilder/image_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func ResourceImagePipeline() *schema.Resource {
"image_recipe_arn": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`^arn:aws[^:]*:imagebuilder:[^:]+:(?:\d{12}|aws):image-recipe/[a-z0-9-_]+/\d+\.\d+\.\d+$`), "valid image recipe ARN must be provided"),
},
"image_tests_configuration": {
Expand Down Expand Up @@ -160,7 +161,7 @@ func resourceImagePipelineCreate(d *schema.ResourceData, meta interface{}) error
}

if v, ok := d.GetOk("image_tests_configuration"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.ImageTestsConfiguration = expandImageBuilderImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
input.ImageTestsConfiguration = expandImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("infrastructure_configuration_arn"); ok {
Expand All @@ -172,7 +173,7 @@ func resourceImagePipelineCreate(d *schema.ResourceData, meta interface{}) error
}

if v, ok := d.GetOk("schedule"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.Schedule = expandImageBuilderPipelineSchedule(v.([]interface{})[0].(map[string]interface{}))
input.Schedule = expandPipelineSchedule(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("status"); ok {
Expand Down Expand Up @@ -236,7 +237,7 @@ func resourceImagePipelineRead(d *schema.ResourceData, meta interface{}) error {
d.Set("image_recipe_arn", imagePipeline.ImageRecipeArn)

if imagePipeline.ImageTestsConfiguration != nil {
d.Set("image_tests_configuration", []interface{}{flattenImageBuilderImageTestsConfiguration(imagePipeline.ImageTestsConfiguration)})
d.Set("image_tests_configuration", []interface{}{flattenImageTestsConfiguration(imagePipeline.ImageTestsConfiguration)})
} else {
d.Set("image_tests_configuration", nil)
}
Expand All @@ -246,7 +247,7 @@ func resourceImagePipelineRead(d *schema.ResourceData, meta interface{}) error {
d.Set("platform", imagePipeline.Platform)

if imagePipeline.Schedule != nil {
d.Set("schedule", []interface{}{flattenImageBuilderSchedule(imagePipeline.Schedule)})
d.Set("schedule", []interface{}{flattenSchedule(imagePipeline.Schedule)})
} else {
d.Set("schedule", nil)
}
Expand Down Expand Up @@ -274,7 +275,6 @@ func resourceImagePipelineUpdate(d *schema.ResourceData, meta interface{}) error
"description",
"distribution_configuration_arn",
"enhanced_image_metadata_enabled",
"image_recipe_arn",
"image_tests_configuration",
"infrastructure_configuration_arn",
"schedule",
Expand All @@ -299,15 +299,15 @@ func resourceImagePipelineUpdate(d *schema.ResourceData, meta interface{}) error
}

if v, ok := d.GetOk("image_tests_configuration"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.ImageTestsConfiguration = expandImageBuilderImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
input.ImageTestsConfiguration = expandImageTestConfiguration(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("infrastructure_configuration_arn"); ok {
input.InfrastructureConfigurationArn = aws.String(v.(string))
}

if v, ok := d.GetOk("schedule"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
input.Schedule = expandImageBuilderPipelineSchedule(v.([]interface{})[0].(map[string]interface{}))
input.Schedule = expandPipelineSchedule(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("status"); ok {
Expand Down Expand Up @@ -352,7 +352,7 @@ func resourceImagePipelineDelete(d *schema.ResourceData, meta interface{}) error
return nil
}

func expandImageBuilderImageTestConfiguration(tfMap map[string]interface{}) *imagebuilder.ImageTestsConfiguration {
func expandImageTestConfiguration(tfMap map[string]interface{}) *imagebuilder.ImageTestsConfiguration {
if tfMap == nil {
return nil
}
Expand All @@ -370,7 +370,7 @@ func expandImageBuilderImageTestConfiguration(tfMap map[string]interface{}) *ima
return apiObject
}

func expandImageBuilderPipelineSchedule(tfMap map[string]interface{}) *imagebuilder.Schedule {
func expandPipelineSchedule(tfMap map[string]interface{}) *imagebuilder.Schedule {
if tfMap == nil {
return nil
}
Expand All @@ -388,7 +388,7 @@ func expandImageBuilderPipelineSchedule(tfMap map[string]interface{}) *imagebuil
return apiObject
}

func flattenImageBuilderImageTestsConfiguration(apiObject *imagebuilder.ImageTestsConfiguration) map[string]interface{} {
func flattenImageTestsConfiguration(apiObject *imagebuilder.ImageTestsConfiguration) map[string]interface{} {
if apiObject == nil {
return nil
}
Expand All @@ -406,7 +406,7 @@ func flattenImageBuilderImageTestsConfiguration(apiObject *imagebuilder.ImageTes
return tfMap
}

func flattenImageBuilderSchedule(apiObject *imagebuilder.Schedule) map[string]interface{} {
func flattenSchedule(apiObject *imagebuilder.Schedule) map[string]interface{} {
if apiObject == nil {
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions internal/service/imagebuilder/image_pipeline_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func dataSourceImagePipelineRead(d *schema.ResourceData, meta interface{}) error
d.Set("image_recipe_arn", imagePipeline.ImageRecipeArn)

if imagePipeline.ImageTestsConfiguration != nil {
d.Set("image_tests_configuration", []interface{}{flattenImageBuilderImageTestsConfiguration(imagePipeline.ImageTestsConfiguration)})
d.Set("image_tests_configuration", []interface{}{flattenImageTestsConfiguration(imagePipeline.ImageTestsConfiguration)})
} else {
d.Set("image_tests_configuration", nil)
}
Expand All @@ -149,7 +149,7 @@ func dataSourceImagePipelineRead(d *schema.ResourceData, meta interface{}) error
d.Set("platform", imagePipeline.Platform)

if imagePipeline.Schedule != nil {
d.Set("schedule", []interface{}{flattenImageBuilderSchedule(imagePipeline.Schedule)})
d.Set("schedule", []interface{}{flattenSchedule(imagePipeline.Schedule)})
} else {
d.Set("schedule", nil)
}
Expand Down
Loading