feat: add aws_imagebuilder_lifecycle_policy & Tech debt: migrate imagebuilder resources to AWS SDK for Go v2

go.mod

@@ -75,6 +75,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/groundstation v1.26.2
 	github.com/aws/aws-sdk-go-v2/service/healthlake v1.23.2
 	github.com/aws/aws-sdk-go-v2/service/identitystore v1.23.2
+	github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.32.1
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.24.2
 	github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.12.2
 	github.com/aws/aws-sdk-go-v2/service/ivschat v1.12.2

go.sum

@@ -176,6 +176,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.30.1 h1:sCLZjJpGNMeyhyudAhipabxqwZpP
 github.com/aws/aws-sdk-go-v2/service/iam v1.30.1/go.mod h1:vc5DmJnsyyX6UpZwIKT2y1hEhzHoGDjONKhDcDwA49g=
 github.com/aws/aws-sdk-go-v2/service/identitystore v1.23.2 h1:1UQL8QlgDvGUwSKWhty8tbgv+QCzs/NAeCWbbuvxLDg=
 github.com/aws/aws-sdk-go-v2/service/identitystore v1.23.2/go.mod h1:pH/6CBpgeQtIpuM4eDgf+OJDrZU+iG03xjy8vIRcI1k=
+github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.32.1 h1:5kP0+cOT2ApEUKUMM+zIP/fZpdmKeQa4Jl5iF8eHI9c=
+github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.32.1/go.mod h1:JUoAL2dg3oOHOv7/HB6r1z65cn9Fx34hGcMa0C4JjDc=
 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.24.2 h1:/Tdn1+AYzUH4WVfDdrKc/JNOC/XP7txBHdVDYkLFlD0=
 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.24.2/go.mod h1:VrG1RiAI8qS4txEGSZBRVjsLdLlH9CP2UHPP3inKL9c=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 h1:EyBZibRTVAs6ECHZOw5/wlylS9OcTzwyjeQMudmREjE=

internal/generate/namevaluesfiltersv2/generators/servicefilters/main.go

