New resource for AppStream ImageBuilder

.changelog/21036.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_appstream_image_builder
+```

aws/internal/service/appstream/finder/finder.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appstream"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/appstream/lister"
 )
 
 // StackByName Retrieve a appstream stack by name
@@ -55,3 +56,40 @@ func FleetByName(ctx context.Context, conn *appstream.AppStream, name string) (*
 
 	return fleet, nil
 }
+
+// ImageBuilderByName Retrieve a appstream ImageBuilder by name
+func ImageBuilderByName(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.ImageBuilder, error) {
+	input := &appstream.DescribeImageBuildersInput{
+		Names: []*string{aws.String(name)},
+	}
+
+	var result *appstream.ImageBuilder
+
+	err := lister.DescribeImageBuildersPagesWithContext(ctx, conn, input, func(page *appstream.DescribeImageBuildersOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, imageBuilder := range page.ImageBuilders {
+			if imageBuilder == nil {
+				continue
+			}
+			if aws.StringValue(imageBuilder.Name) == name {
+				result = imageBuilder
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if result == nil {
+		return nil, nil
+	}
+
+	return result, nil
+}

aws/internal/service/appstream/lister/list.go

@@ -0,0 +1,3 @@
+//go:generate go run ../../../generators/listpages/main.go -function=DescribeImageBuilders github.com/aws/aws-sdk-go/service/appstream
+
+package lister

aws/internal/service/appstream/waiter/status.go

@@ -41,3 +41,20 @@ func FleetState(ctx context.Context, conn *appstream.AppStream, name string) res
 		return fleet, aws.StringValue(fleet.State), nil
 	}
 }
+
+//ImageBuilderState fetches the ImageBuilder and its state
+func ImageBuilderState(ctx context.Context, conn *appstream.AppStream, name string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		imageBuilder, err := finder.ImageBuilderByName(ctx, conn, name)
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		if imageBuilder == nil {
+			return nil, "", nil
+		}
+
+		return imageBuilder, aws.StringValue(imageBuilder.State), nil
+	}
+}

aws/internal/service/appstream/waiter/waiter.go

@@ -2,10 +2,14 @@ package waiter
 
 import (
 	"context"
+	"fmt"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appstream"
+	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
 )
 
 const (
@@ -16,6 +20,9 @@ const (
 	FleetStateTimeout = 180 * time.Minute
 	// FleetOperationTimeout Maximum amount of time to wait for Fleet operation eventual consistency
 	FleetOperationTimeout = 15 * time.Minute
+	// ImageBuilderStateTimeout Maximum amount of time to wait for the ImageBuilderState to be RUNNING
+	// or for the ImageBuilder to be deleted
+	ImageBuilderStateTimeout = 60 * time.Minute
 )
 
 // StackStateDeleted waits for a deleted stack
@@ -70,3 +77,59 @@ func FleetStateStopped(ctx context.Context, conn *appstream.AppStream, name stri
 
 	return nil, err
 }
+
+// ImageBuilderStateRunning waits for a ImageBuilder running
+func ImageBuilderStateRunning(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.ImageBuilder, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{appstream.ImageBuilderStatePending},
+		Target:  []string{appstream.ImageBuilderStateRunning},
+		Refresh: ImageBuilderState(ctx, conn, name),
+		Timeout: ImageBuilderStateTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+	if output, ok := outputRaw.(*appstream.ImageBuilder); ok {
+		if state, errors := aws.StringValue(output.State), output.ImageBuilderErrors; state == appstream.ImageBuilderStateFailed && len(errors) > 0 {
+			var errs *multierror.Error
+
+			for _, err := range errors {
+				errs = multierror.Append(errs, fmt.Errorf("%s: %s", aws.StringValue(err.ErrorCode), aws.StringValue(err.ErrorMessage)))
+			}
+
+			tfresource.SetLastError(err, errs.ErrorOrNil())
+		}
+
+		return output, err
+	}
+
+	return nil, err
+}
+
+// ImageBuilderStateDeleted waits for a ImageBuilder deleted
+func ImageBuilderStateDeleted(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.ImageBuilder, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{appstream.ImageBuilderStatePending, appstream.ImageBuilderStateDeleting},
+		Target:  []string{},
+		Refresh: ImageBuilderState(ctx, conn, name),
+		Timeout: ImageBuilderStateTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+	if output, ok := outputRaw.(*appstream.ImageBuilder); ok {
+		if state, errors := aws.StringValue(output.State), output.ImageBuilderErrors; state == appstream.ImageBuilderStateFailed && len(errors) > 0 {
+			var errs *multierror.Error
+
+			for _, err := range errors {
+				errs = multierror.Append(errs, fmt.Errorf("%s: %s", aws.StringValue(err.ErrorCode), aws.StringValue(err.ErrorMessage)))
+			}
+
+			tfresource.SetLastError(err, errs.ErrorOrNil())
+		}
+
+		return output, err
+	}
+
+	return nil, err
+}

aws/provider.go

@@ -543,6 +543,7 @@ func Provider() *schema.Provider {
 			"aws_apprunner_service":                                   resourceAwsAppRunnerService(),
 			"aws_appstream_stack":                                     resourceAwsAppStreamStack(),
 			"aws_appstream_fleet":                                     resourceAwsAppStreamFleet(),
+			"aws_appstream_image_builder":                             resourceAwsAppStreamImageBuilder(),
 			"aws_appsync_api_key":                                     resourceAwsAppsyncApiKey(),
 			"aws_appsync_datasource":                                  resourceAwsAppsyncDatasource(),
 			"aws_appsync_function":                                    resourceAwsAppsyncFunction(),