From 96b423290f082cb2b734affa4605ce67b93e1fe0 Mon Sep 17 00:00:00 2001 From: Dogers Date: Fri, 21 Feb 2020 23:50:44 +0000 Subject: [PATCH 01/24] Add aws_imagebuilder_component --- aws/data_source_aws_imagebuilder_component.go | 107 ++++++++++ aws/provider.go | 2 + aws/resource_aws_imagebuilder_component.go | 198 ++++++++++++++++++ 3 files changed, 307 insertions(+) create mode 100644 aws/data_source_aws_imagebuilder_component.go create mode 100644 aws/resource_aws_imagebuilder_component.go diff --git a/aws/data_source_aws_imagebuilder_component.go b/aws/data_source_aws_imagebuilder_component.go new file mode 100644 index 00000000000..52416307ec2 --- /dev/null +++ b/aws/data_source_aws_imagebuilder_component.go @@ -0,0 +1,107 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsImageBuilderComponent() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsImageBuilderComponentRead, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Required: true, + }, + "change_description": { + Type: schema.TypeString, + Computed: true, + }, + "data": { + Type: schema.TypeString, + Computed: true, + }, + "date_created": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "encrypted": { + Type: schema.TypeBool, + Computed: true, + Optional: true, + }, + "name": { + Type: schema.TypeString, + Computed: true, + Optional: true, + }, + "owner": { + Type: schema.TypeString, + Computed: true, + Optional: true, + }, + "platform": { + Type: schema.TypeString, + Computed: true, + Optional: true, + }, + "tags": tagsSchemaComputed(), + "type": { + Type: schema.TypeString, + Computed: true, + Optional: true, + }, + "semantic_version": { + Type: schema.TypeInt, + Computed: true, + Optional: true, + }, + }, + } +} + +func dataSourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + componentArn := d.Get("arn").(string) + + params := &imagebuilder.GetComponentInput{ + ComponentBuildVersionArn: aws.String(componentArn), + } + + resp, err := conn.GetComponent(params) + + if err != nil { + return fmt.Errorf("Error retrieving Component: %s", err) + } + + return componentDescriptionAttributes(d, resp.Component) +} + +func componentDescriptionAttributes(d *schema.ResourceData, component *imagebuilder.Component) error { + d.SetId(*component.Arn) + d.Set("change_description", component.ChangeDescription) + d.Set("data", component.Data) + d.Set("date_created", component.DateCreated) + d.Set("description", component.Description) + d.Set("encrypted", component.Encrypted) + d.Set("kms_key_id", component.KmsKeyId) + d.Set("name", component.Name) + d.Set("owner", component.Owner) + d.Set("platform", component.Platform) + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + d.Set("type", component.Type) + d.Set("semantic_version", component.Version) + + return nil +} diff --git a/aws/provider.go b/aws/provider.go index f362186ac57..698e1b78a8f 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -254,6 +254,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_role": dataSourceAwsIAMRole(), "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), "aws_iam_user": dataSourceAwsIAMUser(), + "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), @@ -627,6 +628,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_user_ssh_key": resourceAwsIamUserSshKey(), "aws_iam_user": resourceAwsIamUser(), "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), + "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go new file mode 100644 index 00000000000..7dd136b612e --- /dev/null +++ b/aws/resource_aws_imagebuilder_component.go @@ -0,0 +1,198 @@ +package aws + +import ( + "errors" + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" +) + +func resourceAwsImageBuilderComponent() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsImageBuilderComponentCreate, + Read: resourceAwsImageBuilderComponentRead, + Update: resourceAwsImageBuilderComponentUpdate, + Delete: resourceAwsImageBuilderComponentDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "change_description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "data": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 16000), + ConflictsWith: []string{"uri"}, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "kms_key_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "platform": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{"Windows", "Linux"}, false), + }, + "semantic_version": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "tags": tagsSchema(), + "uri": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ConflictsWith: []string{"data"}, + }, + }, + } +} + +func resourceAwsImageBuilderComponentCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + input := &imagebuilder.CreateComponentInput{ + ClientToken: aws.String(resource.UniqueId()), + Name: aws.String(d.Get("name").(string)), + Platform: aws.String(d.Get("platform").(string)), + SemanticVersion: aws.String(d.Get("semantic_version").(string)), + } + + if v, ok := d.GetOk("change_description"); ok { + input.SetChangeDescription(v.(string)) + } + data, dataok := d.GetOk("data") + if dataok { + input.SetData(data.(string)) + } + if v, ok := d.GetOk("description"); ok { + input.SetDescription(v.(string)) + } + if v, ok := d.GetOk("kms_key_id"); ok { + input.SetKmsKeyId(v.(string)) + } + uri, uriok := d.GetOk("uri") + if uriok { + input.SetUri(uri.(string)) + } + if !uriok && !dataok { + return errors.New("one of data or uri must be set") + } + if v, ok := d.GetOk("tags"); ok { + input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) + } + + log.Printf("[DEBUG] Creating Component: %#v", input) + + resp, err := conn.CreateComponent(input) + if err != nil { + return fmt.Errorf("error creating Component: %s", err) + } + + d.SetId(aws.StringValue(resp.ComponentBuildVersionArn)) + + return resourceAwsImageBuilderComponentRead(d, meta) +} + +func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetComponent(&imagebuilder.GetComponentInput{ + ComponentBuildVersionArn: aws.String(d.Id()), + }) + + if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] Component (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading Component (%s): %s", d.Id(), err) + } + + d.Set("arn", resp.Component.Arn) + d.Set("name", resp.Component.Name) + d.Set("semantic_version", resp.Component.Version) + d.Set("change_description", resp.Component.ChangeDescription) + d.Set("data", resp.Component.Data) + d.Set("description", resp.Component.Description) + d.Set("kms_key_id", resp.Component.KmsKeyId) + d.Set("platform", resp.Component.Platform) + + tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for Component (%s): %s", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsImageBuilderComponentUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + // tags are the only thing we can actually change, everything else is ForceNew + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating tags for Component (%s): %s", d.Id(), err) + } + } + + return resourceAwsImageBuilderComponentRead(d, meta) +} + +func resourceAwsImageBuilderComponentDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + _, err := conn.DeleteComponent(&imagebuilder.DeleteComponentInput{ + ComponentBuildVersionArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Component (%s): %s", d.Id(), err) + } + + return nil +} From 2d588c2608e7eaed0e05a46478fbd4cfbf594239 Mon Sep 17 00:00:00 2001 From: Dogers Date: Sat, 22 Feb 2020 15:33:39 +0000 Subject: [PATCH 02/24] Add test for data_source_aws_imagebuilder_component --- ..._source_aws_imagebuilder_component_test.go | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 aws/data_source_aws_imagebuilder_component_test.go diff --git a/aws/data_source_aws_imagebuilder_component_test.go b/aws/data_source_aws_imagebuilder_component_test.go new file mode 100644 index 00000000000..4c01aac6ed4 --- /dev/null +++ b/aws/data_source_aws_imagebuilder_component_test.go @@ -0,0 +1,58 @@ +package aws + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "testing" +) + +func TestAccDataSourceAwsImageBuilderComponent_basic(t *testing.T) { + rName := fmt.Sprintf("tf-ib-comp-test-%s", acctest.RandString(8)) + resourceName := "aws_builder_component.test" + dataSourceName := "data.aws_builder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceAwsImageBuilderComponentConfig(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"), + resource.TestCheckResourceAttrPair(dataSourceName, "semantic_version", resourceName, "semantic_version"), + ), + }, + }, + }) +} + +func testAccDataSourceAwsImageBuilderComponentConfig(name string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + name = "%s" + platform = "Linux" + semantic_version = "1.0.1" + + data = < Date: Sat, 22 Feb 2020 22:09:54 +0000 Subject: [PATCH 03/24] Add aws_imagebuilder_infrastructureconfiguration --- ...agebuilder_infrastructure_configuration.go | 136 +++++++ aws/provider.go | 2 + ...agebuilder_infrastructure_configuration.go | 335 ++++++++++++++++++ 3 files changed, 473 insertions(+) create mode 100644 aws/data_source_aws_imagebuilder_infrastructure_configuration.go create mode 100644 aws/resource_aws_imagebuilder_infrastructure_configuration.go diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go new file mode 100644 index 00000000000..f5ef897e7af --- /dev/null +++ b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go @@ -0,0 +1,136 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsImageBuilderInfrastructureConfigurationRead, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Required: true, + }, + "datecreated": { + Type: schema.TypeString, + Computed: true, + }, + "dateupdated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "instance_profile_name": { + Type: schema.TypeString, + Computed: true, + }, + "instance_types": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "key_pair": { + Type: schema.TypeString, + Computed: true, + }, + "logging": { + Type: schema.TypeList, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "s3_logs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "s3_bucket_name": { + Type: schema.TypeString, + Computed: true, + }, + "s3_key_prefix": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + "security_group_ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "sns_topic_arn": { + Type: schema.TypeString, + Computed: true, + }, + "subnet_id": { + Type: schema.TypeString, + Computed: true, + }, + "terminate_instance_on_failure": { + Type: schema.TypeBool, + Computed: true, + }, + "tags": tagsSchema(), + }, + } +} + +func dataSourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + componentArn := d.Get("arn").(string) + + params := &imagebuilder.GetInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(componentArn), + } + + resp, err := conn.GetInfrastructureConfiguration(params) + + if err != nil { + return fmt.Errorf("Error retrieving Component: %s", err) + } + + return infraconfigDescriptionAttributes(d, resp.InfrastructureConfiguration) +} + +func infraconfigDescriptionAttributes(d *schema.ResourceData, component *imagebuilder.InfrastructureConfiguration) error { + d.SetId(*component.Arn) + d.Set("datecreated", component.DateCreated) + d.Set("dateupdated", component.DateUpdated) + d.Set("date_created", component.DateCreated) + d.Set("description", component.Description) + d.Set("instance_profile_name", component.InstanceProfileName) + d.Set("instance_types", component.InstanceTypes) + d.Set("key_pair", component.KeyPair) + d.Set("logging", component.Logging) + d.Set("name", component.Name) + d.Set("security_group_ids", component.SecurityGroupIds) + d.Set("sns_topic_arn", component.SnsTopicArn) + d.Set("subnet_id", component.SubnetId) + d.Set("terminate_instance_on_failure", component.TerminateInstanceOnFailure) + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/provider.go b/aws/provider.go index 698e1b78a8f..13c9a568c3c 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -255,6 +255,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), "aws_iam_user": dataSourceAwsIAMUser(), "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), + "aws_imagebuilder_infrastructureconfiguration": dataSourceAwsImageBuilderInfrastructureConfiguration(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), @@ -629,6 +630,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_user": resourceAwsIamUser(), "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), + "aws_imagebuilder_infrastructureconfiguration": resourceAwsImageBuilderInfrastructureConfiguration(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go new file mode 100644 index 00000000000..53557a329ca --- /dev/null +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -0,0 +1,335 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" +) + +func resourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsImageBuilderInfrastructureConfigurationCreate, + Read: resourceAwsImageBuilderInfrastructureConfigurationRead, + Update: resourceAwsImageBuilderInfrastructureConfigurationUpdate, + Delete: resourceAwsImageBuilderInfrastructureConfigurationDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "datecreated": { + Type: schema.TypeString, + Computed: true, + }, + "dateupdated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "instance_profile_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "instance_types": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "key_pair": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "logging": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "s3_logs": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "s3_bucket_name": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "s3_key_prefix": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + Default: "/", + }, + }, + }, + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "security_group_ids": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "sns_topic_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "subnet_id": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "terminate_instance_on_failure": { + Type: schema.TypeBool, + Optional: true, + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + securityIdSet := d.Get("security_group_ids").(*schema.Set) + securityIds := expandStringList(securityIdSet.List()) + instanceIdSet := d.Get("instance_types").(*schema.Set) + instanceIds := expandStringList(instanceIdSet.List()) + + input := &imagebuilder.CreateInfrastructureConfigurationInput{ + ClientToken: aws.String(resource.UniqueId()), + Name: aws.String(d.Get("name").(string)), + InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), + SecurityGroupIds: securityIds, + InstanceTypes: instanceIds, + } + + if v, ok := d.GetOk("description"); ok { + input.SetDescription(v.(string)) + } + if v, ok := d.GetOk("key_pair"); ok { + input.SetKeyPair(v.(string)) + } + if v, ok := d.GetOk("logging"); ok { + input.SetLogging(v.(*imagebuilder.Logging)) + } + if v, ok := d.GetOk("sns_topic_arn"); ok { + input.SetSnsTopicArn(v.(string)) + } + if v, ok := d.GetOk("subnet_id"); ok { + input.SetSubnetId(v.(string)) + } + if v, ok := d.GetOk("tags"); ok { + input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) + } + + log.Printf("[DEBUG] Creating Infrastructure Configuration: %#v", input) + + resp, err := conn.CreateInfrastructureConfiguration(input) + if err != nil { + return fmt.Errorf("error creating Component: %s", err) + } + + d.SetId(aws.StringValue(resp.InfrastructureConfigurationArn)) + + return resourceAwsImageBuilderInfrastructureConfigurationRead(d, meta) +} + +func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(d.Id()), + }) + + if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] Infrastructure Configuration (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading Infrastructure Configuration (%s): %s", d.Id(), err) + } + + d.Set("arn", resp.InfrastructureConfiguration.Arn) + d.Set("datecreated", resp.InfrastructureConfiguration.DateCreated) + d.Set("dateupdated", resp.InfrastructureConfiguration.DateUpdated) + d.Set("description", resp.InfrastructureConfiguration.Description) + d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) + d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) + d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) + d.Set("logging", flattenAwsImageBuilderLogsConfig(resp.InfrastructureConfiguration.Logging)) + d.Set("name", resp.InfrastructureConfiguration.Name) + d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) + d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) + d.Set("subnet_id", resp.InfrastructureConfiguration.SubnetId) + d.Set("terminate_instance_on_failure", resp.InfrastructureConfiguration.TerminateInstanceOnFailure) + + tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for Infrastructure Configuration (%s): %s", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsImageBuilderInfrastructureConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + // Despite not being required by the API, if it's not sent then certain things get wiped to null + upd := imagebuilder.UpdateInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(d.Id()), + InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), + Description: aws.String(d.Get("description").(string)), + KeyPair: aws.String(d.Get("key_pair").(string)), + SubnetId: aws.String(d.Get("subnet_id").(string)), + Logging: expandAwsImageBuilderLogsConfig(d), + } + + if d.HasChange("instance_types") { + if attr := d.Get("instance_types").(*schema.Set); attr.Len() > 0 { + upd.InstanceTypes = expandStringList(attr.List()) + } + } + if d.HasChange("instance_profile_name") { + upd.InstanceProfileName = aws.String(d.Get("instance_profile_name").(string)) + } + if v, ok := d.GetOk("security_group_ids"); ok { + if attr := v.(*schema.Set); attr.Len() > 0 { + upd.SecurityGroupIds = expandStringList(attr.List()) + } + } + if d.HasChange("sns_topic_arn") { + upd.SnsTopicArn = aws.String(d.Get("sns_topic_arn").(string)) + } + if d.HasChange("terminate_instance_on_failure") { + upd.TerminateInstanceOnFailure = aws.Bool(d.Get("terminate_instance_on_failure").(bool)) + } + + if d.HasChange("security_group_ids") { + if attr := d.Get("security_group_ids").(*schema.Set); attr.Len() > 0 { + upd.SecurityGroupIds = expandStringList(attr.List()) + } + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating tags for Infrastructure Configuration (%s): %s", d.Id(), err) + } + } + + _, err := conn.UpdateInfrastructureConfiguration(&upd) + if err != nil { + return fmt.Errorf("error updating Infrastructure Configuration (%s): %s", d.Id(), err) + } + + return resourceAwsImageBuilderInfrastructureConfigurationRead(d, meta) +} + +func resourceAwsImageBuilderInfrastructureConfigurationDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + _, err := conn.DeleteInfrastructureConfiguration(&imagebuilder.DeleteInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Infrastructure Configuration (%s): %s", d.Id(), err) + } + + return nil +} + +func flattenAwsImageBuilderLogsConfig(logsConfig *imagebuilder.Logging) []interface{} { + if logsConfig == nil { + return []interface{}{} + } + + values := map[string]interface{}{} + + // If more logging options are added, add more ifs! + if v := logsConfig.S3Logs; v != nil { + values["s3_logs"] = flattenAwsImageBuilderS3Logs(v) + } + + return []interface{}{values} +} + +func flattenAwsImageBuilderS3Logs(s3LogsConfig *imagebuilder.S3Logs) []interface{} { + values := map[string]interface{}{} + + values["s3_key_prefix"] = aws.StringValue(s3LogsConfig.S3KeyPrefix) + values["s3_bucket_name"] = aws.StringValue(s3LogsConfig.S3BucketName) + + return []interface{}{values} +} + +func expandAwsImageBuilderLogsConfig(d *schema.ResourceData) *imagebuilder.Logging { + logsConfig := &imagebuilder.Logging{} + + if v, ok := d.GetOk("logging"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { + configList := v.([]interface{}) + data := configList[0].(map[string]interface{}) + + if v, ok := data["s3_logs"]; ok { + logsConfig.S3Logs = expandAwsImageBuilderS3LogsConfig(v.([]interface{})) + } + } + + return logsConfig +} + +func expandAwsImageBuilderS3LogsConfig(configList []interface{}) *imagebuilder.S3Logs { + if len(configList) == 0 || configList[0] == nil { + return nil + } + + data := configList[0].(map[string]interface{}) + + s3LogsConfig := &imagebuilder.S3Logs{} + + if v, ok := data["s3_bucket_name"]; ok { + s3LogsConfig.S3BucketName = aws.String(v.(string)) + } + if v, ok := data["s3_key_prefix"]; ok { + s3LogsConfig.S3KeyPrefix = aws.String(v.(string)) + } + + return s3LogsConfig +} From 6414616226c2cbcf25f07eb72356cd4362271d38 Mon Sep 17 00:00:00 2001 From: Dogers Date: Tue, 3 Mar 2020 23:21:38 +0000 Subject: [PATCH 04/24] Add aws_imagebuilder_recipe --- ..._aws_imagebuilder_infrastructure_recipe.go | 183 +++++++++ aws/provider.go | 2 + aws/resource_aws_imagebuilder_recipe.go | 352 ++++++++++++++++++ 3 files changed, 537 insertions(+) create mode 100644 aws/data_source_aws_imagebuilder_infrastructure_recipe.go create mode 100644 aws/resource_aws_imagebuilder_recipe.go diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go new file mode 100644 index 00000000000..7f01bdbde1b --- /dev/null +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -0,0 +1,183 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsImageBuilderRecipe() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsImageBuilderRecipeRead, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "block_device_mappings": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "device_name": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "ebs": { + Type: schema.TypeList, + Required: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_termination": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: true, + }, + "encrypted": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: false, + }, + "iops": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IntBetween(100, 10000), + }, + "kms_key_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateArn, + }, + "snapshot_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "volume_size": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IntBetween(1, 16000), + }, + "volume_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + imagebuilder.EbsVolumeTypeStandard, + imagebuilder.EbsVolumeTypeIo1, + imagebuilder.EbsVolumeTypeGp2, + imagebuilder.EbsVolumeTypeSc1, + imagebuilder.EbsVolumeTypeSt1, + }, true), + }, + }, + }, + }, + "no_device": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "virtual_name": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + }, + }, + }, + "components": { + Type: schema.TypeList, + Required: true, + MinItems: 1, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "datecreated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "owner": { + Type: schema.TypeString, + Computed: true, + }, + "parent_image": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "platform": { + Type: schema.TypeString, + Computed: true, + }, + "semantic_version": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "tags": tagsSchema(), + }, + + } +} + +func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ + ImageRecipeArn: aws.String(d.Id()), + }) + + if err != nil { + return fmt.Errorf("error reading Recipe (%s): %s", d.Id(), err) + } + + return recipeDescriptionAttributes(d, resp.ImageRecipe) +} + +func recipeDescriptionAttributes(d *schema.ResourceData, imageRecipe *imagebuilder.ImageRecipe) error { + d.SetId(*imageRecipe.Arn) + d.Set("arn", imageRecipe.Arn) + d.Set("block_device_mappings", imageRecipe.BlockDeviceMappings) + d.Set("components", imageRecipe.Components) + d.Set("datecreated", imageRecipe.DateCreated) + d.Set("description", imageRecipe.Description) + d.Set("name", imageRecipe.Name) + d.Set("owner", imageRecipe.Owner) + d.Set("parent_image", imageRecipe.ParentImage) + d.Set("platform", imageRecipe.Platform) + d.Set("semantic_version", imageRecipe.Version) + + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(imageRecipe.Tags).IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/provider.go b/aws/provider.go index 13c9a568c3c..e2d79985ac2 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -256,6 +256,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_user": dataSourceAwsIAMUser(), "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), "aws_imagebuilder_infrastructureconfiguration": dataSourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), @@ -631,6 +632,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), "aws_imagebuilder_infrastructureconfiguration": resourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go new file mode 100644 index 00000000000..68297edc9ab --- /dev/null +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -0,0 +1,352 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/backup" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" +) + +func resourceAwsImageBuilderRecipe() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsImageBuilderRecipeCreate, + Read: resourceAwsImageBuilderRecipeRead, + Update: resourceAwsImageBuilderRecipeUpdate, + Delete: resourceAwsImageBuilderRecipeDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "block_device_mappings": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "device_name": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "ebs": { + Type: schema.TypeList, + Required: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_termination": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: true, + }, + "encrypted": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: false, + }, + "iops": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IntBetween(100, 10000), + }, + "kms_key_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validateArn, + }, + "snapshot_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "volume_size": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + ValidateFunc: validation.IntBetween(1, 16000), + }, + "volume_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice([]string{ + imagebuilder.EbsVolumeTypeStandard, + imagebuilder.EbsVolumeTypeIo1, + imagebuilder.EbsVolumeTypeGp2, + imagebuilder.EbsVolumeTypeSc1, + imagebuilder.EbsVolumeTypeSt1, + }, true), + }, + }, + }, + }, + "no_device": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "virtual_name": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + }, + }, + }, + "components": { + Type: schema.TypeList, + Required: true, + MinItems: 1, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "datecreated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "owner": { + Type: schema.TypeString, + Computed: true, + }, + "parent_image": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "platform": { + Type: schema.TypeString, + Computed: true, + }, + "semantic_version": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsImageBuilderRecipeCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + input := &imagebuilder.CreateImageRecipeInput{ + ClientToken: aws.String(resource.UniqueId()), + Components: expandImageBuilderComponentConfig(d.Get("components").([]interface{})), + Name: aws.String(d.Get("name").(string)), + ParentImage: aws.String(d.Get("parent_image").(string)), + SemanticVersion: aws.String(d.Get("semantic_version").(string)), + BlockDeviceMappings: expandImageBuilderBlockDevices(d), + } + + if v, ok := d.GetOk("description"); ok { + input.SetDescription(v.(string)) + } + if v, ok := d.GetOk("tags"); ok { + input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) + } + + log.Printf("[DEBUG] Creating Recipe: %#v", input) + + resp, err := conn.CreateImageRecipe(input) + if err != nil { + return fmt.Errorf("error creating Recipe: %s", err) + } + + d.SetId(aws.StringValue(resp.ImageRecipeArn)) + + return resourceAwsImageBuilderRecipeRead(d, meta) +} + +func resourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ + ImageRecipeArn: aws.String(d.Id()), + }) + + if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] Recipe (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading Recipe (%s): %s", d.Id(), err) + } + + d.Set("arn", resp.ImageRecipe.Arn) + d.Set("block_device_mappings", resp.ImageRecipe.BlockDeviceMappings) + d.Set("components", resp.ImageRecipe.Components) + d.Set("description", resp.ImageRecipe.Description) + d.Set("name", resp.ImageRecipe.Name) + d.Set("owner", resp.ImageRecipe.Owner) + d.Set("parent_image", resp.ImageRecipe.ParentImage) + d.Set("platform", resp.ImageRecipe.Platform) + d.Set("semantic_version", resp.ImageRecipe.Version) + + tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for Recipe (%s): %s", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsImageBuilderRecipeUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + // tags are the only thing we can update! + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating tags for Recipe (%s): %s", d.Id(), err) + } + } + + return resourceAwsImageBuilderRecipeRead(d, meta) +} + +func resourceAwsImageBuilderRecipeDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + _, err := conn.DeleteImageRecipe(&imagebuilder.DeleteImageRecipeInput{ + ImageRecipeArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Recipe (%s): %s", d.Id(), err) + } + + return nil +} + +func expandImageBuilderComponentConfig(comps []interface{}) []*imagebuilder.ComponentConfiguration { + var configs []*imagebuilder.ComponentConfiguration + + for _, line := range comps { + var arn imagebuilder.ComponentConfiguration + arn.ComponentArn = aws.String(line.(string)) + configs = append(configs, &arn) + } + + return configs +} + +func expandImageBuilderBlockDevices(d *schema.ResourceData) []*imagebuilder.InstanceBlockDeviceMapping { + var bdmres []*imagebuilder.InstanceBlockDeviceMapping + + v, ok := d.GetOk("block_device_mappings") + if !ok { + return bdmres + } + + bdmlist := v.([]interface{}) + + for _, bdm := range bdmlist { + if bdm == nil { + continue + } + blockDeviceMapping := readIBBlockDeviceMappingFromConfig(bdm.(map[string]interface{})) + bdmres = append(bdmres, blockDeviceMapping) + } + + return bdmres +} + +func readIBBlockDeviceMappingFromConfig(bdm map[string]interface{}) *imagebuilder.InstanceBlockDeviceMapping { + blockDeviceMapping := &imagebuilder.InstanceBlockDeviceMapping{} + + if v := bdm["device_name"].(string); v != "" { + blockDeviceMapping.DeviceName = aws.String(v) + } + + if v := bdm["no_device"].(string); v != "" { + blockDeviceMapping.NoDevice = aws.String(v) + } + + if v := bdm["virtual_name"].(string); v != "" { + blockDeviceMapping.VirtualName = aws.String(v) + } + + if v := bdm["ebs"]; len(v.([]interface{})) > 0 { + ebs := v.([]interface{}) + if len(ebs) > 0 && ebs[0] != nil { + ebsData := ebs[0].(map[string]interface{}) + imagebuilderEbsBlockDeviceRequest := readIBEbsBlockDeviceFromConfig(ebsData) + blockDeviceMapping.Ebs = imagebuilderEbsBlockDeviceRequest + } + } + + return blockDeviceMapping +} + +func readIBEbsBlockDeviceFromConfig(ebs map[string]interface{}) *imagebuilder.EbsInstanceBlockDeviceSpecification { + ebsDevice := &imagebuilder.EbsInstanceBlockDeviceSpecification{} + + if v, ok := ebs["delete_on_termination"]; ok { + ebsDevice.DeleteOnTermination = aws.Bool(v.(bool)) + } + + if v, ok := ebs["encrypted"]; ok { + ebsDevice.Encrypted = aws.Bool(v.(bool)) + } + + if v := ebs["iops"].(int); v > 0 { + ebsDevice.Iops = aws.Int64(int64(v)) + } + + if v := ebs["kms_key_id"].(string); v != "" { + ebsDevice.KmsKeyId = aws.String(v) + } + + if v := ebs["snapshot_id"].(string); v != "" { + ebsDevice.SnapshotId = aws.String(v) + } + + if v := ebs["volume_size"]; v != nil { + ebsDevice.VolumeSize = aws.Int64(int64(v.(int))) + } + + if v := ebs["volume_type"].(string); v != "" { + ebsDevice.VolumeType = aws.String(v) + } + + return ebsDevice +} From c29b5da3a2fce4b38c1b55be7dfe81ef69a957d6 Mon Sep 17 00:00:00 2001 From: Dogers Date: Wed, 6 May 2020 23:11:26 +0100 Subject: [PATCH 05/24] Rename to aws_imagebuilder_infrastructure_configuration --- aws/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/provider.go b/aws/provider.go index e2d79985ac2..eb88bdbf17e 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -255,7 +255,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), "aws_iam_user": dataSourceAwsIAMUser(), "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), - "aws_imagebuilder_infrastructureconfiguration": dataSourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_infrastructure_configuration": dataSourceAwsImageBuilderInfrastructureConfiguration(), "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), @@ -631,7 +631,7 @@ func Provider() terraform.ResourceProvider { "aws_iam_user": resourceAwsIamUser(), "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), - "aws_imagebuilder_infrastructureconfiguration": resourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_infrastructure_configuration": resourceAwsImageBuilderInfrastructureConfiguration(), "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), From 8b537672e00f198104d48061cfff69eda06d5f51 Mon Sep 17 00:00:00 2001 From: Dogers Date: Mon, 25 May 2020 19:58:57 +0100 Subject: [PATCH 06/24] Fix issue with infraconfig logging --- aws/resource_aws_imagebuilder_infrastructure_configuration.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index 53557a329ca..f70edd34c55 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -129,6 +129,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), SecurityGroupIds: securityIds, InstanceTypes: instanceIds, + Logging: expandAwsImageBuilderLogsConfig(d), } if v, ok := d.GetOk("description"); ok { @@ -137,9 +138,6 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource if v, ok := d.GetOk("key_pair"); ok { input.SetKeyPair(v.(string)) } - if v, ok := d.GetOk("logging"); ok { - input.SetLogging(v.(*imagebuilder.Logging)) - } if v, ok := d.GetOk("sns_topic_arn"); ok { input.SetSnsTopicArn(v.(string)) } From 8ce7b6bdfbb94d039abfe59549cb886ebfe8ef9b Mon Sep 17 00:00:00 2001 From: Dogers Date: Mon, 25 May 2020 21:11:37 +0100 Subject: [PATCH 07/24] Fix incorrect MaxItems on res --- aws/data_source_aws_imagebuilder_infrastructure_configuration.go | 1 - 1 file changed, 1 deletion(-) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go index f5ef897e7af..28ce8c05a13 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go @@ -46,7 +46,6 @@ func dataSourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { "logging": { Type: schema.TypeList, Computed: true, - MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "s3_logs": { From fbe7510eff55e27158df90048dc490d9b14cb786 Mon Sep 17 00:00:00 2001 From: Dogers Date: Mon, 25 May 2020 21:10:36 +0100 Subject: [PATCH 08/24] Fix S024 --- ...rce_aws_imagebuilder_infrastructure_recipe.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go index 7f01bdbde1b..1d487ff86a6 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -21,7 +21,6 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "block_device_mappings": { Type: schema.TypeList, Optional: true, - ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "device_name": { @@ -32,48 +31,40 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "ebs": { Type: schema.TypeList, Required: true, - ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "delete_on_termination": { Type: schema.TypeBool, Optional: true, - ForceNew: true, Default: true, }, "encrypted": { Type: schema.TypeBool, Optional: true, - ForceNew: true, Default: false, }, "iops": { Type: schema.TypeInt, Optional: true, - ForceNew: true, ValidateFunc: validation.IntBetween(100, 10000), }, "kms_key_id": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validateArn, }, "snapshot_id": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "volume_size": { Type: schema.TypeInt, Optional: true, - ForceNew: true, ValidateFunc: validation.IntBetween(1, 16000), }, "volume_type": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ imagebuilder.EbsVolumeTypeStandard, imagebuilder.EbsVolumeTypeIo1, @@ -88,12 +79,10 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "no_device": { Type: schema.TypeString, Optional: true, - ForceNew: true, }, "virtual_name": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 1024), }, }, @@ -103,7 +92,6 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { Type: schema.TypeList, Required: true, MinItems: 1, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "datecreated": { @@ -113,13 +101,11 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 1024), }, "name": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 126), }, "owner": { @@ -129,7 +115,6 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "parent_image": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 126), }, "platform": { @@ -139,7 +124,6 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { "semantic_version": { Type: schema.TypeString, Required: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 128), }, "tags": tagsSchema(), From 28dfb17a3ac72605a7cb731347899baaf3a9be73 Mon Sep 17 00:00:00 2001 From: Dogers Date: Mon, 25 May 2020 21:12:41 +0100 Subject: [PATCH 09/24] Fix AWSR002 --- aws/data_source_aws_imagebuilder_component.go | 31 ++++++++-------- ...agebuilder_infrastructure_configuration.go | 36 +++++++++---------- ..._aws_imagebuilder_infrastructure_recipe.go | 29 +++++++-------- aws/resource_aws_imagebuilder_component.go | 3 +- ...agebuilder_infrastructure_configuration.go | 3 +- aws/resource_aws_imagebuilder_recipe.go | 3 +- 6 files changed, 50 insertions(+), 55 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_component.go b/aws/data_source_aws_imagebuilder_component.go index 52416307ec2..a265b8aa2d8 100644 --- a/aws/data_source_aws_imagebuilder_component.go +++ b/aws/data_source_aws_imagebuilder_component.go @@ -70,6 +70,7 @@ func dataSourceAwsImageBuilderComponent() *schema.Resource { func dataSourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig componentArn := d.Get("arn").(string) @@ -83,25 +84,23 @@ func dataSourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interfa return fmt.Errorf("Error retrieving Component: %s", err) } - return componentDescriptionAttributes(d, resp.Component) -} + d.SetId(*resp.Component.Arn) -func componentDescriptionAttributes(d *schema.ResourceData, component *imagebuilder.Component) error { - d.SetId(*component.Arn) - d.Set("change_description", component.ChangeDescription) - d.Set("data", component.Data) - d.Set("date_created", component.DateCreated) - d.Set("description", component.Description) - d.Set("encrypted", component.Encrypted) - d.Set("kms_key_id", component.KmsKeyId) - d.Set("name", component.Name) - d.Set("owner", component.Owner) - d.Set("platform", component.Platform) - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.Component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } - d.Set("type", component.Type) - d.Set("semantic_version", component.Version) + + d.Set("change_description", resp.Component.ChangeDescription) + d.Set("data", resp.Component.Data) + d.Set("date_created", resp.Component.DateCreated) + d.Set("description", resp.Component.Description) + d.Set("encrypted", resp.Component.Encrypted) + d.Set("kms_key_id", resp.Component.KmsKeyId) + d.Set("name", resp.Component.Name) + d.Set("owner", resp.Component.Owner) + d.Set("platform", resp.Component.Platform) + d.Set("type", resp.Component.Type) + d.Set("semantic_version", resp.Component.Version) return nil } diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go index 28ce8c05a13..96bf7edb050 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go @@ -96,6 +96,7 @@ func dataSourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { func dataSourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig componentArn := d.Get("arn").(string) @@ -109,27 +110,22 @@ func dataSourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.Resource return fmt.Errorf("Error retrieving Component: %s", err) } - return infraconfigDescriptionAttributes(d, resp.InfrastructureConfiguration) -} - -func infraconfigDescriptionAttributes(d *schema.ResourceData, component *imagebuilder.InfrastructureConfiguration) error { - d.SetId(*component.Arn) - d.Set("datecreated", component.DateCreated) - d.Set("dateupdated", component.DateUpdated) - d.Set("date_created", component.DateCreated) - d.Set("description", component.Description) - d.Set("instance_profile_name", component.InstanceProfileName) - d.Set("instance_types", component.InstanceTypes) - d.Set("key_pair", component.KeyPair) - d.Set("logging", component.Logging) - d.Set("name", component.Name) - d.Set("security_group_ids", component.SecurityGroupIds) - d.Set("sns_topic_arn", component.SnsTopicArn) - d.Set("subnet_id", component.SubnetId) - d.Set("terminate_instance_on_failure", component.TerminateInstanceOnFailure) - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().Map()); err != nil { + d.SetId(*resp.InfrastructureConfiguration.Arn) + d.Set("datecreated", resp.InfrastructureConfiguration.DateCreated) + d.Set("dateupdated", resp.InfrastructureConfiguration.DateUpdated) + d.Set("date_created", resp.InfrastructureConfiguration.DateCreated) + d.Set("description", resp.InfrastructureConfiguration.Description) + d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) + d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) + d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) + d.Set("logging", resp.InfrastructureConfiguration.Logging) + d.Set("name", resp.InfrastructureConfiguration.Name) + d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) + d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) + d.Set("subnet_id", resp.InfrastructureConfiguration.SubnetId) + d.Set("terminate_instance_on_failure", resp.InfrastructureConfiguration.TerminateInstanceOnFailure) + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.InfrastructureConfiguration.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } - return nil } diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go index 1d487ff86a6..c1a334ee118 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -134,6 +134,7 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ ImageRecipeArn: aws.String(d.Id()), @@ -143,23 +144,19 @@ func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("error reading Recipe (%s): %s", d.Id(), err) } - return recipeDescriptionAttributes(d, resp.ImageRecipe) -} - -func recipeDescriptionAttributes(d *schema.ResourceData, imageRecipe *imagebuilder.ImageRecipe) error { - d.SetId(*imageRecipe.Arn) - d.Set("arn", imageRecipe.Arn) - d.Set("block_device_mappings", imageRecipe.BlockDeviceMappings) - d.Set("components", imageRecipe.Components) - d.Set("datecreated", imageRecipe.DateCreated) - d.Set("description", imageRecipe.Description) - d.Set("name", imageRecipe.Name) - d.Set("owner", imageRecipe.Owner) - d.Set("parent_image", imageRecipe.ParentImage) - d.Set("platform", imageRecipe.Platform) - d.Set("semantic_version", imageRecipe.Version) + d.SetId(*resp.ImageRecipe.Arn) + d.Set("arn", resp.ImageRecipe.Arn) + d.Set("block_device_mappings", resp.ImageRecipe.BlockDeviceMappings) + d.Set("components", resp.ImageRecipe.Components) + d.Set("datecreated", resp.ImageRecipe.DateCreated) + d.Set("description", resp.ImageRecipe.Description) + d.Set("name", resp.ImageRecipe.Name) + d.Set("owner", resp.ImageRecipe.Owner) + d.Set("parent_image", resp.ImageRecipe.ParentImage) + d.Set("platform", resp.ImageRecipe.Platform) + d.Set("semantic_version", resp.ImageRecipe.Version) - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(imageRecipe.Tags).IgnoreAws().Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.ImageRecipe.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go index 7dd136b612e..e3165965e4f 100644 --- a/aws/resource_aws_imagebuilder_component.go +++ b/aws/resource_aws_imagebuilder_component.go @@ -130,6 +130,7 @@ func resourceAwsImageBuilderComponentCreate(d *schema.ResourceData, meta interfa func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetComponent(&imagebuilder.GetComponentInput{ ComponentBuildVersionArn: aws.String(d.Id()), @@ -158,7 +159,7 @@ func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface if err != nil { return fmt.Errorf("error listing tags for Component (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index f70edd34c55..c2992579112 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -162,6 +162,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ InfrastructureConfigurationArn: aws.String(d.Id()), @@ -195,7 +196,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceDa if err != nil { return fmt.Errorf("error listing tags for Infrastructure Configuration (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go index 68297edc9ab..17844c33076 100644 --- a/aws/resource_aws_imagebuilder_recipe.go +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -189,6 +189,7 @@ func resourceAwsImageBuilderRecipeCreate(d *schema.ResourceData, meta interface{ func resourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn + ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ ImageRecipeArn: aws.String(d.Id()), @@ -218,7 +219,7 @@ func resourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) if err != nil { return fmt.Errorf("error listing tags for Recipe (%s): %s", d.Id(), err) } - if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil { + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } From 507fe429fb7ef5249030b29aff7722833a67b723 Mon Sep 17 00:00:00 2001 From: Dogers Date: Mon, 25 May 2020 21:33:29 +0100 Subject: [PATCH 10/24] Fix linting --- aws/data_source_aws_imagebuilder_component_test.go | 2 +- aws/data_source_aws_imagebuilder_infrastructure_recipe.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_component_test.go b/aws/data_source_aws_imagebuilder_component_test.go index 4c01aac6ed4..a367d642d1d 100644 --- a/aws/data_source_aws_imagebuilder_component_test.go +++ b/aws/data_source_aws_imagebuilder_component_test.go @@ -55,4 +55,4 @@ data "aws_builder_component" "test" { arn = "arn:aws:imagebuilder:eu-west-1:116147290797:component/test/1.0.1/1" } `, name) -} \ No newline at end of file +} diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go index c1a334ee118..02d9b9cd89e 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -128,7 +128,6 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { }, "tags": tagsSchema(), }, - } } From ca89e2b38c3e645388da6035e11b22a66aef2864 Mon Sep 17 00:00:00 2001 From: Jakub Kania Date: Mon, 13 Jul 2020 00:51:25 +0200 Subject: [PATCH 11/24] [#11084] Fix the imagebuilder resource, add test and docs # Conflicts: # aws/provider.go --- ...agebuilder_infrastructure_configuration.go | 48 ++- ...ilder_infrastructure_configuration_test.go | 355 ++++++++++++++++++ website/allowed-subcategories.txt | 1 + website/aws.erb | 14 + ...infrastructure_configuration.html.markdown | 77 ++++ 5 files changed, 476 insertions(+), 19 deletions(-) create mode 100644 aws/resource_aws_imagebuilder_infrastructure_configuration_test.go create mode 100644 website/docs/r/imagebuilder_infrastructure_configuration.html.markdown diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index c2992579112..5eed4f1c8a8 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -27,11 +27,11 @@ func resourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "datecreated": { + "date_created": { Type: schema.TypeString, Computed: true, }, - "dateupdated": { + "date_updated": { Type: schema.TypeString, Computed: true, }, @@ -109,6 +109,7 @@ func resourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { "terminate_instance_on_failure": { Type: schema.TypeBool, Optional: true, + Default: false, }, "tags": tagsSchema(), }, @@ -179,8 +180,8 @@ func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceDa } d.Set("arn", resp.InfrastructureConfiguration.Arn) - d.Set("datecreated", resp.InfrastructureConfiguration.DateCreated) - d.Set("dateupdated", resp.InfrastructureConfiguration.DateUpdated) + d.Set("date_created", resp.InfrastructureConfiguration.DateCreated) + d.Set("date_updated", resp.InfrastructureConfiguration.DateUpdated) d.Set("description", resp.InfrastructureConfiguration.Description) d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) @@ -210,30 +211,41 @@ func resourceAwsImageBuilderInfrastructureConfigurationUpdate(d *schema.Resource upd := imagebuilder.UpdateInfrastructureConfigurationInput{ InfrastructureConfigurationArn: aws.String(d.Id()), InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), - Description: aws.String(d.Get("description").(string)), - KeyPair: aws.String(d.Get("key_pair").(string)), - SubnetId: aws.String(d.Get("subnet_id").(string)), Logging: expandAwsImageBuilderLogsConfig(d), } - if d.HasChange("instance_types") { - if attr := d.Get("instance_types").(*schema.Set); attr.Len() > 0 { - upd.InstanceTypes = expandStringList(attr.List()) - } + if description, ok := d.GetOk("description"); ok { + upd.Description = aws.String(description.(string)) + } + + if key_pair, ok := d.GetOk("key_pair"); ok { + upd.KeyPair = aws.String(key_pair.(string)) + } + + if subnet_id, ok := d.GetOk("subnet_id"); ok { + upd.SubnetId = aws.String(subnet_id.(string)) + } + + if attr := d.Get("instance_types").(*schema.Set); attr.Len() > 0 { + upd.InstanceTypes = expandStringList(attr.List()) } + if d.HasChange("instance_profile_name") { upd.InstanceProfileName = aws.String(d.Get("instance_profile_name").(string)) } + if v, ok := d.GetOk("security_group_ids"); ok { if attr := v.(*schema.Set); attr.Len() > 0 { upd.SecurityGroupIds = expandStringList(attr.List()) } } - if d.HasChange("sns_topic_arn") { - upd.SnsTopicArn = aws.String(d.Get("sns_topic_arn").(string)) + + if sns_topic_arn, ok := d.GetOk("sns_topic_arn"); ok { + upd.SnsTopicArn = aws.String(sns_topic_arn.(string)) } - if d.HasChange("terminate_instance_on_failure") { - upd.TerminateInstanceOnFailure = aws.Bool(d.Get("terminate_instance_on_failure").(bool)) + + if terminate_instance_on_failure, ok := d.GetOk("terminate_instance_on_failure"); ok { + upd.TerminateInstanceOnFailure = aws.Bool(terminate_instance_on_failure.(bool)) } if d.HasChange("security_group_ids") { @@ -276,16 +288,14 @@ func resourceAwsImageBuilderInfrastructureConfigurationDelete(d *schema.Resource } func flattenAwsImageBuilderLogsConfig(logsConfig *imagebuilder.Logging) []interface{} { - if logsConfig == nil { + if logsConfig == nil || logsConfig.S3Logs == nil { return []interface{}{} } values := map[string]interface{}{} // If more logging options are added, add more ifs! - if v := logsConfig.S3Logs; v != nil { - values["s3_logs"] = flattenAwsImageBuilderS3Logs(v) - } + values["s3_logs"] = flattenAwsImageBuilderS3Logs(logsConfig.S3Logs) return []interface{}{values} } diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go b/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go new file mode 100644 index 00000000000..2d9958b9fa1 --- /dev/null +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go @@ -0,0 +1,355 @@ +package aws + +import ( + "errors" + "fmt" + "github.com/aws/aws-sdk-go/aws/awserr" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/terraform" +) + +//Check the minimal configuration +func TestAccAWSImageBuilderInfrastructureConfiguration_basic(t *testing.T) { + var conf imagebuilder.InfrastructureConfiguration + RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) + resourceName := "aws_imagebuilder_infrastructure_configuration.test" + resource.ParallelTest(t, resource.TestCase{ + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSImageBuilderInfrastructureConfiguration_basic(RandomString), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), + resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + ), + }, + }, + }) +} + +//Check the configuration with everything +func TestAccAWSImageBuilderInfrastructureConfiguration_advanced(t *testing.T) { + var conf imagebuilder.InfrastructureConfiguration + RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) + resourceName := "aws_imagebuilder_infrastructure_configuration.test" + + resource.ParallelTest(t, resource.TestCase{ + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSImageBuilderInfrastructureConfiguration_advanced(RandomString), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "instance_profile_name", RandomString), + resource.TestCheckResourceAttr(resourceName, "name", RandomString), + resource.TestCheckResourceAttr(resourceName, "description", "example desc"), + resource.TestCheckResourceAttr(resourceName, "key_pair", RandomString), + resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), + resource.TestCheckResourceAttrSet(resourceName, "subnet_id"), + resource.TestCheckResourceAttr(resourceName, "terminate_instance_on_failure", "false"), + resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "instance_types.#", "1"), + resource.TestCheckResourceAttr(resourceName, "logging.0.s3_logs.0.s3_bucket_name", RandomString), + resource.TestCheckResourceAttr(resourceName, "logging.0.s3_logs.0.s3_key_prefix", "logs"), + ), + }, + }, + }) +} + +//Test the tags work +func TestAccAWSImageBuilderInfrastructureConfiguration_tags(t *testing.T) { + var conf imagebuilder.InfrastructureConfiguration + RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) + resourceName := "aws_imagebuilder_infrastructure_configuration.test" + + resource.ParallelTest(t, resource.TestCase{ + IDRefreshName: resourceName, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAWSImageBuilderInfrastructureConfiguration_tags1(RandomString), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), + resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + ), + }, + { + Config: testAccAWSImageBuilderInfrastructureConfiguration_tags2(RandomString), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), + resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), + resource.TestCheckResourceAttrSet(resourceName, "name"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + ), + }, + }, + }) +} + +func testAccCheckAWSImageBuilderInfrastructureConfigurationExist(n string, res *imagebuilder.InfrastructureConfiguration) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return errors.New("No ImageBuilderInfrastructureConfiguration ID is set") + } + + conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn + + resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(rs.Primary.Attributes["arn"]), + }) + + if err != nil { + return err + } + + if resp == nil || resp.InfrastructureConfiguration == nil { + return fmt.Errorf("Infrastructure configuration (%s) not found", rs.Primary.Attributes["name"]) + } + *res = *resp.InfrastructureConfiguration + return nil + } +} + +func testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy(s *terraform.State) error { + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_imagebuilder_infrastructure_configuration" { + continue + } + + conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn + + resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ + InfrastructureConfigurationArn: aws.String(rs.Primary.Attributes["arn"]), + }) + + if err == nil { + if resp.InfrastructureConfiguration != nil { + return fmt.Errorf("ImageBuilderInfrastructureConfiguration %q still exists", rs.Primary.ID) + } + } + + // Verify the error + if awsErr, ok := err.(awserr.Error); ok { + if awsErr.Code() == "ResourceNotFoundException" { + return nil + } + } + return err + } + + return nil +} + +func testAccAWSImageBuilderInfrastructureConfiguration_basic(ConfigurationName string) string { + return fmt.Sprintf(` + +resource "aws_imagebuilder_infrastructure_configuration" "test" { + instance_profile_name = aws_iam_instance_profile.test_profile.name + name = "%[1]s" +} + +resource "aws_iam_instance_profile" "test_profile" { + name = "%[1]s" + role = aws_iam_role.role.name +} + +resource "aws_iam_role" "role" { + name = "%[1]s" + path = "/" + + assume_role_policy = < +
  • + Image Builder + +
    • +
  • IoT
      diff --git a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown new file mode 100644 index 00000000000..a848ae8303f --- /dev/null +++ b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown @@ -0,0 +1,77 @@ +--- +subcategory: "Image Builder" +layout: "aws" +page_title: "AWS: aws_imagebuilder_infrastructure_configuration" +description: |- + Provides AWS Image Builder infrasctracture configuration +--- + +# Resource: aws_imagebuilder_infrastructure_configuration +Provides AWS Image Builder infrasctracture configuration + +## Example Usage + +```hcl +# Create new infrastructure configuration +resource "aws_imagebuilder_infrastructure_configuration" "test" { + instance_profile_name = aws_iam_instance_profile.test_profile.name + name = "example" + description = "example desc" + instance_types = ["t2.nano", "t3.micro"] + key_pair = aws_key_pair.example.key_name + logging { + s3_logs { + s3_bucket_name = aws_s3_bucket.example.bucket + s3_key_prefix = "logs" + } + } + security_group_ids = [aws_security_group.example.id] + sns_topic_arn = aws_sns_topic.example.arn + subnet_id = aws_subnet.main.id + terminate_instance_on_failure = true + tags = { + foo = "bar" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `instance_profile_name` - (Required) The name of iam instance profile. +* `name` - (Required) The name of the imgage builder infrastructure configuration. +* `description` - (Optional) The description of the imgage builder infrastructure configuration. +* `instance_types` - (Optional) A list of instance to use. +* `key_pair` - (Optional) The name of your key pair +* `logging` - (Optional) The logging configuration, see below for details. +* `security_group_ids` - (Optional) A list of security groups to assign to resource, mandatory if subnet provider. +* `sns_topic_arn` - (Optional) The ARN of sns topic to use. +* `subnet_id` - (Optional) The id of subnet to use, if provided requires that security groups also be provided. +* `tags` - (Optional) A map of tags to assign to the resource. +* `terminate_instance_on_failure` - (Optional) should the instance be terminated when the pipeline fails (Default: false). + +### Logging +The logging object support the following blocks: +* s3_logs + +The s3_logs block supports the following arguments: +* `s3_bucket_name` - (Required) The name of the bucket to use. +* `s3_key_prefix` - (Optional) The prefix to use for logs (Default: "/"). + +## Attributes Reference + +The following attributes are exported in addition to the arguments listed above: + +* `id` - The ARN of the configuration (matches `arn`). +* `arn` - The ARN of the configuration (matches `id`). +* `date_created` - The timestamp when the configuration was created. +* `date_updated` - The timestamp when the configuration was updated. + +## Import + +Infrastructure configuration can be imported using the ARN , e.g. + +``` +$ terraform import aws_imagebuilder_infrastructure_configuration.test '' +``` From 26e1bb9ad2929d8149dfd9ef93329ff56e1e715d Mon Sep 17 00:00:00 2001 From: Dogers Date: Wed, 19 Aug 2020 12:21:11 +0100 Subject: [PATCH 12/24] Fix incorrect import on error handling --- aws/resource_aws_imagebuilder_component.go | 3 +-- aws/resource_aws_imagebuilder_infrastructure_configuration.go | 3 +-- aws/resource_aws_imagebuilder_recipe.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go index e3165965e4f..6fcf40e318d 100644 --- a/aws/resource_aws_imagebuilder_component.go +++ b/aws/resource_aws_imagebuilder_component.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/backup" "github.com/aws/aws-sdk-go/service/imagebuilder" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -136,7 +135,7 @@ func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface ComponentBuildVersionArn: aws.String(d.Id()), }) - if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { log.Printf("[WARN] Component (%s) not found, removing from state", d.Id()) d.SetId("") return nil diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index 5eed4f1c8a8..4271fdb20b5 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/backup" "github.com/aws/aws-sdk-go/service/imagebuilder" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -169,7 +168,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceDa InfrastructureConfigurationArn: aws.String(d.Id()), }) - if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { log.Printf("[WARN] Infrastructure Configuration (%s) not found, removing from state", d.Id()) d.SetId("") return nil diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go index 17844c33076..d34b7c8951a 100644 --- a/aws/resource_aws_imagebuilder_recipe.go +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -3,7 +3,6 @@ package aws import ( "fmt" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/backup" "github.com/aws/aws-sdk-go/service/imagebuilder" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -195,7 +194,7 @@ func resourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) ImageRecipeArn: aws.String(d.Id()), }) - if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") { + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { log.Printf("[WARN] Recipe (%s) not found, removing from state", d.Id()) d.SetId("") return nil From df7016fd4352082c003c3f490bc6ea86685c57dd Mon Sep 17 00:00:00 2001 From: Dogers Date: Wed, 19 Aug 2020 12:22:05 +0100 Subject: [PATCH 13/24] Update to v2 SDK --- aws/data_source_aws_imagebuilder_component.go | 2 +- aws/data_source_aws_imagebuilder_component_test.go | 4 ++-- ..._source_aws_imagebuilder_infrastructure_configuration.go | 2 +- aws/data_source_aws_imagebuilder_infrastructure_recipe.go | 4 ++-- aws/resource_aws_imagebuilder_component.go | 6 +++--- ...esource_aws_imagebuilder_infrastructure_configuration.go | 6 +++--- ...ce_aws_imagebuilder_infrastructure_configuration_test.go | 6 +++--- aws/resource_aws_imagebuilder_recipe.go | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_component.go b/aws/data_source_aws_imagebuilder_component.go index a265b8aa2d8..0bd207b5b30 100644 --- a/aws/data_source_aws_imagebuilder_component.go +++ b/aws/data_source_aws_imagebuilder_component.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) diff --git a/aws/data_source_aws_imagebuilder_component_test.go b/aws/data_source_aws_imagebuilder_component_test.go index a367d642d1d..0a60ecb1da2 100644 --- a/aws/data_source_aws_imagebuilder_component_test.go +++ b/aws/data_source_aws_imagebuilder_component_test.go @@ -2,8 +2,8 @@ package aws import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "testing" ) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go index 96bf7edb050..e5395bce381 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go index 02d9b9cd89e..9e4669df3fa 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" ) diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go index 6fcf40e318d..51467bb4423 100644 --- a/aws/resource_aws_imagebuilder_component.go +++ b/aws/resource_aws_imagebuilder_component.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" "log" ) diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index 4271fdb20b5..e6a730d2656 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" "log" ) diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go b/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go index 2d9958b9fa1..bb554dd0b37 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) //Check the minimal configuration diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go index d34b7c8951a..e84e6789fde 100644 --- a/aws/resource_aws_imagebuilder_recipe.go +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" "log" ) From 89e7bdddb0b05f78de03b7dad403862d2a1c85d9 Mon Sep 17 00:00:00 2001 From: Dogers Date: Wed, 19 Aug 2020 16:17:17 +0100 Subject: [PATCH 14/24] Fix R004 lint issue --- ...agebuilder_infrastructure_configuration.go | 2 +- ..._aws_imagebuilder_infrastructure_recipe.go | 75 +++++++------------ ...agebuilder_infrastructure_configuration.go | 4 +- aws/resource_aws_imagebuilder_recipe.go | 73 +++++++++++++++--- 4 files changed, 92 insertions(+), 62 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go index e5395bce381..68d19207394 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go @@ -118,7 +118,7 @@ func dataSourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.Resource d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) - d.Set("logging", resp.InfrastructureConfiguration.Logging) + d.Set("logging", flattenAwsImageBuilderInfrastructureConfigLogging(resp.InfrastructureConfiguration.Logging)) d.Set("name", resp.InfrastructureConfiguration.Name) d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go index 9e4669df3fa..f9913cc9cee 100644 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go @@ -16,11 +16,11 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, - Computed: true, + Required: true, }, "block_device_mappings": { Type: schema.TypeList, - Optional: true, + Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "device_name": { @@ -30,68 +30,54 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { }, "ebs": { Type: schema.TypeList, - Required: true, + Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "delete_on_termination": { Type: schema.TypeBool, - Optional: true, - Default: true, + Computed: true, }, "encrypted": { Type: schema.TypeBool, - Optional: true, - Default: false, + Computed: true, }, "iops": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntBetween(100, 10000), + Type: schema.TypeInt, + Computed: true, }, "kms_key_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateArn, + Type: schema.TypeString, + Computed: true, }, "snapshot_id": { Type: schema.TypeString, - Optional: true, + Computed: true, }, "volume_size": { - Type: schema.TypeInt, - Optional: true, - ValidateFunc: validation.IntBetween(1, 16000), + Type: schema.TypeInt, + Computed: true, }, "volume_type": { Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{ - imagebuilder.EbsVolumeTypeStandard, - imagebuilder.EbsVolumeTypeIo1, - imagebuilder.EbsVolumeTypeGp2, - imagebuilder.EbsVolumeTypeSc1, - imagebuilder.EbsVolumeTypeSt1, - }, true), + Computed: true, }, }, }, }, "no_device": { Type: schema.TypeString, - Optional: true, + Computed: true, }, "virtual_name": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), + Type: schema.TypeString, + Computed: true, }, }, }, }, "components": { Type: schema.TypeList, - Required: true, - MinItems: 1, + Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, "datecreated": { @@ -99,32 +85,28 @@ func dataSourceAwsImageBuilderRecipe() *schema.Resource { Computed: true, }, "description": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), + Type: schema.TypeString, + Computed: true, }, "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 126), + Type: schema.TypeString, + Computed: true, }, "owner": { Type: schema.TypeString, Computed: true, }, "parent_image": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 126), + Type: schema.TypeString, + Computed: true, }, "platform": { Type: schema.TypeString, Computed: true, }, "semantic_version": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 128), + Type: schema.TypeString, + Computed: true, }, "tags": tagsSchema(), }, @@ -136,7 +118,7 @@ func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{ ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ - ImageRecipeArn: aws.String(d.Id()), + ImageRecipeArn: aws.String(d.Get("arn").(string)), }) if err != nil { @@ -144,9 +126,8 @@ func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{ } d.SetId(*resp.ImageRecipe.Arn) - d.Set("arn", resp.ImageRecipe.Arn) - d.Set("block_device_mappings", resp.ImageRecipe.BlockDeviceMappings) - d.Set("components", resp.ImageRecipe.Components) + d.Set("block_device_mappings", flattenImageBuilderRecipeBlockDeviceMappings(resp.ImageRecipe.BlockDeviceMappings)) + d.Set("components", flattenImageBuilderRecipeComponents(resp.ImageRecipe.Components)) d.Set("datecreated", resp.ImageRecipe.DateCreated) d.Set("description", resp.ImageRecipe.Description) d.Set("name", resp.ImageRecipe.Name) diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index e6a730d2656..ca0453b2149 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -185,7 +185,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceDa d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) - d.Set("logging", flattenAwsImageBuilderLogsConfig(resp.InfrastructureConfiguration.Logging)) + d.Set("logging", flattenAwsImageBuilderInfrastructureConfigLogging(resp.InfrastructureConfiguration.Logging)) d.Set("name", resp.InfrastructureConfiguration.Name) d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) @@ -286,7 +286,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationDelete(d *schema.Resource return nil } -func flattenAwsImageBuilderLogsConfig(logsConfig *imagebuilder.Logging) []interface{} { +func flattenAwsImageBuilderInfrastructureConfigLogging(logsConfig *imagebuilder.Logging) []interface{} { if logsConfig == nil || logsConfig.S3Logs == nil { return []interface{}{} } diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go index e84e6789fde..cd0638dc4c7 100644 --- a/aws/resource_aws_imagebuilder_recipe.go +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -112,7 +112,9 @@ func resourceAwsImageBuilderRecipe() *schema.Resource { Required: true, MinItems: 1, ForceNew: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, }, "datecreated": { Type: schema.TypeString, @@ -160,11 +162,11 @@ func resourceAwsImageBuilderRecipeCreate(d *schema.ResourceData, meta interface{ input := &imagebuilder.CreateImageRecipeInput{ ClientToken: aws.String(resource.UniqueId()), - Components: expandImageBuilderComponentConfig(d.Get("components").([]interface{})), + Components: expandImageBuilderRecipeComponents(d.Get("components").([]interface{})), Name: aws.String(d.Get("name").(string)), ParentImage: aws.String(d.Get("parent_image").(string)), SemanticVersion: aws.String(d.Get("semantic_version").(string)), - BlockDeviceMappings: expandImageBuilderBlockDevices(d), + BlockDeviceMappings: expandImageBuilderRecipeBlockDeviceMappings(d), } if v, ok := d.GetOk("description"); ok { @@ -205,8 +207,8 @@ func resourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) } d.Set("arn", resp.ImageRecipe.Arn) - d.Set("block_device_mappings", resp.ImageRecipe.BlockDeviceMappings) - d.Set("components", resp.ImageRecipe.Components) + d.Set("block_device_mappings", flattenImageBuilderRecipeBlockDeviceMappings(resp.ImageRecipe.BlockDeviceMappings)) + d.Set("components", flattenImageBuilderRecipeComponents(resp.ImageRecipe.Components)) d.Set("description", resp.ImageRecipe.Description) d.Set("name", resp.ImageRecipe.Name) d.Set("owner", resp.ImageRecipe.Owner) @@ -257,7 +259,7 @@ func resourceAwsImageBuilderRecipeDelete(d *schema.ResourceData, meta interface{ return nil } -func expandImageBuilderComponentConfig(comps []interface{}) []*imagebuilder.ComponentConfiguration { +func expandImageBuilderRecipeComponents(comps []interface{}) []*imagebuilder.ComponentConfiguration { var configs []*imagebuilder.ComponentConfiguration for _, line := range comps { @@ -269,7 +271,21 @@ func expandImageBuilderComponentConfig(comps []interface{}) []*imagebuilder.Comp return configs } -func expandImageBuilderBlockDevices(d *schema.ResourceData) []*imagebuilder.InstanceBlockDeviceMapping { +func flattenImageBuilderRecipeComponents(comps []*imagebuilder.ComponentConfiguration) []interface{} { + if len(comps) == 0 { + return nil + } + + res := make([]interface{}, len(comps)) + + for i, comp := range comps { + res[i] = &comp.ComponentArn + } + + return res +} + +func expandImageBuilderRecipeBlockDeviceMappings(d *schema.ResourceData) []*imagebuilder.InstanceBlockDeviceMapping { var bdmres []*imagebuilder.InstanceBlockDeviceMapping v, ok := d.GetOk("block_device_mappings") @@ -283,14 +299,33 @@ func expandImageBuilderBlockDevices(d *schema.ResourceData) []*imagebuilder.Inst if bdm == nil { continue } - blockDeviceMapping := readIBBlockDeviceMappingFromConfig(bdm.(map[string]interface{})) + blockDeviceMapping := expandImageBuilderBlockDeviceMapping(bdm.(map[string]interface{})) bdmres = append(bdmres, blockDeviceMapping) } return bdmres } -func readIBBlockDeviceMappingFromConfig(bdm map[string]interface{}) *imagebuilder.InstanceBlockDeviceMapping { +func flattenImageBuilderRecipeBlockDeviceMappings(blockdevs []*imagebuilder.InstanceBlockDeviceMapping) []map[string]interface{} { + if len(blockdevs) == 0 { + return nil + } + + bdmlist := make([]map[string]interface{}, 0, len(blockdevs)) + + for _, bdm := range blockdevs { + newbdm := map[string]interface{}{} + newbdm["device_name"] = bdm.DeviceName + newbdm["no_device"] = bdm.NoDevice + newbdm["virtual_name"] = bdm.VirtualName + newbdm["ebs"] = flattenImageBuilderBlockDeviceMapping(bdm.Ebs) + bdmlist = append(bdmlist, newbdm) + } + + return bdmlist +} + +func expandImageBuilderBlockDeviceMapping(bdm map[string]interface{}) *imagebuilder.InstanceBlockDeviceMapping { blockDeviceMapping := &imagebuilder.InstanceBlockDeviceMapping{} if v := bdm["device_name"].(string); v != "" { @@ -309,15 +344,29 @@ func readIBBlockDeviceMappingFromConfig(bdm map[string]interface{}) *imagebuilde ebs := v.([]interface{}) if len(ebs) > 0 && ebs[0] != nil { ebsData := ebs[0].(map[string]interface{}) - imagebuilderEbsBlockDeviceRequest := readIBEbsBlockDeviceFromConfig(ebsData) - blockDeviceMapping.Ebs = imagebuilderEbsBlockDeviceRequest + blockDeviceMapping.Ebs = expandImageBuilderEbsBlockDevice(ebsData) } } return blockDeviceMapping } -func readIBEbsBlockDeviceFromConfig(ebs map[string]interface{}) *imagebuilder.EbsInstanceBlockDeviceSpecification { +func flattenImageBuilderBlockDeviceMapping(ebsspec *imagebuilder.EbsInstanceBlockDeviceSpecification) []map[string]interface{} { + + ebs := map[string]interface{}{} + + ebs["delete_on_termination"] = ebsspec.DeleteOnTermination + ebs["encrypted"] = ebsspec.Encrypted + ebs["iops"] = ebsspec.Iops + ebs["kms_key_id"] = ebsspec.KmsKeyId + ebs["snapshot_id"] = ebsspec.SnapshotId + ebs["volume_size"] = ebsspec.VolumeSize + ebs["volume_type"] = ebsspec.VolumeType + + return []map[string]interface{}{ebs} +} + +func expandImageBuilderEbsBlockDevice(ebs map[string]interface{}) *imagebuilder.EbsInstanceBlockDeviceSpecification { ebsDevice := &imagebuilder.EbsInstanceBlockDeviceSpecification{} if v, ok := ebs["delete_on_termination"]; ok { From 18dd1b079ed0b84b9b239ce33a3029c61721b4f3 Mon Sep 17 00:00:00 2001 From: Dogers Date: Wed, 19 Aug 2020 20:05:20 +0100 Subject: [PATCH 15/24] Remove changes to aws.erb --- website/aws.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/website/aws.erb b/website/aws.erb index e53782f2b01..70287e8e4f5 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1974,20 +1974,6 @@
    • -
  • - Image Builder - -
    • -
  • IoT
      From 1b85e9461bdc2bfcd05ecad7a907b8952705f37f Mon Sep 17 00:00:00 2001 From: Dogers Date: Sun, 2 Aug 2020 14:09:41 +0100 Subject: [PATCH 16/24] Add imagebuilder_distribution_configuration --- ...imagebuilder_distribution_configuration.go | 136 + aws/provider.go | 2760 +++++++++-------- ...imagebuilder_distribution_configuration.go | 349 +++ 3 files changed, 1866 insertions(+), 1379 deletions(-) create mode 100644 aws/data_source_aws_imagebuilder_distribution_configuration.go create mode 100644 aws/resource_aws_imagebuilder_distribution_configuration.go diff --git a/aws/data_source_aws_imagebuilder_distribution_configuration.go b/aws/data_source_aws_imagebuilder_distribution_configuration.go new file mode 100644 index 00000000000..ff88afe968c --- /dev/null +++ b/aws/data_source_aws_imagebuilder_distribution_configuration.go @@ -0,0 +1,136 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" +) + +func datasourceAwsImageBuilderDistributionConfiguration() *schema.Resource { + return &schema.Resource{ + Read: datasourceAwsImageBuilderDistributionConfigurationRead, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Required: true, + }, + "date_created": { + Type: schema.TypeString, + Computed: true, + }, + "date_updated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "distributions": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ami_distribution_configuration": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ami_tags": tagsSchema(), + "description": { + Type: schema.TypeString, + Computed: true, + }, + "kms_key_id": { + Type: schema.TypeString, + Computed: true, + }, + "launch_permission": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "user_groups": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "user_ids": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "license_configuration_arn": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "region": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchemaComputed(), + }, + } +} + +func datasourceAwsImageBuilderDistributionConfigurationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetDistributionConfiguration(&imagebuilder.GetDistributionConfigurationInput{ + DistributionConfigurationArn: aws.String(d.Get("arn").(string)), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] DistributionConfiguration (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading DistributionConfiguration (%s): %s", d.Id(), err) + } + + d.SetId(*resp.DistributionConfiguration.Arn) + d.Set("date_created", resp.DistributionConfiguration.DateCreated) + d.Set("date_updated", resp.DistributionConfiguration.DateUpdated) + d.Set("description", resp.DistributionConfiguration.Description) + d.Set("distributions", flattenAwsImageBuilderDistributions(resp.DistributionConfiguration.Distributions)) + d.Set("name", resp.DistributionConfiguration.Name) + + if err != nil { + return fmt.Errorf("error listing tags for DistributionConfiguration (%s): %s", d.Id(), err) + } + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.DistributionConfiguration.Tags).IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/provider.go b/aws/provider.go index 58523e1ae4a..c0f6dd7b680 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -1,1379 +1,1381 @@ -package aws - -import ( - "log" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/mutexkv" -) - -// Provider returns a *schema.Provider. -func Provider() *schema.Provider { - // TODO: Move the validation to this, requires conditional schemas - // TODO: Move the configuration to this, requires validation - - // The actual provider - provider := &schema.Provider{ - Schema: map[string]*schema.Schema{ - "access_key": { - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["access_key"], - }, - - "secret_key": { - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["secret_key"], - }, - - "profile": { - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["profile"], - }, - - "assume_role": assumeRoleSchema(), - - "shared_credentials_file": { - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["shared_credentials_file"], - }, - - "token": { - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["token"], - }, - - "region": { - Type: schema.TypeString, - Required: true, - DefaultFunc: schema.MultiEnvDefaultFunc([]string{ - "AWS_REGION", - "AWS_DEFAULT_REGION", - }, nil), - Description: descriptions["region"], - InputDefault: "us-east-1", - }, - - "max_retries": { - Type: schema.TypeInt, - Optional: true, - Default: 25, - Description: descriptions["max_retries"], - }, - - "allowed_account_ids": { - Type: schema.TypeSet, - Elem: &schema.Schema{Type: schema.TypeString}, - Optional: true, - ConflictsWith: []string{"forbidden_account_ids"}, - Set: schema.HashString, - }, - - "forbidden_account_ids": { - Type: schema.TypeSet, - Elem: &schema.Schema{Type: schema.TypeString}, - Optional: true, - ConflictsWith: []string{"allowed_account_ids"}, - Set: schema.HashString, - }, - - "endpoints": endpointsSchema(), - - "ignore_tags": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Description: "Configuration block with settings to ignore resource tags across all resources.", - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "keys": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - Description: "Resource tag keys to ignore across all resources.", - }, - "key_prefixes": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - Description: "Resource tag key prefixes to ignore across all resources.", - }, - }, - }, - }, - - "insecure": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["insecure"], - }, - - "skip_credentials_validation": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["skip_credentials_validation"], - }, - - "skip_get_ec2_platforms": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["skip_get_ec2_platforms"], - }, - - "skip_region_validation": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["skip_region_validation"], - }, - - "skip_requesting_account_id": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["skip_requesting_account_id"], - }, - - "skip_metadata_api_check": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["skip_metadata_api_check"], - }, - - "s3_force_path_style": { - Type: schema.TypeBool, - Optional: true, - Default: false, - Description: descriptions["s3_force_path_style"], - }, - }, - - DataSourcesMap: map[string]*schema.Resource{ - "aws_acm_certificate": dataSourceAwsAcmCertificate(), - "aws_acmpca_certificate_authority": dataSourceAwsAcmpcaCertificateAuthority(), - "aws_ami": dataSourceAwsAmi(), - "aws_ami_ids": dataSourceAwsAmiIds(), - "aws_api_gateway_api_key": dataSourceAwsApiGatewayApiKey(), - "aws_api_gateway_resource": dataSourceAwsApiGatewayResource(), - "aws_api_gateway_rest_api": dataSourceAwsApiGatewayRestApi(), - "aws_api_gateway_vpc_link": dataSourceAwsApiGatewayVpcLink(), - "aws_arn": dataSourceAwsArn(), - "aws_autoscaling_group": dataSourceAwsAutoscalingGroup(), - "aws_autoscaling_groups": dataSourceAwsAutoscalingGroups(), - "aws_availability_zone": dataSourceAwsAvailabilityZone(), - "aws_availability_zones": dataSourceAwsAvailabilityZones(), - "aws_backup_plan": dataSourceAwsBackupPlan(), - "aws_backup_selection": dataSourceAwsBackupSelection(), - "aws_backup_vault": dataSourceAwsBackupVault(), - "aws_batch_compute_environment": dataSourceAwsBatchComputeEnvironment(), - "aws_batch_job_queue": dataSourceAwsBatchJobQueue(), - "aws_billing_service_account": dataSourceAwsBillingServiceAccount(), - "aws_caller_identity": dataSourceAwsCallerIdentity(), - "aws_canonical_user_id": dataSourceAwsCanonicalUserId(), - "aws_cloudformation_export": dataSourceAwsCloudFormationExport(), - "aws_cloudformation_stack": dataSourceAwsCloudFormationStack(), - "aws_cloudfront_distribution": dataSourceAwsCloudFrontDistribution(), - "aws_cloudhsm_v2_cluster": dataSourceCloudHsmV2Cluster(), - "aws_cloudtrail_service_account": dataSourceAwsCloudTrailServiceAccount(), - "aws_cloudwatch_log_group": dataSourceAwsCloudwatchLogGroup(), - "aws_cognito_user_pools": dataSourceAwsCognitoUserPools(), - "aws_codecommit_repository": dataSourceAwsCodeCommitRepository(), - "aws_cur_report_definition": dataSourceAwsCurReportDefinition(), - "aws_db_cluster_snapshot": dataSourceAwsDbClusterSnapshot(), - "aws_db_event_categories": dataSourceAwsDbEventCategories(), - "aws_db_instance": dataSourceAwsDbInstance(), - "aws_db_snapshot": dataSourceAwsDbSnapshot(), - "aws_directory_service_directory": dataSourceAwsDirectoryServiceDirectory(), - "aws_dx_gateway": dataSourceAwsDxGateway(), - "aws_dynamodb_table": dataSourceAwsDynamoDbTable(), - "aws_ebs_default_kms_key": dataSourceAwsEbsDefaultKmsKey(), - "aws_ebs_encryption_by_default": dataSourceAwsEbsEncryptionByDefault(), - "aws_ebs_snapshot": dataSourceAwsEbsSnapshot(), - "aws_ebs_snapshot_ids": dataSourceAwsEbsSnapshotIds(), - "aws_ebs_volume": dataSourceAwsEbsVolume(), - "aws_ebs_volumes": dataSourceAwsEbsVolumes(), - "aws_ec2_coip_pool": dataSourceAwsEc2CoipPool(), - "aws_ec2_coip_pools": dataSourceAwsEc2CoipPools(), - "aws_ec2_instance_type_offering": dataSourceAwsEc2InstanceTypeOffering(), - "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), - "aws_ec2_local_gateway": dataSourceAwsEc2LocalGateway(), - "aws_ec2_local_gateways": dataSourceAwsEc2LocalGateways(), - "aws_ec2_local_gateway_route_table": dataSourceAwsEc2LocalGatewayRouteTable(), - "aws_ec2_local_gateway_route_tables": dataSourceAwsEc2LocalGatewayRouteTables(), - "aws_ec2_local_gateway_virtual_interface": dataSourceAwsEc2LocalGatewayVirtualInterface(), - "aws_ec2_local_gateway_virtual_interface_group": dataSourceAwsEc2LocalGatewayVirtualInterfaceGroup(), - "aws_ec2_local_gateway_virtual_interface_groups": dataSourceAwsEc2LocalGatewayVirtualInterfaceGroups(), - "aws_ec2_spot_price": dataSourceAwsEc2SpotPrice(), - "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), - "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), - "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), - "aws_ec2_transit_gateway_route_table": dataSourceAwsEc2TransitGatewayRouteTable(), - "aws_ec2_transit_gateway_vpc_attachment": dataSourceAwsEc2TransitGatewayVpcAttachment(), - "aws_ec2_transit_gateway_vpn_attachment": dataSourceAwsEc2TransitGatewayVpnAttachment(), - "aws_ecr_authorization_token": dataSourceAwsEcrAuthorizationToken(), - "aws_ecr_image": dataSourceAwsEcrImage(), - "aws_ecr_repository": dataSourceAwsEcrRepository(), - "aws_ecs_cluster": dataSourceAwsEcsCluster(), - "aws_ecs_container_definition": dataSourceAwsEcsContainerDefinition(), - "aws_ecs_service": dataSourceAwsEcsService(), - "aws_ecs_task_definition": dataSourceAwsEcsTaskDefinition(), - "aws_customer_gateway": dataSourceAwsCustomerGateway(), - "aws_efs_access_point": dataSourceAwsEfsAccessPoint(), - "aws_efs_access_points": dataSourceAwsEfsAccessPoints(), - "aws_efs_file_system": dataSourceAwsEfsFileSystem(), - "aws_efs_mount_target": dataSourceAwsEfsMountTarget(), - "aws_eip": dataSourceAwsEip(), - "aws_eks_cluster": dataSourceAwsEksCluster(), - "aws_eks_cluster_auth": dataSourceAwsEksClusterAuth(), - "aws_elastic_beanstalk_application": dataSourceAwsElasticBeanstalkApplication(), - "aws_elastic_beanstalk_hosted_zone": dataSourceAwsElasticBeanstalkHostedZone(), - "aws_elastic_beanstalk_solution_stack": dataSourceAwsElasticBeanstalkSolutionStack(), - "aws_elasticache_cluster": dataSourceAwsElastiCacheCluster(), - "aws_elasticsearch_domain": dataSourceAwsElasticSearchDomain(), - "aws_elb": dataSourceAwsElb(), - "aws_elasticache_replication_group": dataSourceAwsElasticacheReplicationGroup(), - "aws_elb_hosted_zone_id": dataSourceAwsElbHostedZoneId(), - "aws_elb_service_account": dataSourceAwsElbServiceAccount(), - "aws_glue_script": dataSourceAwsGlueScript(), - "aws_guardduty_detector": dataSourceAwsGuarddutyDetector(), - "aws_iam_account_alias": dataSourceAwsIamAccountAlias(), - "aws_iam_group": dataSourceAwsIAMGroup(), - "aws_iam_instance_profile": dataSourceAwsIAMInstanceProfile(), - "aws_iam_policy": dataSourceAwsIAMPolicy(), - "aws_iam_policy_document": dataSourceAwsIamPolicyDocument(), - "aws_iam_role": dataSourceAwsIAMRole(), - "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), - "aws_iam_user": dataSourceAwsIAMUser(), - "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), - "aws_imagebuilder_infrastructure_configuration": dataSourceAwsImageBuilderInfrastructureConfiguration(), - "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), - "aws_internet_gateway": dataSourceAwsInternetGateway(), - "aws_iot_endpoint": dataSourceAwsIotEndpoint(), - "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), - "aws_instance": dataSourceAwsInstance(), - "aws_instances": dataSourceAwsInstances(), - "aws_ip_ranges": dataSourceAwsIPRanges(), - "aws_kinesis_stream": dataSourceAwsKinesisStream(), - "aws_kms_alias": dataSourceAwsKmsAlias(), - "aws_kms_ciphertext": dataSourceAwsKmsCiphertext(), - "aws_kms_key": dataSourceAwsKmsKey(), - "aws_kms_secret": dataSourceAwsKmsSecret(), - "aws_kms_secrets": dataSourceAwsKmsSecrets(), - "aws_lambda_alias": dataSourceAwsLambdaAlias(), - "aws_lambda_function": dataSourceAwsLambdaFunction(), - "aws_lambda_invocation": dataSourceAwsLambdaInvocation(), - "aws_lambda_layer_version": dataSourceAwsLambdaLayerVersion(), - "aws_launch_configuration": dataSourceAwsLaunchConfiguration(), - "aws_launch_template": dataSourceAwsLaunchTemplate(), - "aws_mq_broker": dataSourceAwsMqBroker(), - "aws_msk_cluster": dataSourceAwsMskCluster(), - "aws_msk_configuration": dataSourceAwsMskConfiguration(), - "aws_nat_gateway": dataSourceAwsNatGateway(), - "aws_network_acls": dataSourceAwsNetworkAcls(), - "aws_network_interface": dataSourceAwsNetworkInterface(), - "aws_network_interfaces": dataSourceAwsNetworkInterfaces(), - "aws_organizations_organization": dataSourceAwsOrganizationsOrganization(), - "aws_organizations_organizational_units": dataSourceAwsOrganizationsOrganizationalUnits(), - "aws_outposts_outpost": dataSourceAwsOutpostsOutpost(), - "aws_outposts_outpost_instance_type": dataSourceAwsOutpostsOutpostInstanceType(), - "aws_outposts_outpost_instance_types": dataSourceAwsOutpostsOutpostInstanceTypes(), - "aws_outposts_outposts": dataSourceAwsOutpostsOutposts(), - "aws_outposts_site": dataSourceAwsOutpostsSite(), - "aws_outposts_sites": dataSourceAwsOutpostsSites(), - "aws_partition": dataSourceAwsPartition(), - "aws_prefix_list": dataSourceAwsPrefixList(), - "aws_pricing_product": dataSourceAwsPricingProduct(), - "aws_qldb_ledger": dataSourceAwsQLDBLedger(), - "aws_ram_resource_share": dataSourceAwsRamResourceShare(), - "aws_rds_cluster": dataSourceAwsRdsCluster(), - "aws_redshift_cluster": dataSourceAwsRedshiftCluster(), - "aws_redshift_service_account": dataSourceAwsRedshiftServiceAccount(), - "aws_region": dataSourceAwsRegion(), - "aws_regions": dataSourceAwsRegions(), - "aws_route": dataSourceAwsRoute(), - "aws_route_table": dataSourceAwsRouteTable(), - "aws_route_tables": dataSourceAwsRouteTables(), - "aws_route53_delegation_set": dataSourceAwsDelegationSet(), - "aws_route53_resolver_rule": dataSourceAwsRoute53ResolverRule(), - "aws_route53_resolver_rules": dataSourceAwsRoute53ResolverRules(), - "aws_route53_zone": dataSourceAwsRoute53Zone(), - "aws_s3_bucket": dataSourceAwsS3Bucket(), - "aws_s3_bucket_object": dataSourceAwsS3BucketObject(), - "aws_s3_bucket_objects": dataSourceAwsS3BucketObjects(), - "aws_secretsmanager_secret": dataSourceAwsSecretsManagerSecret(), - "aws_secretsmanager_secret_rotation": dataSourceAwsSecretsManagerSecretRotation(), - "aws_secretsmanager_secret_version": dataSourceAwsSecretsManagerSecretVersion(), - "aws_servicequotas_service": dataSourceAwsServiceQuotasService(), - "aws_servicequotas_service_quota": dataSourceAwsServiceQuotasServiceQuota(), - "aws_sfn_activity": dataSourceAwsSfnActivity(), - "aws_sfn_state_machine": dataSourceAwsSfnStateMachine(), - "aws_sns_topic": dataSourceAwsSnsTopic(), - "aws_sqs_queue": dataSourceAwsSqsQueue(), - "aws_ssm_document": dataSourceAwsSsmDocument(), - "aws_ssm_parameter": dataSourceAwsSsmParameter(), - "aws_ssm_patch_baseline": dataSourceAwsSsmPatchBaseline(), - "aws_storagegateway_local_disk": dataSourceAwsStorageGatewayLocalDisk(), - "aws_subnet": dataSourceAwsSubnet(), - "aws_subnet_ids": dataSourceAwsSubnetIDs(), - "aws_transfer_server": dataSourceAwsTransferServer(), - "aws_vpcs": dataSourceAwsVpcs(), - "aws_security_group": dataSourceAwsSecurityGroup(), - "aws_security_groups": dataSourceAwsSecurityGroups(), - "aws_vpc": dataSourceAwsVpc(), - "aws_vpc_dhcp_options": dataSourceAwsVpcDhcpOptions(), - "aws_vpc_endpoint": dataSourceAwsVpcEndpoint(), - "aws_vpc_endpoint_service": dataSourceAwsVpcEndpointService(), - "aws_vpc_peering_connection": dataSourceAwsVpcPeeringConnection(), - "aws_vpn_gateway": dataSourceAwsVpnGateway(), - "aws_waf_ipset": dataSourceAwsWafIpSet(), - "aws_waf_rule": dataSourceAwsWafRule(), - "aws_waf_rate_based_rule": dataSourceAwsWafRateBasedRule(), - "aws_waf_web_acl": dataSourceAwsWafWebAcl(), - "aws_wafregional_ipset": dataSourceAwsWafRegionalIpSet(), - "aws_wafregional_rule": dataSourceAwsWafRegionalRule(), - "aws_wafregional_rate_based_rule": dataSourceAwsWafRegionalRateBasedRule(), - "aws_wafregional_web_acl": dataSourceAwsWafRegionalWebAcl(), - "aws_wafv2_ip_set": dataSourceAwsWafv2IPSet(), - "aws_wafv2_regex_pattern_set": dataSourceAwsWafv2RegexPatternSet(), - "aws_wafv2_rule_group": dataSourceAwsWafv2RuleGroup(), - "aws_wafv2_web_acl": dataSourceAwsWafv2WebACL(), - "aws_workspaces_bundle": dataSourceAwsWorkspacesBundle(), - "aws_workspaces_directory": dataSourceAwsWorkspacesDirectory(), - - // Adding the Aliases for the ALB -> LB Rename - "aws_lb": dataSourceAwsLb(), - "aws_alb": dataSourceAwsLb(), - "aws_lb_listener": dataSourceAwsLbListener(), - "aws_alb_listener": dataSourceAwsLbListener(), - "aws_lb_target_group": dataSourceAwsLbTargetGroup(), - "aws_alb_target_group": dataSourceAwsLbTargetGroup(), - }, - - ResourcesMap: map[string]*schema.Resource{ - "aws_accessanalyzer_analyzer": resourceAwsAccessAnalyzerAnalyzer(), - "aws_acm_certificate": resourceAwsAcmCertificate(), - "aws_acm_certificate_validation": resourceAwsAcmCertificateValidation(), - "aws_acmpca_certificate_authority": resourceAwsAcmpcaCertificateAuthority(), - "aws_ami": resourceAwsAmi(), - "aws_ami_copy": resourceAwsAmiCopy(), - "aws_ami_from_instance": resourceAwsAmiFromInstance(), - "aws_ami_launch_permission": resourceAwsAmiLaunchPermission(), - "aws_api_gateway_account": resourceAwsApiGatewayAccount(), - "aws_api_gateway_api_key": resourceAwsApiGatewayApiKey(), - "aws_api_gateway_authorizer": resourceAwsApiGatewayAuthorizer(), - "aws_api_gateway_base_path_mapping": resourceAwsApiGatewayBasePathMapping(), - "aws_api_gateway_client_certificate": resourceAwsApiGatewayClientCertificate(), - "aws_api_gateway_deployment": resourceAwsApiGatewayDeployment(), - "aws_api_gateway_documentation_part": resourceAwsApiGatewayDocumentationPart(), - "aws_api_gateway_documentation_version": resourceAwsApiGatewayDocumentationVersion(), - "aws_api_gateway_domain_name": resourceAwsApiGatewayDomainName(), - "aws_api_gateway_gateway_response": resourceAwsApiGatewayGatewayResponse(), - "aws_api_gateway_integration": resourceAwsApiGatewayIntegration(), - "aws_api_gateway_integration_response": resourceAwsApiGatewayIntegrationResponse(), - "aws_api_gateway_method": resourceAwsApiGatewayMethod(), - "aws_api_gateway_method_response": resourceAwsApiGatewayMethodResponse(), - "aws_api_gateway_method_settings": resourceAwsApiGatewayMethodSettings(), - "aws_api_gateway_model": resourceAwsApiGatewayModel(), - "aws_api_gateway_request_validator": resourceAwsApiGatewayRequestValidator(), - "aws_api_gateway_resource": resourceAwsApiGatewayResource(), - "aws_api_gateway_rest_api": resourceAwsApiGatewayRestApi(), - "aws_api_gateway_stage": resourceAwsApiGatewayStage(), - "aws_api_gateway_usage_plan": resourceAwsApiGatewayUsagePlan(), - "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), - "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), - "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), - "aws_apigatewayv2_api_mapping": resourceAwsApiGatewayV2ApiMapping(), - "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), - "aws_apigatewayv2_deployment": resourceAwsApiGatewayV2Deployment(), - "aws_apigatewayv2_domain_name": resourceAwsApiGatewayV2DomainName(), - "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), - "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), - "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), - "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), - "aws_apigatewayv2_route_response": resourceAwsApiGatewayV2RouteResponse(), - "aws_apigatewayv2_stage": resourceAwsApiGatewayV2Stage(), - "aws_apigatewayv2_vpc_link": resourceAwsApiGatewayV2VpcLink(), - "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), - "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), - "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), - "aws_appautoscaling_scheduled_action": resourceAwsAppautoscalingScheduledAction(), - "aws_appmesh_mesh": resourceAwsAppmeshMesh(), - "aws_appmesh_route": resourceAwsAppmeshRoute(), - "aws_appmesh_virtual_node": resourceAwsAppmeshVirtualNode(), - "aws_appmesh_virtual_router": resourceAwsAppmeshVirtualRouter(), - "aws_appmesh_virtual_service": resourceAwsAppmeshVirtualService(), - "aws_appsync_api_key": resourceAwsAppsyncApiKey(), - "aws_appsync_datasource": resourceAwsAppsyncDatasource(), - "aws_appsync_function": resourceAwsAppsyncFunction(), - "aws_appsync_graphql_api": resourceAwsAppsyncGraphqlApi(), - "aws_appsync_resolver": resourceAwsAppsyncResolver(), - "aws_athena_database": resourceAwsAthenaDatabase(), - "aws_athena_named_query": resourceAwsAthenaNamedQuery(), - "aws_athena_workgroup": resourceAwsAthenaWorkgroup(), - "aws_autoscaling_attachment": resourceAwsAutoscalingAttachment(), - "aws_autoscaling_group": resourceAwsAutoscalingGroup(), - "aws_autoscaling_lifecycle_hook": resourceAwsAutoscalingLifecycleHook(), - "aws_autoscaling_notification": resourceAwsAutoscalingNotification(), - "aws_autoscaling_policy": resourceAwsAutoscalingPolicy(), - "aws_autoscaling_schedule": resourceAwsAutoscalingSchedule(), - "aws_backup_plan": resourceAwsBackupPlan(), - "aws_backup_selection": resourceAwsBackupSelection(), - "aws_backup_vault": resourceAwsBackupVault(), - "aws_budgets_budget": resourceAwsBudgetsBudget(), - "aws_cloud9_environment_ec2": resourceAwsCloud9EnvironmentEc2(), - "aws_cloudformation_stack": resourceAwsCloudFormationStack(), - "aws_cloudformation_stack_set": resourceAwsCloudFormationStackSet(), - "aws_cloudformation_stack_set_instance": resourceAwsCloudFormationStackSetInstance(), - "aws_cloudfront_distribution": resourceAwsCloudFrontDistribution(), - "aws_cloudfront_origin_access_identity": resourceAwsCloudFrontOriginAccessIdentity(), - "aws_cloudfront_public_key": resourceAwsCloudFrontPublicKey(), - "aws_cloudtrail": resourceAwsCloudTrail(), - "aws_cloudwatch_event_permission": resourceAwsCloudWatchEventPermission(), - "aws_cloudwatch_event_rule": resourceAwsCloudWatchEventRule(), - "aws_cloudwatch_event_target": resourceAwsCloudWatchEventTarget(), - "aws_cloudwatch_log_destination": resourceAwsCloudWatchLogDestination(), - "aws_cloudwatch_log_destination_policy": resourceAwsCloudWatchLogDestinationPolicy(), - "aws_cloudwatch_log_group": resourceAwsCloudWatchLogGroup(), - "aws_cloudwatch_log_metric_filter": resourceAwsCloudWatchLogMetricFilter(), - "aws_cloudwatch_log_resource_policy": resourceAwsCloudWatchLogResourcePolicy(), - "aws_cloudwatch_log_stream": resourceAwsCloudWatchLogStream(), - "aws_cloudwatch_log_subscription_filter": resourceAwsCloudwatchLogSubscriptionFilter(), - "aws_config_aggregate_authorization": resourceAwsConfigAggregateAuthorization(), - "aws_config_config_rule": resourceAwsConfigConfigRule(), - "aws_config_configuration_aggregator": resourceAwsConfigConfigurationAggregator(), - "aws_config_configuration_recorder": resourceAwsConfigConfigurationRecorder(), - "aws_config_configuration_recorder_status": resourceAwsConfigConfigurationRecorderStatus(), - "aws_config_delivery_channel": resourceAwsConfigDeliveryChannel(), - "aws_config_organization_custom_rule": resourceAwsConfigOrganizationCustomRule(), - "aws_config_organization_managed_rule": resourceAwsConfigOrganizationManagedRule(), - "aws_cognito_identity_pool": resourceAwsCognitoIdentityPool(), - "aws_cognito_identity_pool_roles_attachment": resourceAwsCognitoIdentityPoolRolesAttachment(), - "aws_cognito_identity_provider": resourceAwsCognitoIdentityProvider(), - "aws_cognito_user_group": resourceAwsCognitoUserGroup(), - "aws_cognito_user_pool": resourceAwsCognitoUserPool(), - "aws_cognito_user_pool_client": resourceAwsCognitoUserPoolClient(), - "aws_cognito_user_pool_domain": resourceAwsCognitoUserPoolDomain(), - "aws_cloudhsm_v2_cluster": resourceAwsCloudHsmV2Cluster(), - "aws_cloudhsm_v2_hsm": resourceAwsCloudHsmV2Hsm(), - "aws_cognito_resource_server": resourceAwsCognitoResourceServer(), - "aws_cloudwatch_metric_alarm": resourceAwsCloudWatchMetricAlarm(), - "aws_cloudwatch_dashboard": resourceAwsCloudWatchDashboard(), - "aws_codedeploy_app": resourceAwsCodeDeployApp(), - "aws_codedeploy_deployment_config": resourceAwsCodeDeployDeploymentConfig(), - "aws_codedeploy_deployment_group": resourceAwsCodeDeployDeploymentGroup(), - "aws_codecommit_repository": resourceAwsCodeCommitRepository(), - "aws_codecommit_trigger": resourceAwsCodeCommitTrigger(), - "aws_codebuild_project": resourceAwsCodeBuildProject(), - "aws_codebuild_source_credential": resourceAwsCodeBuildSourceCredential(), - "aws_codebuild_webhook": resourceAwsCodeBuildWebhook(), - "aws_codepipeline": resourceAwsCodePipeline(), - "aws_codepipeline_webhook": resourceAwsCodePipelineWebhook(), - "aws_codestarnotifications_notification_rule": resourceAwsCodeStarNotificationsNotificationRule(), - "aws_cur_report_definition": resourceAwsCurReportDefinition(), - "aws_customer_gateway": resourceAwsCustomerGateway(), - "aws_datapipeline_pipeline": resourceAwsDataPipelinePipeline(), - "aws_datasync_agent": resourceAwsDataSyncAgent(), - "aws_datasync_location_efs": resourceAwsDataSyncLocationEfs(), - "aws_datasync_location_nfs": resourceAwsDataSyncLocationNfs(), - "aws_datasync_location_s3": resourceAwsDataSyncLocationS3(), - "aws_datasync_location_smb": resourceAwsDataSyncLocationSmb(), - "aws_datasync_task": resourceAwsDataSyncTask(), - "aws_dax_cluster": resourceAwsDaxCluster(), - "aws_dax_parameter_group": resourceAwsDaxParameterGroup(), - "aws_dax_subnet_group": resourceAwsDaxSubnetGroup(), - "aws_db_cluster_snapshot": resourceAwsDbClusterSnapshot(), - "aws_db_event_subscription": resourceAwsDbEventSubscription(), - "aws_db_instance": resourceAwsDbInstance(), - "aws_db_instance_role_association": resourceAwsDbInstanceRoleAssociation(), - "aws_db_option_group": resourceAwsDbOptionGroup(), - "aws_db_parameter_group": resourceAwsDbParameterGroup(), - "aws_db_security_group": resourceAwsDbSecurityGroup(), - "aws_db_snapshot": resourceAwsDbSnapshot(), - "aws_db_subnet_group": resourceAwsDbSubnetGroup(), - "aws_devicefarm_project": resourceAwsDevicefarmProject(), - "aws_directory_service_directory": resourceAwsDirectoryServiceDirectory(), - "aws_directory_service_conditional_forwarder": resourceAwsDirectoryServiceConditionalForwarder(), - "aws_directory_service_log_subscription": resourceAwsDirectoryServiceLogSubscription(), - "aws_dlm_lifecycle_policy": resourceAwsDlmLifecyclePolicy(), - "aws_dms_certificate": resourceAwsDmsCertificate(), - "aws_dms_endpoint": resourceAwsDmsEndpoint(), - "aws_dms_event_subscription": resourceAwsDmsEventSubscription(), - "aws_dms_replication_instance": resourceAwsDmsReplicationInstance(), - "aws_dms_replication_subnet_group": resourceAwsDmsReplicationSubnetGroup(), - "aws_dms_replication_task": resourceAwsDmsReplicationTask(), - "aws_docdb_cluster": resourceAwsDocDBCluster(), - "aws_docdb_cluster_instance": resourceAwsDocDBClusterInstance(), - "aws_docdb_cluster_parameter_group": resourceAwsDocDBClusterParameterGroup(), - "aws_docdb_cluster_snapshot": resourceAwsDocDBClusterSnapshot(), - "aws_docdb_subnet_group": resourceAwsDocDBSubnetGroup(), - "aws_dx_bgp_peer": resourceAwsDxBgpPeer(), - "aws_dx_connection": resourceAwsDxConnection(), - "aws_dx_connection_association": resourceAwsDxConnectionAssociation(), - "aws_dx_gateway": resourceAwsDxGateway(), - "aws_dx_gateway_association": resourceAwsDxGatewayAssociation(), - "aws_dx_gateway_association_proposal": resourceAwsDxGatewayAssociationProposal(), - "aws_dx_hosted_private_virtual_interface": resourceAwsDxHostedPrivateVirtualInterface(), - "aws_dx_hosted_private_virtual_interface_accepter": resourceAwsDxHostedPrivateVirtualInterfaceAccepter(), - "aws_dx_hosted_public_virtual_interface": resourceAwsDxHostedPublicVirtualInterface(), - "aws_dx_hosted_public_virtual_interface_accepter": resourceAwsDxHostedPublicVirtualInterfaceAccepter(), - "aws_dx_hosted_transit_virtual_interface": resourceAwsDxHostedTransitVirtualInterface(), - "aws_dx_hosted_transit_virtual_interface_accepter": resourceAwsDxHostedTransitVirtualInterfaceAccepter(), - "aws_dx_lag": resourceAwsDxLag(), - "aws_dx_private_virtual_interface": resourceAwsDxPrivateVirtualInterface(), - "aws_dx_public_virtual_interface": resourceAwsDxPublicVirtualInterface(), - "aws_dx_transit_virtual_interface": resourceAwsDxTransitVirtualInterface(), - "aws_dynamodb_table": resourceAwsDynamoDbTable(), - "aws_dynamodb_table_item": resourceAwsDynamoDbTableItem(), - "aws_dynamodb_global_table": resourceAwsDynamoDbGlobalTable(), - "aws_ebs_default_kms_key": resourceAwsEbsDefaultKmsKey(), - "aws_ebs_encryption_by_default": resourceAwsEbsEncryptionByDefault(), - "aws_ebs_snapshot": resourceAwsEbsSnapshot(), - "aws_ebs_snapshot_copy": resourceAwsEbsSnapshotCopy(), - "aws_ebs_volume": resourceAwsEbsVolume(), - "aws_ec2_availability_zone_group": resourceAwsEc2AvailabilityZoneGroup(), - "aws_ec2_capacity_reservation": resourceAwsEc2CapacityReservation(), - "aws_ec2_client_vpn_authorization_rule": resourceAwsEc2ClientVpnAuthorizationRule(), - "aws_ec2_client_vpn_endpoint": resourceAwsEc2ClientVpnEndpoint(), - "aws_ec2_client_vpn_network_association": resourceAwsEc2ClientVpnNetworkAssociation(), - "aws_ec2_client_vpn_route": resourceAwsEc2ClientVpnRoute(), - "aws_ec2_fleet": resourceAwsEc2Fleet(), - "aws_ec2_local_gateway_route": resourceAwsEc2LocalGatewayRoute(), - "aws_ec2_local_gateway_route_table_vpc_association": resourceAwsEc2LocalGatewayRouteTableVpcAssociation(), - "aws_ec2_tag": resourceAwsEc2Tag(), - "aws_ec2_traffic_mirror_filter": resourceAwsEc2TrafficMirrorFilter(), - "aws_ec2_traffic_mirror_filter_rule": resourceAwsEc2TrafficMirrorFilterRule(), - "aws_ec2_traffic_mirror_target": resourceAwsEc2TrafficMirrorTarget(), - "aws_ec2_traffic_mirror_session": resourceAwsEc2TrafficMirrorSession(), - "aws_ec2_transit_gateway": resourceAwsEc2TransitGateway(), - "aws_ec2_transit_gateway_peering_attachment": resourceAwsEc2TransitGatewayPeeringAttachment(), - "aws_ec2_transit_gateway_peering_attachment_accepter": resourceAwsEc2TransitGatewayPeeringAttachmentAccepter(), - "aws_ec2_transit_gateway_route": resourceAwsEc2TransitGatewayRoute(), - "aws_ec2_transit_gateway_route_table": resourceAwsEc2TransitGatewayRouteTable(), - "aws_ec2_transit_gateway_route_table_association": resourceAwsEc2TransitGatewayRouteTableAssociation(), - "aws_ec2_transit_gateway_route_table_propagation": resourceAwsEc2TransitGatewayRouteTablePropagation(), - "aws_ec2_transit_gateway_vpc_attachment": resourceAwsEc2TransitGatewayVpcAttachment(), - "aws_ec2_transit_gateway_vpc_attachment_accepter": resourceAwsEc2TransitGatewayVpcAttachmentAccepter(), - "aws_ecr_lifecycle_policy": resourceAwsEcrLifecyclePolicy(), - "aws_ecr_repository": resourceAwsEcrRepository(), - "aws_ecr_repository_policy": resourceAwsEcrRepositoryPolicy(), - "aws_ecs_capacity_provider": resourceAwsEcsCapacityProvider(), - "aws_ecs_cluster": resourceAwsEcsCluster(), - "aws_ecs_service": resourceAwsEcsService(), - "aws_ecs_task_definition": resourceAwsEcsTaskDefinition(), - "aws_efs_access_point": resourceAwsEfsAccessPoint(), - "aws_efs_file_system": resourceAwsEfsFileSystem(), - "aws_efs_file_system_policy": resourceAwsEfsFileSystemPolicy(), - "aws_efs_mount_target": resourceAwsEfsMountTarget(), - "aws_egress_only_internet_gateway": resourceAwsEgressOnlyInternetGateway(), - "aws_eip": resourceAwsEip(), - "aws_eip_association": resourceAwsEipAssociation(), - "aws_eks_cluster": resourceAwsEksCluster(), - "aws_eks_fargate_profile": resourceAwsEksFargateProfile(), - "aws_eks_node_group": resourceAwsEksNodeGroup(), - "aws_elasticache_cluster": resourceAwsElasticacheCluster(), - "aws_elasticache_parameter_group": resourceAwsElasticacheParameterGroup(), - "aws_elasticache_replication_group": resourceAwsElasticacheReplicationGroup(), - "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(), - "aws_elasticache_subnet_group": resourceAwsElasticacheSubnetGroup(), - "aws_elastic_beanstalk_application": resourceAwsElasticBeanstalkApplication(), - "aws_elastic_beanstalk_application_version": resourceAwsElasticBeanstalkApplicationVersion(), - "aws_elastic_beanstalk_configuration_template": resourceAwsElasticBeanstalkConfigurationTemplate(), - "aws_elastic_beanstalk_environment": resourceAwsElasticBeanstalkEnvironment(), - "aws_elasticsearch_domain": resourceAwsElasticSearchDomain(), - "aws_elasticsearch_domain_policy": resourceAwsElasticSearchDomainPolicy(), - "aws_elastictranscoder_pipeline": resourceAwsElasticTranscoderPipeline(), - "aws_elastictranscoder_preset": resourceAwsElasticTranscoderPreset(), - "aws_elb": resourceAwsElb(), - "aws_elb_attachment": resourceAwsElbAttachment(), - "aws_emr_cluster": resourceAwsEMRCluster(), - "aws_emr_instance_group": resourceAwsEMRInstanceGroup(), - "aws_emr_security_configuration": resourceAwsEMRSecurityConfiguration(), - "aws_flow_log": resourceAwsFlowLog(), - "aws_fsx_lustre_file_system": resourceAwsFsxLustreFileSystem(), - "aws_fsx_windows_file_system": resourceAwsFsxWindowsFileSystem(), - "aws_fms_admin_account": resourceAwsFmsAdminAccount(), - "aws_gamelift_alias": resourceAwsGameliftAlias(), - "aws_gamelift_build": resourceAwsGameliftBuild(), - "aws_gamelift_fleet": resourceAwsGameliftFleet(), - "aws_gamelift_game_session_queue": resourceAwsGameliftGameSessionQueue(), - "aws_glacier_vault": resourceAwsGlacierVault(), - "aws_glacier_vault_lock": resourceAwsGlacierVaultLock(), - "aws_globalaccelerator_accelerator": resourceAwsGlobalAcceleratorAccelerator(), - "aws_globalaccelerator_endpoint_group": resourceAwsGlobalAcceleratorEndpointGroup(), - "aws_globalaccelerator_listener": resourceAwsGlobalAcceleratorListener(), - "aws_glue_catalog_database": resourceAwsGlueCatalogDatabase(), - "aws_glue_catalog_table": resourceAwsGlueCatalogTable(), - "aws_glue_classifier": resourceAwsGlueClassifier(), - "aws_glue_connection": resourceAwsGlueConnection(), - "aws_glue_crawler": resourceAwsGlueCrawler(), - "aws_glue_job": resourceAwsGlueJob(), - "aws_glue_security_configuration": resourceAwsGlueSecurityConfiguration(), - "aws_glue_trigger": resourceAwsGlueTrigger(), - "aws_glue_workflow": resourceAwsGlueWorkflow(), - "aws_guardduty_detector": resourceAwsGuardDutyDetector(), - "aws_guardduty_invite_accepter": resourceAwsGuardDutyInviteAccepter(), - "aws_guardduty_ipset": resourceAwsGuardDutyIpset(), - "aws_guardduty_member": resourceAwsGuardDutyMember(), - "aws_guardduty_organization_admin_account": resourceAwsGuardDutyOrganizationAdminAccount(), - "aws_guardduty_organization_configuration": resourceAwsGuardDutyOrganizationConfiguration(), - "aws_guardduty_threatintelset": resourceAwsGuardDutyThreatintelset(), - "aws_iam_access_key": resourceAwsIamAccessKey(), - "aws_iam_account_alias": resourceAwsIamAccountAlias(), - "aws_iam_account_password_policy": resourceAwsIamAccountPasswordPolicy(), - "aws_iam_group_policy": resourceAwsIamGroupPolicy(), - "aws_iam_group": resourceAwsIamGroup(), - "aws_iam_group_membership": resourceAwsIamGroupMembership(), - "aws_iam_group_policy_attachment": resourceAwsIamGroupPolicyAttachment(), - "aws_iam_instance_profile": resourceAwsIamInstanceProfile(), - "aws_iam_openid_connect_provider": resourceAwsIamOpenIDConnectProvider(), - "aws_iam_policy": resourceAwsIamPolicy(), - "aws_iam_policy_attachment": resourceAwsIamPolicyAttachment(), - "aws_iam_role_policy_attachment": resourceAwsIamRolePolicyAttachment(), - "aws_iam_role_policy": resourceAwsIamRolePolicy(), - "aws_iam_role": resourceAwsIamRole(), - "aws_iam_saml_provider": resourceAwsIamSamlProvider(), - "aws_iam_server_certificate": resourceAwsIAMServerCertificate(), - "aws_iam_service_linked_role": resourceAwsIamServiceLinkedRole(), - "aws_iam_user_group_membership": resourceAwsIamUserGroupMembership(), - "aws_iam_user_policy_attachment": resourceAwsIamUserPolicyAttachment(), - "aws_iam_user_policy": resourceAwsIamUserPolicy(), - "aws_iam_user_ssh_key": resourceAwsIamUserSshKey(), - "aws_iam_user": resourceAwsIamUser(), - "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), - "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), - "aws_imagebuilder_infrastructure_configuration": resourceAwsImageBuilderInfrastructureConfiguration(), - "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), - "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), - "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), - "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), - "aws_instance": resourceAwsInstance(), - "aws_internet_gateway": resourceAwsInternetGateway(), - "aws_iot_certificate": resourceAwsIotCertificate(), - "aws_iot_policy": resourceAwsIotPolicy(), - "aws_iot_policy_attachment": resourceAwsIotPolicyAttachment(), - "aws_iot_thing": resourceAwsIotThing(), - "aws_iot_thing_principal_attachment": resourceAwsIotThingPrincipalAttachment(), - "aws_iot_thing_type": resourceAwsIotThingType(), - "aws_iot_topic_rule": resourceAwsIotTopicRule(), - "aws_iot_role_alias": resourceAwsIotRoleAlias(), - "aws_key_pair": resourceAwsKeyPair(), - "aws_kinesis_firehose_delivery_stream": resourceAwsKinesisFirehoseDeliveryStream(), - "aws_kinesis_stream": resourceAwsKinesisStream(), - "aws_kinesis_analytics_application": resourceAwsKinesisAnalyticsApplication(), - "aws_kinesis_video_stream": resourceAwsKinesisVideoStream(), - "aws_kms_alias": resourceAwsKmsAlias(), - "aws_kms_external_key": resourceAwsKmsExternalKey(), - "aws_kms_grant": resourceAwsKmsGrant(), - "aws_kms_key": resourceAwsKmsKey(), - "aws_kms_ciphertext": resourceAwsKmsCiphertext(), - "aws_lambda_alias": resourceAwsLambdaAlias(), - "aws_lambda_event_source_mapping": resourceAwsLambdaEventSourceMapping(), - "aws_lambda_function_event_invoke_config": resourceAwsLambdaFunctionEventInvokeConfig(), - "aws_lambda_function": resourceAwsLambdaFunction(), - "aws_lambda_layer_version": resourceAwsLambdaLayerVersion(), - "aws_lambda_permission": resourceAwsLambdaPermission(), - "aws_lambda_provisioned_concurrency_config": resourceAwsLambdaProvisionedConcurrencyConfig(), - "aws_launch_configuration": resourceAwsLaunchConfiguration(), - "aws_launch_template": resourceAwsLaunchTemplate(), - "aws_licensemanager_association": resourceAwsLicenseManagerAssociation(), - "aws_licensemanager_license_configuration": resourceAwsLicenseManagerLicenseConfiguration(), - "aws_lightsail_domain": resourceAwsLightsailDomain(), - "aws_lightsail_instance": resourceAwsLightsailInstance(), - "aws_lightsail_key_pair": resourceAwsLightsailKeyPair(), - "aws_lightsail_static_ip": resourceAwsLightsailStaticIp(), - "aws_lightsail_static_ip_attachment": resourceAwsLightsailStaticIpAttachment(), - "aws_lb_cookie_stickiness_policy": resourceAwsLBCookieStickinessPolicy(), - "aws_load_balancer_policy": resourceAwsLoadBalancerPolicy(), - "aws_load_balancer_backend_server_policy": resourceAwsLoadBalancerBackendServerPolicies(), - "aws_load_balancer_listener_policy": resourceAwsLoadBalancerListenerPolicies(), - "aws_lb_ssl_negotiation_policy": resourceAwsLBSSLNegotiationPolicy(), - "aws_macie_member_account_association": resourceAwsMacieMemberAccountAssociation(), - "aws_macie_s3_bucket_association": resourceAwsMacieS3BucketAssociation(), - "aws_main_route_table_association": resourceAwsMainRouteTableAssociation(), - "aws_mq_broker": resourceAwsMqBroker(), - "aws_mq_configuration": resourceAwsMqConfiguration(), - "aws_media_convert_queue": resourceAwsMediaConvertQueue(), - "aws_media_package_channel": resourceAwsMediaPackageChannel(), - "aws_media_store_container": resourceAwsMediaStoreContainer(), - "aws_media_store_container_policy": resourceAwsMediaStoreContainerPolicy(), - "aws_msk_cluster": resourceAwsMskCluster(), - "aws_msk_configuration": resourceAwsMskConfiguration(), - "aws_nat_gateway": resourceAwsNatGateway(), - "aws_network_acl": resourceAwsNetworkAcl(), - "aws_default_network_acl": resourceAwsDefaultNetworkAcl(), - "aws_neptune_cluster": resourceAwsNeptuneCluster(), - "aws_neptune_cluster_instance": resourceAwsNeptuneClusterInstance(), - "aws_neptune_cluster_parameter_group": resourceAwsNeptuneClusterParameterGroup(), - "aws_neptune_cluster_snapshot": resourceAwsNeptuneClusterSnapshot(), - "aws_neptune_event_subscription": resourceAwsNeptuneEventSubscription(), - "aws_neptune_parameter_group": resourceAwsNeptuneParameterGroup(), - "aws_neptune_subnet_group": resourceAwsNeptuneSubnetGroup(), - "aws_network_acl_rule": resourceAwsNetworkAclRule(), - "aws_network_interface": resourceAwsNetworkInterface(), - "aws_network_interface_attachment": resourceAwsNetworkInterfaceAttachment(), - "aws_opsworks_application": resourceAwsOpsworksApplication(), - "aws_opsworks_stack": resourceAwsOpsworksStack(), - "aws_opsworks_java_app_layer": resourceAwsOpsworksJavaAppLayer(), - "aws_opsworks_haproxy_layer": resourceAwsOpsworksHaproxyLayer(), - "aws_opsworks_static_web_layer": resourceAwsOpsworksStaticWebLayer(), - "aws_opsworks_php_app_layer": resourceAwsOpsworksPhpAppLayer(), - "aws_opsworks_rails_app_layer": resourceAwsOpsworksRailsAppLayer(), - "aws_opsworks_nodejs_app_layer": resourceAwsOpsworksNodejsAppLayer(), - "aws_opsworks_memcached_layer": resourceAwsOpsworksMemcachedLayer(), - "aws_opsworks_mysql_layer": resourceAwsOpsworksMysqlLayer(), - "aws_opsworks_ganglia_layer": resourceAwsOpsworksGangliaLayer(), - "aws_opsworks_custom_layer": resourceAwsOpsworksCustomLayer(), - "aws_opsworks_instance": resourceAwsOpsworksInstance(), - "aws_opsworks_user_profile": resourceAwsOpsworksUserProfile(), - "aws_opsworks_permission": resourceAwsOpsworksPermission(), - "aws_opsworks_rds_db_instance": resourceAwsOpsworksRdsDbInstance(), - "aws_organizations_organization": resourceAwsOrganizationsOrganization(), - "aws_organizations_account": resourceAwsOrganizationsAccount(), - "aws_organizations_policy": resourceAwsOrganizationsPolicy(), - "aws_organizations_policy_attachment": resourceAwsOrganizationsPolicyAttachment(), - "aws_organizations_organizational_unit": resourceAwsOrganizationsOrganizationalUnit(), - "aws_placement_group": resourceAwsPlacementGroup(), - "aws_proxy_protocol_policy": resourceAwsProxyProtocolPolicy(), - "aws_qldb_ledger": resourceAwsQLDBLedger(), - "aws_quicksight_group": resourceAwsQuickSightGroup(), - "aws_quicksight_user": resourceAwsQuickSightUser(), - "aws_ram_principal_association": resourceAwsRamPrincipalAssociation(), - "aws_ram_resource_association": resourceAwsRamResourceAssociation(), - "aws_ram_resource_share": resourceAwsRamResourceShare(), - "aws_ram_resource_share_accepter": resourceAwsRamResourceShareAccepter(), - "aws_rds_cluster": resourceAwsRDSCluster(), - "aws_rds_cluster_endpoint": resourceAwsRDSClusterEndpoint(), - "aws_rds_cluster_instance": resourceAwsRDSClusterInstance(), - "aws_rds_cluster_parameter_group": resourceAwsRDSClusterParameterGroup(), - "aws_rds_global_cluster": resourceAwsRDSGlobalCluster(), - "aws_redshift_cluster": resourceAwsRedshiftCluster(), - "aws_redshift_security_group": resourceAwsRedshiftSecurityGroup(), - "aws_redshift_parameter_group": resourceAwsRedshiftParameterGroup(), - "aws_redshift_subnet_group": resourceAwsRedshiftSubnetGroup(), - "aws_redshift_snapshot_copy_grant": resourceAwsRedshiftSnapshotCopyGrant(), - "aws_redshift_snapshot_schedule": resourceAwsRedshiftSnapshotSchedule(), - "aws_redshift_snapshot_schedule_association": resourceAwsRedshiftSnapshotScheduleAssociation(), - "aws_redshift_event_subscription": resourceAwsRedshiftEventSubscription(), - "aws_resourcegroups_group": resourceAwsResourceGroupsGroup(), - "aws_route53_delegation_set": resourceAwsRoute53DelegationSet(), - "aws_route53_query_log": resourceAwsRoute53QueryLog(), - "aws_route53_record": resourceAwsRoute53Record(), - "aws_route53_zone_association": resourceAwsRoute53ZoneAssociation(), - "aws_route53_vpc_association_authorization": resourceAwsRoute53VPCAssociationAuthorization(), - "aws_route53_zone": resourceAwsRoute53Zone(), - "aws_route53_health_check": resourceAwsRoute53HealthCheck(), - "aws_route53_resolver_endpoint": resourceAwsRoute53ResolverEndpoint(), - "aws_route53_resolver_rule_association": resourceAwsRoute53ResolverRuleAssociation(), - "aws_route53_resolver_rule": resourceAwsRoute53ResolverRule(), - "aws_route": resourceAwsRoute(), - "aws_route_table": resourceAwsRouteTable(), - "aws_default_route_table": resourceAwsDefaultRouteTable(), - "aws_route_table_association": resourceAwsRouteTableAssociation(), - "aws_sagemaker_model": resourceAwsSagemakerModel(), - "aws_sagemaker_endpoint_configuration": resourceAwsSagemakerEndpointConfiguration(), - "aws_sagemaker_endpoint": resourceAwsSagemakerEndpoint(), - "aws_sagemaker_notebook_instance_lifecycle_configuration": resourceAwsSagemakerNotebookInstanceLifeCycleConfiguration(), - "aws_sagemaker_notebook_instance": resourceAwsSagemakerNotebookInstance(), - "aws_secretsmanager_secret": resourceAwsSecretsManagerSecret(), - "aws_secretsmanager_secret_version": resourceAwsSecretsManagerSecretVersion(), - "aws_secretsmanager_secret_rotation": resourceAwsSecretsManagerSecretRotation(), - "aws_ses_active_receipt_rule_set": resourceAwsSesActiveReceiptRuleSet(), - "aws_ses_domain_identity": resourceAwsSesDomainIdentity(), - "aws_ses_domain_identity_verification": resourceAwsSesDomainIdentityVerification(), - "aws_ses_domain_dkim": resourceAwsSesDomainDkim(), - "aws_ses_domain_mail_from": resourceAwsSesDomainMailFrom(), - "aws_ses_email_identity": resourceAwsSesEmailIdentity(), - "aws_ses_identity_policy": resourceAwsSesIdentityPolicy(), - "aws_ses_receipt_filter": resourceAwsSesReceiptFilter(), - "aws_ses_receipt_rule": resourceAwsSesReceiptRule(), - "aws_ses_receipt_rule_set": resourceAwsSesReceiptRuleSet(), - "aws_ses_configuration_set": resourceAwsSesConfigurationSet(), - "aws_ses_event_destination": resourceAwsSesEventDestination(), - "aws_ses_identity_notification_topic": resourceAwsSesNotificationTopic(), - "aws_ses_template": resourceAwsSesTemplate(), - "aws_s3_access_point": resourceAwsS3AccessPoint(), - "aws_s3_account_public_access_block": resourceAwsS3AccountPublicAccessBlock(), - "aws_s3_bucket": resourceAwsS3Bucket(), - "aws_s3_bucket_analytics_configuration": resourceAwsS3BucketAnalyticsConfiguration(), - "aws_s3_bucket_policy": resourceAwsS3BucketPolicy(), - "aws_s3_bucket_public_access_block": resourceAwsS3BucketPublicAccessBlock(), - "aws_s3_bucket_object": resourceAwsS3BucketObject(), - "aws_s3_bucket_notification": resourceAwsS3BucketNotification(), - "aws_s3_bucket_metric": resourceAwsS3BucketMetric(), - "aws_s3_bucket_inventory": resourceAwsS3BucketInventory(), - "aws_security_group": resourceAwsSecurityGroup(), - "aws_network_interface_sg_attachment": resourceAwsNetworkInterfaceSGAttachment(), - "aws_default_security_group": resourceAwsDefaultSecurityGroup(), - "aws_security_group_rule": resourceAwsSecurityGroupRule(), - "aws_securityhub_account": resourceAwsSecurityHubAccount(), - "aws_securityhub_member": resourceAwsSecurityHubMember(), - "aws_securityhub_product_subscription": resourceAwsSecurityHubProductSubscription(), - "aws_securityhub_standards_subscription": resourceAwsSecurityHubStandardsSubscription(), - "aws_servicecatalog_portfolio": resourceAwsServiceCatalogPortfolio(), - "aws_service_discovery_http_namespace": resourceAwsServiceDiscoveryHttpNamespace(), - "aws_service_discovery_private_dns_namespace": resourceAwsServiceDiscoveryPrivateDnsNamespace(), - "aws_service_discovery_public_dns_namespace": resourceAwsServiceDiscoveryPublicDnsNamespace(), - "aws_service_discovery_service": resourceAwsServiceDiscoveryService(), - "aws_servicequotas_service_quota": resourceAwsServiceQuotasServiceQuota(), - "aws_shield_protection": resourceAwsShieldProtection(), - "aws_simpledb_domain": resourceAwsSimpleDBDomain(), - "aws_ssm_activation": resourceAwsSsmActivation(), - "aws_ssm_association": resourceAwsSsmAssociation(), - "aws_ssm_document": resourceAwsSsmDocument(), - "aws_ssm_maintenance_window": resourceAwsSsmMaintenanceWindow(), - "aws_ssm_maintenance_window_target": resourceAwsSsmMaintenanceWindowTarget(), - "aws_ssm_maintenance_window_task": resourceAwsSsmMaintenanceWindowTask(), - "aws_ssm_patch_baseline": resourceAwsSsmPatchBaseline(), - "aws_ssm_patch_group": resourceAwsSsmPatchGroup(), - "aws_ssm_parameter": resourceAwsSsmParameter(), - "aws_ssm_resource_data_sync": resourceAwsSsmResourceDataSync(), - "aws_storagegateway_cache": resourceAwsStorageGatewayCache(), - "aws_storagegateway_cached_iscsi_volume": resourceAwsStorageGatewayCachedIscsiVolume(), - "aws_storagegateway_gateway": resourceAwsStorageGatewayGateway(), - "aws_storagegateway_nfs_file_share": resourceAwsStorageGatewayNfsFileShare(), - "aws_storagegateway_smb_file_share": resourceAwsStorageGatewaySmbFileShare(), - "aws_storagegateway_upload_buffer": resourceAwsStorageGatewayUploadBuffer(), - "aws_storagegateway_working_storage": resourceAwsStorageGatewayWorkingStorage(), - "aws_spot_datafeed_subscription": resourceAwsSpotDataFeedSubscription(), - "aws_spot_instance_request": resourceAwsSpotInstanceRequest(), - "aws_spot_fleet_request": resourceAwsSpotFleetRequest(), - "aws_sqs_queue": resourceAwsSqsQueue(), - "aws_sqs_queue_policy": resourceAwsSqsQueuePolicy(), - "aws_snapshot_create_volume_permission": resourceAwsSnapshotCreateVolumePermission(), - "aws_sns_platform_application": resourceAwsSnsPlatformApplication(), - "aws_sns_sms_preferences": resourceAwsSnsSmsPreferences(), - "aws_sns_topic": resourceAwsSnsTopic(), - "aws_sns_topic_policy": resourceAwsSnsTopicPolicy(), - "aws_sns_topic_subscription": resourceAwsSnsTopicSubscription(), - "aws_sfn_activity": resourceAwsSfnActivity(), - "aws_sfn_state_machine": resourceAwsSfnStateMachine(), - "aws_default_subnet": resourceAwsDefaultSubnet(), - "aws_subnet": resourceAwsSubnet(), - "aws_swf_domain": resourceAwsSwfDomain(), - "aws_transfer_server": resourceAwsTransferServer(), - "aws_transfer_ssh_key": resourceAwsTransferSshKey(), - "aws_transfer_user": resourceAwsTransferUser(), - "aws_volume_attachment": resourceAwsVolumeAttachment(), - "aws_vpc_dhcp_options_association": resourceAwsVpcDhcpOptionsAssociation(), - "aws_default_vpc_dhcp_options": resourceAwsDefaultVpcDhcpOptions(), - "aws_vpc_dhcp_options": resourceAwsVpcDhcpOptions(), - "aws_vpc_peering_connection": resourceAwsVpcPeeringConnection(), - "aws_vpc_peering_connection_accepter": resourceAwsVpcPeeringConnectionAccepter(), - "aws_vpc_peering_connection_options": resourceAwsVpcPeeringConnectionOptions(), - "aws_default_vpc": resourceAwsDefaultVpc(), - "aws_vpc": resourceAwsVpc(), - "aws_vpc_endpoint": resourceAwsVpcEndpoint(), - "aws_vpc_endpoint_connection_notification": resourceAwsVpcEndpointConnectionNotification(), - "aws_vpc_endpoint_route_table_association": resourceAwsVpcEndpointRouteTableAssociation(), - "aws_vpc_endpoint_subnet_association": resourceAwsVpcEndpointSubnetAssociation(), - "aws_vpc_endpoint_service": resourceAwsVpcEndpointService(), - "aws_vpc_endpoint_service_allowed_principal": resourceAwsVpcEndpointServiceAllowedPrincipal(), - "aws_vpc_ipv4_cidr_block_association": resourceAwsVpcIpv4CidrBlockAssociation(), - "aws_vpn_connection": resourceAwsVpnConnection(), - "aws_vpn_connection_route": resourceAwsVpnConnectionRoute(), - "aws_vpn_gateway": resourceAwsVpnGateway(), - "aws_vpn_gateway_attachment": resourceAwsVpnGatewayAttachment(), - "aws_vpn_gateway_route_propagation": resourceAwsVpnGatewayRoutePropagation(), - "aws_waf_byte_match_set": resourceAwsWafByteMatchSet(), - "aws_waf_ipset": resourceAwsWafIPSet(), - "aws_waf_rate_based_rule": resourceAwsWafRateBasedRule(), - "aws_waf_regex_match_set": resourceAwsWafRegexMatchSet(), - "aws_waf_regex_pattern_set": resourceAwsWafRegexPatternSet(), - "aws_waf_rule": resourceAwsWafRule(), - "aws_waf_rule_group": resourceAwsWafRuleGroup(), - "aws_waf_size_constraint_set": resourceAwsWafSizeConstraintSet(), - "aws_waf_web_acl": resourceAwsWafWebAcl(), - "aws_waf_xss_match_set": resourceAwsWafXssMatchSet(), - "aws_waf_sql_injection_match_set": resourceAwsWafSqlInjectionMatchSet(), - "aws_waf_geo_match_set": resourceAwsWafGeoMatchSet(), - "aws_wafregional_byte_match_set": resourceAwsWafRegionalByteMatchSet(), - "aws_wafregional_geo_match_set": resourceAwsWafRegionalGeoMatchSet(), - "aws_wafregional_ipset": resourceAwsWafRegionalIPSet(), - "aws_wafregional_rate_based_rule": resourceAwsWafRegionalRateBasedRule(), - "aws_wafregional_regex_match_set": resourceAwsWafRegionalRegexMatchSet(), - "aws_wafregional_regex_pattern_set": resourceAwsWafRegionalRegexPatternSet(), - "aws_wafregional_rule": resourceAwsWafRegionalRule(), - "aws_wafregional_rule_group": resourceAwsWafRegionalRuleGroup(), - "aws_wafregional_size_constraint_set": resourceAwsWafRegionalSizeConstraintSet(), - "aws_wafregional_sql_injection_match_set": resourceAwsWafRegionalSqlInjectionMatchSet(), - "aws_wafregional_xss_match_set": resourceAwsWafRegionalXssMatchSet(), - "aws_wafregional_web_acl": resourceAwsWafRegionalWebAcl(), - "aws_wafregional_web_acl_association": resourceAwsWafRegionalWebAclAssociation(), - "aws_wafv2_ip_set": resourceAwsWafv2IPSet(), - "aws_wafv2_regex_pattern_set": resourceAwsWafv2RegexPatternSet(), - "aws_wafv2_rule_group": resourceAwsWafv2RuleGroup(), - "aws_wafv2_web_acl": resourceAwsWafv2WebACL(), - "aws_wafv2_web_acl_association": resourceAwsWafv2WebACLAssociation(), - "aws_wafv2_web_acl_logging_configuration": resourceAwsWafv2WebACLLoggingConfiguration(), - "aws_worklink_fleet": resourceAwsWorkLinkFleet(), - "aws_worklink_website_certificate_authority_association": resourceAwsWorkLinkWebsiteCertificateAuthorityAssociation(), - "aws_workspaces_directory": resourceAwsWorkspacesDirectory(), - "aws_workspaces_workspace": resourceAwsWorkspacesWorkspace(), - "aws_batch_compute_environment": resourceAwsBatchComputeEnvironment(), - "aws_batch_job_definition": resourceAwsBatchJobDefinition(), - "aws_batch_job_queue": resourceAwsBatchJobQueue(), - "aws_pinpoint_app": resourceAwsPinpointApp(), - "aws_pinpoint_adm_channel": resourceAwsPinpointADMChannel(), - "aws_pinpoint_apns_channel": resourceAwsPinpointAPNSChannel(), - "aws_pinpoint_apns_sandbox_channel": resourceAwsPinpointAPNSSandboxChannel(), - "aws_pinpoint_apns_voip_channel": resourceAwsPinpointAPNSVoipChannel(), - "aws_pinpoint_apns_voip_sandbox_channel": resourceAwsPinpointAPNSVoipSandboxChannel(), - "aws_pinpoint_baidu_channel": resourceAwsPinpointBaiduChannel(), - "aws_pinpoint_email_channel": resourceAwsPinpointEmailChannel(), - "aws_pinpoint_event_stream": resourceAwsPinpointEventStream(), - "aws_pinpoint_gcm_channel": resourceAwsPinpointGCMChannel(), - "aws_pinpoint_sms_channel": resourceAwsPinpointSMSChannel(), - "aws_xray_sampling_rule": resourceAwsXraySamplingRule(), - "aws_workspaces_ip_group": resourceAwsWorkspacesIpGroup(), - - // ALBs are actually LBs because they can be type `network` or `application` - // To avoid regressions, we will add a new resource for each and they both point - // back to the old ALB version. IF the Terraform supported aliases for resources - // this would be a whole lot simpler - "aws_alb": resourceAwsLb(), - "aws_lb": resourceAwsLb(), - "aws_alb_listener": resourceAwsLbListener(), - "aws_lb_listener": resourceAwsLbListener(), - "aws_alb_listener_certificate": resourceAwsLbListenerCertificate(), - "aws_lb_listener_certificate": resourceAwsLbListenerCertificate(), - "aws_alb_listener_rule": resourceAwsLbbListenerRule(), - "aws_lb_listener_rule": resourceAwsLbbListenerRule(), - "aws_alb_target_group": resourceAwsLbTargetGroup(), - "aws_lb_target_group": resourceAwsLbTargetGroup(), - "aws_alb_target_group_attachment": resourceAwsLbTargetGroupAttachment(), - "aws_lb_target_group_attachment": resourceAwsLbTargetGroupAttachment(), - }, - } - - provider.ConfigureFunc = func(d *schema.ResourceData) (interface{}, error) { - terraformVersion := provider.TerraformVersion - if terraformVersion == "" { - // Terraform 0.12 introduced this field to the protocol - // We can therefore assume that if it's missing it's 0.10 or 0.11 - terraformVersion = "0.11+compatible" - } - return providerConfigure(d, terraformVersion) - } - - return provider -} - -var descriptions map[string]string -var endpointServiceNames []string - -func init() { - descriptions = map[string]string{ - "region": "The region where AWS operations will take place. Examples\n" + - "are us-east-1, us-west-2, etc.", - - "access_key": "The access key for API operations. You can retrieve this\n" + - "from the 'Security & Credentials' section of the AWS console.", - - "secret_key": "The secret key for API operations. You can retrieve this\n" + - "from the 'Security & Credentials' section of the AWS console.", - - "profile": "The profile for API operations. If not set, the default profile\n" + - "created with `aws configure` will be used.", - - "shared_credentials_file": "The path to the shared credentials file. If not set\n" + - "this defaults to ~/.aws/credentials.", - - "token": "session token. A session token is only required if you are\n" + - "using temporary security credentials.", - - "max_retries": "The maximum number of times an AWS API request is\n" + - "being executed. If the API request still fails, an error is\n" + - "thrown.", - - "endpoint": "Use this to override the default service endpoint URL", - - "insecure": "Explicitly allow the provider to perform \"insecure\" SSL requests. If omitted," + - "default value is `false`", - - "skip_credentials_validation": "Skip the credentials validation via STS API. " + - "Used for AWS API implementations that do not have STS available/implemented.", - - "skip_get_ec2_platforms": "Skip getting the supported EC2 platforms. " + - "Used by users that don't have ec2:DescribeAccountAttributes permissions.", - - "skip_region_validation": "Skip static validation of region name. " + - "Used by users of alternative AWS-like APIs or users w/ access to regions that are not public (yet).", - - "skip_requesting_account_id": "Skip requesting the account ID. " + - "Used for AWS API implementations that do not have IAM/STS API and/or metadata API.", - - "skip_medatadata_api_check": "Skip the AWS Metadata API check. " + - "Used for AWS API implementations that do not have a metadata api endpoint.", - - "s3_force_path_style": "Set this to true to force the request to use path-style addressing,\n" + - "i.e., http://s3.amazonaws.com/BUCKET/KEY. By default, the S3 client will\n" + - "use virtual hosted bucket addressing when possible\n" + - "(http://BUCKET.s3.amazonaws.com/KEY). Specific to the Amazon S3 service.", - } - - endpointServiceNames = []string{ - "accessanalyzer", - "acm", - "acmpca", - "amplify", - "apigateway", - "applicationautoscaling", - "applicationinsights", - "appmesh", - "appstream", - "appsync", - "athena", - "autoscaling", - "autoscalingplans", - "backup", - "batch", - "budgets", - "cloud9", - "cloudformation", - "cloudfront", - "cloudhsm", - "cloudsearch", - "cloudtrail", - "cloudwatch", - "cloudwatchevents", - "cloudwatchlogs", - "codeartifact", - "codebuild", - "codecommit", - "codedeploy", - "codepipeline", - "cognitoidentity", - "cognitoidp", - "configservice", - "cur", - "dataexchange", - "datapipeline", - "datasync", - "dax", - "devicefarm", - "directconnect", - "dlm", - "dms", - "docdb", - "ds", - "dynamodb", - "ec2", - "ecr", - "ecs", - "efs", - "eks", - "elasticache", - "elasticbeanstalk", - "elastictranscoder", - "elb", - "emr", - "es", - "firehose", - "fms", - "forecast", - "fsx", - "gamelift", - "glacier", - "globalaccelerator", - "glue", - "greengrass", - "guardduty", - "iam", - "imagebuilder", - "inspector", - "iot", - "iotanalytics", - "iotevents", - "kafka", - "kinesis", - "kinesisanalytics", - "kinesisanalyticsv2", - "kinesisvideo", - "kms", - "lakeformation", - "lambda", - "lexmodels", - "licensemanager", - "lightsail", - "macie", - "managedblockchain", - "marketplacecatalog", - "mediaconnect", - "mediaconvert", - "medialive", - "mediapackage", - "mediastore", - "mediastoredata", - "mq", - "neptune", - "networkmanager", - "opsworks", - "organizations", - "outposts", - "personalize", - "pinpoint", - "pricing", - "qldb", - "quicksight", - "ram", - "rds", - "redshift", - "resourcegroups", - "resourcegroupstaggingapi", - "route53", - "route53domains", - "route53resolver", - "s3", - "s3control", - "sagemaker", - "sdb", - "secretsmanager", - "securityhub", - "serverlessrepo", - "servicecatalog", - "servicediscovery", - "servicequotas", - "ses", - "shield", - "sns", - "sqs", - "ssm", - "stepfunctions", - "storagegateway", - "sts", - "swf", - "synthetics", - "transfer", - "waf", - "wafregional", - "wafv2", - "worklink", - "workmail", - "workspaces", - "xray", - } -} - -func providerConfigure(d *schema.ResourceData, terraformVersion string) (interface{}, error) { - config := Config{ - AccessKey: d.Get("access_key").(string), - SecretKey: d.Get("secret_key").(string), - Profile: d.Get("profile").(string), - Token: d.Get("token").(string), - Region: d.Get("region").(string), - CredsFilename: d.Get("shared_credentials_file").(string), - Endpoints: make(map[string]string), - MaxRetries: d.Get("max_retries").(int), - IgnoreTagsConfig: expandProviderIgnoreTags(d.Get("ignore_tags").([]interface{})), - Insecure: d.Get("insecure").(bool), - SkipCredsValidation: d.Get("skip_credentials_validation").(bool), - SkipGetEC2Platforms: d.Get("skip_get_ec2_platforms").(bool), - SkipRegionValidation: d.Get("skip_region_validation").(bool), - SkipRequestingAccountId: d.Get("skip_requesting_account_id").(bool), - SkipMetadataApiCheck: d.Get("skip_metadata_api_check").(bool), - S3ForcePathStyle: d.Get("s3_force_path_style").(bool), - terraformVersion: terraformVersion, - } - - if l, ok := d.Get("assume_role").([]interface{}); ok && len(l) > 0 && l[0] != nil { - m := l[0].(map[string]interface{}) - - if v, ok := m["duration_seconds"].(int); ok && v != 0 { - config.AssumeRoleDurationSeconds = v - } - - if v, ok := m["external_id"].(string); ok && v != "" { - config.AssumeRoleExternalID = v - } - - if v, ok := m["policy"].(string); ok && v != "" { - config.AssumeRolePolicy = v - } - - if policyARNSet, ok := m["policy_arns"].(*schema.Set); ok && policyARNSet.Len() > 0 { - for _, policyARNRaw := range policyARNSet.List() { - policyARN, ok := policyARNRaw.(string) - - if !ok { - continue - } - - config.AssumeRolePolicyARNs = append(config.AssumeRolePolicyARNs, policyARN) - } - } - - if v, ok := m["role_arn"].(string); ok && v != "" { - config.AssumeRoleARN = v - } - - if v, ok := m["session_name"].(string); ok && v != "" { - config.AssumeRoleSessionName = v - } - - if tagMapRaw, ok := m["tags"].(map[string]interface{}); ok && len(tagMapRaw) > 0 { - config.AssumeRoleTags = make(map[string]string) - - for k, vRaw := range tagMapRaw { - v, ok := vRaw.(string) - - if !ok { - continue - } - - config.AssumeRoleTags[k] = v - } - } - - if transitiveTagKeySet, ok := m["transitive_tag_keys"].(*schema.Set); ok && transitiveTagKeySet.Len() > 0 { - for _, transitiveTagKeyRaw := range transitiveTagKeySet.List() { - transitiveTagKey, ok := transitiveTagKeyRaw.(string) - - if !ok { - continue - } - - config.AssumeRoleTransitiveTagKeys = append(config.AssumeRoleTransitiveTagKeys, transitiveTagKey) - } - } - - log.Printf("[INFO] assume_role configuration set: (ARN: %q, SessionID: %q, ExternalID: %q)", config.AssumeRoleARN, config.AssumeRoleSessionName, config.AssumeRoleExternalID) - } - - endpointsSet := d.Get("endpoints").(*schema.Set) - - for _, endpointsSetI := range endpointsSet.List() { - endpoints := endpointsSetI.(map[string]interface{}) - for _, endpointServiceName := range endpointServiceNames { - config.Endpoints[endpointServiceName] = endpoints[endpointServiceName].(string) - } - } - - if v, ok := d.GetOk("allowed_account_ids"); ok { - for _, accountIDRaw := range v.(*schema.Set).List() { - config.AllowedAccountIds = append(config.AllowedAccountIds, accountIDRaw.(string)) - } - } - - if v, ok := d.GetOk("forbidden_account_ids"); ok { - for _, accountIDRaw := range v.(*schema.Set).List() { - config.ForbiddenAccountIds = append(config.ForbiddenAccountIds, accountIDRaw.(string)) - } - } - - return config.Client() -} - -// This is a global MutexKV for use within this plugin. -var awsMutexKV = mutexkv.NewMutexKV() - -func assumeRoleSchema() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "duration_seconds": { - Type: schema.TypeInt, - Optional: true, - Description: "Seconds to restrict the assume role session duration.", - }, - "external_id": { - Type: schema.TypeString, - Optional: true, - Description: "Unique identifier that might be required for assuming a role in another account.", - }, - "policy": { - Type: schema.TypeString, - Optional: true, - Description: "IAM Policy JSON describing further restricting permissions for the IAM Role being assumed.", - }, - "policy_arns": { - Type: schema.TypeSet, - Optional: true, - Description: "Amazon Resource Names (ARNs) of IAM Policies describing further restricting permissions for the IAM Role being assumed.", - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "role_arn": { - Type: schema.TypeString, - Optional: true, - Description: "Amazon Resource Name of an IAM Role to assume prior to making API calls.", - }, - "session_name": { - Type: schema.TypeString, - Optional: true, - Description: "Identifier for the assumed role session.", - }, - "tags": { - Type: schema.TypeMap, - Optional: true, - Description: "Assume role session tags.", - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "transitive_tag_keys": { - Type: schema.TypeSet, - Optional: true, - Description: "Assume role session tag keys to pass to any subsequent sessions.", - Elem: &schema.Schema{Type: schema.TypeString}, - }, - }, - }, - } -} - -func endpointsSchema() *schema.Schema { - endpointsAttributes := make(map[string]*schema.Schema) - - for _, endpointServiceName := range endpointServiceNames { - endpointsAttributes[endpointServiceName] = &schema.Schema{ - Type: schema.TypeString, - Optional: true, - Default: "", - Description: descriptions["endpoint"], - } - } - - return &schema.Schema{ - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: endpointsAttributes, - }, - } -} - -func expandProviderIgnoreTags(l []interface{}) *keyvaluetags.IgnoreConfig { - if len(l) == 0 || l[0] == nil { - return nil - } - - ignoreConfig := &keyvaluetags.IgnoreConfig{} - m := l[0].(map[string]interface{}) - - if v, ok := m["keys"].(*schema.Set); ok { - ignoreConfig.Keys = keyvaluetags.New(v.List()) - } - - if v, ok := m["key_prefixes"].(*schema.Set); ok { - ignoreConfig.KeyPrefixes = keyvaluetags.New(v.List()) - } - - return ignoreConfig -} +package aws + +import ( + "log" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/mutexkv" +) + +// Provider returns a *schema.Provider. +func Provider() *schema.Provider { + // TODO: Move the validation to this, requires conditional schemas + // TODO: Move the configuration to this, requires validation + + // The actual provider + provider := &schema.Provider{ + Schema: map[string]*schema.Schema{ + "access_key": { + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["access_key"], + }, + + "secret_key": { + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["secret_key"], + }, + + "profile": { + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["profile"], + }, + + "assume_role": assumeRoleSchema(), + + "shared_credentials_file": { + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["shared_credentials_file"], + }, + + "token": { + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["token"], + }, + + "region": { + Type: schema.TypeString, + Required: true, + DefaultFunc: schema.MultiEnvDefaultFunc([]string{ + "AWS_REGION", + "AWS_DEFAULT_REGION", + }, nil), + Description: descriptions["region"], + InputDefault: "us-east-1", + }, + + "max_retries": { + Type: schema.TypeInt, + Optional: true, + Default: 25, + Description: descriptions["max_retries"], + }, + + "allowed_account_ids": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + ConflictsWith: []string{"forbidden_account_ids"}, + Set: schema.HashString, + }, + + "forbidden_account_ids": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + ConflictsWith: []string{"allowed_account_ids"}, + Set: schema.HashString, + }, + + "endpoints": endpointsSchema(), + + "ignore_tags": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Description: "Configuration block with settings to ignore resource tags across all resources.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "keys": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + Description: "Resource tag keys to ignore across all resources.", + }, + "key_prefixes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + Description: "Resource tag key prefixes to ignore across all resources.", + }, + }, + }, + }, + + "insecure": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["insecure"], + }, + + "skip_credentials_validation": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["skip_credentials_validation"], + }, + + "skip_get_ec2_platforms": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["skip_get_ec2_platforms"], + }, + + "skip_region_validation": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["skip_region_validation"], + }, + + "skip_requesting_account_id": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["skip_requesting_account_id"], + }, + + "skip_metadata_api_check": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["skip_metadata_api_check"], + }, + + "s3_force_path_style": { + Type: schema.TypeBool, + Optional: true, + Default: false, + Description: descriptions["s3_force_path_style"], + }, + }, + + DataSourcesMap: map[string]*schema.Resource{ + "aws_acm_certificate": dataSourceAwsAcmCertificate(), + "aws_acmpca_certificate_authority": dataSourceAwsAcmpcaCertificateAuthority(), + "aws_ami": dataSourceAwsAmi(), + "aws_ami_ids": dataSourceAwsAmiIds(), + "aws_api_gateway_api_key": dataSourceAwsApiGatewayApiKey(), + "aws_api_gateway_resource": dataSourceAwsApiGatewayResource(), + "aws_api_gateway_rest_api": dataSourceAwsApiGatewayRestApi(), + "aws_api_gateway_vpc_link": dataSourceAwsApiGatewayVpcLink(), + "aws_arn": dataSourceAwsArn(), + "aws_autoscaling_group": dataSourceAwsAutoscalingGroup(), + "aws_autoscaling_groups": dataSourceAwsAutoscalingGroups(), + "aws_availability_zone": dataSourceAwsAvailabilityZone(), + "aws_availability_zones": dataSourceAwsAvailabilityZones(), + "aws_backup_plan": dataSourceAwsBackupPlan(), + "aws_backup_selection": dataSourceAwsBackupSelection(), + "aws_backup_vault": dataSourceAwsBackupVault(), + "aws_batch_compute_environment": dataSourceAwsBatchComputeEnvironment(), + "aws_batch_job_queue": dataSourceAwsBatchJobQueue(), + "aws_billing_service_account": dataSourceAwsBillingServiceAccount(), + "aws_caller_identity": dataSourceAwsCallerIdentity(), + "aws_canonical_user_id": dataSourceAwsCanonicalUserId(), + "aws_cloudformation_export": dataSourceAwsCloudFormationExport(), + "aws_cloudformation_stack": dataSourceAwsCloudFormationStack(), + "aws_cloudfront_distribution": dataSourceAwsCloudFrontDistribution(), + "aws_cloudhsm_v2_cluster": dataSourceCloudHsmV2Cluster(), + "aws_cloudtrail_service_account": dataSourceAwsCloudTrailServiceAccount(), + "aws_cloudwatch_log_group": dataSourceAwsCloudwatchLogGroup(), + "aws_cognito_user_pools": dataSourceAwsCognitoUserPools(), + "aws_codecommit_repository": dataSourceAwsCodeCommitRepository(), + "aws_cur_report_definition": dataSourceAwsCurReportDefinition(), + "aws_db_cluster_snapshot": dataSourceAwsDbClusterSnapshot(), + "aws_db_event_categories": dataSourceAwsDbEventCategories(), + "aws_db_instance": dataSourceAwsDbInstance(), + "aws_db_snapshot": dataSourceAwsDbSnapshot(), + "aws_directory_service_directory": dataSourceAwsDirectoryServiceDirectory(), + "aws_dx_gateway": dataSourceAwsDxGateway(), + "aws_dynamodb_table": dataSourceAwsDynamoDbTable(), + "aws_ebs_default_kms_key": dataSourceAwsEbsDefaultKmsKey(), + "aws_ebs_encryption_by_default": dataSourceAwsEbsEncryptionByDefault(), + "aws_ebs_snapshot": dataSourceAwsEbsSnapshot(), + "aws_ebs_snapshot_ids": dataSourceAwsEbsSnapshotIds(), + "aws_ebs_volume": dataSourceAwsEbsVolume(), + "aws_ebs_volumes": dataSourceAwsEbsVolumes(), + "aws_ec2_coip_pool": dataSourceAwsEc2CoipPool(), + "aws_ec2_coip_pools": dataSourceAwsEc2CoipPools(), + "aws_ec2_instance_type_offering": dataSourceAwsEc2InstanceTypeOffering(), + "aws_ec2_instance_type_offerings": dataSourceAwsEc2InstanceTypeOfferings(), + "aws_ec2_local_gateway": dataSourceAwsEc2LocalGateway(), + "aws_ec2_local_gateways": dataSourceAwsEc2LocalGateways(), + "aws_ec2_local_gateway_route_table": dataSourceAwsEc2LocalGatewayRouteTable(), + "aws_ec2_local_gateway_route_tables": dataSourceAwsEc2LocalGatewayRouteTables(), + "aws_ec2_local_gateway_virtual_interface": dataSourceAwsEc2LocalGatewayVirtualInterface(), + "aws_ec2_local_gateway_virtual_interface_group": dataSourceAwsEc2LocalGatewayVirtualInterfaceGroup(), + "aws_ec2_local_gateway_virtual_interface_groups": dataSourceAwsEc2LocalGatewayVirtualInterfaceGroups(), + "aws_ec2_spot_price": dataSourceAwsEc2SpotPrice(), + "aws_ec2_transit_gateway": dataSourceAwsEc2TransitGateway(), + "aws_ec2_transit_gateway_dx_gateway_attachment": dataSourceAwsEc2TransitGatewayDxGatewayAttachment(), + "aws_ec2_transit_gateway_peering_attachment": dataSourceAwsEc2TransitGatewayPeeringAttachment(), + "aws_ec2_transit_gateway_route_table": dataSourceAwsEc2TransitGatewayRouteTable(), + "aws_ec2_transit_gateway_vpc_attachment": dataSourceAwsEc2TransitGatewayVpcAttachment(), + "aws_ec2_transit_gateway_vpn_attachment": dataSourceAwsEc2TransitGatewayVpnAttachment(), + "aws_ecr_authorization_token": dataSourceAwsEcrAuthorizationToken(), + "aws_ecr_image": dataSourceAwsEcrImage(), + "aws_ecr_repository": dataSourceAwsEcrRepository(), + "aws_ecs_cluster": dataSourceAwsEcsCluster(), + "aws_ecs_container_definition": dataSourceAwsEcsContainerDefinition(), + "aws_ecs_service": dataSourceAwsEcsService(), + "aws_ecs_task_definition": dataSourceAwsEcsTaskDefinition(), + "aws_customer_gateway": dataSourceAwsCustomerGateway(), + "aws_efs_access_point": dataSourceAwsEfsAccessPoint(), + "aws_efs_access_points": dataSourceAwsEfsAccessPoints(), + "aws_efs_file_system": dataSourceAwsEfsFileSystem(), + "aws_efs_mount_target": dataSourceAwsEfsMountTarget(), + "aws_eip": dataSourceAwsEip(), + "aws_eks_cluster": dataSourceAwsEksCluster(), + "aws_eks_cluster_auth": dataSourceAwsEksClusterAuth(), + "aws_elastic_beanstalk_application": dataSourceAwsElasticBeanstalkApplication(), + "aws_elastic_beanstalk_hosted_zone": dataSourceAwsElasticBeanstalkHostedZone(), + "aws_elastic_beanstalk_solution_stack": dataSourceAwsElasticBeanstalkSolutionStack(), + "aws_elasticache_cluster": dataSourceAwsElastiCacheCluster(), + "aws_elasticsearch_domain": dataSourceAwsElasticSearchDomain(), + "aws_elb": dataSourceAwsElb(), + "aws_elasticache_replication_group": dataSourceAwsElasticacheReplicationGroup(), + "aws_elb_hosted_zone_id": dataSourceAwsElbHostedZoneId(), + "aws_elb_service_account": dataSourceAwsElbServiceAccount(), + "aws_glue_script": dataSourceAwsGlueScript(), + "aws_guardduty_detector": dataSourceAwsGuarddutyDetector(), + "aws_iam_account_alias": dataSourceAwsIamAccountAlias(), + "aws_iam_group": dataSourceAwsIAMGroup(), + "aws_iam_instance_profile": dataSourceAwsIAMInstanceProfile(), + "aws_iam_policy": dataSourceAwsIAMPolicy(), + "aws_iam_policy_document": dataSourceAwsIamPolicyDocument(), + "aws_iam_role": dataSourceAwsIAMRole(), + "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), + "aws_iam_user": dataSourceAwsIAMUser(), + "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), + "aws_imagebuilder_distribution_configuration": datasourceAwsImageBuilderDistributionConfiguration(), + "aws_imagebuilder_infrastructure_configuration": dataSourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), + "aws_internet_gateway": dataSourceAwsInternetGateway(), + "aws_iot_endpoint": dataSourceAwsIotEndpoint(), + "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), + "aws_instance": dataSourceAwsInstance(), + "aws_instances": dataSourceAwsInstances(), + "aws_ip_ranges": dataSourceAwsIPRanges(), + "aws_kinesis_stream": dataSourceAwsKinesisStream(), + "aws_kms_alias": dataSourceAwsKmsAlias(), + "aws_kms_ciphertext": dataSourceAwsKmsCiphertext(), + "aws_kms_key": dataSourceAwsKmsKey(), + "aws_kms_secret": dataSourceAwsKmsSecret(), + "aws_kms_secrets": dataSourceAwsKmsSecrets(), + "aws_lambda_alias": dataSourceAwsLambdaAlias(), + "aws_lambda_function": dataSourceAwsLambdaFunction(), + "aws_lambda_invocation": dataSourceAwsLambdaInvocation(), + "aws_lambda_layer_version": dataSourceAwsLambdaLayerVersion(), + "aws_launch_configuration": dataSourceAwsLaunchConfiguration(), + "aws_launch_template": dataSourceAwsLaunchTemplate(), + "aws_mq_broker": dataSourceAwsMqBroker(), + "aws_msk_cluster": dataSourceAwsMskCluster(), + "aws_msk_configuration": dataSourceAwsMskConfiguration(), + "aws_nat_gateway": dataSourceAwsNatGateway(), + "aws_network_acls": dataSourceAwsNetworkAcls(), + "aws_network_interface": dataSourceAwsNetworkInterface(), + "aws_network_interfaces": dataSourceAwsNetworkInterfaces(), + "aws_organizations_organization": dataSourceAwsOrganizationsOrganization(), + "aws_organizations_organizational_units": dataSourceAwsOrganizationsOrganizationalUnits(), + "aws_outposts_outpost": dataSourceAwsOutpostsOutpost(), + "aws_outposts_outpost_instance_type": dataSourceAwsOutpostsOutpostInstanceType(), + "aws_outposts_outpost_instance_types": dataSourceAwsOutpostsOutpostInstanceTypes(), + "aws_outposts_outposts": dataSourceAwsOutpostsOutposts(), + "aws_outposts_site": dataSourceAwsOutpostsSite(), + "aws_outposts_sites": dataSourceAwsOutpostsSites(), + "aws_partition": dataSourceAwsPartition(), + "aws_prefix_list": dataSourceAwsPrefixList(), + "aws_pricing_product": dataSourceAwsPricingProduct(), + "aws_qldb_ledger": dataSourceAwsQLDBLedger(), + "aws_ram_resource_share": dataSourceAwsRamResourceShare(), + "aws_rds_cluster": dataSourceAwsRdsCluster(), + "aws_redshift_cluster": dataSourceAwsRedshiftCluster(), + "aws_redshift_service_account": dataSourceAwsRedshiftServiceAccount(), + "aws_region": dataSourceAwsRegion(), + "aws_regions": dataSourceAwsRegions(), + "aws_route": dataSourceAwsRoute(), + "aws_route_table": dataSourceAwsRouteTable(), + "aws_route_tables": dataSourceAwsRouteTables(), + "aws_route53_delegation_set": dataSourceAwsDelegationSet(), + "aws_route53_resolver_rule": dataSourceAwsRoute53ResolverRule(), + "aws_route53_resolver_rules": dataSourceAwsRoute53ResolverRules(), + "aws_route53_zone": dataSourceAwsRoute53Zone(), + "aws_s3_bucket": dataSourceAwsS3Bucket(), + "aws_s3_bucket_object": dataSourceAwsS3BucketObject(), + "aws_s3_bucket_objects": dataSourceAwsS3BucketObjects(), + "aws_secretsmanager_secret": dataSourceAwsSecretsManagerSecret(), + "aws_secretsmanager_secret_rotation": dataSourceAwsSecretsManagerSecretRotation(), + "aws_secretsmanager_secret_version": dataSourceAwsSecretsManagerSecretVersion(), + "aws_servicequotas_service": dataSourceAwsServiceQuotasService(), + "aws_servicequotas_service_quota": dataSourceAwsServiceQuotasServiceQuota(), + "aws_sfn_activity": dataSourceAwsSfnActivity(), + "aws_sfn_state_machine": dataSourceAwsSfnStateMachine(), + "aws_sns_topic": dataSourceAwsSnsTopic(), + "aws_sqs_queue": dataSourceAwsSqsQueue(), + "aws_ssm_document": dataSourceAwsSsmDocument(), + "aws_ssm_parameter": dataSourceAwsSsmParameter(), + "aws_ssm_patch_baseline": dataSourceAwsSsmPatchBaseline(), + "aws_storagegateway_local_disk": dataSourceAwsStorageGatewayLocalDisk(), + "aws_subnet": dataSourceAwsSubnet(), + "aws_subnet_ids": dataSourceAwsSubnetIDs(), + "aws_transfer_server": dataSourceAwsTransferServer(), + "aws_vpcs": dataSourceAwsVpcs(), + "aws_security_group": dataSourceAwsSecurityGroup(), + "aws_security_groups": dataSourceAwsSecurityGroups(), + "aws_vpc": dataSourceAwsVpc(), + "aws_vpc_dhcp_options": dataSourceAwsVpcDhcpOptions(), + "aws_vpc_endpoint": dataSourceAwsVpcEndpoint(), + "aws_vpc_endpoint_service": dataSourceAwsVpcEndpointService(), + "aws_vpc_peering_connection": dataSourceAwsVpcPeeringConnection(), + "aws_vpn_gateway": dataSourceAwsVpnGateway(), + "aws_waf_ipset": dataSourceAwsWafIpSet(), + "aws_waf_rule": dataSourceAwsWafRule(), + "aws_waf_rate_based_rule": dataSourceAwsWafRateBasedRule(), + "aws_waf_web_acl": dataSourceAwsWafWebAcl(), + "aws_wafregional_ipset": dataSourceAwsWafRegionalIpSet(), + "aws_wafregional_rule": dataSourceAwsWafRegionalRule(), + "aws_wafregional_rate_based_rule": dataSourceAwsWafRegionalRateBasedRule(), + "aws_wafregional_web_acl": dataSourceAwsWafRegionalWebAcl(), + "aws_wafv2_ip_set": dataSourceAwsWafv2IPSet(), + "aws_wafv2_regex_pattern_set": dataSourceAwsWafv2RegexPatternSet(), + "aws_wafv2_rule_group": dataSourceAwsWafv2RuleGroup(), + "aws_wafv2_web_acl": dataSourceAwsWafv2WebACL(), + "aws_workspaces_bundle": dataSourceAwsWorkspacesBundle(), + "aws_workspaces_directory": dataSourceAwsWorkspacesDirectory(), + + // Adding the Aliases for the ALB -> LB Rename + "aws_lb": dataSourceAwsLb(), + "aws_alb": dataSourceAwsLb(), + "aws_lb_listener": dataSourceAwsLbListener(), + "aws_alb_listener": dataSourceAwsLbListener(), + "aws_lb_target_group": dataSourceAwsLbTargetGroup(), + "aws_alb_target_group": dataSourceAwsLbTargetGroup(), + }, + + ResourcesMap: map[string]*schema.Resource{ + "aws_accessanalyzer_analyzer": resourceAwsAccessAnalyzerAnalyzer(), + "aws_acm_certificate": resourceAwsAcmCertificate(), + "aws_acm_certificate_validation": resourceAwsAcmCertificateValidation(), + "aws_acmpca_certificate_authority": resourceAwsAcmpcaCertificateAuthority(), + "aws_ami": resourceAwsAmi(), + "aws_ami_copy": resourceAwsAmiCopy(), + "aws_ami_from_instance": resourceAwsAmiFromInstance(), + "aws_ami_launch_permission": resourceAwsAmiLaunchPermission(), + "aws_api_gateway_account": resourceAwsApiGatewayAccount(), + "aws_api_gateway_api_key": resourceAwsApiGatewayApiKey(), + "aws_api_gateway_authorizer": resourceAwsApiGatewayAuthorizer(), + "aws_api_gateway_base_path_mapping": resourceAwsApiGatewayBasePathMapping(), + "aws_api_gateway_client_certificate": resourceAwsApiGatewayClientCertificate(), + "aws_api_gateway_deployment": resourceAwsApiGatewayDeployment(), + "aws_api_gateway_documentation_part": resourceAwsApiGatewayDocumentationPart(), + "aws_api_gateway_documentation_version": resourceAwsApiGatewayDocumentationVersion(), + "aws_api_gateway_domain_name": resourceAwsApiGatewayDomainName(), + "aws_api_gateway_gateway_response": resourceAwsApiGatewayGatewayResponse(), + "aws_api_gateway_integration": resourceAwsApiGatewayIntegration(), + "aws_api_gateway_integration_response": resourceAwsApiGatewayIntegrationResponse(), + "aws_api_gateway_method": resourceAwsApiGatewayMethod(), + "aws_api_gateway_method_response": resourceAwsApiGatewayMethodResponse(), + "aws_api_gateway_method_settings": resourceAwsApiGatewayMethodSettings(), + "aws_api_gateway_model": resourceAwsApiGatewayModel(), + "aws_api_gateway_request_validator": resourceAwsApiGatewayRequestValidator(), + "aws_api_gateway_resource": resourceAwsApiGatewayResource(), + "aws_api_gateway_rest_api": resourceAwsApiGatewayRestApi(), + "aws_api_gateway_stage": resourceAwsApiGatewayStage(), + "aws_api_gateway_usage_plan": resourceAwsApiGatewayUsagePlan(), + "aws_api_gateway_usage_plan_key": resourceAwsApiGatewayUsagePlanKey(), + "aws_api_gateway_vpc_link": resourceAwsApiGatewayVpcLink(), + "aws_apigatewayv2_api": resourceAwsApiGatewayV2Api(), + "aws_apigatewayv2_api_mapping": resourceAwsApiGatewayV2ApiMapping(), + "aws_apigatewayv2_authorizer": resourceAwsApiGatewayV2Authorizer(), + "aws_apigatewayv2_deployment": resourceAwsApiGatewayV2Deployment(), + "aws_apigatewayv2_domain_name": resourceAwsApiGatewayV2DomainName(), + "aws_apigatewayv2_integration": resourceAwsApiGatewayV2Integration(), + "aws_apigatewayv2_integration_response": resourceAwsApiGatewayV2IntegrationResponse(), + "aws_apigatewayv2_model": resourceAwsApiGatewayV2Model(), + "aws_apigatewayv2_route": resourceAwsApiGatewayV2Route(), + "aws_apigatewayv2_route_response": resourceAwsApiGatewayV2RouteResponse(), + "aws_apigatewayv2_stage": resourceAwsApiGatewayV2Stage(), + "aws_apigatewayv2_vpc_link": resourceAwsApiGatewayV2VpcLink(), + "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), + "aws_appautoscaling_target": resourceAwsAppautoscalingTarget(), + "aws_appautoscaling_policy": resourceAwsAppautoscalingPolicy(), + "aws_appautoscaling_scheduled_action": resourceAwsAppautoscalingScheduledAction(), + "aws_appmesh_mesh": resourceAwsAppmeshMesh(), + "aws_appmesh_route": resourceAwsAppmeshRoute(), + "aws_appmesh_virtual_node": resourceAwsAppmeshVirtualNode(), + "aws_appmesh_virtual_router": resourceAwsAppmeshVirtualRouter(), + "aws_appmesh_virtual_service": resourceAwsAppmeshVirtualService(), + "aws_appsync_api_key": resourceAwsAppsyncApiKey(), + "aws_appsync_datasource": resourceAwsAppsyncDatasource(), + "aws_appsync_function": resourceAwsAppsyncFunction(), + "aws_appsync_graphql_api": resourceAwsAppsyncGraphqlApi(), + "aws_appsync_resolver": resourceAwsAppsyncResolver(), + "aws_athena_database": resourceAwsAthenaDatabase(), + "aws_athena_named_query": resourceAwsAthenaNamedQuery(), + "aws_athena_workgroup": resourceAwsAthenaWorkgroup(), + "aws_autoscaling_attachment": resourceAwsAutoscalingAttachment(), + "aws_autoscaling_group": resourceAwsAutoscalingGroup(), + "aws_autoscaling_lifecycle_hook": resourceAwsAutoscalingLifecycleHook(), + "aws_autoscaling_notification": resourceAwsAutoscalingNotification(), + "aws_autoscaling_policy": resourceAwsAutoscalingPolicy(), + "aws_autoscaling_schedule": resourceAwsAutoscalingSchedule(), + "aws_backup_plan": resourceAwsBackupPlan(), + "aws_backup_selection": resourceAwsBackupSelection(), + "aws_backup_vault": resourceAwsBackupVault(), + "aws_budgets_budget": resourceAwsBudgetsBudget(), + "aws_cloud9_environment_ec2": resourceAwsCloud9EnvironmentEc2(), + "aws_cloudformation_stack": resourceAwsCloudFormationStack(), + "aws_cloudformation_stack_set": resourceAwsCloudFormationStackSet(), + "aws_cloudformation_stack_set_instance": resourceAwsCloudFormationStackSetInstance(), + "aws_cloudfront_distribution": resourceAwsCloudFrontDistribution(), + "aws_cloudfront_origin_access_identity": resourceAwsCloudFrontOriginAccessIdentity(), + "aws_cloudfront_public_key": resourceAwsCloudFrontPublicKey(), + "aws_cloudtrail": resourceAwsCloudTrail(), + "aws_cloudwatch_event_permission": resourceAwsCloudWatchEventPermission(), + "aws_cloudwatch_event_rule": resourceAwsCloudWatchEventRule(), + "aws_cloudwatch_event_target": resourceAwsCloudWatchEventTarget(), + "aws_cloudwatch_log_destination": resourceAwsCloudWatchLogDestination(), + "aws_cloudwatch_log_destination_policy": resourceAwsCloudWatchLogDestinationPolicy(), + "aws_cloudwatch_log_group": resourceAwsCloudWatchLogGroup(), + "aws_cloudwatch_log_metric_filter": resourceAwsCloudWatchLogMetricFilter(), + "aws_cloudwatch_log_resource_policy": resourceAwsCloudWatchLogResourcePolicy(), + "aws_cloudwatch_log_stream": resourceAwsCloudWatchLogStream(), + "aws_cloudwatch_log_subscription_filter": resourceAwsCloudwatchLogSubscriptionFilter(), + "aws_config_aggregate_authorization": resourceAwsConfigAggregateAuthorization(), + "aws_config_config_rule": resourceAwsConfigConfigRule(), + "aws_config_configuration_aggregator": resourceAwsConfigConfigurationAggregator(), + "aws_config_configuration_recorder": resourceAwsConfigConfigurationRecorder(), + "aws_config_configuration_recorder_status": resourceAwsConfigConfigurationRecorderStatus(), + "aws_config_delivery_channel": resourceAwsConfigDeliveryChannel(), + "aws_config_organization_custom_rule": resourceAwsConfigOrganizationCustomRule(), + "aws_config_organization_managed_rule": resourceAwsConfigOrganizationManagedRule(), + "aws_cognito_identity_pool": resourceAwsCognitoIdentityPool(), + "aws_cognito_identity_pool_roles_attachment": resourceAwsCognitoIdentityPoolRolesAttachment(), + "aws_cognito_identity_provider": resourceAwsCognitoIdentityProvider(), + "aws_cognito_user_group": resourceAwsCognitoUserGroup(), + "aws_cognito_user_pool": resourceAwsCognitoUserPool(), + "aws_cognito_user_pool_client": resourceAwsCognitoUserPoolClient(), + "aws_cognito_user_pool_domain": resourceAwsCognitoUserPoolDomain(), + "aws_cloudhsm_v2_cluster": resourceAwsCloudHsmV2Cluster(), + "aws_cloudhsm_v2_hsm": resourceAwsCloudHsmV2Hsm(), + "aws_cognito_resource_server": resourceAwsCognitoResourceServer(), + "aws_cloudwatch_metric_alarm": resourceAwsCloudWatchMetricAlarm(), + "aws_cloudwatch_dashboard": resourceAwsCloudWatchDashboard(), + "aws_codedeploy_app": resourceAwsCodeDeployApp(), + "aws_codedeploy_deployment_config": resourceAwsCodeDeployDeploymentConfig(), + "aws_codedeploy_deployment_group": resourceAwsCodeDeployDeploymentGroup(), + "aws_codecommit_repository": resourceAwsCodeCommitRepository(), + "aws_codecommit_trigger": resourceAwsCodeCommitTrigger(), + "aws_codebuild_project": resourceAwsCodeBuildProject(), + "aws_codebuild_source_credential": resourceAwsCodeBuildSourceCredential(), + "aws_codebuild_webhook": resourceAwsCodeBuildWebhook(), + "aws_codepipeline": resourceAwsCodePipeline(), + "aws_codepipeline_webhook": resourceAwsCodePipelineWebhook(), + "aws_codestarnotifications_notification_rule": resourceAwsCodeStarNotificationsNotificationRule(), + "aws_cur_report_definition": resourceAwsCurReportDefinition(), + "aws_customer_gateway": resourceAwsCustomerGateway(), + "aws_datapipeline_pipeline": resourceAwsDataPipelinePipeline(), + "aws_datasync_agent": resourceAwsDataSyncAgent(), + "aws_datasync_location_efs": resourceAwsDataSyncLocationEfs(), + "aws_datasync_location_nfs": resourceAwsDataSyncLocationNfs(), + "aws_datasync_location_s3": resourceAwsDataSyncLocationS3(), + "aws_datasync_location_smb": resourceAwsDataSyncLocationSmb(), + "aws_datasync_task": resourceAwsDataSyncTask(), + "aws_dax_cluster": resourceAwsDaxCluster(), + "aws_dax_parameter_group": resourceAwsDaxParameterGroup(), + "aws_dax_subnet_group": resourceAwsDaxSubnetGroup(), + "aws_db_cluster_snapshot": resourceAwsDbClusterSnapshot(), + "aws_db_event_subscription": resourceAwsDbEventSubscription(), + "aws_db_instance": resourceAwsDbInstance(), + "aws_db_instance_role_association": resourceAwsDbInstanceRoleAssociation(), + "aws_db_option_group": resourceAwsDbOptionGroup(), + "aws_db_parameter_group": resourceAwsDbParameterGroup(), + "aws_db_security_group": resourceAwsDbSecurityGroup(), + "aws_db_snapshot": resourceAwsDbSnapshot(), + "aws_db_subnet_group": resourceAwsDbSubnetGroup(), + "aws_devicefarm_project": resourceAwsDevicefarmProject(), + "aws_directory_service_directory": resourceAwsDirectoryServiceDirectory(), + "aws_directory_service_conditional_forwarder": resourceAwsDirectoryServiceConditionalForwarder(), + "aws_directory_service_log_subscription": resourceAwsDirectoryServiceLogSubscription(), + "aws_dlm_lifecycle_policy": resourceAwsDlmLifecyclePolicy(), + "aws_dms_certificate": resourceAwsDmsCertificate(), + "aws_dms_endpoint": resourceAwsDmsEndpoint(), + "aws_dms_event_subscription": resourceAwsDmsEventSubscription(), + "aws_dms_replication_instance": resourceAwsDmsReplicationInstance(), + "aws_dms_replication_subnet_group": resourceAwsDmsReplicationSubnetGroup(), + "aws_dms_replication_task": resourceAwsDmsReplicationTask(), + "aws_docdb_cluster": resourceAwsDocDBCluster(), + "aws_docdb_cluster_instance": resourceAwsDocDBClusterInstance(), + "aws_docdb_cluster_parameter_group": resourceAwsDocDBClusterParameterGroup(), + "aws_docdb_cluster_snapshot": resourceAwsDocDBClusterSnapshot(), + "aws_docdb_subnet_group": resourceAwsDocDBSubnetGroup(), + "aws_dx_bgp_peer": resourceAwsDxBgpPeer(), + "aws_dx_connection": resourceAwsDxConnection(), + "aws_dx_connection_association": resourceAwsDxConnectionAssociation(), + "aws_dx_gateway": resourceAwsDxGateway(), + "aws_dx_gateway_association": resourceAwsDxGatewayAssociation(), + "aws_dx_gateway_association_proposal": resourceAwsDxGatewayAssociationProposal(), + "aws_dx_hosted_private_virtual_interface": resourceAwsDxHostedPrivateVirtualInterface(), + "aws_dx_hosted_private_virtual_interface_accepter": resourceAwsDxHostedPrivateVirtualInterfaceAccepter(), + "aws_dx_hosted_public_virtual_interface": resourceAwsDxHostedPublicVirtualInterface(), + "aws_dx_hosted_public_virtual_interface_accepter": resourceAwsDxHostedPublicVirtualInterfaceAccepter(), + "aws_dx_hosted_transit_virtual_interface": resourceAwsDxHostedTransitVirtualInterface(), + "aws_dx_hosted_transit_virtual_interface_accepter": resourceAwsDxHostedTransitVirtualInterfaceAccepter(), + "aws_dx_lag": resourceAwsDxLag(), + "aws_dx_private_virtual_interface": resourceAwsDxPrivateVirtualInterface(), + "aws_dx_public_virtual_interface": resourceAwsDxPublicVirtualInterface(), + "aws_dx_transit_virtual_interface": resourceAwsDxTransitVirtualInterface(), + "aws_dynamodb_table": resourceAwsDynamoDbTable(), + "aws_dynamodb_table_item": resourceAwsDynamoDbTableItem(), + "aws_dynamodb_global_table": resourceAwsDynamoDbGlobalTable(), + "aws_ebs_default_kms_key": resourceAwsEbsDefaultKmsKey(), + "aws_ebs_encryption_by_default": resourceAwsEbsEncryptionByDefault(), + "aws_ebs_snapshot": resourceAwsEbsSnapshot(), + "aws_ebs_snapshot_copy": resourceAwsEbsSnapshotCopy(), + "aws_ebs_volume": resourceAwsEbsVolume(), + "aws_ec2_availability_zone_group": resourceAwsEc2AvailabilityZoneGroup(), + "aws_ec2_capacity_reservation": resourceAwsEc2CapacityReservation(), + "aws_ec2_client_vpn_authorization_rule": resourceAwsEc2ClientVpnAuthorizationRule(), + "aws_ec2_client_vpn_endpoint": resourceAwsEc2ClientVpnEndpoint(), + "aws_ec2_client_vpn_network_association": resourceAwsEc2ClientVpnNetworkAssociation(), + "aws_ec2_client_vpn_route": resourceAwsEc2ClientVpnRoute(), + "aws_ec2_fleet": resourceAwsEc2Fleet(), + "aws_ec2_local_gateway_route": resourceAwsEc2LocalGatewayRoute(), + "aws_ec2_local_gateway_route_table_vpc_association": resourceAwsEc2LocalGatewayRouteTableVpcAssociation(), + "aws_ec2_tag": resourceAwsEc2Tag(), + "aws_ec2_traffic_mirror_filter": resourceAwsEc2TrafficMirrorFilter(), + "aws_ec2_traffic_mirror_filter_rule": resourceAwsEc2TrafficMirrorFilterRule(), + "aws_ec2_traffic_mirror_target": resourceAwsEc2TrafficMirrorTarget(), + "aws_ec2_traffic_mirror_session": resourceAwsEc2TrafficMirrorSession(), + "aws_ec2_transit_gateway": resourceAwsEc2TransitGateway(), + "aws_ec2_transit_gateway_peering_attachment": resourceAwsEc2TransitGatewayPeeringAttachment(), + "aws_ec2_transit_gateway_peering_attachment_accepter": resourceAwsEc2TransitGatewayPeeringAttachmentAccepter(), + "aws_ec2_transit_gateway_route": resourceAwsEc2TransitGatewayRoute(), + "aws_ec2_transit_gateway_route_table": resourceAwsEc2TransitGatewayRouteTable(), + "aws_ec2_transit_gateway_route_table_association": resourceAwsEc2TransitGatewayRouteTableAssociation(), + "aws_ec2_transit_gateway_route_table_propagation": resourceAwsEc2TransitGatewayRouteTablePropagation(), + "aws_ec2_transit_gateway_vpc_attachment": resourceAwsEc2TransitGatewayVpcAttachment(), + "aws_ec2_transit_gateway_vpc_attachment_accepter": resourceAwsEc2TransitGatewayVpcAttachmentAccepter(), + "aws_ecr_lifecycle_policy": resourceAwsEcrLifecyclePolicy(), + "aws_ecr_repository": resourceAwsEcrRepository(), + "aws_ecr_repository_policy": resourceAwsEcrRepositoryPolicy(), + "aws_ecs_capacity_provider": resourceAwsEcsCapacityProvider(), + "aws_ecs_cluster": resourceAwsEcsCluster(), + "aws_ecs_service": resourceAwsEcsService(), + "aws_ecs_task_definition": resourceAwsEcsTaskDefinition(), + "aws_efs_access_point": resourceAwsEfsAccessPoint(), + "aws_efs_file_system": resourceAwsEfsFileSystem(), + "aws_efs_file_system_policy": resourceAwsEfsFileSystemPolicy(), + "aws_efs_mount_target": resourceAwsEfsMountTarget(), + "aws_egress_only_internet_gateway": resourceAwsEgressOnlyInternetGateway(), + "aws_eip": resourceAwsEip(), + "aws_eip_association": resourceAwsEipAssociation(), + "aws_eks_cluster": resourceAwsEksCluster(), + "aws_eks_fargate_profile": resourceAwsEksFargateProfile(), + "aws_eks_node_group": resourceAwsEksNodeGroup(), + "aws_elasticache_cluster": resourceAwsElasticacheCluster(), + "aws_elasticache_parameter_group": resourceAwsElasticacheParameterGroup(), + "aws_elasticache_replication_group": resourceAwsElasticacheReplicationGroup(), + "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(), + "aws_elasticache_subnet_group": resourceAwsElasticacheSubnetGroup(), + "aws_elastic_beanstalk_application": resourceAwsElasticBeanstalkApplication(), + "aws_elastic_beanstalk_application_version": resourceAwsElasticBeanstalkApplicationVersion(), + "aws_elastic_beanstalk_configuration_template": resourceAwsElasticBeanstalkConfigurationTemplate(), + "aws_elastic_beanstalk_environment": resourceAwsElasticBeanstalkEnvironment(), + "aws_elasticsearch_domain": resourceAwsElasticSearchDomain(), + "aws_elasticsearch_domain_policy": resourceAwsElasticSearchDomainPolicy(), + "aws_elastictranscoder_pipeline": resourceAwsElasticTranscoderPipeline(), + "aws_elastictranscoder_preset": resourceAwsElasticTranscoderPreset(), + "aws_elb": resourceAwsElb(), + "aws_elb_attachment": resourceAwsElbAttachment(), + "aws_emr_cluster": resourceAwsEMRCluster(), + "aws_emr_instance_group": resourceAwsEMRInstanceGroup(), + "aws_emr_security_configuration": resourceAwsEMRSecurityConfiguration(), + "aws_flow_log": resourceAwsFlowLog(), + "aws_fsx_lustre_file_system": resourceAwsFsxLustreFileSystem(), + "aws_fsx_windows_file_system": resourceAwsFsxWindowsFileSystem(), + "aws_fms_admin_account": resourceAwsFmsAdminAccount(), + "aws_gamelift_alias": resourceAwsGameliftAlias(), + "aws_gamelift_build": resourceAwsGameliftBuild(), + "aws_gamelift_fleet": resourceAwsGameliftFleet(), + "aws_gamelift_game_session_queue": resourceAwsGameliftGameSessionQueue(), + "aws_glacier_vault": resourceAwsGlacierVault(), + "aws_glacier_vault_lock": resourceAwsGlacierVaultLock(), + "aws_globalaccelerator_accelerator": resourceAwsGlobalAcceleratorAccelerator(), + "aws_globalaccelerator_endpoint_group": resourceAwsGlobalAcceleratorEndpointGroup(), + "aws_globalaccelerator_listener": resourceAwsGlobalAcceleratorListener(), + "aws_glue_catalog_database": resourceAwsGlueCatalogDatabase(), + "aws_glue_catalog_table": resourceAwsGlueCatalogTable(), + "aws_glue_classifier": resourceAwsGlueClassifier(), + "aws_glue_connection": resourceAwsGlueConnection(), + "aws_glue_crawler": resourceAwsGlueCrawler(), + "aws_glue_job": resourceAwsGlueJob(), + "aws_glue_security_configuration": resourceAwsGlueSecurityConfiguration(), + "aws_glue_trigger": resourceAwsGlueTrigger(), + "aws_glue_workflow": resourceAwsGlueWorkflow(), + "aws_guardduty_detector": resourceAwsGuardDutyDetector(), + "aws_guardduty_invite_accepter": resourceAwsGuardDutyInviteAccepter(), + "aws_guardduty_ipset": resourceAwsGuardDutyIpset(), + "aws_guardduty_member": resourceAwsGuardDutyMember(), + "aws_guardduty_organization_admin_account": resourceAwsGuardDutyOrganizationAdminAccount(), + "aws_guardduty_organization_configuration": resourceAwsGuardDutyOrganizationConfiguration(), + "aws_guardduty_threatintelset": resourceAwsGuardDutyThreatintelset(), + "aws_iam_access_key": resourceAwsIamAccessKey(), + "aws_iam_account_alias": resourceAwsIamAccountAlias(), + "aws_iam_account_password_policy": resourceAwsIamAccountPasswordPolicy(), + "aws_iam_group_policy": resourceAwsIamGroupPolicy(), + "aws_iam_group": resourceAwsIamGroup(), + "aws_iam_group_membership": resourceAwsIamGroupMembership(), + "aws_iam_group_policy_attachment": resourceAwsIamGroupPolicyAttachment(), + "aws_iam_instance_profile": resourceAwsIamInstanceProfile(), + "aws_iam_openid_connect_provider": resourceAwsIamOpenIDConnectProvider(), + "aws_iam_policy": resourceAwsIamPolicy(), + "aws_iam_policy_attachment": resourceAwsIamPolicyAttachment(), + "aws_iam_role_policy_attachment": resourceAwsIamRolePolicyAttachment(), + "aws_iam_role_policy": resourceAwsIamRolePolicy(), + "aws_iam_role": resourceAwsIamRole(), + "aws_iam_saml_provider": resourceAwsIamSamlProvider(), + "aws_iam_server_certificate": resourceAwsIAMServerCertificate(), + "aws_iam_service_linked_role": resourceAwsIamServiceLinkedRole(), + "aws_iam_user_group_membership": resourceAwsIamUserGroupMembership(), + "aws_iam_user_policy_attachment": resourceAwsIamUserPolicyAttachment(), + "aws_iam_user_policy": resourceAwsIamUserPolicy(), + "aws_iam_user_ssh_key": resourceAwsIamUserSshKey(), + "aws_iam_user": resourceAwsIamUser(), + "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), + "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), + "aws_imagebuilder_distribution_configuration": resourceAwsImageBuilderDistributionConfiguration(), + "aws_imagebuilder_infrastructure_configuration": resourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), + "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), + "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), + "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), + "aws_instance": resourceAwsInstance(), + "aws_internet_gateway": resourceAwsInternetGateway(), + "aws_iot_certificate": resourceAwsIotCertificate(), + "aws_iot_policy": resourceAwsIotPolicy(), + "aws_iot_policy_attachment": resourceAwsIotPolicyAttachment(), + "aws_iot_thing": resourceAwsIotThing(), + "aws_iot_thing_principal_attachment": resourceAwsIotThingPrincipalAttachment(), + "aws_iot_thing_type": resourceAwsIotThingType(), + "aws_iot_topic_rule": resourceAwsIotTopicRule(), + "aws_iot_role_alias": resourceAwsIotRoleAlias(), + "aws_key_pair": resourceAwsKeyPair(), + "aws_kinesis_firehose_delivery_stream": resourceAwsKinesisFirehoseDeliveryStream(), + "aws_kinesis_stream": resourceAwsKinesisStream(), + "aws_kinesis_analytics_application": resourceAwsKinesisAnalyticsApplication(), + "aws_kinesis_video_stream": resourceAwsKinesisVideoStream(), + "aws_kms_alias": resourceAwsKmsAlias(), + "aws_kms_external_key": resourceAwsKmsExternalKey(), + "aws_kms_grant": resourceAwsKmsGrant(), + "aws_kms_key": resourceAwsKmsKey(), + "aws_kms_ciphertext": resourceAwsKmsCiphertext(), + "aws_lambda_alias": resourceAwsLambdaAlias(), + "aws_lambda_event_source_mapping": resourceAwsLambdaEventSourceMapping(), + "aws_lambda_function_event_invoke_config": resourceAwsLambdaFunctionEventInvokeConfig(), + "aws_lambda_function": resourceAwsLambdaFunction(), + "aws_lambda_layer_version": resourceAwsLambdaLayerVersion(), + "aws_lambda_permission": resourceAwsLambdaPermission(), + "aws_lambda_provisioned_concurrency_config": resourceAwsLambdaProvisionedConcurrencyConfig(), + "aws_launch_configuration": resourceAwsLaunchConfiguration(), + "aws_launch_template": resourceAwsLaunchTemplate(), + "aws_licensemanager_association": resourceAwsLicenseManagerAssociation(), + "aws_licensemanager_license_configuration": resourceAwsLicenseManagerLicenseConfiguration(), + "aws_lightsail_domain": resourceAwsLightsailDomain(), + "aws_lightsail_instance": resourceAwsLightsailInstance(), + "aws_lightsail_key_pair": resourceAwsLightsailKeyPair(), + "aws_lightsail_static_ip": resourceAwsLightsailStaticIp(), + "aws_lightsail_static_ip_attachment": resourceAwsLightsailStaticIpAttachment(), + "aws_lb_cookie_stickiness_policy": resourceAwsLBCookieStickinessPolicy(), + "aws_load_balancer_policy": resourceAwsLoadBalancerPolicy(), + "aws_load_balancer_backend_server_policy": resourceAwsLoadBalancerBackendServerPolicies(), + "aws_load_balancer_listener_policy": resourceAwsLoadBalancerListenerPolicies(), + "aws_lb_ssl_negotiation_policy": resourceAwsLBSSLNegotiationPolicy(), + "aws_macie_member_account_association": resourceAwsMacieMemberAccountAssociation(), + "aws_macie_s3_bucket_association": resourceAwsMacieS3BucketAssociation(), + "aws_main_route_table_association": resourceAwsMainRouteTableAssociation(), + "aws_mq_broker": resourceAwsMqBroker(), + "aws_mq_configuration": resourceAwsMqConfiguration(), + "aws_media_convert_queue": resourceAwsMediaConvertQueue(), + "aws_media_package_channel": resourceAwsMediaPackageChannel(), + "aws_media_store_container": resourceAwsMediaStoreContainer(), + "aws_media_store_container_policy": resourceAwsMediaStoreContainerPolicy(), + "aws_msk_cluster": resourceAwsMskCluster(), + "aws_msk_configuration": resourceAwsMskConfiguration(), + "aws_nat_gateway": resourceAwsNatGateway(), + "aws_network_acl": resourceAwsNetworkAcl(), + "aws_default_network_acl": resourceAwsDefaultNetworkAcl(), + "aws_neptune_cluster": resourceAwsNeptuneCluster(), + "aws_neptune_cluster_instance": resourceAwsNeptuneClusterInstance(), + "aws_neptune_cluster_parameter_group": resourceAwsNeptuneClusterParameterGroup(), + "aws_neptune_cluster_snapshot": resourceAwsNeptuneClusterSnapshot(), + "aws_neptune_event_subscription": resourceAwsNeptuneEventSubscription(), + "aws_neptune_parameter_group": resourceAwsNeptuneParameterGroup(), + "aws_neptune_subnet_group": resourceAwsNeptuneSubnetGroup(), + "aws_network_acl_rule": resourceAwsNetworkAclRule(), + "aws_network_interface": resourceAwsNetworkInterface(), + "aws_network_interface_attachment": resourceAwsNetworkInterfaceAttachment(), + "aws_opsworks_application": resourceAwsOpsworksApplication(), + "aws_opsworks_stack": resourceAwsOpsworksStack(), + "aws_opsworks_java_app_layer": resourceAwsOpsworksJavaAppLayer(), + "aws_opsworks_haproxy_layer": resourceAwsOpsworksHaproxyLayer(), + "aws_opsworks_static_web_layer": resourceAwsOpsworksStaticWebLayer(), + "aws_opsworks_php_app_layer": resourceAwsOpsworksPhpAppLayer(), + "aws_opsworks_rails_app_layer": resourceAwsOpsworksRailsAppLayer(), + "aws_opsworks_nodejs_app_layer": resourceAwsOpsworksNodejsAppLayer(), + "aws_opsworks_memcached_layer": resourceAwsOpsworksMemcachedLayer(), + "aws_opsworks_mysql_layer": resourceAwsOpsworksMysqlLayer(), + "aws_opsworks_ganglia_layer": resourceAwsOpsworksGangliaLayer(), + "aws_opsworks_custom_layer": resourceAwsOpsworksCustomLayer(), + "aws_opsworks_instance": resourceAwsOpsworksInstance(), + "aws_opsworks_user_profile": resourceAwsOpsworksUserProfile(), + "aws_opsworks_permission": resourceAwsOpsworksPermission(), + "aws_opsworks_rds_db_instance": resourceAwsOpsworksRdsDbInstance(), + "aws_organizations_organization": resourceAwsOrganizationsOrganization(), + "aws_organizations_account": resourceAwsOrganizationsAccount(), + "aws_organizations_policy": resourceAwsOrganizationsPolicy(), + "aws_organizations_policy_attachment": resourceAwsOrganizationsPolicyAttachment(), + "aws_organizations_organizational_unit": resourceAwsOrganizationsOrganizationalUnit(), + "aws_placement_group": resourceAwsPlacementGroup(), + "aws_proxy_protocol_policy": resourceAwsProxyProtocolPolicy(), + "aws_qldb_ledger": resourceAwsQLDBLedger(), + "aws_quicksight_group": resourceAwsQuickSightGroup(), + "aws_quicksight_user": resourceAwsQuickSightUser(), + "aws_ram_principal_association": resourceAwsRamPrincipalAssociation(), + "aws_ram_resource_association": resourceAwsRamResourceAssociation(), + "aws_ram_resource_share": resourceAwsRamResourceShare(), + "aws_ram_resource_share_accepter": resourceAwsRamResourceShareAccepter(), + "aws_rds_cluster": resourceAwsRDSCluster(), + "aws_rds_cluster_endpoint": resourceAwsRDSClusterEndpoint(), + "aws_rds_cluster_instance": resourceAwsRDSClusterInstance(), + "aws_rds_cluster_parameter_group": resourceAwsRDSClusterParameterGroup(), + "aws_rds_global_cluster": resourceAwsRDSGlobalCluster(), + "aws_redshift_cluster": resourceAwsRedshiftCluster(), + "aws_redshift_security_group": resourceAwsRedshiftSecurityGroup(), + "aws_redshift_parameter_group": resourceAwsRedshiftParameterGroup(), + "aws_redshift_subnet_group": resourceAwsRedshiftSubnetGroup(), + "aws_redshift_snapshot_copy_grant": resourceAwsRedshiftSnapshotCopyGrant(), + "aws_redshift_snapshot_schedule": resourceAwsRedshiftSnapshotSchedule(), + "aws_redshift_snapshot_schedule_association": resourceAwsRedshiftSnapshotScheduleAssociation(), + "aws_redshift_event_subscription": resourceAwsRedshiftEventSubscription(), + "aws_resourcegroups_group": resourceAwsResourceGroupsGroup(), + "aws_route53_delegation_set": resourceAwsRoute53DelegationSet(), + "aws_route53_query_log": resourceAwsRoute53QueryLog(), + "aws_route53_record": resourceAwsRoute53Record(), + "aws_route53_zone_association": resourceAwsRoute53ZoneAssociation(), + "aws_route53_vpc_association_authorization": resourceAwsRoute53VPCAssociationAuthorization(), + "aws_route53_zone": resourceAwsRoute53Zone(), + "aws_route53_health_check": resourceAwsRoute53HealthCheck(), + "aws_route53_resolver_endpoint": resourceAwsRoute53ResolverEndpoint(), + "aws_route53_resolver_rule_association": resourceAwsRoute53ResolverRuleAssociation(), + "aws_route53_resolver_rule": resourceAwsRoute53ResolverRule(), + "aws_route": resourceAwsRoute(), + "aws_route_table": resourceAwsRouteTable(), + "aws_default_route_table": resourceAwsDefaultRouteTable(), + "aws_route_table_association": resourceAwsRouteTableAssociation(), + "aws_sagemaker_model": resourceAwsSagemakerModel(), + "aws_sagemaker_endpoint_configuration": resourceAwsSagemakerEndpointConfiguration(), + "aws_sagemaker_endpoint": resourceAwsSagemakerEndpoint(), + "aws_sagemaker_notebook_instance_lifecycle_configuration": resourceAwsSagemakerNotebookInstanceLifeCycleConfiguration(), + "aws_sagemaker_notebook_instance": resourceAwsSagemakerNotebookInstance(), + "aws_secretsmanager_secret": resourceAwsSecretsManagerSecret(), + "aws_secretsmanager_secret_version": resourceAwsSecretsManagerSecretVersion(), + "aws_secretsmanager_secret_rotation": resourceAwsSecretsManagerSecretRotation(), + "aws_ses_active_receipt_rule_set": resourceAwsSesActiveReceiptRuleSet(), + "aws_ses_domain_identity": resourceAwsSesDomainIdentity(), + "aws_ses_domain_identity_verification": resourceAwsSesDomainIdentityVerification(), + "aws_ses_domain_dkim": resourceAwsSesDomainDkim(), + "aws_ses_domain_mail_from": resourceAwsSesDomainMailFrom(), + "aws_ses_email_identity": resourceAwsSesEmailIdentity(), + "aws_ses_identity_policy": resourceAwsSesIdentityPolicy(), + "aws_ses_receipt_filter": resourceAwsSesReceiptFilter(), + "aws_ses_receipt_rule": resourceAwsSesReceiptRule(), + "aws_ses_receipt_rule_set": resourceAwsSesReceiptRuleSet(), + "aws_ses_configuration_set": resourceAwsSesConfigurationSet(), + "aws_ses_event_destination": resourceAwsSesEventDestination(), + "aws_ses_identity_notification_topic": resourceAwsSesNotificationTopic(), + "aws_ses_template": resourceAwsSesTemplate(), + "aws_s3_access_point": resourceAwsS3AccessPoint(), + "aws_s3_account_public_access_block": resourceAwsS3AccountPublicAccessBlock(), + "aws_s3_bucket": resourceAwsS3Bucket(), + "aws_s3_bucket_analytics_configuration": resourceAwsS3BucketAnalyticsConfiguration(), + "aws_s3_bucket_policy": resourceAwsS3BucketPolicy(), + "aws_s3_bucket_public_access_block": resourceAwsS3BucketPublicAccessBlock(), + "aws_s3_bucket_object": resourceAwsS3BucketObject(), + "aws_s3_bucket_notification": resourceAwsS3BucketNotification(), + "aws_s3_bucket_metric": resourceAwsS3BucketMetric(), + "aws_s3_bucket_inventory": resourceAwsS3BucketInventory(), + "aws_security_group": resourceAwsSecurityGroup(), + "aws_network_interface_sg_attachment": resourceAwsNetworkInterfaceSGAttachment(), + "aws_default_security_group": resourceAwsDefaultSecurityGroup(), + "aws_security_group_rule": resourceAwsSecurityGroupRule(), + "aws_securityhub_account": resourceAwsSecurityHubAccount(), + "aws_securityhub_member": resourceAwsSecurityHubMember(), + "aws_securityhub_product_subscription": resourceAwsSecurityHubProductSubscription(), + "aws_securityhub_standards_subscription": resourceAwsSecurityHubStandardsSubscription(), + "aws_servicecatalog_portfolio": resourceAwsServiceCatalogPortfolio(), + "aws_service_discovery_http_namespace": resourceAwsServiceDiscoveryHttpNamespace(), + "aws_service_discovery_private_dns_namespace": resourceAwsServiceDiscoveryPrivateDnsNamespace(), + "aws_service_discovery_public_dns_namespace": resourceAwsServiceDiscoveryPublicDnsNamespace(), + "aws_service_discovery_service": resourceAwsServiceDiscoveryService(), + "aws_servicequotas_service_quota": resourceAwsServiceQuotasServiceQuota(), + "aws_shield_protection": resourceAwsShieldProtection(), + "aws_simpledb_domain": resourceAwsSimpleDBDomain(), + "aws_ssm_activation": resourceAwsSsmActivation(), + "aws_ssm_association": resourceAwsSsmAssociation(), + "aws_ssm_document": resourceAwsSsmDocument(), + "aws_ssm_maintenance_window": resourceAwsSsmMaintenanceWindow(), + "aws_ssm_maintenance_window_target": resourceAwsSsmMaintenanceWindowTarget(), + "aws_ssm_maintenance_window_task": resourceAwsSsmMaintenanceWindowTask(), + "aws_ssm_patch_baseline": resourceAwsSsmPatchBaseline(), + "aws_ssm_patch_group": resourceAwsSsmPatchGroup(), + "aws_ssm_parameter": resourceAwsSsmParameter(), + "aws_ssm_resource_data_sync": resourceAwsSsmResourceDataSync(), + "aws_storagegateway_cache": resourceAwsStorageGatewayCache(), + "aws_storagegateway_cached_iscsi_volume": resourceAwsStorageGatewayCachedIscsiVolume(), + "aws_storagegateway_gateway": resourceAwsStorageGatewayGateway(), + "aws_storagegateway_nfs_file_share": resourceAwsStorageGatewayNfsFileShare(), + "aws_storagegateway_smb_file_share": resourceAwsStorageGatewaySmbFileShare(), + "aws_storagegateway_upload_buffer": resourceAwsStorageGatewayUploadBuffer(), + "aws_storagegateway_working_storage": resourceAwsStorageGatewayWorkingStorage(), + "aws_spot_datafeed_subscription": resourceAwsSpotDataFeedSubscription(), + "aws_spot_instance_request": resourceAwsSpotInstanceRequest(), + "aws_spot_fleet_request": resourceAwsSpotFleetRequest(), + "aws_sqs_queue": resourceAwsSqsQueue(), + "aws_sqs_queue_policy": resourceAwsSqsQueuePolicy(), + "aws_snapshot_create_volume_permission": resourceAwsSnapshotCreateVolumePermission(), + "aws_sns_platform_application": resourceAwsSnsPlatformApplication(), + "aws_sns_sms_preferences": resourceAwsSnsSmsPreferences(), + "aws_sns_topic": resourceAwsSnsTopic(), + "aws_sns_topic_policy": resourceAwsSnsTopicPolicy(), + "aws_sns_topic_subscription": resourceAwsSnsTopicSubscription(), + "aws_sfn_activity": resourceAwsSfnActivity(), + "aws_sfn_state_machine": resourceAwsSfnStateMachine(), + "aws_default_subnet": resourceAwsDefaultSubnet(), + "aws_subnet": resourceAwsSubnet(), + "aws_swf_domain": resourceAwsSwfDomain(), + "aws_transfer_server": resourceAwsTransferServer(), + "aws_transfer_ssh_key": resourceAwsTransferSshKey(), + "aws_transfer_user": resourceAwsTransferUser(), + "aws_volume_attachment": resourceAwsVolumeAttachment(), + "aws_vpc_dhcp_options_association": resourceAwsVpcDhcpOptionsAssociation(), + "aws_default_vpc_dhcp_options": resourceAwsDefaultVpcDhcpOptions(), + "aws_vpc_dhcp_options": resourceAwsVpcDhcpOptions(), + "aws_vpc_peering_connection": resourceAwsVpcPeeringConnection(), + "aws_vpc_peering_connection_accepter": resourceAwsVpcPeeringConnectionAccepter(), + "aws_vpc_peering_connection_options": resourceAwsVpcPeeringConnectionOptions(), + "aws_default_vpc": resourceAwsDefaultVpc(), + "aws_vpc": resourceAwsVpc(), + "aws_vpc_endpoint": resourceAwsVpcEndpoint(), + "aws_vpc_endpoint_connection_notification": resourceAwsVpcEndpointConnectionNotification(), + "aws_vpc_endpoint_route_table_association": resourceAwsVpcEndpointRouteTableAssociation(), + "aws_vpc_endpoint_subnet_association": resourceAwsVpcEndpointSubnetAssociation(), + "aws_vpc_endpoint_service": resourceAwsVpcEndpointService(), + "aws_vpc_endpoint_service_allowed_principal": resourceAwsVpcEndpointServiceAllowedPrincipal(), + "aws_vpc_ipv4_cidr_block_association": resourceAwsVpcIpv4CidrBlockAssociation(), + "aws_vpn_connection": resourceAwsVpnConnection(), + "aws_vpn_connection_route": resourceAwsVpnConnectionRoute(), + "aws_vpn_gateway": resourceAwsVpnGateway(), + "aws_vpn_gateway_attachment": resourceAwsVpnGatewayAttachment(), + "aws_vpn_gateway_route_propagation": resourceAwsVpnGatewayRoutePropagation(), + "aws_waf_byte_match_set": resourceAwsWafByteMatchSet(), + "aws_waf_ipset": resourceAwsWafIPSet(), + "aws_waf_rate_based_rule": resourceAwsWafRateBasedRule(), + "aws_waf_regex_match_set": resourceAwsWafRegexMatchSet(), + "aws_waf_regex_pattern_set": resourceAwsWafRegexPatternSet(), + "aws_waf_rule": resourceAwsWafRule(), + "aws_waf_rule_group": resourceAwsWafRuleGroup(), + "aws_waf_size_constraint_set": resourceAwsWafSizeConstraintSet(), + "aws_waf_web_acl": resourceAwsWafWebAcl(), + "aws_waf_xss_match_set": resourceAwsWafXssMatchSet(), + "aws_waf_sql_injection_match_set": resourceAwsWafSqlInjectionMatchSet(), + "aws_waf_geo_match_set": resourceAwsWafGeoMatchSet(), + "aws_wafregional_byte_match_set": resourceAwsWafRegionalByteMatchSet(), + "aws_wafregional_geo_match_set": resourceAwsWafRegionalGeoMatchSet(), + "aws_wafregional_ipset": resourceAwsWafRegionalIPSet(), + "aws_wafregional_rate_based_rule": resourceAwsWafRegionalRateBasedRule(), + "aws_wafregional_regex_match_set": resourceAwsWafRegionalRegexMatchSet(), + "aws_wafregional_regex_pattern_set": resourceAwsWafRegionalRegexPatternSet(), + "aws_wafregional_rule": resourceAwsWafRegionalRule(), + "aws_wafregional_rule_group": resourceAwsWafRegionalRuleGroup(), + "aws_wafregional_size_constraint_set": resourceAwsWafRegionalSizeConstraintSet(), + "aws_wafregional_sql_injection_match_set": resourceAwsWafRegionalSqlInjectionMatchSet(), + "aws_wafregional_xss_match_set": resourceAwsWafRegionalXssMatchSet(), + "aws_wafregional_web_acl": resourceAwsWafRegionalWebAcl(), + "aws_wafregional_web_acl_association": resourceAwsWafRegionalWebAclAssociation(), + "aws_wafv2_ip_set": resourceAwsWafv2IPSet(), + "aws_wafv2_regex_pattern_set": resourceAwsWafv2RegexPatternSet(), + "aws_wafv2_rule_group": resourceAwsWafv2RuleGroup(), + "aws_wafv2_web_acl": resourceAwsWafv2WebACL(), + "aws_wafv2_web_acl_association": resourceAwsWafv2WebACLAssociation(), + "aws_wafv2_web_acl_logging_configuration": resourceAwsWafv2WebACLLoggingConfiguration(), + "aws_worklink_fleet": resourceAwsWorkLinkFleet(), + "aws_worklink_website_certificate_authority_association": resourceAwsWorkLinkWebsiteCertificateAuthorityAssociation(), + "aws_workspaces_directory": resourceAwsWorkspacesDirectory(), + "aws_workspaces_workspace": resourceAwsWorkspacesWorkspace(), + "aws_batch_compute_environment": resourceAwsBatchComputeEnvironment(), + "aws_batch_job_definition": resourceAwsBatchJobDefinition(), + "aws_batch_job_queue": resourceAwsBatchJobQueue(), + "aws_pinpoint_app": resourceAwsPinpointApp(), + "aws_pinpoint_adm_channel": resourceAwsPinpointADMChannel(), + "aws_pinpoint_apns_channel": resourceAwsPinpointAPNSChannel(), + "aws_pinpoint_apns_sandbox_channel": resourceAwsPinpointAPNSSandboxChannel(), + "aws_pinpoint_apns_voip_channel": resourceAwsPinpointAPNSVoipChannel(), + "aws_pinpoint_apns_voip_sandbox_channel": resourceAwsPinpointAPNSVoipSandboxChannel(), + "aws_pinpoint_baidu_channel": resourceAwsPinpointBaiduChannel(), + "aws_pinpoint_email_channel": resourceAwsPinpointEmailChannel(), + "aws_pinpoint_event_stream": resourceAwsPinpointEventStream(), + "aws_pinpoint_gcm_channel": resourceAwsPinpointGCMChannel(), + "aws_pinpoint_sms_channel": resourceAwsPinpointSMSChannel(), + "aws_xray_sampling_rule": resourceAwsXraySamplingRule(), + "aws_workspaces_ip_group": resourceAwsWorkspacesIpGroup(), + + // ALBs are actually LBs because they can be type `network` or `application` + // To avoid regressions, we will add a new resource for each and they both point + // back to the old ALB version. IF the Terraform supported aliases for resources + // this would be a whole lot simpler + "aws_alb": resourceAwsLb(), + "aws_lb": resourceAwsLb(), + "aws_alb_listener": resourceAwsLbListener(), + "aws_lb_listener": resourceAwsLbListener(), + "aws_alb_listener_certificate": resourceAwsLbListenerCertificate(), + "aws_lb_listener_certificate": resourceAwsLbListenerCertificate(), + "aws_alb_listener_rule": resourceAwsLbbListenerRule(), + "aws_lb_listener_rule": resourceAwsLbbListenerRule(), + "aws_alb_target_group": resourceAwsLbTargetGroup(), + "aws_lb_target_group": resourceAwsLbTargetGroup(), + "aws_alb_target_group_attachment": resourceAwsLbTargetGroupAttachment(), + "aws_lb_target_group_attachment": resourceAwsLbTargetGroupAttachment(), + }, + } + + provider.ConfigureFunc = func(d *schema.ResourceData) (interface{}, error) { + terraformVersion := provider.TerraformVersion + if terraformVersion == "" { + // Terraform 0.12 introduced this field to the protocol + // We can therefore assume that if it's missing it's 0.10 or 0.11 + terraformVersion = "0.11+compatible" + } + return providerConfigure(d, terraformVersion) + } + + return provider +} + +var descriptions map[string]string +var endpointServiceNames []string + +func init() { + descriptions = map[string]string{ + "region": "The region where AWS operations will take place. Examples\n" + + "are us-east-1, us-west-2, etc.", + + "access_key": "The access key for API operations. You can retrieve this\n" + + "from the 'Security & Credentials' section of the AWS console.", + + "secret_key": "The secret key for API operations. You can retrieve this\n" + + "from the 'Security & Credentials' section of the AWS console.", + + "profile": "The profile for API operations. If not set, the default profile\n" + + "created with `aws configure` will be used.", + + "shared_credentials_file": "The path to the shared credentials file. If not set\n" + + "this defaults to ~/.aws/credentials.", + + "token": "session token. A session token is only required if you are\n" + + "using temporary security credentials.", + + "max_retries": "The maximum number of times an AWS API request is\n" + + "being executed. If the API request still fails, an error is\n" + + "thrown.", + + "endpoint": "Use this to override the default service endpoint URL", + + "insecure": "Explicitly allow the provider to perform \"insecure\" SSL requests. If omitted," + + "default value is `false`", + + "skip_credentials_validation": "Skip the credentials validation via STS API. " + + "Used for AWS API implementations that do not have STS available/implemented.", + + "skip_get_ec2_platforms": "Skip getting the supported EC2 platforms. " + + "Used by users that don't have ec2:DescribeAccountAttributes permissions.", + + "skip_region_validation": "Skip static validation of region name. " + + "Used by users of alternative AWS-like APIs or users w/ access to regions that are not public (yet).", + + "skip_requesting_account_id": "Skip requesting the account ID. " + + "Used for AWS API implementations that do not have IAM/STS API and/or metadata API.", + + "skip_medatadata_api_check": "Skip the AWS Metadata API check. " + + "Used for AWS API implementations that do not have a metadata api endpoint.", + + "s3_force_path_style": "Set this to true to force the request to use path-style addressing,\n" + + "i.e., http://s3.amazonaws.com/BUCKET/KEY. By default, the S3 client will\n" + + "use virtual hosted bucket addressing when possible\n" + + "(http://BUCKET.s3.amazonaws.com/KEY). Specific to the Amazon S3 service.", + } + + endpointServiceNames = []string{ + "accessanalyzer", + "acm", + "acmpca", + "amplify", + "apigateway", + "applicationautoscaling", + "applicationinsights", + "appmesh", + "appstream", + "appsync", + "athena", + "autoscaling", + "autoscalingplans", + "backup", + "batch", + "budgets", + "cloud9", + "cloudformation", + "cloudfront", + "cloudhsm", + "cloudsearch", + "cloudtrail", + "cloudwatch", + "cloudwatchevents", + "cloudwatchlogs", + "codeartifact", + "codebuild", + "codecommit", + "codedeploy", + "codepipeline", + "cognitoidentity", + "cognitoidp", + "configservice", + "cur", + "dataexchange", + "datapipeline", + "datasync", + "dax", + "devicefarm", + "directconnect", + "dlm", + "dms", + "docdb", + "ds", + "dynamodb", + "ec2", + "ecr", + "ecs", + "efs", + "eks", + "elasticache", + "elasticbeanstalk", + "elastictranscoder", + "elb", + "emr", + "es", + "firehose", + "fms", + "forecast", + "fsx", + "gamelift", + "glacier", + "globalaccelerator", + "glue", + "greengrass", + "guardduty", + "iam", + "imagebuilder", + "inspector", + "iot", + "iotanalytics", + "iotevents", + "kafka", + "kinesis", + "kinesisanalytics", + "kinesisanalyticsv2", + "kinesisvideo", + "kms", + "lakeformation", + "lambda", + "lexmodels", + "licensemanager", + "lightsail", + "macie", + "managedblockchain", + "marketplacecatalog", + "mediaconnect", + "mediaconvert", + "medialive", + "mediapackage", + "mediastore", + "mediastoredata", + "mq", + "neptune", + "networkmanager", + "opsworks", + "organizations", + "outposts", + "personalize", + "pinpoint", + "pricing", + "qldb", + "quicksight", + "ram", + "rds", + "redshift", + "resourcegroups", + "resourcegroupstaggingapi", + "route53", + "route53domains", + "route53resolver", + "s3", + "s3control", + "sagemaker", + "sdb", + "secretsmanager", + "securityhub", + "serverlessrepo", + "servicecatalog", + "servicediscovery", + "servicequotas", + "ses", + "shield", + "sns", + "sqs", + "ssm", + "stepfunctions", + "storagegateway", + "sts", + "swf", + "synthetics", + "transfer", + "waf", + "wafregional", + "wafv2", + "worklink", + "workmail", + "workspaces", + "xray", + } +} + +func providerConfigure(d *schema.ResourceData, terraformVersion string) (interface{}, error) { + config := Config{ + AccessKey: d.Get("access_key").(string), + SecretKey: d.Get("secret_key").(string), + Profile: d.Get("profile").(string), + Token: d.Get("token").(string), + Region: d.Get("region").(string), + CredsFilename: d.Get("shared_credentials_file").(string), + Endpoints: make(map[string]string), + MaxRetries: d.Get("max_retries").(int), + IgnoreTagsConfig: expandProviderIgnoreTags(d.Get("ignore_tags").([]interface{})), + Insecure: d.Get("insecure").(bool), + SkipCredsValidation: d.Get("skip_credentials_validation").(bool), + SkipGetEC2Platforms: d.Get("skip_get_ec2_platforms").(bool), + SkipRegionValidation: d.Get("skip_region_validation").(bool), + SkipRequestingAccountId: d.Get("skip_requesting_account_id").(bool), + SkipMetadataApiCheck: d.Get("skip_metadata_api_check").(bool), + S3ForcePathStyle: d.Get("s3_force_path_style").(bool), + terraformVersion: terraformVersion, + } + + if l, ok := d.Get("assume_role").([]interface{}); ok && len(l) > 0 && l[0] != nil { + m := l[0].(map[string]interface{}) + + if v, ok := m["duration_seconds"].(int); ok && v != 0 { + config.AssumeRoleDurationSeconds = v + } + + if v, ok := m["external_id"].(string); ok && v != "" { + config.AssumeRoleExternalID = v + } + + if v, ok := m["policy"].(string); ok && v != "" { + config.AssumeRolePolicy = v + } + + if policyARNSet, ok := m["policy_arns"].(*schema.Set); ok && policyARNSet.Len() > 0 { + for _, policyARNRaw := range policyARNSet.List() { + policyARN, ok := policyARNRaw.(string) + + if !ok { + continue + } + + config.AssumeRolePolicyARNs = append(config.AssumeRolePolicyARNs, policyARN) + } + } + + if v, ok := m["role_arn"].(string); ok && v != "" { + config.AssumeRoleARN = v + } + + if v, ok := m["session_name"].(string); ok && v != "" { + config.AssumeRoleSessionName = v + } + + if tagMapRaw, ok := m["tags"].(map[string]interface{}); ok && len(tagMapRaw) > 0 { + config.AssumeRoleTags = make(map[string]string) + + for k, vRaw := range tagMapRaw { + v, ok := vRaw.(string) + + if !ok { + continue + } + + config.AssumeRoleTags[k] = v + } + } + + if transitiveTagKeySet, ok := m["transitive_tag_keys"].(*schema.Set); ok && transitiveTagKeySet.Len() > 0 { + for _, transitiveTagKeyRaw := range transitiveTagKeySet.List() { + transitiveTagKey, ok := transitiveTagKeyRaw.(string) + + if !ok { + continue + } + + config.AssumeRoleTransitiveTagKeys = append(config.AssumeRoleTransitiveTagKeys, transitiveTagKey) + } + } + + log.Printf("[INFO] assume_role configuration set: (ARN: %q, SessionID: %q, ExternalID: %q)", config.AssumeRoleARN, config.AssumeRoleSessionName, config.AssumeRoleExternalID) + } + + endpointsSet := d.Get("endpoints").(*schema.Set) + + for _, endpointsSetI := range endpointsSet.List() { + endpoints := endpointsSetI.(map[string]interface{}) + for _, endpointServiceName := range endpointServiceNames { + config.Endpoints[endpointServiceName] = endpoints[endpointServiceName].(string) + } + } + + if v, ok := d.GetOk("allowed_account_ids"); ok { + for _, accountIDRaw := range v.(*schema.Set).List() { + config.AllowedAccountIds = append(config.AllowedAccountIds, accountIDRaw.(string)) + } + } + + if v, ok := d.GetOk("forbidden_account_ids"); ok { + for _, accountIDRaw := range v.(*schema.Set).List() { + config.ForbiddenAccountIds = append(config.ForbiddenAccountIds, accountIDRaw.(string)) + } + } + + return config.Client() +} + +// This is a global MutexKV for use within this plugin. +var awsMutexKV = mutexkv.NewMutexKV() + +func assumeRoleSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "duration_seconds": { + Type: schema.TypeInt, + Optional: true, + Description: "Seconds to restrict the assume role session duration.", + }, + "external_id": { + Type: schema.TypeString, + Optional: true, + Description: "Unique identifier that might be required for assuming a role in another account.", + }, + "policy": { + Type: schema.TypeString, + Optional: true, + Description: "IAM Policy JSON describing further restricting permissions for the IAM Role being assumed.", + }, + "policy_arns": { + Type: schema.TypeSet, + Optional: true, + Description: "Amazon Resource Names (ARNs) of IAM Policies describing further restricting permissions for the IAM Role being assumed.", + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "role_arn": { + Type: schema.TypeString, + Optional: true, + Description: "Amazon Resource Name of an IAM Role to assume prior to making API calls.", + }, + "session_name": { + Type: schema.TypeString, + Optional: true, + Description: "Identifier for the assumed role session.", + }, + "tags": { + Type: schema.TypeMap, + Optional: true, + Description: "Assume role session tags.", + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "transitive_tag_keys": { + Type: schema.TypeSet, + Optional: true, + Description: "Assume role session tag keys to pass to any subsequent sessions.", + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + } +} + +func endpointsSchema() *schema.Schema { + endpointsAttributes := make(map[string]*schema.Schema) + + for _, endpointServiceName := range endpointServiceNames { + endpointsAttributes[endpointServiceName] = &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Default: "", + Description: descriptions["endpoint"], + } + } + + return &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: endpointsAttributes, + }, + } +} + +func expandProviderIgnoreTags(l []interface{}) *keyvaluetags.IgnoreConfig { + if len(l) == 0 || l[0] == nil { + return nil + } + + ignoreConfig := &keyvaluetags.IgnoreConfig{} + m := l[0].(map[string]interface{}) + + if v, ok := m["keys"].(*schema.Set); ok { + ignoreConfig.Keys = keyvaluetags.New(v.List()) + } + + if v, ok := m["key_prefixes"].(*schema.Set); ok { + ignoreConfig.KeyPrefixes = keyvaluetags.New(v.List()) + } + + return ignoreConfig +} diff --git a/aws/resource_aws_imagebuilder_distribution_configuration.go b/aws/resource_aws_imagebuilder_distribution_configuration.go new file mode 100644 index 00000000000..339f6dd7f93 --- /dev/null +++ b/aws/resource_aws_imagebuilder_distribution_configuration.go @@ -0,0 +1,349 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" + "regexp" +) + +func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsImageBuilderDistributionConfigurationCreate, + Read: resourceAwsImageBuilderDistributionConfigurationRead, + Update: resourceAwsImageBuilderDistributionConfigurationUpdate, + Delete: resourceAwsImageBuilderDistributionConfigurationDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "date_created": { + Type: schema.TypeString, + Computed: true, + }, + "date_updated": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "distributions": { + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ami_distribution_configuration": { + Type: schema.TypeSet, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ami_tags": tagsSchema(), + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(0, 1024), + }, + "kms_key_id": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "launch_permission": { + Type: schema.TypeSet, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "user_groups": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + }, + "user_ids": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.All( + validation.StringLenBetween(0, 127), + validation.StringMatch(regexp.MustCompile(`^[-_A-Za-z0-9{][-_A-Za-z0-9\s:{}]+[-_A-Za-z0-9}]$`), "must contain only alphanumeric characters, periods, underscores, and hyphens"), + ), + }, + }, + }, + }, + "license_configuration_arn": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "region": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(0, 1024), + }, + }, + }, + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringLenBetween(1, 126), + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsImageBuilderDistributionConfigurationCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + input := &imagebuilder.CreateDistributionConfigurationInput{ + ClientToken: aws.String(resource.UniqueId()), + Name: aws.String(d.Get("name").(string)), + Distributions: expandAwsImageBuilderDistributions(d), + } + + if v, ok := d.GetOk("description"); ok { + input.SetDescription(v.(string)) + } + + if v, ok := d.GetOk("tags"); ok { + input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) + } + + log.Printf("[DEBUG] Creating DistributionConfiguration: %#v", input) + + resp, err := conn.CreateDistributionConfiguration(input) + if err != nil { + return fmt.Errorf("error creating DistributionConfiguration: %s", err) + } + + d.SetId(aws.StringValue(resp.DistributionConfigurationArn)) + + return resourceAwsImageBuilderDistributionConfigurationRead(d, meta) +} + +func resourceAwsImageBuilderDistributionConfigurationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetDistributionConfiguration(&imagebuilder.GetDistributionConfigurationInput{ + DistributionConfigurationArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] DistributionConfiguration (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading DistributionConfiguration (%s): %s", d.Id(), err) + } + + d.Set("arn", resp.DistributionConfiguration.Arn) + d.Set("date_created", resp.DistributionConfiguration.DateCreated) + d.Set("date_updated", resp.DistributionConfiguration.DateUpdated) + d.Set("description", resp.DistributionConfiguration.Description) + d.Set("distributions", flattenAwsImageBuilderDistributions(resp.DistributionConfiguration.Distributions)) + d.Set("name", resp.DistributionConfiguration.Name) + + tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for DistributionConfiguration (%s): %s", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsImageBuilderDistributionConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + upd := imagebuilder.UpdateDistributionConfigurationInput{ + DistributionConfigurationArn: aws.String(d.Id()), + Distributions: expandAwsImageBuilderDistributions(d), + } + + if description, ok := d.GetOk("description"); ok { + upd.Description = aws.String(description.(string)) + } + + if d.HasChange("tags") { + o, n := d.GetChange("tags") + if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { + return fmt.Errorf("error updating tags for DistributionConfiguration (%s): %s", d.Id(), err) + } + } + + _, err := conn.UpdateDistributionConfiguration(&upd) + if err != nil { + return fmt.Errorf("error updating Distribution Configuration (%s): %s", d.Id(), err) + } + + return resourceAwsImageBuilderDistributionConfigurationRead(d, meta) +} + +func resourceAwsImageBuilderDistributionConfigurationDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + _, err := conn.DeleteDistributionConfiguration(&imagebuilder.DeleteDistributionConfigurationInput{ + DistributionConfigurationArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Distribution Config (%s): %s", d.Id(), err) + } + + return nil +} + +func expandAwsImageBuilderDistributions(d *schema.ResourceData) []*imagebuilder.Distribution { + configs := d.Get("distributions").(*schema.Set).List() + + if len(configs) == 0 { + return nil + } + + distriblist := make([]*imagebuilder.Distribution, 0) + + for _, config := range configs { + distrib := expandAwsImageBuilderDistribution(config.(map[string]interface{})) + distriblist = append(distriblist, &distrib) + } + + return distriblist +} + +func flattenAwsImageBuilderDistributions(distribs []*imagebuilder.Distribution) []interface{} { + if distribs == nil { + return nil + } + + distriblist := []interface{}{} + + for _, dist := range distribs { + distrib := flattenAwsImageBuilderDistribution(dist) + distriblist = append(distriblist, distrib) + } + + return distriblist +} + +func expandAwsImageBuilderDistribution(data map[string]interface{}) imagebuilder.Distribution { + distrib := imagebuilder.Distribution{ + Region: aws.String(data["region"].(string)), + LicenseConfigurationArns: expandStringList(data["license_configuration_arn"].(*schema.Set).List()), + } + + if v, ok := data["ami_distribution_configuration"]; ok { + if len(v.(*schema.Set).List()) > 0 { + adc := v.(*schema.Set).List()[0].(map[string]interface{}) + + amidistconfig := imagebuilder.AmiDistributionConfiguration{ + Description: aws.String((adc["description"]).(string)), + Name: aws.String(adc["name"].(string)), + } + + if len(adc["kms_key_id"].(string)) != 0 { + amidistconfig.KmsKeyId = aws.String(adc["kms_key_id"].(string)) + } + + if len(adc["launch_permission"].(*schema.Set).List()) > 0 { + + lp := adc["launch_permission"].(*schema.Set).List()[0].(map[string]interface{}) + + launchperm := imagebuilder.LaunchPermissionConfiguration{ + UserGroups: aws.StringSlice(sIfTosString(lp["user_groups"].(*schema.Set).List())), + UserIds: aws.StringSlice(sIfTosString(lp["user_ids"].(*schema.Set).List())), + } + amidistconfig.LaunchPermission = &launchperm + } + + tags := adc["ami_tags"].(map[string]interface{}) + if len(tags) > 0 { + amitags := make(map[string]*string, len(tags)) + for k, v := range tags { + amitags[k] = aws.String(v.(string)) + } + amidistconfig.AmiTags = amitags + } + distrib.AmiDistributionConfiguration = &amidistconfig + } + } + + return distrib +} + +func flattenAwsImageBuilderDistribution(distribution *imagebuilder.Distribution) map[string]interface{} { + distrib := map[string]interface{}{} + + distrib["license_configuration_arn"] = schema.NewSet(schema.HashString, flattenStringList(distribution.LicenseConfigurationArns)) + distrib["region"] = *distribution.Region + + distribconf := make(map[string]interface{}) + if distribution.AmiDistributionConfiguration != nil { + distribconf["ami_tags"] = keyvaluetags.ImagebuilderKeyValueTags(distribution.AmiDistributionConfiguration.AmiTags) + distribconf["description"] = aws.String(*distribution.AmiDistributionConfiguration.Description) + distribconf["kms_key_id"] = distribution.AmiDistributionConfiguration.KmsKeyId + distribconf["name"] = distribution.AmiDistributionConfiguration.Name + + if distribution.AmiDistributionConfiguration.LaunchPermission != nil { + distribconf["launch_permission"] = []interface{}{ + map[string]interface{}{ + "user_ids": distribution.AmiDistributionConfiguration.LaunchPermission.UserIds, + "user_groups": distribution.AmiDistributionConfiguration.LaunchPermission.UserGroups, + }, + } + } + } + + distrib["ami_distribution_configuration"] = []interface{}{distribconf} + + return distrib +} + +func sIfTosString(in []interface{}) []string { + out := make([]string, len(in)) + for i, v := range in { + out[i] = fmt.Sprint(v) + } + + return out +} From eb8e1ed39555afd0af356848377d9f16bcc385fc Mon Sep 17 00:00:00 2001 From: Dogers Date: Tue, 25 Aug 2020 13:11:02 +0100 Subject: [PATCH 17/24] Add imagebuilder_image_pipeline --- ..._source_aws_imagebuilder_image_pipeline.go | 119 +++++++ aws/provider.go | 2 + ...esource_aws_imagebuilder_image_pipeline.go | 299 ++++++++++++++++++ 3 files changed, 420 insertions(+) create mode 100644 aws/data_source_aws_imagebuilder_image_pipeline.go create mode 100644 aws/resource_aws_imagebuilder_image_pipeline.go diff --git a/aws/data_source_aws_imagebuilder_image_pipeline.go b/aws/data_source_aws_imagebuilder_image_pipeline.go new file mode 100644 index 00000000000..8137d0ab149 --- /dev/null +++ b/aws/data_source_aws_imagebuilder_image_pipeline.go @@ -0,0 +1,119 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" +) + +func dataSourceAwsImageBuilderImagePipeline() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsImageBuilderImagePipelineRead, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Required: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "distribution_configuration_arn": { + Type: schema.TypeString, + Computed: true, + }, + "enhanced_image_metadata_enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "image_recipe_arn": { + Type: schema.TypeString, + Computed: true, + }, + "image_tests_configuration": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "image_tests_enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "timeout_minutes": { + Type: schema.TypeInt, + Computed: true, + }, + }, + }, + }, + "infrastructure_configuration_arn": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Computed: true, + }, + "platform": { + Type: schema.TypeString, + Computed: true, + }, + "schedule": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "pipeline_execution_start_condition": { + Type: schema.TypeString, + Computed: true, + }, + "schedule_expression": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "status": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchema(), + }, + } +} + +func dataSourceAwsImageBuilderImagePipelineRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetImagePipeline(&imagebuilder.GetImagePipelineInput{ + ImagePipelineArn: aws.String(d.Get("arn").(string)), + }) + + if err != nil { + return fmt.Errorf("error reading Image Pipeline (%s): %s", d.Id(), err) + } + + d.SetId(*resp.ImagePipeline.Arn) + d.Set("description", resp.ImagePipeline.Description) + d.Set("distribution_configuration_arn", resp.ImagePipeline.DistributionConfigurationArn) + d.Set("enhanced_image_metadata_enabled", resp.ImagePipeline.EnhancedImageMetadataEnabled) + d.Set("image_recipe_arn", resp.ImagePipeline.ImageRecipeArn) + d.Set("image_tests_configuration", flattenAwsImageBuilderTestConfiguration(resp.ImagePipeline.ImageTestsConfiguration)) + d.Set("infrastructure_configuration_arn", resp.ImagePipeline.InfrastructureConfigurationArn) + d.Set("name", resp.ImagePipeline.Name) + d.Set("platform", resp.ImagePipeline.Platform) + if resp.ImagePipeline.Schedule != nil { + d.Set("schedule", flattenAwsImageBuilderPipelineSchedule(resp.ImagePipeline.Schedule)) + } + d.Set("status", resp.ImagePipeline.Status) + + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.ImagePipeline.Tags).IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} diff --git a/aws/provider.go b/aws/provider.go index c0f6dd7b680..c4f3dca9e06 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -264,6 +264,7 @@ func Provider() *schema.Provider { "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), "aws_imagebuilder_distribution_configuration": datasourceAwsImageBuilderDistributionConfiguration(), "aws_imagebuilder_infrastructure_configuration": dataSourceAwsImageBuilderInfrastructureConfiguration(), + "aws_imagebuilder_image_pipeline": dataSourceAwsImageBuilderImagePipeline(), "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), @@ -662,6 +663,7 @@ func Provider() *schema.Provider { "aws_imagebuilder_distribution_configuration": resourceAwsImageBuilderDistributionConfiguration(), "aws_imagebuilder_infrastructure_configuration": resourceAwsImageBuilderInfrastructureConfiguration(), "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), + "aws_imagebuilder_image_pipeline": resourceAwsImageBuilderImagePipeline(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), diff --git a/aws/resource_aws_imagebuilder_image_pipeline.go b/aws/resource_aws_imagebuilder_image_pipeline.go new file mode 100644 index 00000000000..426a6b8d910 --- /dev/null +++ b/aws/resource_aws_imagebuilder_image_pipeline.go @@ -0,0 +1,299 @@ +package aws + +import ( + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" + "log" + "regexp" +) + +func resourceAwsImageBuilderImagePipeline() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsImageBuilderImagePipelineCreate, + Read: resourceAwsImageBuilderImagePipelineRead, + Update: resourceAwsImageBuilderImagePipelineUpdate, + Delete: resourceAwsImageBuilderImagePipelineDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "arn": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + "distribution_configuration_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringMatch(regexp.MustCompile("^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):distribution-configuration/[a-z0-9-_]+$"), "valid distribution configuration ARN must be provided"), + }, + "enhanced_image_metadata_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "image_recipe_arn": { + Type: schema.TypeString, + Required: true, + ForceNew: true, // this should be updatable, but recreating the recipe causes TF to error saying it's depended on by other resources, the pipeline + 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": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "image_tests_enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + "timeout_minutes": { + Type: schema.TypeInt, + Optional: true, + Default: 720, + ValidateFunc: validation.IntBetween(60, 1440), + }, + }, + }, + }, + "infrastructure_configuration_arn": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringMatch(regexp.MustCompile("^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):infrastructure-configuration/[a-z0-9-_]+$"), "valid infrastructure configuration ARN must be provided"), + }, + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.StringMatch(regexp.MustCompile("^[-_A-Za-z-0-9][-_A-Za-z0-9 ]{1,126}[-_A-Za-z-0-9]$"), "valid name must be provided"), + }, + "schedule": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "pipeline_execution_start_condition": { + Type: schema.TypeString, + Optional: true, + Default: "EXPRESSION_MATCH_ONLY", + ValidateFunc: validation.StringInSlice([]string{"EXPRESSION_MATCH_ONLY", "EXPRESSION_MATCH_AND_DEPENDENCY_UPDATES_AVAILABLE"}, false), + }, + "schedule_expression": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1024), + }, + }, + }, + }, + "status": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice([]string{"ENABLED", "DISABLED"}, false), + Default: "ENABLED", + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsImageBuilderImagePipelineCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + input := &imagebuilder.CreateImagePipelineInput{ + EnhancedImageMetadataEnabled: aws.Bool(d.Get("enhanced_image_metadata_enabled").(bool)), + ImageRecipeArn: aws.String(d.Get("image_recipe_arn").(string)), + InfrastructureConfigurationArn: aws.String(d.Get("infrastructure_configuration_arn").(string)), + Name: aws.String(d.Get("name").(string)), + Status: aws.String(d.Get("status").(string)), + } + + if v, ok := d.GetOk("description"); ok { + input.SetDescription(v.(string)) + } + + if v, ok := d.GetOk("distribution_configuration_arn"); ok { + input.SetDistributionConfigurationArn(v.(string)) + } + + if v, ok := d.GetOk("image_tests_configuration"); ok { + input.ImageTestsConfiguration = expandAwsImageBuilderTestConfiguration(v) + } + + if v, ok := d.GetOk("schedule"); ok { + input.Schedule = expandAwsImageBuilderPipelineSchedule(v) + } + + if v, ok := d.GetOk("tags"); ok { + input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) + } + + log.Printf("[DEBUG] Creating Image Pipeline: %#v", input) + + resp, err := conn.CreateImagePipeline(input) + if err != nil { + return fmt.Errorf("error creating Image Pipeline: %s", err) + } + + d.SetId(aws.StringValue(resp.ImagePipelineArn)) + + return resourceAwsImageBuilderImagePipelineRead(d, meta) +} + +func resourceAwsImageBuilderImagePipelineRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + resp, err := conn.GetImagePipeline(&imagebuilder.GetImagePipelineInput{ + ImagePipelineArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + log.Printf("[WARN] Image Pipeline (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return fmt.Errorf("error reading Image Pipeline (%s): %s", d.Id(), err) + } + + d.Set("arn", resp.ImagePipeline.Arn) + d.Set("description", resp.ImagePipeline.Description) + d.Set("distribution_configuration_arn", resp.ImagePipeline.DistributionConfigurationArn) + d.Set("enhanced_image_metadata_enabled", resp.ImagePipeline.EnhancedImageMetadataEnabled) + d.Set("image_recipe_arn", resp.ImagePipeline.ImageRecipeArn) + d.Set("image_tests_configuration", flattenAwsImageBuilderTestConfiguration(resp.ImagePipeline.ImageTestsConfiguration)) + d.Set("infrastructure_configuration_arn", resp.ImagePipeline.InfrastructureConfigurationArn) + d.Set("name", resp.ImagePipeline.Name) + // TODO: platform?? this isn't in create so why in read? auto field? + + if resp.ImagePipeline.Schedule != nil { + d.Set("schedule", flattenAwsImageBuilderPipelineSchedule(resp.ImagePipeline.Schedule)) + } + d.Set("status", resp.ImagePipeline.Status) + + tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) + if err != nil { + return fmt.Errorf("error listing tags for Image Pipeline (%s): %s", d.Id(), err) + } + if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { + return fmt.Errorf("error setting tags: %s", err) + } + + return nil +} + +func resourceAwsImageBuilderImagePipelineUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + input := &imagebuilder.UpdateImagePipelineInput{ + ImagePipelineArn: aws.String(d.Id()), + ImageRecipeArn: aws.String(d.Get("image_recipe_arn").(string)), + InfrastructureConfigurationArn: aws.String(d.Get("infrastructure_configuration_arn").(string)), + } + + if v, ok := d.GetOk("description"); ok { + input.Description = aws.String(v.(string)) + } + + if v, ok := d.GetOk("distribution_configuration_arn"); ok { + input.DistributionConfigurationArn = aws.String(v.(string)) + } + + if v, ok := d.GetOk("enhanced_image_metadata_enabled"); ok { + input.EnhancedImageMetadataEnabled = aws.Bool(v.(bool)) + } + + if d.HasChange("image_tests_configuration") { + input.ImageTestsConfiguration = expandAwsImageBuilderTestConfiguration(d.Get("image_tests_configuration")) + } + + if d.HasChange("schedule") { + input.Schedule = expandAwsImageBuilderPipelineSchedule(d.Get("schedule")) + } + + if v, ok := d.GetOk("status"); ok { + input.Status = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Updating Image Pipeline: %#v", input) + _, err := conn.UpdateImagePipeline(input) + if err != nil { + return fmt.Errorf("error updating Image Pipeline (%s): %s", d.Id(), err) + } + + return resourceAwsImageBuilderImagePipelineRead(d, meta) +} + +func resourceAwsImageBuilderImagePipelineDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).imagebuilderconn + + _, err := conn.DeleteImagePipeline(&imagebuilder.DeleteImagePipelineInput{ + ImagePipelineArn: aws.String(d.Id()), + }) + + if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + return nil + } + + if err != nil { + return fmt.Errorf("error deleting Image Pipeline (%s): %s", d.Id(), err) + } + + return nil +} + +func expandAwsImageBuilderTestConfiguration(d interface{}) *imagebuilder.ImageTestsConfiguration { + testconfig := d.([]interface{})[0].(map[string]interface{}) + + itc := &imagebuilder.ImageTestsConfiguration{ + ImageTestsEnabled: testconfig["image_tests_enabled"].(*bool), + TimeoutMinutes: testconfig["timeout_minutes"].(*int64), + } + + return itc +} + +func expandAwsImageBuilderPipelineSchedule(d interface{}) *imagebuilder.Schedule { + schedconfig := d.([]interface{})[0].(map[string]interface{}) + + ibsched := &imagebuilder.Schedule{ + PipelineExecutionStartCondition: schedconfig["pipeline_execution_start_condition"].(*string), + ScheduleExpression: schedconfig["schedule_expression"].(*string), + } + + return ibsched +} + +func flattenAwsImageBuilderTestConfiguration(configuration *imagebuilder.ImageTestsConfiguration) map[string]interface{} { + testconfig := make(map[string]interface{}) + + if configuration != nil { + testconfig["timeout_minutes"] = configuration.TimeoutMinutes + testconfig["image_tests_enabled"] = configuration.ImageTestsEnabled + } + + return testconfig +} + +func flattenAwsImageBuilderPipelineSchedule(schedule *imagebuilder.Schedule) map[string]interface{} { + schedconfig := make(map[string]interface{}, 2) + + schedconfig["schedule_expression"] = schedule.ScheduleExpression + schedconfig["pipeline_execution_start_condition"] = schedule.PipelineExecutionStartCondition + + return schedconfig +} From 0402fe72c833d53c29e0e995ad38eac6d280095c Mon Sep 17 00:00:00 2001 From: Bill Schneider Date: Fri, 28 Aug 2020 14:15:55 -0400 Subject: [PATCH 18/24] fixed some lint issues and fixed terminate_instance_on_failure not being set on create --- ...ata_source_aws_imagebuilder_image_pipeline.go | 2 +- ...ws_imagebuilder_distribution_configuration.go | 16 ++++++++-------- aws/resource_aws_imagebuilder_image_pipeline.go | 6 +++--- ..._imagebuilder_infrastructure_configuration.go | 3 +++ ...er_infrastructure_configuration.html.markdown | 2 ++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_image_pipeline.go b/aws/data_source_aws_imagebuilder_image_pipeline.go index 8137d0ab149..1d9adea6d71 100644 --- a/aws/data_source_aws_imagebuilder_image_pipeline.go +++ b/aws/data_source_aws_imagebuilder_image_pipeline.go @@ -58,7 +58,7 @@ func dataSourceAwsImageBuilderImagePipeline() *schema.Resource { Computed: true, }, "platform": { - Type: schema.TypeString, + Type: schema.TypeString, Computed: true, }, "schedule": { diff --git a/aws/resource_aws_imagebuilder_distribution_configuration.go b/aws/resource_aws_imagebuilder_distribution_configuration.go index 339f6dd7f93..428b16cb872 100644 --- a/aws/resource_aws_imagebuilder_distribution_configuration.go +++ b/aws/resource_aws_imagebuilder_distribution_configuration.go @@ -47,7 +47,7 @@ func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "ami_distribution_configuration": { - Type: schema.TypeSet, + Type: schema.TypeList, Required: true, MaxItems: 1, Elem: &schema.Resource{ @@ -55,7 +55,7 @@ func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { "ami_tags": tagsSchema(), "description": { Type: schema.TypeString, - Optional: true, + Required: true, ValidateFunc: validation.StringLenBetween(0, 1024), }, "kms_key_id": { @@ -64,7 +64,7 @@ func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 1024), }, "launch_permission": { - Type: schema.TypeSet, + Type: schema.TypeList, MaxItems: 1, Optional: true, Elem: &schema.Resource{ @@ -90,7 +90,7 @@ func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { }, "name": { Type: schema.TypeString, - Optional: true, + Required: true, ValidateFunc: validation.All( validation.StringLenBetween(0, 127), validation.StringMatch(regexp.MustCompile(`^[-_A-Za-z0-9{][-_A-Za-z0-9\s:{}]+[-_A-Za-z0-9}]$`), "must contain only alphanumeric characters, periods, underscores, and hyphens"), @@ -273,8 +273,8 @@ func expandAwsImageBuilderDistribution(data map[string]interface{}) imagebuilder } if v, ok := data["ami_distribution_configuration"]; ok { - if len(v.(*schema.Set).List()) > 0 { - adc := v.(*schema.Set).List()[0].(map[string]interface{}) + if len(v.([]interface{})) > 0 { + adc := v.([]interface{})[0].(map[string]interface{}) amidistconfig := imagebuilder.AmiDistributionConfiguration{ Description: aws.String((adc["description"]).(string)), @@ -285,9 +285,9 @@ func expandAwsImageBuilderDistribution(data map[string]interface{}) imagebuilder amidistconfig.KmsKeyId = aws.String(adc["kms_key_id"].(string)) } - if len(adc["launch_permission"].(*schema.Set).List()) > 0 { + if len(adc["launch_permission"].([]interface{})) > 0 { - lp := adc["launch_permission"].(*schema.Set).List()[0].(map[string]interface{}) + lp := adc["launch_permission"].([]interface{})[0].(map[string]interface{}) launchperm := imagebuilder.LaunchPermissionConfiguration{ UserGroups: aws.StringSlice(sIfTosString(lp["user_groups"].(*schema.Set).List())), diff --git a/aws/resource_aws_imagebuilder_image_pipeline.go b/aws/resource_aws_imagebuilder_image_pipeline.go index 426a6b8d910..836ead909ea 100644 --- a/aws/resource_aws_imagebuilder_image_pipeline.go +++ b/aws/resource_aws_imagebuilder_image_pipeline.go @@ -34,7 +34,7 @@ func resourceAwsImageBuilderImagePipeline() *schema.Resource { "distribution_configuration_arn": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.StringMatch(regexp.MustCompile("^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):distribution-configuration/[a-z0-9-_]+$"), "valid distribution configuration ARN must be provided"), + ValidateFunc: validation.StringMatch(regexp.MustCompile(`^arn:aws[^:]*:imagebuilder:[^:]+:(?:\d{12}|aws):distribution-configuration/[a-z0-9-_]+$`), "valid distribution configuration ARN must be provided"), }, "enhanced_image_metadata_enabled": { Type: schema.TypeBool, @@ -45,7 +45,7 @@ func resourceAwsImageBuilderImagePipeline() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, // this should be updatable, but recreating the recipe causes TF to error saying it's depended on by other resources, the pipeline - 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"), + 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": { Type: schema.TypeList, @@ -71,7 +71,7 @@ func resourceAwsImageBuilderImagePipeline() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.StringMatch(regexp.MustCompile("^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):infrastructure-configuration/[a-z0-9-_]+$"), "valid infrastructure configuration ARN must be provided"), + ValidateFunc: validation.StringMatch(regexp.MustCompile(`^arn:aws[^:]*:imagebuilder:[^:]+:(?:\d{12}|aws):infrastructure-configuration/[a-z0-9-_]+$`), "valid infrastructure configuration ARN must be provided"), }, "name": { Type: schema.TypeString, diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index ca0453b2149..83b990878b7 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -144,6 +144,9 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource if v, ok := d.GetOk("subnet_id"); ok { input.SetSubnetId(v.(string)) } + if v, ok := d.GetOk("terminate_instance_on_failure"); ok { + input.SetTerminateInstanceOnFailure(v.(bool)) + } if v, ok := d.GetOk("tags"); ok { input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) } diff --git a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown index a848ae8303f..1153dfe79d8 100644 --- a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown +++ b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown @@ -53,9 +53,11 @@ The following arguments are supported: ### Logging The logging object support the following blocks: + * s3_logs The s3_logs block supports the following arguments: + * `s3_bucket_name` - (Required) The name of the bucket to use. * `s3_key_prefix` - (Optional) The prefix to use for logs (Default: "/"). From a20d1206b12958525573365a709d96e9f600752d Mon Sep 17 00:00:00 2001 From: Bill Schneider Date: Fri, 28 Aug 2020 14:41:39 -0400 Subject: [PATCH 19/24] description can be updated in place --- aws/resource_aws_imagebuilder_component.go | 1 - aws/resource_aws_imagebuilder_distribution_configuration.go | 1 - aws/resource_aws_imagebuilder_recipe.go | 1 - 3 files changed, 3 deletions(-) diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go index 51467bb4423..197079a838d 100644 --- a/aws/resource_aws_imagebuilder_component.go +++ b/aws/resource_aws_imagebuilder_component.go @@ -43,7 +43,6 @@ func resourceAwsImageBuilderComponent() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 1024), }, "kms_key_id": { diff --git a/aws/resource_aws_imagebuilder_distribution_configuration.go b/aws/resource_aws_imagebuilder_distribution_configuration.go index 428b16cb872..e3c5671293d 100644 --- a/aws/resource_aws_imagebuilder_distribution_configuration.go +++ b/aws/resource_aws_imagebuilder_distribution_configuration.go @@ -38,7 +38,6 @@ func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 1024), }, "distributions": { diff --git a/aws/resource_aws_imagebuilder_recipe.go b/aws/resource_aws_imagebuilder_recipe.go index cd0638dc4c7..6da3b303ae3 100644 --- a/aws/resource_aws_imagebuilder_recipe.go +++ b/aws/resource_aws_imagebuilder_recipe.go @@ -123,7 +123,6 @@ func resourceAwsImageBuilderRecipe() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, - ForceNew: true, ValidateFunc: validation.StringLenBetween(1, 1024), }, "name": { From 0a7cf065a29639acf590dbe7bae18bfa0a76e512 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 12 Nov 2020 14:05:25 -0500 Subject: [PATCH 20/24] service/imagebuilder: Remove non-aws_imagebuilder_component files --- ...imagebuilder_distribution_configuration.go | 136 ------ ..._source_aws_imagebuilder_image_pipeline.go | 119 ------ ...agebuilder_infrastructure_configuration.go | 131 ------ ..._aws_imagebuilder_infrastructure_recipe.go | 144 ------- aws/provider.go | 8 - ...imagebuilder_distribution_configuration.go | 348 --------------- ...esource_aws_imagebuilder_image_pipeline.go | 299 ------------- ...agebuilder_infrastructure_configuration.go | 346 --------------- ...ilder_infrastructure_configuration_test.go | 355 ---------------- aws/resource_aws_imagebuilder_recipe.go | 400 ------------------ ...infrastructure_configuration.html.markdown | 79 ---- 11 files changed, 2365 deletions(-) delete mode 100644 aws/data_source_aws_imagebuilder_distribution_configuration.go delete mode 100644 aws/data_source_aws_imagebuilder_image_pipeline.go delete mode 100644 aws/data_source_aws_imagebuilder_infrastructure_configuration.go delete mode 100644 aws/data_source_aws_imagebuilder_infrastructure_recipe.go delete mode 100644 aws/resource_aws_imagebuilder_distribution_configuration.go delete mode 100644 aws/resource_aws_imagebuilder_image_pipeline.go delete mode 100644 aws/resource_aws_imagebuilder_infrastructure_configuration.go delete mode 100644 aws/resource_aws_imagebuilder_infrastructure_configuration_test.go delete mode 100644 aws/resource_aws_imagebuilder_recipe.go delete mode 100644 website/docs/r/imagebuilder_infrastructure_configuration.html.markdown diff --git a/aws/data_source_aws_imagebuilder_distribution_configuration.go b/aws/data_source_aws_imagebuilder_distribution_configuration.go deleted file mode 100644 index ff88afe968c..00000000000 --- a/aws/data_source_aws_imagebuilder_distribution_configuration.go +++ /dev/null @@ -1,136 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" -) - -func datasourceAwsImageBuilderDistributionConfiguration() *schema.Resource { - return &schema.Resource{ - Read: datasourceAwsImageBuilderDistributionConfigurationRead, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Required: true, - }, - "date_created": { - Type: schema.TypeString, - Computed: true, - }, - "date_updated": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Computed: true, - }, - "distributions": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ami_distribution_configuration": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ami_tags": tagsSchema(), - "description": { - Type: schema.TypeString, - Computed: true, - }, - "kms_key_id": { - Type: schema.TypeString, - Computed: true, - }, - "launch_permission": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "user_groups": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "user_ids": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "license_configuration_arn": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "region": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Computed: true, - }, - "tags": tagsSchemaComputed(), - }, - } -} - -func datasourceAwsImageBuilderDistributionConfigurationRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - resp, err := conn.GetDistributionConfiguration(&imagebuilder.GetDistributionConfigurationInput{ - DistributionConfigurationArn: aws.String(d.Get("arn").(string)), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] DistributionConfiguration (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } - - if err != nil { - return fmt.Errorf("error reading DistributionConfiguration (%s): %s", d.Id(), err) - } - - d.SetId(*resp.DistributionConfiguration.Arn) - d.Set("date_created", resp.DistributionConfiguration.DateCreated) - d.Set("date_updated", resp.DistributionConfiguration.DateUpdated) - d.Set("description", resp.DistributionConfiguration.Description) - d.Set("distributions", flattenAwsImageBuilderDistributions(resp.DistributionConfiguration.Distributions)) - d.Set("name", resp.DistributionConfiguration.Name) - - if err != nil { - return fmt.Errorf("error listing tags for DistributionConfiguration (%s): %s", d.Id(), err) - } - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.DistributionConfiguration.Tags).IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} diff --git a/aws/data_source_aws_imagebuilder_image_pipeline.go b/aws/data_source_aws_imagebuilder_image_pipeline.go deleted file mode 100644 index 1d9adea6d71..00000000000 --- a/aws/data_source_aws_imagebuilder_image_pipeline.go +++ /dev/null @@ -1,119 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" -) - -func dataSourceAwsImageBuilderImagePipeline() *schema.Resource { - return &schema.Resource{ - Read: dataSourceAwsImageBuilderImagePipelineRead, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Required: true, - }, - "description": { - Type: schema.TypeString, - Computed: true, - }, - "distribution_configuration_arn": { - Type: schema.TypeString, - Computed: true, - }, - "enhanced_image_metadata_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - "image_recipe_arn": { - Type: schema.TypeString, - Computed: true, - }, - "image_tests_configuration": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "image_tests_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - "timeout_minutes": { - Type: schema.TypeInt, - Computed: true, - }, - }, - }, - }, - "infrastructure_configuration_arn": { - Type: schema.TypeString, - Computed: true, - }, - "name": { - Type: schema.TypeString, - Computed: true, - }, - "platform": { - Type: schema.TypeString, - Computed: true, - }, - "schedule": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "pipeline_execution_start_condition": { - Type: schema.TypeString, - Computed: true, - }, - "schedule_expression": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "status": { - Type: schema.TypeString, - Computed: true, - }, - "tags": tagsSchema(), - }, - } -} - -func dataSourceAwsImageBuilderImagePipelineRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - resp, err := conn.GetImagePipeline(&imagebuilder.GetImagePipelineInput{ - ImagePipelineArn: aws.String(d.Get("arn").(string)), - }) - - if err != nil { - return fmt.Errorf("error reading Image Pipeline (%s): %s", d.Id(), err) - } - - d.SetId(*resp.ImagePipeline.Arn) - d.Set("description", resp.ImagePipeline.Description) - d.Set("distribution_configuration_arn", resp.ImagePipeline.DistributionConfigurationArn) - d.Set("enhanced_image_metadata_enabled", resp.ImagePipeline.EnhancedImageMetadataEnabled) - d.Set("image_recipe_arn", resp.ImagePipeline.ImageRecipeArn) - d.Set("image_tests_configuration", flattenAwsImageBuilderTestConfiguration(resp.ImagePipeline.ImageTestsConfiguration)) - d.Set("infrastructure_configuration_arn", resp.ImagePipeline.InfrastructureConfigurationArn) - d.Set("name", resp.ImagePipeline.Name) - d.Set("platform", resp.ImagePipeline.Platform) - if resp.ImagePipeline.Schedule != nil { - d.Set("schedule", flattenAwsImageBuilderPipelineSchedule(resp.ImagePipeline.Schedule)) - } - d.Set("status", resp.ImagePipeline.Status) - - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.ImagePipeline.Tags).IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} diff --git a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go b/aws/data_source_aws_imagebuilder_infrastructure_configuration.go deleted file mode 100644 index 68d19207394..00000000000 --- a/aws/data_source_aws_imagebuilder_infrastructure_configuration.go +++ /dev/null @@ -1,131 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" -) - -func dataSourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { - return &schema.Resource{ - Read: dataSourceAwsImageBuilderInfrastructureConfigurationRead, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Required: true, - }, - "datecreated": { - Type: schema.TypeString, - Computed: true, - }, - "dateupdated": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Computed: true, - }, - "instance_profile_name": { - Type: schema.TypeString, - Computed: true, - }, - "instance_types": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "key_pair": { - Type: schema.TypeString, - Computed: true, - }, - "logging": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "s3_logs": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "s3_bucket_name": { - Type: schema.TypeString, - Computed: true, - }, - "s3_key_prefix": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Computed: true, - }, - "security_group_ids": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "sns_topic_arn": { - Type: schema.TypeString, - Computed: true, - }, - "subnet_id": { - Type: schema.TypeString, - Computed: true, - }, - "terminate_instance_on_failure": { - Type: schema.TypeBool, - Computed: true, - }, - "tags": tagsSchema(), - }, - } -} - -func dataSourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig - - componentArn := d.Get("arn").(string) - - params := &imagebuilder.GetInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(componentArn), - } - - resp, err := conn.GetInfrastructureConfiguration(params) - - if err != nil { - return fmt.Errorf("Error retrieving Component: %s", err) - } - - d.SetId(*resp.InfrastructureConfiguration.Arn) - d.Set("datecreated", resp.InfrastructureConfiguration.DateCreated) - d.Set("dateupdated", resp.InfrastructureConfiguration.DateUpdated) - d.Set("date_created", resp.InfrastructureConfiguration.DateCreated) - d.Set("description", resp.InfrastructureConfiguration.Description) - d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) - d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) - d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) - d.Set("logging", flattenAwsImageBuilderInfrastructureConfigLogging(resp.InfrastructureConfiguration.Logging)) - d.Set("name", resp.InfrastructureConfiguration.Name) - d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) - d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) - d.Set("subnet_id", resp.InfrastructureConfiguration.SubnetId) - d.Set("terminate_instance_on_failure", resp.InfrastructureConfiguration.TerminateInstanceOnFailure) - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.InfrastructureConfiguration.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - return nil -} diff --git a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go b/aws/data_source_aws_imagebuilder_infrastructure_recipe.go deleted file mode 100644 index f9913cc9cee..00000000000 --- a/aws/data_source_aws_imagebuilder_infrastructure_recipe.go +++ /dev/null @@ -1,144 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" -) - -func dataSourceAwsImageBuilderRecipe() *schema.Resource { - return &schema.Resource{ - Read: dataSourceAwsImageBuilderRecipeRead, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Required: true, - }, - "block_device_mappings": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "device_name": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "ebs": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "delete_on_termination": { - Type: schema.TypeBool, - Computed: true, - }, - "encrypted": { - Type: schema.TypeBool, - Computed: true, - }, - "iops": { - Type: schema.TypeInt, - Computed: true, - }, - "kms_key_id": { - Type: schema.TypeString, - Computed: true, - }, - "snapshot_id": { - Type: schema.TypeString, - Computed: true, - }, - "volume_size": { - Type: schema.TypeInt, - Computed: true, - }, - "volume_type": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "no_device": { - Type: schema.TypeString, - Computed: true, - }, - "virtual_name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, - "components": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "datecreated": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Computed: true, - }, - "name": { - Type: schema.TypeString, - Computed: true, - }, - "owner": { - Type: schema.TypeString, - Computed: true, - }, - "parent_image": { - Type: schema.TypeString, - Computed: true, - }, - "platform": { - Type: schema.TypeString, - Computed: true, - }, - "semantic_version": { - Type: schema.TypeString, - Computed: true, - }, - "tags": tagsSchema(), - }, - } -} - -func dataSourceAwsImageBuilderRecipeRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig - - resp, err := conn.GetImageRecipe(&imagebuilder.GetImageRecipeInput{ - ImageRecipeArn: aws.String(d.Get("arn").(string)), - }) - - if err != nil { - return fmt.Errorf("error reading Recipe (%s): %s", d.Id(), err) - } - - d.SetId(*resp.ImageRecipe.Arn) - d.Set("block_device_mappings", flattenImageBuilderRecipeBlockDeviceMappings(resp.ImageRecipe.BlockDeviceMappings)) - d.Set("components", flattenImageBuilderRecipeComponents(resp.ImageRecipe.Components)) - d.Set("datecreated", resp.ImageRecipe.DateCreated) - d.Set("description", resp.ImageRecipe.Description) - d.Set("name", resp.ImageRecipe.Name) - d.Set("owner", resp.ImageRecipe.Owner) - d.Set("parent_image", resp.ImageRecipe.ParentImage) - d.Set("platform", resp.ImageRecipe.Platform) - d.Set("semantic_version", resp.ImageRecipe.Version) - - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.ImageRecipe.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} diff --git a/aws/provider.go b/aws/provider.go index 86fd14c0663..4aea86da05b 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -267,10 +267,6 @@ func Provider() *schema.Provider { "aws_iam_server_certificate": dataSourceAwsIAMServerCertificate(), "aws_iam_user": dataSourceAwsIAMUser(), "aws_imagebuilder_component": dataSourceAwsImageBuilderComponent(), - "aws_imagebuilder_distribution_configuration": datasourceAwsImageBuilderDistributionConfiguration(), - "aws_imagebuilder_infrastructure_configuration": dataSourceAwsImageBuilderInfrastructureConfiguration(), - "aws_imagebuilder_image_pipeline": dataSourceAwsImageBuilderImagePipeline(), - "aws_imagebuilder_recipe": dataSourceAwsImageBuilderRecipe(), "aws_internet_gateway": dataSourceAwsInternetGateway(), "aws_iot_endpoint": dataSourceAwsIotEndpoint(), "aws_inspector_rules_packages": dataSourceAwsInspectorRulesPackages(), @@ -704,10 +700,6 @@ func Provider() *schema.Provider { "aws_iam_user": resourceAwsIamUser(), "aws_iam_user_login_profile": resourceAwsIamUserLoginProfile(), "aws_imagebuilder_component": resourceAwsImageBuilderComponent(), - "aws_imagebuilder_distribution_configuration": resourceAwsImageBuilderDistributionConfiguration(), - "aws_imagebuilder_infrastructure_configuration": resourceAwsImageBuilderInfrastructureConfiguration(), - "aws_imagebuilder_recipe": resourceAwsImageBuilderRecipe(), - "aws_imagebuilder_image_pipeline": resourceAwsImageBuilderImagePipeline(), "aws_inspector_assessment_target": resourceAWSInspectorAssessmentTarget(), "aws_inspector_assessment_template": resourceAWSInspectorAssessmentTemplate(), "aws_inspector_resource_group": resourceAWSInspectorResourceGroup(), diff --git a/aws/resource_aws_imagebuilder_distribution_configuration.go b/aws/resource_aws_imagebuilder_distribution_configuration.go deleted file mode 100644 index e3c5671293d..00000000000 --- a/aws/resource_aws_imagebuilder_distribution_configuration.go +++ /dev/null @@ -1,348 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" - "regexp" -) - -func resourceAwsImageBuilderDistributionConfiguration() *schema.Resource { - return &schema.Resource{ - Create: resourceAwsImageBuilderDistributionConfigurationCreate, - Read: resourceAwsImageBuilderDistributionConfigurationRead, - Update: resourceAwsImageBuilderDistributionConfigurationUpdate, - Delete: resourceAwsImageBuilderDistributionConfigurationDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Computed: true, - }, - "date_created": { - Type: schema.TypeString, - Computed: true, - }, - "date_updated": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "distributions": { - Type: schema.TypeSet, - Required: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ami_distribution_configuration": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "ami_tags": tagsSchema(), - "description": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(0, 1024), - }, - "kms_key_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "launch_permission": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "user_groups": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - }, - "user_ids": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.All( - validation.StringLenBetween(0, 127), - validation.StringMatch(regexp.MustCompile(`^[-_A-Za-z0-9{][-_A-Za-z0-9\s:{}]+[-_A-Za-z0-9}]$`), "must contain only alphanumeric characters, periods, underscores, and hyphens"), - ), - }, - }, - }, - }, - "license_configuration_arn": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, - "region": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(0, 1024), - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringLenBetween(1, 126), - }, - "tags": tagsSchema(), - }, - } -} - -func resourceAwsImageBuilderDistributionConfigurationCreate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - input := &imagebuilder.CreateDistributionConfigurationInput{ - ClientToken: aws.String(resource.UniqueId()), - Name: aws.String(d.Get("name").(string)), - Distributions: expandAwsImageBuilderDistributions(d), - } - - if v, ok := d.GetOk("description"); ok { - input.SetDescription(v.(string)) - } - - if v, ok := d.GetOk("tags"); ok { - input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) - } - - log.Printf("[DEBUG] Creating DistributionConfiguration: %#v", input) - - resp, err := conn.CreateDistributionConfiguration(input) - if err != nil { - return fmt.Errorf("error creating DistributionConfiguration: %s", err) - } - - d.SetId(aws.StringValue(resp.DistributionConfigurationArn)) - - return resourceAwsImageBuilderDistributionConfigurationRead(d, meta) -} - -func resourceAwsImageBuilderDistributionConfigurationRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - resp, err := conn.GetDistributionConfiguration(&imagebuilder.GetDistributionConfigurationInput{ - DistributionConfigurationArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] DistributionConfiguration (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } - - if err != nil { - return fmt.Errorf("error reading DistributionConfiguration (%s): %s", d.Id(), err) - } - - d.Set("arn", resp.DistributionConfiguration.Arn) - d.Set("date_created", resp.DistributionConfiguration.DateCreated) - d.Set("date_updated", resp.DistributionConfiguration.DateUpdated) - d.Set("description", resp.DistributionConfiguration.Description) - d.Set("distributions", flattenAwsImageBuilderDistributions(resp.DistributionConfiguration.Distributions)) - d.Set("name", resp.DistributionConfiguration.Name) - - tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) - if err != nil { - return fmt.Errorf("error listing tags for DistributionConfiguration (%s): %s", d.Id(), err) - } - if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} - -func resourceAwsImageBuilderDistributionConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - upd := imagebuilder.UpdateDistributionConfigurationInput{ - DistributionConfigurationArn: aws.String(d.Id()), - Distributions: expandAwsImageBuilderDistributions(d), - } - - if description, ok := d.GetOk("description"); ok { - upd.Description = aws.String(description.(string)) - } - - if d.HasChange("tags") { - o, n := d.GetChange("tags") - if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { - return fmt.Errorf("error updating tags for DistributionConfiguration (%s): %s", d.Id(), err) - } - } - - _, err := conn.UpdateDistributionConfiguration(&upd) - if err != nil { - return fmt.Errorf("error updating Distribution Configuration (%s): %s", d.Id(), err) - } - - return resourceAwsImageBuilderDistributionConfigurationRead(d, meta) -} - -func resourceAwsImageBuilderDistributionConfigurationDelete(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - _, err := conn.DeleteDistributionConfiguration(&imagebuilder.DeleteDistributionConfigurationInput{ - DistributionConfigurationArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - return nil - } - - if err != nil { - return fmt.Errorf("error deleting Distribution Config (%s): %s", d.Id(), err) - } - - return nil -} - -func expandAwsImageBuilderDistributions(d *schema.ResourceData) []*imagebuilder.Distribution { - configs := d.Get("distributions").(*schema.Set).List() - - if len(configs) == 0 { - return nil - } - - distriblist := make([]*imagebuilder.Distribution, 0) - - for _, config := range configs { - distrib := expandAwsImageBuilderDistribution(config.(map[string]interface{})) - distriblist = append(distriblist, &distrib) - } - - return distriblist -} - -func flattenAwsImageBuilderDistributions(distribs []*imagebuilder.Distribution) []interface{} { - if distribs == nil { - return nil - } - - distriblist := []interface{}{} - - for _, dist := range distribs { - distrib := flattenAwsImageBuilderDistribution(dist) - distriblist = append(distriblist, distrib) - } - - return distriblist -} - -func expandAwsImageBuilderDistribution(data map[string]interface{}) imagebuilder.Distribution { - distrib := imagebuilder.Distribution{ - Region: aws.String(data["region"].(string)), - LicenseConfigurationArns: expandStringList(data["license_configuration_arn"].(*schema.Set).List()), - } - - if v, ok := data["ami_distribution_configuration"]; ok { - if len(v.([]interface{})) > 0 { - adc := v.([]interface{})[0].(map[string]interface{}) - - amidistconfig := imagebuilder.AmiDistributionConfiguration{ - Description: aws.String((adc["description"]).(string)), - Name: aws.String(adc["name"].(string)), - } - - if len(adc["kms_key_id"].(string)) != 0 { - amidistconfig.KmsKeyId = aws.String(adc["kms_key_id"].(string)) - } - - if len(adc["launch_permission"].([]interface{})) > 0 { - - lp := adc["launch_permission"].([]interface{})[0].(map[string]interface{}) - - launchperm := imagebuilder.LaunchPermissionConfiguration{ - UserGroups: aws.StringSlice(sIfTosString(lp["user_groups"].(*schema.Set).List())), - UserIds: aws.StringSlice(sIfTosString(lp["user_ids"].(*schema.Set).List())), - } - amidistconfig.LaunchPermission = &launchperm - } - - tags := adc["ami_tags"].(map[string]interface{}) - if len(tags) > 0 { - amitags := make(map[string]*string, len(tags)) - for k, v := range tags { - amitags[k] = aws.String(v.(string)) - } - amidistconfig.AmiTags = amitags - } - distrib.AmiDistributionConfiguration = &amidistconfig - } - } - - return distrib -} - -func flattenAwsImageBuilderDistribution(distribution *imagebuilder.Distribution) map[string]interface{} { - distrib := map[string]interface{}{} - - distrib["license_configuration_arn"] = schema.NewSet(schema.HashString, flattenStringList(distribution.LicenseConfigurationArns)) - distrib["region"] = *distribution.Region - - distribconf := make(map[string]interface{}) - if distribution.AmiDistributionConfiguration != nil { - distribconf["ami_tags"] = keyvaluetags.ImagebuilderKeyValueTags(distribution.AmiDistributionConfiguration.AmiTags) - distribconf["description"] = aws.String(*distribution.AmiDistributionConfiguration.Description) - distribconf["kms_key_id"] = distribution.AmiDistributionConfiguration.KmsKeyId - distribconf["name"] = distribution.AmiDistributionConfiguration.Name - - if distribution.AmiDistributionConfiguration.LaunchPermission != nil { - distribconf["launch_permission"] = []interface{}{ - map[string]interface{}{ - "user_ids": distribution.AmiDistributionConfiguration.LaunchPermission.UserIds, - "user_groups": distribution.AmiDistributionConfiguration.LaunchPermission.UserGroups, - }, - } - } - } - - distrib["ami_distribution_configuration"] = []interface{}{distribconf} - - return distrib -} - -func sIfTosString(in []interface{}) []string { - out := make([]string, len(in)) - for i, v := range in { - out[i] = fmt.Sprint(v) - } - - return out -} diff --git a/aws/resource_aws_imagebuilder_image_pipeline.go b/aws/resource_aws_imagebuilder_image_pipeline.go deleted file mode 100644 index 836ead909ea..00000000000 --- a/aws/resource_aws_imagebuilder_image_pipeline.go +++ /dev/null @@ -1,299 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" - "regexp" -) - -func resourceAwsImageBuilderImagePipeline() *schema.Resource { - return &schema.Resource{ - Create: resourceAwsImageBuilderImagePipelineCreate, - Read: resourceAwsImageBuilderImagePipelineRead, - Update: resourceAwsImageBuilderImagePipelineUpdate, - Delete: resourceAwsImageBuilderImagePipelineDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "distribution_configuration_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringMatch(regexp.MustCompile(`^arn:aws[^:]*:imagebuilder:[^:]+:(?:\d{12}|aws):distribution-configuration/[a-z0-9-_]+$`), "valid distribution configuration ARN must be provided"), - }, - "enhanced_image_metadata_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - "image_recipe_arn": { - Type: schema.TypeString, - Required: true, - ForceNew: true, // this should be updatable, but recreating the recipe causes TF to error saying it's depended on by other resources, the pipeline - 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": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "image_tests_enabled": { - Type: schema.TypeBool, - Optional: true, - Default: true, - }, - "timeout_minutes": { - Type: schema.TypeInt, - Optional: true, - Default: 720, - ValidateFunc: validation.IntBetween(60, 1440), - }, - }, - }, - }, - "infrastructure_configuration_arn": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringMatch(regexp.MustCompile(`^arn:aws[^:]*:imagebuilder:[^:]+:(?:\d{12}|aws):infrastructure-configuration/[a-z0-9-_]+$`), "valid infrastructure configuration ARN must be provided"), - }, - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validation.StringMatch(regexp.MustCompile("^[-_A-Za-z-0-9][-_A-Za-z0-9 ]{1,126}[-_A-Za-z-0-9]$"), "valid name must be provided"), - }, - "schedule": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "pipeline_execution_start_condition": { - Type: schema.TypeString, - Optional: true, - Default: "EXPRESSION_MATCH_ONLY", - ValidateFunc: validation.StringInSlice([]string{"EXPRESSION_MATCH_ONLY", "EXPRESSION_MATCH_AND_DEPENDENCY_UPDATES_AVAILABLE"}, false), - }, - "schedule_expression": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - }, - }, - }, - "status": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice([]string{"ENABLED", "DISABLED"}, false), - Default: "ENABLED", - }, - "tags": tagsSchema(), - }, - } -} - -func resourceAwsImageBuilderImagePipelineCreate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - input := &imagebuilder.CreateImagePipelineInput{ - EnhancedImageMetadataEnabled: aws.Bool(d.Get("enhanced_image_metadata_enabled").(bool)), - ImageRecipeArn: aws.String(d.Get("image_recipe_arn").(string)), - InfrastructureConfigurationArn: aws.String(d.Get("infrastructure_configuration_arn").(string)), - Name: aws.String(d.Get("name").(string)), - Status: aws.String(d.Get("status").(string)), - } - - if v, ok := d.GetOk("description"); ok { - input.SetDescription(v.(string)) - } - - if v, ok := d.GetOk("distribution_configuration_arn"); ok { - input.SetDistributionConfigurationArn(v.(string)) - } - - if v, ok := d.GetOk("image_tests_configuration"); ok { - input.ImageTestsConfiguration = expandAwsImageBuilderTestConfiguration(v) - } - - if v, ok := d.GetOk("schedule"); ok { - input.Schedule = expandAwsImageBuilderPipelineSchedule(v) - } - - if v, ok := d.GetOk("tags"); ok { - input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) - } - - log.Printf("[DEBUG] Creating Image Pipeline: %#v", input) - - resp, err := conn.CreateImagePipeline(input) - if err != nil { - return fmt.Errorf("error creating Image Pipeline: %s", err) - } - - d.SetId(aws.StringValue(resp.ImagePipelineArn)) - - return resourceAwsImageBuilderImagePipelineRead(d, meta) -} - -func resourceAwsImageBuilderImagePipelineRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - resp, err := conn.GetImagePipeline(&imagebuilder.GetImagePipelineInput{ - ImagePipelineArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] Image Pipeline (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } - - if err != nil { - return fmt.Errorf("error reading Image Pipeline (%s): %s", d.Id(), err) - } - - d.Set("arn", resp.ImagePipeline.Arn) - d.Set("description", resp.ImagePipeline.Description) - d.Set("distribution_configuration_arn", resp.ImagePipeline.DistributionConfigurationArn) - d.Set("enhanced_image_metadata_enabled", resp.ImagePipeline.EnhancedImageMetadataEnabled) - d.Set("image_recipe_arn", resp.ImagePipeline.ImageRecipeArn) - d.Set("image_tests_configuration", flattenAwsImageBuilderTestConfiguration(resp.ImagePipeline.ImageTestsConfiguration)) - d.Set("infrastructure_configuration_arn", resp.ImagePipeline.InfrastructureConfigurationArn) - d.Set("name", resp.ImagePipeline.Name) - // TODO: platform?? this isn't in create so why in read? auto field? - - if resp.ImagePipeline.Schedule != nil { - d.Set("schedule", flattenAwsImageBuilderPipelineSchedule(resp.ImagePipeline.Schedule)) - } - d.Set("status", resp.ImagePipeline.Status) - - tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) - if err != nil { - return fmt.Errorf("error listing tags for Image Pipeline (%s): %s", d.Id(), err) - } - if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(meta.(*AWSClient).IgnoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} - -func resourceAwsImageBuilderImagePipelineUpdate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - input := &imagebuilder.UpdateImagePipelineInput{ - ImagePipelineArn: aws.String(d.Id()), - ImageRecipeArn: aws.String(d.Get("image_recipe_arn").(string)), - InfrastructureConfigurationArn: aws.String(d.Get("infrastructure_configuration_arn").(string)), - } - - if v, ok := d.GetOk("description"); ok { - input.Description = aws.String(v.(string)) - } - - if v, ok := d.GetOk("distribution_configuration_arn"); ok { - input.DistributionConfigurationArn = aws.String(v.(string)) - } - - if v, ok := d.GetOk("enhanced_image_metadata_enabled"); ok { - input.EnhancedImageMetadataEnabled = aws.Bool(v.(bool)) - } - - if d.HasChange("image_tests_configuration") { - input.ImageTestsConfiguration = expandAwsImageBuilderTestConfiguration(d.Get("image_tests_configuration")) - } - - if d.HasChange("schedule") { - input.Schedule = expandAwsImageBuilderPipelineSchedule(d.Get("schedule")) - } - - if v, ok := d.GetOk("status"); ok { - input.Status = aws.String(v.(string)) - } - - log.Printf("[DEBUG] Updating Image Pipeline: %#v", input) - _, err := conn.UpdateImagePipeline(input) - if err != nil { - return fmt.Errorf("error updating Image Pipeline (%s): %s", d.Id(), err) - } - - return resourceAwsImageBuilderImagePipelineRead(d, meta) -} - -func resourceAwsImageBuilderImagePipelineDelete(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - _, err := conn.DeleteImagePipeline(&imagebuilder.DeleteImagePipelineInput{ - ImagePipelineArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - return nil - } - - if err != nil { - return fmt.Errorf("error deleting Image Pipeline (%s): %s", d.Id(), err) - } - - return nil -} - -func expandAwsImageBuilderTestConfiguration(d interface{}) *imagebuilder.ImageTestsConfiguration { - testconfig := d.([]interface{})[0].(map[string]interface{}) - - itc := &imagebuilder.ImageTestsConfiguration{ - ImageTestsEnabled: testconfig["image_tests_enabled"].(*bool), - TimeoutMinutes: testconfig["timeout_minutes"].(*int64), - } - - return itc -} - -func expandAwsImageBuilderPipelineSchedule(d interface{}) *imagebuilder.Schedule { - schedconfig := d.([]interface{})[0].(map[string]interface{}) - - ibsched := &imagebuilder.Schedule{ - PipelineExecutionStartCondition: schedconfig["pipeline_execution_start_condition"].(*string), - ScheduleExpression: schedconfig["schedule_expression"].(*string), - } - - return ibsched -} - -func flattenAwsImageBuilderTestConfiguration(configuration *imagebuilder.ImageTestsConfiguration) map[string]interface{} { - testconfig := make(map[string]interface{}) - - if configuration != nil { - testconfig["timeout_minutes"] = configuration.TimeoutMinutes - testconfig["image_tests_enabled"] = configuration.ImageTestsEnabled - } - - return testconfig -} - -func flattenAwsImageBuilderPipelineSchedule(schedule *imagebuilder.Schedule) map[string]interface{} { - schedconfig := make(map[string]interface{}, 2) - - schedconfig["schedule_expression"] = schedule.ScheduleExpression - schedconfig["pipeline_execution_start_condition"] = schedule.PipelineExecutionStartCondition - - return schedconfig -} diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go deleted file mode 100644 index 83b990878b7..00000000000 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ /dev/null @@ -1,346 +0,0 @@ -package aws - -import ( - "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" - "log" -) - -func resourceAwsImageBuilderInfrastructureConfiguration() *schema.Resource { - return &schema.Resource{ - Create: resourceAwsImageBuilderInfrastructureConfigurationCreate, - Read: resourceAwsImageBuilderInfrastructureConfigurationRead, - Update: resourceAwsImageBuilderInfrastructureConfigurationUpdate, - Delete: resourceAwsImageBuilderInfrastructureConfigurationDelete, - Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, - }, - - Schema: map[string]*schema.Schema{ - "arn": { - Type: schema.TypeString, - Computed: true, - }, - "date_created": { - Type: schema.TypeString, - Computed: true, - }, - "date_updated": { - Type: schema.TypeString, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "instance_profile_name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "instance_types": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "key_pair": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "logging": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "s3_logs": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "s3_bucket_name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "s3_key_prefix": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - Default: "/", - }, - }, - }, - }, - }, - }, - }, - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "security_group_ids": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: schema.HashString, - }, - "sns_topic_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "subnet_id": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 1024), - }, - "terminate_instance_on_failure": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - "tags": tagsSchema(), - }, - } -} - -func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - securityIdSet := d.Get("security_group_ids").(*schema.Set) - securityIds := expandStringList(securityIdSet.List()) - instanceIdSet := d.Get("instance_types").(*schema.Set) - instanceIds := expandStringList(instanceIdSet.List()) - - input := &imagebuilder.CreateInfrastructureConfigurationInput{ - ClientToken: aws.String(resource.UniqueId()), - Name: aws.String(d.Get("name").(string)), - InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), - SecurityGroupIds: securityIds, - InstanceTypes: instanceIds, - Logging: expandAwsImageBuilderLogsConfig(d), - } - - if v, ok := d.GetOk("description"); ok { - input.SetDescription(v.(string)) - } - if v, ok := d.GetOk("key_pair"); ok { - input.SetKeyPair(v.(string)) - } - if v, ok := d.GetOk("sns_topic_arn"); ok { - input.SetSnsTopicArn(v.(string)) - } - if v, ok := d.GetOk("subnet_id"); ok { - input.SetSubnetId(v.(string)) - } - if v, ok := d.GetOk("terminate_instance_on_failure"); ok { - input.SetTerminateInstanceOnFailure(v.(bool)) - } - if v, ok := d.GetOk("tags"); ok { - input.SetTags(keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags()) - } - - log.Printf("[DEBUG] Creating Infrastructure Configuration: %#v", input) - - resp, err := conn.CreateInfrastructureConfiguration(input) - if err != nil { - return fmt.Errorf("error creating Component: %s", err) - } - - d.SetId(aws.StringValue(resp.InfrastructureConfigurationArn)) - - return resourceAwsImageBuilderInfrastructureConfigurationRead(d, meta) -} - -func resourceAwsImageBuilderInfrastructureConfigurationRead(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig - - resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] Infrastructure Configuration (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } - - if err != nil { - return fmt.Errorf("error reading Infrastructure Configuration (%s): %s", d.Id(), err) - } - - d.Set("arn", resp.InfrastructureConfiguration.Arn) - d.Set("date_created", resp.InfrastructureConfiguration.DateCreated) - d.Set("date_updated", resp.InfrastructureConfiguration.DateUpdated) - d.Set("description", resp.InfrastructureConfiguration.Description) - d.Set("instance_profile_name", resp.InfrastructureConfiguration.InstanceProfileName) - d.Set("instance_types", resp.InfrastructureConfiguration.InstanceTypes) - d.Set("key_pair", resp.InfrastructureConfiguration.KeyPair) - d.Set("logging", flattenAwsImageBuilderInfrastructureConfigLogging(resp.InfrastructureConfiguration.Logging)) - d.Set("name", resp.InfrastructureConfiguration.Name) - d.Set("security_group_ids", resp.InfrastructureConfiguration.SecurityGroupIds) - d.Set("sns_topic_arn", resp.InfrastructureConfiguration.SnsTopicArn) - d.Set("subnet_id", resp.InfrastructureConfiguration.SubnetId) - d.Set("terminate_instance_on_failure", resp.InfrastructureConfiguration.TerminateInstanceOnFailure) - - tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) - if err != nil { - return fmt.Errorf("error listing tags for Infrastructure Configuration (%s): %s", d.Id(), err) - } - if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) - } - - return nil -} - -func resourceAwsImageBuilderInfrastructureConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - // Despite not being required by the API, if it's not sent then certain things get wiped to null - upd := imagebuilder.UpdateInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(d.Id()), - InstanceProfileName: aws.String(d.Get("instance_profile_name").(string)), - Logging: expandAwsImageBuilderLogsConfig(d), - } - - if description, ok := d.GetOk("description"); ok { - upd.Description = aws.String(description.(string)) - } - - if key_pair, ok := d.GetOk("key_pair"); ok { - upd.KeyPair = aws.String(key_pair.(string)) - } - - if subnet_id, ok := d.GetOk("subnet_id"); ok { - upd.SubnetId = aws.String(subnet_id.(string)) - } - - if attr := d.Get("instance_types").(*schema.Set); attr.Len() > 0 { - upd.InstanceTypes = expandStringList(attr.List()) - } - - if d.HasChange("instance_profile_name") { - upd.InstanceProfileName = aws.String(d.Get("instance_profile_name").(string)) - } - - if v, ok := d.GetOk("security_group_ids"); ok { - if attr := v.(*schema.Set); attr.Len() > 0 { - upd.SecurityGroupIds = expandStringList(attr.List()) - } - } - - if sns_topic_arn, ok := d.GetOk("sns_topic_arn"); ok { - upd.SnsTopicArn = aws.String(sns_topic_arn.(string)) - } - - if terminate_instance_on_failure, ok := d.GetOk("terminate_instance_on_failure"); ok { - upd.TerminateInstanceOnFailure = aws.Bool(terminate_instance_on_failure.(bool)) - } - - if d.HasChange("security_group_ids") { - if attr := d.Get("security_group_ids").(*schema.Set); attr.Len() > 0 { - upd.SecurityGroupIds = expandStringList(attr.List()) - } - } - - if d.HasChange("tags") { - o, n := d.GetChange("tags") - if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { - return fmt.Errorf("error updating tags for Infrastructure Configuration (%s): %s", d.Id(), err) - } - } - - _, err := conn.UpdateInfrastructureConfiguration(&upd) - if err != nil { - return fmt.Errorf("error updating Infrastructure Configuration (%s): %s", d.Id(), err) - } - - return resourceAwsImageBuilderInfrastructureConfigurationRead(d, meta) -} - -func resourceAwsImageBuilderInfrastructureConfigurationDelete(d *schema.ResourceData, meta interface{}) error { - conn := meta.(*AWSClient).imagebuilderconn - - _, err := conn.DeleteInfrastructureConfiguration(&imagebuilder.DeleteInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(d.Id()), - }) - - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - return nil - } - - if err != nil { - return fmt.Errorf("error deleting Infrastructure Configuration (%s): %s", d.Id(), err) - } - - return nil -} - -func flattenAwsImageBuilderInfrastructureConfigLogging(logsConfig *imagebuilder.Logging) []interface{} { - if logsConfig == nil || logsConfig.S3Logs == nil { - return []interface{}{} - } - - values := map[string]interface{}{} - - // If more logging options are added, add more ifs! - values["s3_logs"] = flattenAwsImageBuilderS3Logs(logsConfig.S3Logs) - - return []interface{}{values} -} - -func flattenAwsImageBuilderS3Logs(s3LogsConfig *imagebuilder.S3Logs) []interface{} { - values := map[string]interface{}{} - - values["s3_key_prefix"] = aws.StringValue(s3LogsConfig.S3KeyPrefix) - values["s3_bucket_name"] = aws.StringValue(s3LogsConfig.S3BucketName) - - return []interface{}{values} -} - -func expandAwsImageBuilderLogsConfig(d *schema.ResourceData) *imagebuilder.Logging { - logsConfig := &imagebuilder.Logging{} - - if v, ok := d.GetOk("logging"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { - configList := v.([]interface{}) - data := configList[0].(map[string]interface{}) - - if v, ok := data["s3_logs"]; ok { - logsConfig.S3Logs = expandAwsImageBuilderS3LogsConfig(v.([]interface{})) - } - } - - return logsConfig -} - -func expandAwsImageBuilderS3LogsConfig(configList []interface{}) *imagebuilder.S3Logs { - if len(configList) == 0 || configList[0] == nil { - return nil - } - - data := configList[0].(map[string]interface{}) - - s3LogsConfig := &imagebuilder.S3Logs{} - - if v, ok := data["s3_bucket_name"]; ok { - s3LogsConfig.S3BucketName = aws.String(v.(string)) - } - if v, ok := data["s3_key_prefix"]; ok { - s3LogsConfig.S3KeyPrefix = aws.String(v.(string)) - } - - return s3LogsConfig -} diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go b/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go deleted file mode 100644 index bb554dd0b37..00000000000 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration_test.go +++ /dev/null @@ -1,355 +0,0 @@ -package aws - -import ( - "errors" - "fmt" - "github.com/aws/aws-sdk-go/aws/awserr" - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/imagebuilder" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" -) - -//Check the minimal configuration -func TestAccAWSImageBuilderInfrastructureConfiguration_basic(t *testing.T) { - var conf imagebuilder.InfrastructureConfiguration - RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) - resourceName := "aws_imagebuilder_infrastructure_configuration.test" - resource.ParallelTest(t, resource.TestCase{ - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSImageBuilderInfrastructureConfiguration_basic(RandomString), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), - resource.TestCheckResourceAttrSet(resourceName, "name"), - ), - }, - }, - }) -} - -//Check the configuration with everything -func TestAccAWSImageBuilderInfrastructureConfiguration_advanced(t *testing.T) { - var conf imagebuilder.InfrastructureConfiguration - RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) - resourceName := "aws_imagebuilder_infrastructure_configuration.test" - - resource.ParallelTest(t, resource.TestCase{ - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSImageBuilderInfrastructureConfiguration_advanced(RandomString), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), - resource.TestCheckResourceAttr(resourceName, "instance_profile_name", RandomString), - resource.TestCheckResourceAttr(resourceName, "name", RandomString), - resource.TestCheckResourceAttr(resourceName, "description", "example desc"), - resource.TestCheckResourceAttr(resourceName, "key_pair", RandomString), - resource.TestCheckResourceAttrSet(resourceName, "sns_topic_arn"), - resource.TestCheckResourceAttrSet(resourceName, "subnet_id"), - resource.TestCheckResourceAttr(resourceName, "terminate_instance_on_failure", "false"), - resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), - resource.TestCheckResourceAttr(resourceName, "instance_types.#", "1"), - resource.TestCheckResourceAttr(resourceName, "logging.0.s3_logs.0.s3_bucket_name", RandomString), - resource.TestCheckResourceAttr(resourceName, "logging.0.s3_logs.0.s3_key_prefix", "logs"), - ), - }, - }, - }) -} - -//Test the tags work -func TestAccAWSImageBuilderInfrastructureConfiguration_tags(t *testing.T) { - var conf imagebuilder.InfrastructureConfiguration - RandomString := fmt.Sprintf("tf-test-%d", acctest.RandInt()) - resourceName := "aws_imagebuilder_infrastructure_configuration.test" - - resource.ParallelTest(t, resource.TestCase{ - IDRefreshName: resourceName, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAWSImageBuilderInfrastructureConfiguration_tags1(RandomString), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), - resource.TestCheckResourceAttrSet(resourceName, "name"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), - ), - }, - { - Config: testAccAWSImageBuilderInfrastructureConfiguration_tags2(RandomString), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckAWSImageBuilderInfrastructureConfigurationExist(resourceName, &conf), - resource.TestCheckResourceAttrSet(resourceName, "instance_profile_name"), - resource.TestCheckResourceAttrSet(resourceName, "name"), - resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), - ), - }, - }, - }) -} - -func testAccCheckAWSImageBuilderInfrastructureConfigurationExist(n string, res *imagebuilder.InfrastructureConfiguration) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Not found: %s", n) - } - - if rs.Primary.ID == "" { - return errors.New("No ImageBuilderInfrastructureConfiguration ID is set") - } - - conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn - - resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(rs.Primary.Attributes["arn"]), - }) - - if err != nil { - return err - } - - if resp == nil || resp.InfrastructureConfiguration == nil { - return fmt.Errorf("Infrastructure configuration (%s) not found", rs.Primary.Attributes["name"]) - } - *res = *resp.InfrastructureConfiguration - return nil - } -} - -func testAccCheckAWSImageBuilderInfrastructureConfigurationDestroy(s *terraform.State) error { - - for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_imagebuilder_infrastructure_configuration" { - continue - } - - conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn - - resp, err := conn.GetInfrastructureConfiguration(&imagebuilder.GetInfrastructureConfigurationInput{ - InfrastructureConfigurationArn: aws.String(rs.Primary.Attributes["arn"]), - }) - - if err == nil { - if resp.InfrastructureConfiguration != nil { - return fmt.Errorf("ImageBuilderInfrastructureConfiguration %q still exists", rs.Primary.ID) - } - } - - // Verify the error - if awsErr, ok := err.(awserr.Error); ok { - if awsErr.Code() == "ResourceNotFoundException" { - return nil - } - } - return err - } - - return nil -} - -func testAccAWSImageBuilderInfrastructureConfiguration_basic(ConfigurationName string) string { - return fmt.Sprintf(` - -resource "aws_imagebuilder_infrastructure_configuration" "test" { - instance_profile_name = aws_iam_instance_profile.test_profile.name - name = "%[1]s" -} - -resource "aws_iam_instance_profile" "test_profile" { - name = "%[1]s" - role = aws_iam_role.role.name -} - -resource "aws_iam_role" "role" { - name = "%[1]s" - path = "/" - - assume_role_policy = < 0 { - ebs := v.([]interface{}) - if len(ebs) > 0 && ebs[0] != nil { - ebsData := ebs[0].(map[string]interface{}) - blockDeviceMapping.Ebs = expandImageBuilderEbsBlockDevice(ebsData) - } - } - - return blockDeviceMapping -} - -func flattenImageBuilderBlockDeviceMapping(ebsspec *imagebuilder.EbsInstanceBlockDeviceSpecification) []map[string]interface{} { - - ebs := map[string]interface{}{} - - ebs["delete_on_termination"] = ebsspec.DeleteOnTermination - ebs["encrypted"] = ebsspec.Encrypted - ebs["iops"] = ebsspec.Iops - ebs["kms_key_id"] = ebsspec.KmsKeyId - ebs["snapshot_id"] = ebsspec.SnapshotId - ebs["volume_size"] = ebsspec.VolumeSize - ebs["volume_type"] = ebsspec.VolumeType - - return []map[string]interface{}{ebs} -} - -func expandImageBuilderEbsBlockDevice(ebs map[string]interface{}) *imagebuilder.EbsInstanceBlockDeviceSpecification { - ebsDevice := &imagebuilder.EbsInstanceBlockDeviceSpecification{} - - if v, ok := ebs["delete_on_termination"]; ok { - ebsDevice.DeleteOnTermination = aws.Bool(v.(bool)) - } - - if v, ok := ebs["encrypted"]; ok { - ebsDevice.Encrypted = aws.Bool(v.(bool)) - } - - if v := ebs["iops"].(int); v > 0 { - ebsDevice.Iops = aws.Int64(int64(v)) - } - - if v := ebs["kms_key_id"].(string); v != "" { - ebsDevice.KmsKeyId = aws.String(v) - } - - if v := ebs["snapshot_id"].(string); v != "" { - ebsDevice.SnapshotId = aws.String(v) - } - - if v := ebs["volume_size"]; v != nil { - ebsDevice.VolumeSize = aws.Int64(int64(v.(int))) - } - - if v := ebs["volume_type"].(string); v != "" { - ebsDevice.VolumeType = aws.String(v) - } - - return ebsDevice -} diff --git a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown deleted file mode 100644 index 1153dfe79d8..00000000000 --- a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown +++ /dev/null @@ -1,79 +0,0 @@ ---- -subcategory: "Image Builder" -layout: "aws" -page_title: "AWS: aws_imagebuilder_infrastructure_configuration" -description: |- - Provides AWS Image Builder infrasctracture configuration ---- - -# Resource: aws_imagebuilder_infrastructure_configuration -Provides AWS Image Builder infrasctracture configuration - -## Example Usage - -```hcl -# Create new infrastructure configuration -resource "aws_imagebuilder_infrastructure_configuration" "test" { - instance_profile_name = aws_iam_instance_profile.test_profile.name - name = "example" - description = "example desc" - instance_types = ["t2.nano", "t3.micro"] - key_pair = aws_key_pair.example.key_name - logging { - s3_logs { - s3_bucket_name = aws_s3_bucket.example.bucket - s3_key_prefix = "logs" - } - } - security_group_ids = [aws_security_group.example.id] - sns_topic_arn = aws_sns_topic.example.arn - subnet_id = aws_subnet.main.id - terminate_instance_on_failure = true - tags = { - foo = "bar" - } -} -``` - -## Argument Reference - -The following arguments are supported: - -* `instance_profile_name` - (Required) The name of iam instance profile. -* `name` - (Required) The name of the imgage builder infrastructure configuration. -* `description` - (Optional) The description of the imgage builder infrastructure configuration. -* `instance_types` - (Optional) A list of instance to use. -* `key_pair` - (Optional) The name of your key pair -* `logging` - (Optional) The logging configuration, see below for details. -* `security_group_ids` - (Optional) A list of security groups to assign to resource, mandatory if subnet provider. -* `sns_topic_arn` - (Optional) The ARN of sns topic to use. -* `subnet_id` - (Optional) The id of subnet to use, if provided requires that security groups also be provided. -* `tags` - (Optional) A map of tags to assign to the resource. -* `terminate_instance_on_failure` - (Optional) should the instance be terminated when the pipeline fails (Default: false). - -### Logging -The logging object support the following blocks: - -* s3_logs - -The s3_logs block supports the following arguments: - -* `s3_bucket_name` - (Required) The name of the bucket to use. -* `s3_key_prefix` - (Optional) The prefix to use for logs (Default: "/"). - -## Attributes Reference - -The following attributes are exported in addition to the arguments listed above: - -* `id` - The ARN of the configuration (matches `arn`). -* `arn` - The ARN of the configuration (matches `id`). -* `date_created` - The timestamp when the configuration was created. -* `date_updated` - The timestamp when the configuration was updated. - -## Import - -Infrastructure configuration can be imported using the ARN , e.g. - -``` -$ terraform import aws_imagebuilder_infrastructure_configuration.test '' -``` From aed6234645c4f47c5a1d9fbd243bb3bc3eb53414 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 12 Nov 2020 17:53:44 -0500 Subject: [PATCH 21/24] New Resource: aws_imagebuilder_component Reference: https://github.com/hashicorp/terraform-provider-aws/issues/11084 Reference: https://github.com/hashicorp/terraform-provider-aws/issues/13315 Changes: ``` * **New Data Source:** `aws_imagebuilder_component` * **New Resource:** `aws_imagebuilder_component` ``` Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAwsImageBuilderComponent_basic (18.98s) --- PASS: TestAccAwsImageBuilderComponent_ChangeDescription (19.15s) --- PASS: TestAccAwsImageBuilderComponent_Description (19.29s) --- PASS: TestAccAwsImageBuilderComponent_disappears (15.10s) --- PASS: TestAccAwsImageBuilderComponent_KmsKeyId (23.58s) --- PASS: TestAccAwsImageBuilderComponent_Platform_Windows (19.22s) --- PASS: TestAccAwsImageBuilderComponent_SupportedOsVersions (19.15s) --- PASS: TestAccAwsImageBuilderComponent_Tags (42.96s) --- PASS: TestAccAwsImageBuilderComponent_Uri (35.66s) --- PASS: TestAccAwsImageBuilderComponentDataSource_Arn (18.51s) ``` Output from acceptance testing in AWS GovCloud (US): ``` --- PASS: TestAccAwsImageBuilderComponent_basic (24.13s) --- PASS: TestAccAwsImageBuilderComponent_ChangeDescription (23.39s) --- PASS: TestAccAwsImageBuilderComponent_Description (24.43s) --- PASS: TestAccAwsImageBuilderComponent_disappears (19.28s) --- PASS: TestAccAwsImageBuilderComponent_KmsKeyId (28.49s) --- PASS: TestAccAwsImageBuilderComponent_Platform_Windows (24.54s) --- PASS: TestAccAwsImageBuilderComponent_SupportedOsVersions (24.05s) --- PASS: TestAccAwsImageBuilderComponent_Tags (53.99s) --- PASS: TestAccAwsImageBuilderComponent_Uri (40.78s) --- PASS: TestAccAwsImageBuilderComponentDataSource_Arn (24.26s) ``` Output from sweeper in AWS Commercial: ``` 2020/11/12 16:58:32 [DEBUG] Running Sweepers for region (us-west-2): 2020/11/12 16:58:32 [DEBUG] Running Sweeper (aws_imagebuilder_component) in region (us-west-2) 2020/11/12 16:58:45 Sweeper Tests ran successfully: - aws_imagebuilder_component 2020/11/12 16:58:45 [DEBUG] Running Sweepers for region (us-east-1): 2020/11/12 16:58:45 [DEBUG] Running Sweeper (aws_imagebuilder_component) in region (us-east-1) 2020/11/12 16:58:46 Sweeper Tests ran successfully: - aws_imagebuilder_component ok github.com/terraform-providers/terraform-provider-aws/aws 18.223s ``` Output from sweeper in AWS GovCloud (US): ``` 2020/11/12 16:59:00 [DEBUG] Running Sweepers for region (us-gov-west-1): 2020/11/12 16:59:00 [DEBUG] Running Sweeper (aws_imagebuilder_component) in region (us-gov-west-1) 2020/11/12 16:59:03 Sweeper Tests ran successfully: - aws_imagebuilder_component ok github.com/terraform-providers/terraform-provider-aws/aws 5.004s ``` --- aws/data_source_aws_imagebuilder_component.go | 70 +- ..._source_aws_imagebuilder_component_test.go | 74 +- aws/resource_aws_imagebuilder_component.go | 182 +++-- ...esource_aws_imagebuilder_component_test.go | 652 ++++++++++++++++++ .../d/imagebuilder_component.html.markdown | 41 ++ .../r/imagebuilder_component.html.markdown | 86 +++ 6 files changed, 984 insertions(+), 121 deletions(-) create mode 100644 aws/resource_aws_imagebuilder_component_test.go create mode 100644 website/docs/d/imagebuilder_component.html.markdown create mode 100644 website/docs/r/imagebuilder_component.html.markdown diff --git a/aws/data_source_aws_imagebuilder_component.go b/aws/data_source_aws_imagebuilder_component.go index 0bd207b5b30..23276c9e4d8 100644 --- a/aws/data_source_aws_imagebuilder_component.go +++ b/aws/data_source_aws_imagebuilder_component.go @@ -2,6 +2,7 @@ package aws import ( "fmt" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/imagebuilder" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -14,8 +15,9 @@ func dataSourceAwsImageBuilderComponent() *schema.Resource { Schema: map[string]*schema.Schema{ "arn": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, + ValidateFunc: validateArn, }, "change_description": { Type: schema.TypeString, @@ -36,33 +38,36 @@ func dataSourceAwsImageBuilderComponent() *schema.Resource { "encrypted": { Type: schema.TypeBool, Computed: true, - Optional: true, + }, + "kms_key_id": { + Type: schema.TypeString, + Computed: true, }, "name": { Type: schema.TypeString, Computed: true, - Optional: true, }, "owner": { Type: schema.TypeString, Computed: true, - Optional: true, }, "platform": { Type: schema.TypeString, Computed: true, - Optional: true, + }, + "supported_os_versions": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "tags": tagsSchemaComputed(), "type": { Type: schema.TypeString, Computed: true, - Optional: true, }, - "semantic_version": { - Type: schema.TypeInt, + "version": { + Type: schema.TypeString, Computed: true, - Optional: true, }, }, } @@ -72,35 +77,44 @@ func dataSourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interfa conn := meta.(*AWSClient).imagebuilderconn ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig - componentArn := d.Get("arn").(string) + input := &imagebuilder.GetComponentInput{} - params := &imagebuilder.GetComponentInput{ - ComponentBuildVersionArn: aws.String(componentArn), + if v, ok := d.GetOk("arn"); ok { + input.ComponentBuildVersionArn = aws.String(v.(string)) } - resp, err := conn.GetComponent(params) + output, err := conn.GetComponent(input) if err != nil { - return fmt.Errorf("Error retrieving Component: %s", err) + return fmt.Errorf("error getting Image Builder Component: %w", err) + } + + if output == nil || output.Component == nil { + return fmt.Errorf("error getting Image Builder Component: empty result") } - d.SetId(*resp.Component.Arn) + component := output.Component + + d.SetId(aws.StringValue(component.Arn)) + + d.Set("arn", component.Arn) + d.Set("change_description", component.ChangeDescription) + d.Set("data", component.Data) + d.Set("date_created", component.DateCreated) + d.Set("description", component.Description) + d.Set("encrypted", component.Encrypted) + d.Set("kms_key_id", component.KmsKeyId) + d.Set("name", component.Name) + d.Set("owner", component.Owner) + d.Set("platform", component.Platform) + d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions)) - if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(resp.Component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } - d.Set("change_description", resp.Component.ChangeDescription) - d.Set("data", resp.Component.Data) - d.Set("date_created", resp.Component.DateCreated) - d.Set("description", resp.Component.Description) - d.Set("encrypted", resp.Component.Encrypted) - d.Set("kms_key_id", resp.Component.KmsKeyId) - d.Set("name", resp.Component.Name) - d.Set("owner", resp.Component.Owner) - d.Set("platform", resp.Component.Platform) - d.Set("type", resp.Component.Type) - d.Set("semantic_version", resp.Component.Version) + d.Set("type", component.Type) + d.Set("version", component.Version) return nil } diff --git a/aws/data_source_aws_imagebuilder_component_test.go b/aws/data_source_aws_imagebuilder_component_test.go index 0a60ecb1da2..78362385b67 100644 --- a/aws/data_source_aws_imagebuilder_component_test.go +++ b/aws/data_source_aws_imagebuilder_component_test.go @@ -2,57 +2,69 @@ package aws import ( "fmt" + "testing" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "testing" ) -func TestAccDataSourceAwsImageBuilderComponent_basic(t *testing.T) { - rName := fmt.Sprintf("tf-ib-comp-test-%s", acctest.RandString(8)) - resourceName := "aws_builder_component.test" - dataSourceName := "data.aws_builder_component.test" +func TestAccAwsImageBuilderComponentDataSource_Arn(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + dataSourceName := "data.aws_imagebuilder_component.test" + resourceName := "aws_imagebuilder_component.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: testAccProviderFactories, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, Steps: []resource.TestStep{ { - Config: testAccDataSourceAwsImageBuilderComponentConfig(rName), + Config: testAccAwsImageBuilderComponentDataSourceConfigBuildVersionArn(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "change_description", resourceName, "change_description"), + resource.TestCheckResourceAttrPair(dataSourceName, "data", resourceName, "data"), + resource.TestCheckResourceAttrPair(dataSourceName, "date_created", resourceName, "date_created"), + resource.TestCheckResourceAttrPair(dataSourceName, "description", resourceName, "description"), + resource.TestCheckResourceAttrPair(dataSourceName, "encrypted", resourceName, "encrypted"), + resource.TestCheckResourceAttrPair(dataSourceName, "kms_key_id", resourceName, "kms_key_id"), resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"), - resource.TestCheckResourceAttrPair(dataSourceName, "semantic_version", resourceName, "semantic_version"), + resource.TestCheckResourceAttrPair(dataSourceName, "owner", resourceName, "owner"), + resource.TestCheckResourceAttrPair(dataSourceName, "platform", resourceName, "platform"), + resource.TestCheckResourceAttrPair(dataSourceName, "supported_os_versions.#", resourceName, "supported_os_versions.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "tags.%", resourceName, "tags.%"), + resource.TestCheckResourceAttrPair(dataSourceName, "type", resourceName, "type"), + resource.TestCheckResourceAttrPair(dataSourceName, "version", resourceName, "version"), ), }, }, }) } -func testAccDataSourceAwsImageBuilderComponentConfig(name string) string { +func testAccAwsImageBuilderComponentDataSourceConfigBuildVersionArn(rName string) string { return fmt.Sprintf(` resource "aws_imagebuilder_component" "test" { - name = "%s" - platform = "Linux" - semantic_version = "1.0.1" - - data = < 0 { + input.SupportedOsVersions = expandStringSet(v.(*schema.Set)) + } + + if v, ok := d.GetOk("tags"); ok && len(v.(map[string]interface{})) > 0 { + input.Tags = keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().ImagebuilderTags() + } + + if v, ok := d.GetOk("uri"); ok { + input.Uri = aws.String(v.(string)) + } + + if v, ok := d.GetOk("version"); ok { + input.SemanticVersion = aws.String(v.(string)) } - log.Printf("[DEBUG] Creating Component: %#v", input) + output, err := conn.CreateComponent(input) - resp, err := conn.CreateComponent(input) if err != nil { - return fmt.Errorf("error creating Component: %s", err) + return fmt.Errorf("error creating Image Builder Component: %w", err) } - d.SetId(aws.StringValue(resp.ComponentBuildVersionArn)) + if output == nil { + return fmt.Errorf("error creating Image Builder Component: empty result") + } + + d.SetId(aws.StringValue(output.ComponentBuildVersionArn)) return resourceAwsImageBuilderComponentRead(d, meta) } @@ -130,48 +176,58 @@ func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface conn := meta.(*AWSClient).imagebuilderconn ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig - resp, err := conn.GetComponent(&imagebuilder.GetComponentInput{ + input := &imagebuilder.GetComponentInput{ ComponentBuildVersionArn: aws.String(d.Id()), - }) + } + + output, err := conn.GetComponent(input) - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { - log.Printf("[WARN] Component (%s) not found, removing from state", d.Id()) + if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, imagebuilder.ErrCodeResourceNotFoundException) { + log.Printf("[WARN] Image Builder Component (%s) not found, removing from state", d.Id()) d.SetId("") return nil } if err != nil { - return fmt.Errorf("error reading Component (%s): %s", d.Id(), err) + return fmt.Errorf("error getting Image Builder Component (%s): %w", d.Id(), err) } - d.Set("arn", resp.Component.Arn) - d.Set("name", resp.Component.Name) - d.Set("semantic_version", resp.Component.Version) - d.Set("change_description", resp.Component.ChangeDescription) - d.Set("data", resp.Component.Data) - d.Set("description", resp.Component.Description) - d.Set("kms_key_id", resp.Component.KmsKeyId) - d.Set("platform", resp.Component.Platform) - - tags, err := keyvaluetags.ImagebuilderListTags(conn, d.Get("arn").(string)) - if err != nil { - return fmt.Errorf("error listing tags for Component (%s): %s", d.Id(), err) + if output == nil || output.Component == nil { + return fmt.Errorf("error getting Image Builder Component (%s): empty result", d.Id()) } - if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { + + component := output.Component + + d.Set("arn", component.Arn) + d.Set("change_description", component.ChangeDescription) + d.Set("data", component.Data) + d.Set("date_created", component.DateCreated) + d.Set("description", component.Description) + d.Set("encrypted", component.Encrypted) + d.Set("kms_key_id", component.KmsKeyId) + d.Set("name", component.Name) + d.Set("owner", component.Owner) + d.Set("platform", component.Platform) + d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions)) + + if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { return fmt.Errorf("error setting tags: %s", err) } + d.Set("type", component.Type) + d.Set("version", component.Version) + return nil } func resourceAwsImageBuilderComponentUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn - // tags are the only thing we can actually change, everything else is ForceNew if d.HasChange("tags") { o, n := d.GetChange("tags") - if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { - return fmt.Errorf("error updating tags for Component (%s): %s", d.Id(), err) + + if err := keyvaluetags.ImagebuilderUpdateTags(conn, d.Id(), o, n); err != nil { + return fmt.Errorf("error updating tags for Image Builder Component (%s): %w", d.Id(), err) } } @@ -181,16 +237,18 @@ func resourceAwsImageBuilderComponentUpdate(d *schema.ResourceData, meta interfa func resourceAwsImageBuilderComponentDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).imagebuilderconn - _, err := conn.DeleteComponent(&imagebuilder.DeleteComponentInput{ + input := &imagebuilder.DeleteComponentInput{ ComponentBuildVersionArn: aws.String(d.Id()), - }) + } + + _, err := conn.DeleteComponent(input) - if isAWSErr(err, imagebuilder.ErrCodeResourceNotFoundException, "") { + if tfawserr.ErrCodeEquals(err, imagebuilder.ErrCodeResourceNotFoundException) { return nil } if err != nil { - return fmt.Errorf("error deleting Component (%s): %s", d.Id(), err) + return fmt.Errorf("error deleting Image Builder Component (%s): %w", d.Id(), err) } return nil diff --git a/aws/resource_aws_imagebuilder_component_test.go b/aws/resource_aws_imagebuilder_component_test.go new file mode 100644 index 00000000000..bbc0d0f026f --- /dev/null +++ b/aws/resource_aws_imagebuilder_component_test.go @@ -0,0 +1,652 @@ +package aws + +import ( + "fmt" + "log" + "regexp" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/imagebuilder" + "github.com/hashicorp/aws-sdk-go-base/tfawserr" + "github.com/hashicorp/go-multierror" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" +) + +func init() { + resource.AddTestSweepers("aws_imagebuilder_component", &resource.Sweeper{ + Name: "aws_imagebuilder_component", + F: testSweepImageBuilderComponents, + }) +} + +func testSweepImageBuilderComponents(region string) error { + client, err := sharedClientForRegion(region) + if err != nil { + return fmt.Errorf("error getting client: %s", err) + } + conn := client.(*AWSClient).imagebuilderconn + + var sweeperErrs *multierror.Error + + input := &imagebuilder.ListComponentsInput{ + Owner: aws.String(imagebuilder.OwnershipSelf), + } + + err = conn.ListComponentsPages(input, func(page *imagebuilder.ListComponentsOutput, lastPage bool) bool { + if page == nil { + return !lastPage + } + + for _, componentVersion := range page.ComponentVersionList { + if componentVersion == nil { + continue + } + + arn := aws.StringValue(componentVersion.Arn) + input := &imagebuilder.ListComponentBuildVersionsInput{ + ComponentVersionArn: componentVersion.Arn, + } + + err := conn.ListComponentBuildVersionsPages(input, func(page *imagebuilder.ListComponentBuildVersionsOutput, lastPage bool) bool { + if page == nil { + return !lastPage + } + + for _, componentSummary := range page.ComponentSummaryList { + if componentSummary == nil { + continue + } + + arn := aws.StringValue(componentSummary.Arn) + + r := resourceAwsImageBuilderComponent() + d := r.Data(nil) + d.SetId(arn) + + err := r.Delete(d, client) + + if err != nil { + sweeperErr := fmt.Errorf("error deleting Image Builder Component (%s): %w", arn, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !lastPage + }) + + if err != nil { + sweeperErr := fmt.Errorf("error listing Image Builder Component (%s) versions: %w", arn, err) + log.Printf("[ERROR] %s", sweeperErr) + sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) + continue + } + } + + return !lastPage + }) + + if testSweepSkipSweepError(err) { + log.Printf("[WARN] Skipping Image Builder Component sweep for %s: %s", region, err) + return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors + } + + if err != nil { + sweeperErrs = multierror.Append(sweeperErrs, fmt.Errorf("error listing Image Builder Components: %w", err)) + } + + return sweeperErrs.ErrorOrNil() +} + +func TestAccAwsImageBuilderComponent_basic(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + testAccMatchResourceAttrRegionalARN(resourceName, "arn", "imagebuilder", regexp.MustCompile(fmt.Sprintf("component/%s/1.0.0/[1-9][0-9]*", rName))), + resource.TestCheckResourceAttr(resourceName, "change_description", ""), + resource.TestMatchResourceAttr(resourceName, "data", regexp.MustCompile(`schemaVersion`)), + testAccCheckResourceAttrRfc3339(resourceName, "date_created"), + resource.TestCheckResourceAttr(resourceName, "description", ""), + resource.TestCheckResourceAttr(resourceName, "encrypted", "true"), + resource.TestCheckResourceAttr(resourceName, "kms_key_id", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + testAccCheckResourceAttrAccountID(resourceName, "owner"), + resource.TestCheckResourceAttr(resourceName, "platform", imagebuilder.PlatformLinux), + resource.TestCheckResourceAttr(resourceName, "supported_os_versions.#", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "type", imagebuilder.ComponentTypeBuild), + resource.TestCheckResourceAttr(resourceName, "version", "1.0.0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_disappears(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + testAccCheckResourceDisappears(testAccProvider, resourceAwsImageBuilderComponent(), resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_ChangeDescription(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigChangeDescription(rName, "description1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "change_description", "description1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_Description(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigDescription(rName, "description1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "description", "description1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_KmsKeyId(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + kmsKeyResourceName := "aws_kms_key.test" + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigKmsKeyId(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttrPair(resourceName, "kms_key_id", kmsKeyResourceName, "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_Platform_Windows(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigPlatformWindows(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "platform", imagebuilder.PlatformWindows), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_SupportedOsVersions(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigSupportedOsVersions(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "supported_os_versions.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_Tags(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigTags1(rName, "key1", "value1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAwsImageBuilderComponentConfigTags2(rName, "key1", "value1updated", "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "2"), + resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + { + Config: testAccAwsImageBuilderComponentConfigTags1(rName, "key2", "value2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"), + ), + }, + }, + }) +} + +func TestAccAwsImageBuilderComponent_Uri(t *testing.T) { + rName := acctest.RandomWithPrefix("tf-acc-test") + resourceName := "aws_imagebuilder_component.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAwsImageBuilderComponentDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAwsImageBuilderComponentConfigUri(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAwsImageBuilderComponentExists(resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"uri"}, + }, + }, + }) +} + +func testAccCheckAwsImageBuilderComponentDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_imagebuilder_component" { + continue + } + + input := &imagebuilder.GetComponentInput{ + ComponentBuildVersionArn: aws.String(rs.Primary.ID), + } + + output, err := conn.GetComponent(input) + + if tfawserr.ErrCodeEquals(err, imagebuilder.ErrCodeResourceNotFoundException) { + continue + } + + if err != nil { + return fmt.Errorf("error getting Image Builder Component (%s): %w", rs.Primary.ID, err) + } + + if output != nil { + return fmt.Errorf("Image Builder Component (%s) still exists", rs.Primary.ID) + } + } + + return nil +} + +func testAccCheckAwsImageBuilderComponentExists(resourceName string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("resource not found: %s", resourceName) + } + + conn := testAccProvider.Meta().(*AWSClient).imagebuilderconn + + input := &imagebuilder.GetComponentInput{ + ComponentBuildVersionArn: aws.String(rs.Primary.ID), + } + + _, err := conn.GetComponent(input) + + if err != nil { + return fmt.Errorf("error getting Image Builder Component (%s): %w", rs.Primary.ID, err) + } + + return nil + } +} + +func testAccAwsImageBuilderComponentConfigChangeDescription(rName string, changeDescription string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + change_description = %[2]q + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Linux" + version = "1.0.0" +} +`, rName, changeDescription) +} + +func testAccAwsImageBuilderComponentConfigDescription(rName string, description string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + description = %[2]q + name = %[1]q + platform = "Linux" + version = "1.0.0" +} +`, rName, description) +} + +func testAccAwsImageBuilderComponentConfigKmsKeyId(rName string) string { + return fmt.Sprintf(` +resource "aws_kms_key" "test" { + deletion_window_in_days = 7 +} + +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + kms_key_id = aws_kms_key.test.arn + name = %[1]q + platform = "Linux" + version = "1.0.0" +} +`, rName) +} + +func testAccAwsImageBuilderComponentConfigName(rName string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Linux" + version = "1.0.0" +} +`, rName) +} + +func testAccAwsImageBuilderComponentConfigPlatformWindows(rName string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecutePowerShell" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Windows" + version = "1.0.0" +} +`, rName) +} + +func testAccAwsImageBuilderComponentConfigSupportedOsVersions(rName string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Linux" + supported_os_versions = ["Amazon Linux 2"] + version = "1.0.0" +} +`, rName) +} + +func testAccAwsImageBuilderComponentConfigTags1(rName string, tagKey1 string, tagValue1 string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Linux" + version = "1.0.0" + + tags = { + %[2]q = %[3]q + } +} +`, rName, tagKey1, tagValue1) +} + +func testAccAwsImageBuilderComponentConfigTags2(rName string, tagKey1 string, tagValue1 string, tagKey2 string, tagValue2 string) string { + return fmt.Sprintf(` +resource "aws_imagebuilder_component" "test" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = %[1]q + platform = "Linux" + version = "1.0.0" + + tags = { + %[2]q = %[3]q + %[4]q = %[5]q + } +} +`, rName, tagKey1, tagValue1, tagKey2, tagValue2) +} + +func testAccAwsImageBuilderComponentConfigUri(rName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q +} + +resource "aws_s3_bucket_object" "test" { + bucket = aws_s3_bucket.test.bucket + content = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + key = "test.yml" +} + +resource "aws_imagebuilder_component" "test" { + name = %[1]q + platform = "Linux" + uri = "s3://${aws_s3_bucket.test.bucket}/${aws_s3_bucket_object.test.key}" + version = "1.0.0" +} +`, rName) +} diff --git a/website/docs/d/imagebuilder_component.html.markdown b/website/docs/d/imagebuilder_component.html.markdown new file mode 100644 index 00000000000..13c903cb3bf --- /dev/null +++ b/website/docs/d/imagebuilder_component.html.markdown @@ -0,0 +1,41 @@ +--- +subcategory: "Image Builder" +layout: "aws" +page_title: "AWS: aws_imagebuilder_component" +description: |- + Provides details about an Image Builder Component +--- + +# Data Source: aws_imagebuilder_component + +Provides details about an Image Builder Component. + +## Example Usage + +```hcl +data "aws_imagebuilder_component" "example" { + arn = "arn:aws:imagebuilder:us-west-2:aws:component/amazon-cloudwatch-agent-linux/1.0.0" +} +``` + +## Argument Reference + +* `arn` - (Required) Amazon Resource Name (ARN) of the component. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `change_description` - Change description of the component. +* `data` - Data of the component. +* `date_created` - Date the component was created. +* `description` - Description of the component. +* `encrypted` - Encryption status of the component. +* `kms_key_id` - Amazon Resource Name (ARN) of the Key Management Service (KMS) Key used to encrypt the component. +* `name` - Name of the component. +* `owner` - Owner of the component. +* `platform` - Platform of the component. +* `supported_os_versions` - Operating Systems (OSes) supported by the component. +* `tags` - Key-value map of resource tags for the component. +* `type` - Type of the component. +* `version` - Version of the component. diff --git a/website/docs/r/imagebuilder_component.html.markdown b/website/docs/r/imagebuilder_component.html.markdown new file mode 100644 index 00000000000..b2f25c82603 --- /dev/null +++ b/website/docs/r/imagebuilder_component.html.markdown @@ -0,0 +1,86 @@ +--- +subcategory: "Image Builder" +layout: "aws" +page_title: "AWS: aws_imagebuilder_component" +description: |- + Manage an Image Builder Component +--- + +# Resource: aws_imagebuilder_component + +Manages an Image Builder Component. + +## Example Usage + +### Inline Data Document + +```hcl +resource "aws_imagebuilder_component" "example" { + data = yamlencode({ + phases = [{ + name = "build" + steps = [{ + action = "ExecuteBash" + inputs = { + commands = ["echo 'hello world'"] + } + name = "example" + onFailure = "Continue" + }] + }] + schemaVersion = 1.0 + }) + name = "example" + platform = "Linux" + version = "1.0.0" +} +``` + +### URI Document + +```hcl +resource "aws_imagebuilder_component" "example" { + name = "example" + platform = "Linux" + uri = "s3://${aws_s3_bucket_object.example.bucket}/${aws_s3_bucket_object.example.key}" + version = "1.0.0" +} +``` + +## Argument Reference + +The following arguments are required: + +* `name` - (Required) Name of the component. +* `platform` - (Required) Platform of the component. +* `version` - (Required) Version of the component. + +The following attributes are optional: + +* `change_description` - (Optional) Change description of the component. +* `data` - (Optional) Inline YAML string with data of the component. Exactly one of `data` and `uri` can be specified. Terraform will only perform drift detection of its value when present in a configuration. +* `description` - (Optional) Description of the component. +* `kms_key_id` - (Optional) Amazon Resource Name (ARN) of the Key Management Service (KMS) Key used to encrypt the component. +* `supported_os_versions` - (Optional) Set of Operating Systems (OS) supported by the component. +* `tags` - (Optional) Key-value map of resource tags for the component. +* `uri` - (Optional) S3 URI with data of the component. Exactly one of `data` and `uri` can be specified. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `arn` - (Required) Amazon Resource Name (ARN) of the component. +* `date_created` - Date the component was created. +* `encrypted` - Encryption status of the component. +* `owner` - Owner of the component. +* `type` - Type of the component. + +## Import + +`aws_imagebuilder_components` resources can be imported by using the Amazon Resource Name (ARN), e.g. + +``` +$ terraform import aws_imagebuilder_component.example arn:aws:imagebuilder:us-east-1:123456789012:component/example/1.0.0/1 +``` + +Certain resource arguments, such as `uri`, cannot be read via the API and imported into Terraform. Terraform will display a difference for these arguments the first run after import if declared in the Terraform configuration for an imported resource. From 462e3248dfb19bcd3e913660566ffbf45959727f Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 13 Nov 2020 10:20:04 -0500 Subject: [PATCH 22/24] resource/aws_imagebuilder_component: terrafmt fixes --- ...resource_aws_imagebuilder_component_test.go | 18 +++++++++--------- .../r/imagebuilder_component.html.markdown | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_imagebuilder_component_test.go b/aws/resource_aws_imagebuilder_component_test.go index bbc0d0f026f..0bee0113e67 100644 --- a/aws/resource_aws_imagebuilder_component_test.go +++ b/aws/resource_aws_imagebuilder_component_test.go @@ -414,7 +414,7 @@ resource "aws_imagebuilder_component" "test" { change_description = %[2]q data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -438,7 +438,7 @@ func testAccAwsImageBuilderComponentConfigDescription(rName string, description resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -467,7 +467,7 @@ resource "aws_kms_key" "test" { resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -492,7 +492,7 @@ func testAccAwsImageBuilderComponentConfigName(rName string) string { resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -516,7 +516,7 @@ func testAccAwsImageBuilderComponentConfigPlatformWindows(rName string) string { resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecutePowerShell" inputs = { @@ -540,7 +540,7 @@ func testAccAwsImageBuilderComponentConfigSupportedOsVersions(rName string) stri resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -565,7 +565,7 @@ func testAccAwsImageBuilderComponentConfigTags1(rName string, tagKey1 string, ta resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -593,7 +593,7 @@ func testAccAwsImageBuilderComponentConfigTags2(rName string, tagKey1 string, ta resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { @@ -627,7 +627,7 @@ resource "aws_s3_bucket_object" "test" { bucket = aws_s3_bucket.test.bucket content = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { diff --git a/website/docs/r/imagebuilder_component.html.markdown b/website/docs/r/imagebuilder_component.html.markdown index b2f25c82603..0f164dc33ab 100644 --- a/website/docs/r/imagebuilder_component.html.markdown +++ b/website/docs/r/imagebuilder_component.html.markdown @@ -18,7 +18,7 @@ Manages an Image Builder Component. resource "aws_imagebuilder_component" "example" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { From 068c4fd3c406631d94b5c497cc4849356e0b33f5 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 13 Nov 2020 10:31:00 -0500 Subject: [PATCH 23/24] tests/data-source/aws_imagebuilder_component: terrafmt fix --- aws/data_source_aws_imagebuilder_component_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/data_source_aws_imagebuilder_component_test.go b/aws/data_source_aws_imagebuilder_component_test.go index 78362385b67..feb31cfcc83 100644 --- a/aws/data_source_aws_imagebuilder_component_test.go +++ b/aws/data_source_aws_imagebuilder_component_test.go @@ -46,7 +46,7 @@ func testAccAwsImageBuilderComponentDataSourceConfigBuildVersionArn(rName string resource "aws_imagebuilder_component" "test" { data = yamlencode({ phases = [{ - name = "build" + name = "build" steps = [{ action = "ExecuteBash" inputs = { From 45e74500909b7836d6ce71059b0d92704cd3b7e7 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 17 Nov 2020 14:32:24 -0500 Subject: [PATCH 24/24] Apply suggestions from code review --- aws/data_source_aws_imagebuilder_component.go | 2 +- aws/resource_aws_imagebuilder_component.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/data_source_aws_imagebuilder_component.go b/aws/data_source_aws_imagebuilder_component.go index 23276c9e4d8..20fe6efb607 100644 --- a/aws/data_source_aws_imagebuilder_component.go +++ b/aws/data_source_aws_imagebuilder_component.go @@ -110,7 +110,7 @@ func dataSourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interfa d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions)) if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) + return fmt.Errorf("error setting tags: %w", err) } d.Set("type", component.Type) diff --git a/aws/resource_aws_imagebuilder_component.go b/aws/resource_aws_imagebuilder_component.go index 9e663db6c07..59fa135e242 100644 --- a/aws/resource_aws_imagebuilder_component.go +++ b/aws/resource_aws_imagebuilder_component.go @@ -211,7 +211,7 @@ func resourceAwsImageBuilderComponentRead(d *schema.ResourceData, meta interface d.Set("supported_os_versions", aws.StringValueSlice(component.SupportedOsVersions)) if err := d.Set("tags", keyvaluetags.ImagebuilderKeyValueTags(component.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil { - return fmt.Errorf("error setting tags: %s", err) + return fmt.Errorf("error setting tags: %w", err) } d.Set("type", component.Type)