Merge pull request #20543 from coderGo93/appstream-fleet

New resource for AppStream Fleet

.changelog/20543.txt

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

aws/data_source_aws_iam_group_test.go

@@ -18,7 +18,7 @@ func TestAccAWSDataSourceIAMGroup_basic(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMGroupConfig(groupName),
+				Config: testAccAwsIAMGroupDataSourceConfig(groupName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"),
 					resource.TestCheckResourceAttr("data.aws_iam_group.test", "path", "/"),
@@ -42,7 +42,7 @@ func TestAccAWSDataSourceIAMGroup_users(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMGroupConfigWithUser(groupName, userName, groupMemberShipName, userCount),
+				Config: testAccAwsIAMGroupDataSourceConfigWithUser(groupName, userName, groupMemberShipName, userCount),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"),
 					resource.TestCheckResourceAttr("data.aws_iam_group.test", "path", "/"),
@@ -59,7 +59,7 @@ func TestAccAWSDataSourceIAMGroup_users(t *testing.T) {
 	})
 }
 
-func testAccAwsIAMGroupConfig(name string) string {
+func testAccAwsIAMGroupDataSourceConfig(name string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_group" "group" {
   name = "%s"
@@ -72,7 +72,7 @@ data "aws_iam_group" "test" {
 `, name)
 }
 
-func testAccAwsIAMGroupConfigWithUser(groupName, userName, membershipName string, userCount int) string {
+func testAccAwsIAMGroupDataSourceConfigWithUser(groupName, userName, membershipName string, userCount int) string {
 	return fmt.Sprintf(`
 resource "aws_iam_group" "group" {
   name = "%s"

aws/data_source_aws_iam_role_test.go

@@ -20,7 +20,7 @@ func TestAccAWSDataSourceIAMRole_basic(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMRoleConfig(roleName),
+				Config: testAccAwsIAMRoleDataSourceConfig(roleName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"),
 					resource.TestCheckResourceAttrPair(dataSourceName, "assume_role_policy", resourceName, "assume_role_policy"),
@@ -48,7 +48,7 @@ func TestAccAWSDataSourceIAMRole_tags(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMRoleConfig_tags(roleName),
+				Config: testAccAwsIAMRoleDataSourceConfig_tags(roleName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"),
 					resource.TestCheckResourceAttrPair(dataSourceName, "assume_role_policy", resourceName, "assume_role_policy"),
@@ -67,7 +67,7 @@ func TestAccAWSDataSourceIAMRole_tags(t *testing.T) {
 	})
 }
 
-func testAccAwsIAMRoleConfig(roleName string) string {
+func testAccAwsIAMRoleDataSourceConfig(roleName string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_role" "test" {
   name = %[1]q
@@ -97,7 +97,7 @@ data "aws_iam_role" "test" {
 `, roleName)
 }
 
-func testAccAwsIAMRoleConfig_tags(roleName string) string {
+func testAccAwsIAMRoleDataSourceConfig_tags(roleName string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_role" "test" {
   name = %q

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

@@ -16,12 +16,13 @@ func StackByName(ctx context.Context, conn *appstream.AppStream, name string) (*
 
 	var stack *appstream.Stack
 	resp, err := conn.DescribeStacksWithContext(ctx, input)
+
 	if err != nil {
 		return nil, err
 	}
 
 	if len(resp.Stacks) > 1 {
-		return nil, fmt.Errorf("[ERROR] got more than one stack with the name %s", name)
+		return nil, fmt.Errorf("got more than one stack with the name %s", name)
 	}
 
 	if len(resp.Stacks) == 1 {
@@ -30,3 +31,27 @@ func StackByName(ctx context.Context, conn *appstream.AppStream, name string) (*
 
 	return stack, nil
 }
+
+// FleetByName Retrieve a appstream fleet by name
+func FleetByName(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.Fleet, error) {
+	input := &appstream.DescribeFleetsInput{
+		Names: []*string{aws.String(name)},
+	}
+
+	var fleet *appstream.Fleet
+	resp, err := conn.DescribeFleetsWithContext(ctx, input)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(resp.Fleets) > 1 {
+		return nil, fmt.Errorf("got more than one fleet with the name %s", name)
+	}
+
+	if len(resp.Fleets) == 1 {
+		fleet = resp.Fleets[0]
+	}
+
+	return fleet, nil
+}

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

@@ -3,6 +3,7 @@ package waiter
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appstream"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/appstream/finder"
@@ -23,3 +24,20 @@ func StackState(ctx context.Context, conn *appstream.AppStream, name string) res
 		return stack, "AVAILABLE", nil
 	}
 }
+
+//FleetState fetches the fleet and its state
+func FleetState(ctx context.Context, conn *appstream.AppStream, name string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		fleet, err := finder.FleetByName(ctx, conn, name)
+
+		if err != nil {
+			return nil, "Unknown", err
+		}
+
+		if fleet == nil {
+			return fleet, "NotFound", nil
+		}
+
+		return fleet, aws.StringValue(fleet.State), nil
+	}
+}

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

@@ -11,6 +11,11 @@ import (
 const (
 	// StackOperationTimeout Maximum amount of time to wait for Stack operation eventual consistency
 	StackOperationTimeout = 4 * time.Minute
+
+	// FleetStateTimeout Maximum amount of time to wait for the FleetState to be RUNNING or STOPPED
+	FleetStateTimeout = 180 * time.Minute
+	// FleetOperationTimeout Maximum amount of time to wait for Fleet operation eventual consistency
+	FleetOperationTimeout = 15 * time.Minute
 )
 
 // StackStateDeleted waits for a deleted stack
@@ -29,3 +34,39 @@ func StackStateDeleted(ctx context.Context, conn *appstream.AppStream, name stri
 
 	return nil, err
 }
+
+// FleetStateRunning waits for a fleet running
+func FleetStateRunning(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.Fleet, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{appstream.FleetStateStarting},
+		Target:  []string{appstream.FleetStateRunning},
+		Refresh: FleetState(ctx, conn, name),
+		Timeout: FleetStateTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+	if output, ok := outputRaw.(*appstream.Fleet); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
+// FleetStateStopped waits for a fleet stopped
+func FleetStateStopped(ctx context.Context, conn *appstream.AppStream, name string) (*appstream.Fleet, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{appstream.FleetStateStopping},
+		Target:  []string{appstream.FleetStateStopped},
+		Refresh: FleetState(ctx, conn, name),
+		Timeout: FleetStateTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+	if output, ok := outputRaw.(*appstream.Fleet); ok {
+		return output, err
+	}
+
+	return nil, err
+}

aws/provider.go

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