@@ -20,6 +20,7 @@ const filename = `service_filters_v2_gen.go`
 // Representing types such as []*ec2.Filter, []*rds.Filter, ...
 var sliceServiceNames = []string{
 	"secretsmanager",
+	"imagebuilder",
 }
 
 type TemplateData struct {
@@ -82,18 +83,17 @@ var templateBody = `
 package namevaluesfiltersv2
 
 import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports
+	"github.com/aws/aws-sdk-go-v2/aws"
 {{- range .SliceServiceNames }}
-{{- if eq . (. | FilterPackage) }}
-	{{ . }}
-{{- end }}
+	{{ . | FilterPackage }}
 {{- end }}
 )
 
 // []*SERVICE.Filter handling
 {{- range .SliceServiceNames }}
 
 // {{ . | Title }}Filters returns {{ . }} service filters.
-func (filters NameValuesFilters) {{ . | Title }}Filters() []*{{ . | FilterPackagePrefix }}.{{ . | FilterType }} {
+func (filters NameValuesFilters) {{ . | Title }}Filters() []{{ . | FilterPackagePrefix }}.{{ . | FilterType }} {
 	m := filters.Map()
 
 	if len(m) == 0 {
@@ -104,7 +104,7 @@ func (filters NameValuesFilters) {{ . | Title }}Filters() []*{{ . | FilterPackag
 
 	for k, v := range m {
 		filter := {{ . | FilterPackagePrefix }}.{{ . | FilterType }}{
-			{{ . | FilterTypeNameField }}:   { . | FilterPackagePrefix }}.FilterNameStringType(k),
+			{{ . | FilterTypeNameField }}:   {{ . | FilterPackagePrefix }}.FilterNameStringType(k),
 			{{ . | FilterTypeValuesField }}: v,
 		}
 

internal/generate/namevaluesfiltersv2/imagebuilder_filters.go

@@ -0,0 +1,36 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+//go:build !generate
+// +build !generate
+
+package namevaluesfiltersv2
+
+import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports
+	"github.com/aws/aws-sdk-go-v2/aws"
+	imagebuildertypes "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types"
+)
+
+// []*SERVICE.Filter handling
+
+// ImagebuilderFilters returns imagebuilder service filters.
+func (filters NameValuesFilters) ImagebuilderFilters() []imagebuildertypes.Filter {
+	m := filters.Map()
+
+	if len(m) == 0 {
+		return nil
+	}
+
+	result := make([]imagebuildertypes.Filter, 0, len(m))
+
+	for k, v := range m {
+		filter := imagebuildertypes.Filter{
+			Name:   aws.String(k),
+			Values: v,
+		}
+
+		result = append(result, filter)
+	}
+
+	return result
+}

internal/generate/namevaluesfiltersv2/name_values_filters_test.go

@@ -10,32 +10,33 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/generate/namevaluesfilters"
+	"github.com/hashicorp/terraform-provider-aws/internal/generate/namevaluesfiltersv2"
 )
 
 func TestNameValuesFiltersMap(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
 		name    string
-		filters namevaluesfilters.NameValuesFilters
+		filters namevaluesfiltersv2.NameValuesFilters
 		want    map[string][]string
 	}{
 		{
 			name:    "empty",
-			filters: namevaluesfilters.New(map[string][]string{}),
+			filters: namevaluesfiltersv2.New(map[string][]string{}),
 			want:    map[string][]string{},
 		},
 		{
 			name: "empty_strings",
-			filters: namevaluesfilters.New(map[string][]string{
+			filters: namevaluesfiltersv2.New(map[string][]string{
 				"name1": {""},
 				"name2": {"", ""},
 			}),
 			want: map[string][]string{},
 		},
 		{
 			name: "duplicates",
-			filters: namevaluesfilters.New(map[string][]string{
+			filters: namevaluesfiltersv2.New(map[string][]string{
 				"name1": {"value1"},
 				"name2": {"value2a", "value2b", "", "value2a", "value2c", "value2c"},
 			}),

internal/service/imagebuilder/component.go

@@ -7,14 +7,16 @@ import (
 	"context"
 	"log"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/imagebuilder"
-	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/imagebuilder"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/enum"
+	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
@@ -84,10 +86,10 @@ func ResourceComponent() *schema.Resource {
 				Computed: true,
 			},
 			"platform": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validation.StringInSlice(imagebuilder.Platform_Values(), false),
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				ValidateDiagFunc: enum.Validate[awstypes.Platform](),
 			},
 			"skip_destroy": {
 				Type:     schema.TypeBool,
@@ -131,7 +133,7 @@ func ResourceComponent() *schema.Resource {
 
 func resourceComponentCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).ImageBuilderConn(ctx)
+	conn := meta.(*conns.AWSClient).ImageBuilderClient(ctx)
 
 	input := &imagebuilder.CreateComponentInput{
 		ClientToken: aws.String(id.UniqueId()),
@@ -159,11 +161,11 @@ func resourceComponentCreate(ctx context.Context, d *schema.ResourceData, meta i
 	}
 
 	if v, ok := d.GetOk("platform"); ok {
-		input.Platform = aws.String(v.(string))
+		input.Platform = awstypes.Platform(v.(string))
 	}
 
 	if v, ok := d.GetOk("supported_os_versions"); ok && v.(*schema.Set).Len() > 0 {
-		input.SupportedOsVersions = flex.ExpandStringSet(v.(*schema.Set))
+		input.SupportedOsVersions = flex.ExpandStringValueSet(v.(*schema.Set))
 	}
 
 	if v, ok := d.GetOk("uri"); ok {
@@ -174,7 +176,7 @@ func resourceComponentCreate(ctx context.Context, d *schema.ResourceData, meta i
 		input.SemanticVersion = aws.String(v.(string))
 	}
 
-	output, err := conn.CreateComponentWithContext(ctx, input)
+	output, err := conn.CreateComponent(ctx, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "creating Image Builder Component: %s", err)
@@ -184,22 +186,22 @@ func resourceComponentCreate(ctx context.Context, d *schema.ResourceData, meta i
 		return sdkdiag.AppendErrorf(diags, "creating Image Builder Component: empty result")
 	}
 
-	d.SetId(aws.StringValue(output.ComponentBuildVersionArn))
+	d.SetId(aws.ToString(output.ComponentBuildVersionArn))
 
 	return append(diags, resourceComponentRead(ctx, d, meta)...)
 }
 
 func resourceComponentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).ImageBuilderConn(ctx)
+	conn := meta.(*conns.AWSClient).ImageBuilderClient(ctx)
 
 	input := &imagebuilder.GetComponentInput{
 		ComponentBuildVersionArn: aws.String(d.Id()),
 	}
 
-	output, err := conn.GetComponentWithContext(ctx, input)
+	output, err := conn.GetComponent(ctx, input)
 
-	if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, imagebuilder.ErrCodeResourceNotFoundException) {
+	if !d.IsNewResource() && errs.MessageContains(err, ResourceNotFoundException, "cannot be found") {
 		log.Printf("[WARN] Image Builder Component (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return diags
@@ -225,7 +227,7 @@ func resourceComponentRead(ctx context.Context, d *schema.ResourceData, meta int
 	d.Set("name", component.Name)
 	d.Set("owner", component.Owner)
 	d.Set("platform", component.Platform)
-	d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions))
+	d.Set("supported_os_versions", component.SupportedOsVersions)
 
 	setTagsOut(ctx, component.Tags)
 
@@ -251,15 +253,15 @@ func resourceComponentDelete(ctx context.Context, d *schema.ResourceData, meta i
 		return diags
 	}
 
-	conn := meta.(*conns.AWSClient).ImageBuilderConn(ctx)
+	conn := meta.(*conns.AWSClient).ImageBuilderClient(ctx)
 
 	input := &imagebuilder.DeleteComponentInput{
 		ComponentBuildVersionArn: aws.String(d.Id()),
 	}
 
-	_, err := conn.DeleteComponentWithContext(ctx, input)
+	_, err := conn.DeleteComponent(ctx, input)
 
-	if tfawserr.ErrCodeEquals(err, imagebuilder.ErrCodeResourceNotFoundException) {
+	if errs.MessageContains(err, ResourceNotFoundException, "cannot be found") {
 		return diags
 	}
 

internal/service/imagebuilder/component_data_source.go

@@ -6,8 +6,8 @@ package imagebuilder
 import (
 	"context"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/imagebuilder"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/imagebuilder"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
@@ -83,16 +83,15 @@ func DataSourceComponent() *schema.Resource {
 
 func dataSourceComponentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).ImageBuilderConn(ctx)
-	ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
+	conn := meta.(*conns.AWSClient).ImageBuilderClient(ctx)
 
 	input := &imagebuilder.GetComponentInput{}
 
 	if v, ok := d.GetOk("arn"); ok {
 		input.ComponentBuildVersionArn = aws.String(v.(string))
 	}
 
-	output, err := conn.GetComponentWithContext(ctx, input)
+	output, err := conn.GetComponent(ctx, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "getting Image Builder Component: %s", err)
@@ -104,7 +103,7 @@ func dataSourceComponentRead(ctx context.Context, d *schema.ResourceData, meta i
 
 	component := output.Component
 
-	d.SetId(aws.StringValue(component.Arn))
+	d.SetId(aws.ToString(component.Arn))
 
 	d.Set("arn", component.Arn)
 	d.Set("change_description", component.ChangeDescription)
@@ -116,11 +115,9 @@ func dataSourceComponentRead(ctx context.Context, d *schema.ResourceData, meta i
 	d.Set("name", component.Name)
 	d.Set("owner", component.Owner)
 	d.Set("platform", component.Platform)
-	d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions))
+	d.Set("supported_os_versions", component.SupportedOsVersions)
 
-	if err := d.Set("tags", KeyValueTags(ctx, component.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
-		return sdkdiag.AppendErrorf(diags, "setting tags: %s", err)
-	}
+	setTagsOut(ctx, component.Tags)
 
 	d.Set("type", component.Type)
 	d.Set("version", component.Version)