From 43d363b36de51a07a57da313217d679f6d3c36c6 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 2 Nov 2021 13:17:39 -0400 Subject: [PATCH 1/3] Realign inconsistent elasticbeanstalk names --- .github/labeler-issue-triage.yml | 2 +- .semgrep.yml | 2 +- docs/contributing/contribution-checklists.md | 2 +- internal/provider/provider.go | 21 ++- internal/service/ec2/sweep.go | 4 +- .../application_data_source_test.go | 8 +- .../elasticbeanstalk/application_test.go | 60 ++++---- .../application_version_test.go | 40 +++--- .../configuration_template_test.go | 30 ++-- .../elasticbeanstalk/environment_test.go | 134 +++++++++--------- .../hosted_zone_data_source_test.go | 8 +- .../solution_stack_data_source.go | 4 +- .../solution_stack_data_source_test.go | 6 +- internal/service/elasticbeanstalk/sweep.go | 10 +- internal/service/iam/sweep.go | 4 +- internal/service/sqs/sweep.go | 2 +- ...lasticbeanstalk_application.html.markdown} | 10 +- ...lasticbeanstalk_hosted_zone.html.markdown} | 6 +- ...ticbeanstalk_solution_stack.html.markdown} | 6 +- ...lasticbeanstalk_application.html.markdown} | 8 +- ...anstalk_application_version.html.markdown} | 10 +- ...talk_configuration_template.html.markdown} | 10 +- ...lasticbeanstalk_environment.html.markdown} | 18 +-- 23 files changed, 206 insertions(+), 199 deletions(-) rename website/docs/d/{elastic_beanstalk_application.html.markdown => elasticbeanstalk_application.html.markdown} (79%) rename website/docs/d/{elastic_beanstalk_hosted_zone.html.markdown => elasticbeanstalk_hosted_zone.html.markdown} (77%) rename website/docs/d/{elastic_beanstalk_solution_stack.html.markdown => elasticbeanstalk_solution_stack.html.markdown} (86%) rename website/docs/r/{elastic_beanstalk_application.html.markdown => elasticbeanstalk_application.html.markdown} (91%) rename website/docs/r/{elastic_beanstalk_application_version.html.markdown => elasticbeanstalk_application_version.html.markdown} (86%) rename website/docs/r/{elastic_beanstalk_configuration_template.html.markdown => elasticbeanstalk_configuration_template.html.markdown} (86%) rename website/docs/r/{elastic_beanstalk_environment.html.markdown => elasticbeanstalk_environment.html.markdown} (91%) diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml index 8e5e7a01cc70..904b678484e8 100644 --- a/.github/labeler-issue-triage.yml +++ b/.github/labeler-issue-triage.yml @@ -161,7 +161,7 @@ elastic-transcoder: service/elasticache: - '((\*|-) ?`?|(data|resource) "?)aws_elasticache_' service/elasticbeanstalk: - - '((\*|-) ?`?|(data|resource) "?)aws_elastic_beanstalk_' + - '((\*|-) ?`?|(data|resource) "?)aws_elasticbeanstalk_' service/elasticsearch: - '((\*|-) ?`?|(data|resource) "?)aws_elasticsearch_' service/elb: diff --git a/.semgrep.yml b/.semgrep.yml index 990eb25d85a0..4ee45214182c 100644 --- a/.semgrep.yml +++ b/.semgrep.yml @@ -30,7 +30,7 @@ rules: # Legacy resource handling - aws/resource_aws_autoscaling_group.go - aws/resource_aws_efs_mount_target.go - - aws/resource_aws_elastic_beanstalk_environment.go + - aws/resource_aws_elasticbeanstalk_environment.go - aws/resource_aws_elb.go - aws/resource_aws_iam_server_certificate.go - aws/resource_aws_lambda_event_source_mapping.go diff --git a/docs/contributing/contribution-checklists.md b/docs/contributing/contribution-checklists.md index 1ac4d76d9ee0..9093fa954d5e 100644 --- a/docs/contributing/contribution-checklists.md +++ b/docs/contributing/contribution-checklists.md @@ -938,4 +938,4 @@ RIPStaticConfig if they are not documented yet. - [ ] Check [CloudTrail Supported Regions docs](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-supported-regions.html#cloudtrail-supported-regions) and add AWS Account ID if available to `aws/data_source_aws_cloudtrail_service_account.go` - [ ] Check [Elastic Load Balancing Access Logs docs](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy) and add Elastic Load Balancing Account ID if available to `aws/data_source_aws_elb_service_account.go` - [ ] Check [Redshift Database Audit Logging docs](https://docs.aws.amazon.com/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions) and add AWS Account ID if available to `aws/data_source_aws_redshift_service_account.go` -- [ ] Check [AWS Elastic Beanstalk endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html#elasticbeanstalk_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elastic_beanstalk_hosted_zone.go` +- [ ] Check [AWS Elastic Beanstalk endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html#elasticbeanstalk_region) and add Route53 Hosted Zone ID if available to `aws/data_source_aws_elasticbeanstalk_hosted_zone.go` diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 7471764fb8fd..223203dd2d64 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -497,9 +497,12 @@ func Provider() *schema.Provider { "aws_elasticache_replication_group": elasticache.DataSourceReplicationGroup(), "aws_elasticache_user": elasticache.DataSourceUser(), - "aws_elastic_beanstalk_application": elasticbeanstalk.DataSourceApplication(), - "aws_elastic_beanstalk_hosted_zone": elasticbeanstalk.DataSourceHostedZone(), - "aws_elastic_beanstalk_solution_stack": elasticbeanstalk.DataSourceSolutionStack(), + "aws_elasticbeanstalk_application": elasticbeanstalk.DataSourceApplication(), + "aws_elasticbeanstalk_hosted_zone": elasticbeanstalk.DataSourceHostedZone(), + "aws_elasticbeanstalk_solution_stack": elasticbeanstalk.DataSourceSolutionStack(), + "aws_elastic_beanstalk_application": elasticbeanstalk.DataSourceApplication(), // backward compatible alias + "aws_elastic_beanstalk_hosted_zone": elasticbeanstalk.DataSourceHostedZone(), // backward compatible alias + "aws_elastic_beanstalk_solution_stack": elasticbeanstalk.DataSourceSolutionStack(), // backward compatible alias "aws_elasticsearch_domain": elasticsearch.DataSourceDomain(), @@ -1119,10 +1122,14 @@ func Provider() *schema.Provider { "aws_elasticache_user": elasticache.ResourceUser(), "aws_elasticache_user_group": elasticache.ResourceUserGroup(), - "aws_elastic_beanstalk_application": elasticbeanstalk.ResourceApplication(), - "aws_elastic_beanstalk_application_version": elasticbeanstalk.ResourceApplicationVersion(), - "aws_elastic_beanstalk_configuration_template": elasticbeanstalk.ResourceConfigurationTemplate(), - "aws_elastic_beanstalk_environment": elasticbeanstalk.ResourceEnvironment(), + "aws_elasticbeanstalk_application": elasticbeanstalk.ResourceApplication(), + "aws_elasticbeanstalk_application_version": elasticbeanstalk.ResourceApplicationVersion(), + "aws_elasticbeanstalk_configuration_template": elasticbeanstalk.ResourceConfigurationTemplate(), + "aws_elasticbeanstalk_environment": elasticbeanstalk.ResourceEnvironment(), + "aws_elastic_beanstalk_application": elasticbeanstalk.ResourceApplication(), // backward compatible alias + "aws_elastic_beanstalk_application_version": elasticbeanstalk.ResourceApplicationVersion(), // backward compatible alias + "aws_elastic_beanstalk_configuration_template": elasticbeanstalk.ResourceConfigurationTemplate(), // backward compatible alias + "aws_elastic_beanstalk_environment": elasticbeanstalk.ResourceEnvironment(), // backward compatible alias "aws_elasticsearch_domain": elasticsearch.ResourceDomain(), "aws_elasticsearch_domain_policy": elasticsearch.ResourceDomainPolicy(), diff --git a/internal/service/ec2/sweep.go b/internal/service/ec2/sweep.go index c9168ffc5015..fd860dea7d27 100644 --- a/internal/service/ec2/sweep.go +++ b/internal/service/ec2/sweep.go @@ -97,7 +97,7 @@ func init() { resource.AddTestSweepers("aws_key_pair", &resource.Sweeper{ Name: "aws_key_pair", Dependencies: []string{ - "aws_elastic_beanstalk_environment", + "aws_elasticbeanstalk_environment", "aws_instance", "aws_spot_fleet_request", }, @@ -166,7 +166,7 @@ func init() { Dependencies: []string{ "aws_autoscaling_group", "aws_batch_compute_environment", - "aws_elastic_beanstalk_environment", + "aws_elasticbeanstalk_environment", "aws_cloudhsm_v2_cluster", "aws_db_subnet_group", "aws_directory_service_directory", diff --git a/internal/service/elasticbeanstalk/application_data_source_test.go b/internal/service/elasticbeanstalk/application_data_source_test.go index bb21f9a08353..0f82150224c0 100644 --- a/internal/service/elasticbeanstalk/application_data_source_test.go +++ b/internal/service/elasticbeanstalk/application_data_source_test.go @@ -16,8 +16,8 @@ import ( func TestAccElasticBeanstalkApplicationDataSource_basic(t *testing.T) { rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(5)) - dataSourceResourceName := "data.aws_elastic_beanstalk_application.test" - resourceName := "aws_elastic_beanstalk_application.tftest" + dataSourceResourceName := "data.aws_elasticbeanstalk_application.test" + resourceName := "aws_elasticbeanstalk_application.tftest" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -45,8 +45,8 @@ func testAccApplicationDataSourceConfig_Basic(rName string) string { return fmt.Sprintf(` %s -data "aws_elastic_beanstalk_application" "test" { - name = aws_elastic_beanstalk_application.tftest.name +data "aws_elasticbeanstalk_application" "test" { + name = aws_elasticbeanstalk_application.tftest.name } `, testAccBeanstalkAppConfigWithMaxAge(rName)) } diff --git a/internal/service/elasticbeanstalk/application_test.go b/internal/service/elasticbeanstalk/application_test.go index 2f89ede8c98f..ade1a3549103 100644 --- a/internal/service/elasticbeanstalk/application_test.go +++ b/internal/service/elasticbeanstalk/application_test.go @@ -17,7 +17,7 @@ import ( func TestAccElasticBeanstalkApplication_BeanstalkApp_basic(t *testing.T) { var app elasticbeanstalk.ApplicationDescription rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_elastic_beanstalk_application.tftest" + resourceName := "aws_elasticbeanstalk_application.tftest" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -53,47 +53,47 @@ func TestAccElasticBeanstalkApplication_BeanstalkApp_appVersionLifecycle(t *test { Config: testAccBeanstalkAppConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkAppExists("aws_elastic_beanstalk_application.tftest", &app), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.service_role"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_count"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3"), + testAccCheckBeanstalkAppExists("aws_elasticbeanstalk_application.tftest", &app), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.service_role"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_count"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3"), ), }, { Config: testAccBeanstalkAppConfigWithMaxAge(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkAppExists("aws_elastic_beanstalk_application.tftest", &app), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.#", "1"), + testAccCheckBeanstalkAppExists("aws_elasticbeanstalk_application.tftest", &app), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.#", "1"), resource.TestCheckResourceAttrPair( - "aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.service_role", + "aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.service_role", "aws_iam_role.beanstalk_service", "arn"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days", "90"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_count", "0"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3", "true"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days", "90"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_count", "0"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3", "true"), ), }, { Config: testAccBeanstalkAppConfigWithMaxCount(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkAppExists("aws_elastic_beanstalk_application.tftest", &app), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.#", "1"), + testAccCheckBeanstalkAppExists("aws_elasticbeanstalk_application.tftest", &app), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.#", "1"), resource.TestCheckResourceAttrPair( - "aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.service_role", + "aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.service_role", "aws_iam_role.beanstalk_service", "arn"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days", "0"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_count", "10"), - resource.TestCheckResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3", "false"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days", "0"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_count", "10"), + resource.TestCheckResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3", "false"), ), }, { Config: testAccBeanstalkAppConfig(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkAppExists("aws_elastic_beanstalk_application.tftest", &app), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.service_role"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.max_count"), - resource.TestCheckNoResourceAttr("aws_elastic_beanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3"), + testAccCheckBeanstalkAppExists("aws_elasticbeanstalk_application.tftest", &app), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.service_role"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_age_in_days"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.max_count"), + resource.TestCheckNoResourceAttr("aws_elasticbeanstalk_application.tftest", "appversion_lifecycle.0.delete_source_from_s3"), ), }, }, @@ -103,7 +103,7 @@ func TestAccElasticBeanstalkApplication_BeanstalkApp_appVersionLifecycle(t *test func TestAccElasticBeanstalkApplication_BeanstalkApp_tags(t *testing.T) { var app elasticbeanstalk.ApplicationDescription rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_elastic_beanstalk_application.tftest" + resourceName := "aws_elasticbeanstalk_application.tftest" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -161,7 +161,7 @@ func testAccCheckBeanstalkAppDestroy(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ElasticBeanstalkConn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_elastic_beanstalk_application" { + if rs.Type != "aws_elasticbeanstalk_application" { continue } @@ -216,7 +216,7 @@ func testAccCheckBeanstalkAppExists(n string, app *elasticbeanstalk.ApplicationD func testAccBeanstalkAppConfig(rName string) string { return fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "%s" description = "tf-test-desc" } @@ -277,7 +277,7 @@ EOF func testAccBeanstalkAppConfigWithMaxAge(rName string) string { return testAccBeanstalkAppServiceRole(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "%s" description = "tf-test-desc" @@ -292,7 +292,7 @@ resource "aws_elastic_beanstalk_application" "tftest" { func testAccBeanstalkAppConfigWithMaxCount(rName string) string { return testAccBeanstalkAppServiceRole(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "%s" description = "tf-test-desc" @@ -307,7 +307,7 @@ resource "aws_elastic_beanstalk_application" "tftest" { func testAccBeanstalkAppConfigWithTags(rName, tag1, tag2 string) string { return fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "%s" description = "tf-test-desc" @@ -321,7 +321,7 @@ resource "aws_elastic_beanstalk_application" "tftest" { func testAccBeanstalkAppConfigWithAddTags(rName, tag1, tag2, tag3 string) string { return fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "%s" description = "tf-test-desc" diff --git a/internal/service/elasticbeanstalk/application_version_test.go b/internal/service/elasticbeanstalk/application_version_test.go index f1dbbe0d6ae9..9a24e5c2ec64 100644 --- a/internal/service/elasticbeanstalk/application_version_test.go +++ b/internal/service/elasticbeanstalk/application_version_test.go @@ -27,7 +27,7 @@ func TestAccElasticBeanstalkApplicationVersion_BeanstalkApp_basic(t *testing.T) { Config: testAccBeanstalkApplicationVersionConfig(sdkacctest.RandInt()), Check: resource.ComposeTestCheckFunc( - testAccCheckApplicationVersionExists("aws_elastic_beanstalk_application_version.default", &appVersion), + testAccCheckApplicationVersionExists("aws_elasticbeanstalk_application_version.default", &appVersion), ), }, }, @@ -47,8 +47,8 @@ func TestAccElasticBeanstalkApplicationVersion_BeanstalkApp_duplicateLabels(t *t { Config: testAccBeanstalkApplicationVersionConfig_duplicateLabel(sdkacctest.RandInt()), Check: resource.ComposeTestCheckFunc( - testAccCheckApplicationVersionExists("aws_elastic_beanstalk_application_version.first", &firstAppVersion), - testAccCheckApplicationVersionExists("aws_elastic_beanstalk_application_version.second", &secondAppVersion), + testAccCheckApplicationVersionExists("aws_elasticbeanstalk_application_version.first", &firstAppVersion), + testAccCheckApplicationVersionExists("aws_elasticbeanstalk_application_version.second", &secondAppVersion), ), }, }, @@ -57,7 +57,7 @@ func TestAccElasticBeanstalkApplicationVersion_BeanstalkApp_duplicateLabels(t *t func TestAccElasticBeanstalkApplicationVersion_BeanstalkApp_tags(t *testing.T) { var appVersion elasticbeanstalk.ApplicationVersionDescription - resourceName := "aws_elastic_beanstalk_application_version.default" + resourceName := "aws_elasticbeanstalk_application_version.default" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -110,7 +110,7 @@ func testAccCheckApplicationVersionDestroy(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ElasticBeanstalkConn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_elastic_beanstalk_application_version" { + if rs.Type != "aws_elasticbeanstalk_application_version" { continue } @@ -183,13 +183,13 @@ resource "aws_s3_bucket_object" "default" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application" "default" { +resource "aws_elasticbeanstalk_application" "default" { name = "tf-test-name-%d" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "default" { - application = aws_elastic_beanstalk_application.default.name +resource "aws_elasticbeanstalk_application_version" "default" { + application = aws_elasticbeanstalk_application.default.name name = "tf-test-version-label-%d" bucket = aws_s3_bucket.default.id key = aws_s3_bucket_object.default.id @@ -209,25 +209,25 @@ resource "aws_s3_bucket_object" "default" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application" "first" { +resource "aws_elasticbeanstalk_application" "first" { name = "tf-test-name-%d-first" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "first" { - application = aws_elastic_beanstalk_application.first.name +resource "aws_elasticbeanstalk_application_version" "first" { + application = aws_elasticbeanstalk_application.first.name name = "tf-test-version-label-%d" bucket = aws_s3_bucket.default.id key = aws_s3_bucket_object.default.id } -resource "aws_elastic_beanstalk_application" "second" { +resource "aws_elasticbeanstalk_application" "second" { name = "tf-test-name-%d-second" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "second" { - application = aws_elastic_beanstalk_application.second.name +resource "aws_elasticbeanstalk_application_version" "second" { + application = aws_elasticbeanstalk_application.second.name name = "tf-test-version-label-%d" bucket = aws_s3_bucket.default.id key = aws_s3_bucket_object.default.id @@ -247,13 +247,13 @@ resource "aws_s3_bucket_object" "default" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application" "default" { +resource "aws_elasticbeanstalk_application" "default" { name = "tf-test-name-%[1]d" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "default" { - application = aws_elastic_beanstalk_application.default.name +resource "aws_elasticbeanstalk_application_version" "default" { + application = aws_elasticbeanstalk_application.default.name name = "tf-test-version-label-%[1]d" bucket = aws_s3_bucket.default.id key = aws_s3_bucket_object.default.id @@ -278,13 +278,13 @@ resource "aws_s3_bucket_object" "default" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application" "default" { +resource "aws_elasticbeanstalk_application" "default" { name = "tf-test-name-%[1]d" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "default" { - application = aws_elastic_beanstalk_application.default.name +resource "aws_elasticbeanstalk_application_version" "default" { + application = aws_elasticbeanstalk_application.default.name name = "tf-test-version-label-%[1]d" bucket = aws_s3_bucket.default.id key = aws_s3_bucket_object.default.id diff --git a/internal/service/elasticbeanstalk/configuration_template_test.go b/internal/service/elasticbeanstalk/configuration_template_test.go index 5a5ad902faa6..e104afba87b3 100644 --- a/internal/service/elasticbeanstalk/configuration_template_test.go +++ b/internal/service/elasticbeanstalk/configuration_template_test.go @@ -26,7 +26,7 @@ func TestAccElasticBeanstalkConfigurationTemplate_Beanstalk_basic(t *testing.T) { Config: testAccBeanstalkConfigurationTemplateConfig(sdkacctest.RandString(5)), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkConfigurationTemplateExists("aws_elastic_beanstalk_configuration_template.tf_template", &config), + testAccCheckBeanstalkConfigurationTemplateExists("aws_elasticbeanstalk_configuration_template.tf_template", &config), ), }, }, @@ -45,7 +45,7 @@ func TestAccElasticBeanstalkConfigurationTemplate_Beanstalk_vpc(t *testing.T) { { Config: testAccBeanstalkConfigurationTemplateConfig_VPC(sdkacctest.RandString(5)), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkConfigurationTemplateExists("aws_elastic_beanstalk_configuration_template.tf_template", &config), + testAccCheckBeanstalkConfigurationTemplateExists("aws_elasticbeanstalk_configuration_template.tf_template", &config), ), }, }, @@ -64,10 +64,10 @@ func TestAccElasticBeanstalkConfigurationTemplate_Beanstalk_setting(t *testing.T { Config: testAccBeanstalkConfigurationTemplateConfig_Setting(sdkacctest.RandString(5)), Check: resource.ComposeTestCheckFunc( - testAccCheckBeanstalkConfigurationTemplateExists("aws_elastic_beanstalk_configuration_template.tf_template", &config), + testAccCheckBeanstalkConfigurationTemplateExists("aws_elasticbeanstalk_configuration_template.tf_template", &config), resource.TestCheckResourceAttr( - "aws_elastic_beanstalk_configuration_template.tf_template", "setting.#", "1"), - resource.TestCheckTypeSetElemNestedAttrs("aws_elastic_beanstalk_configuration_template.tf_template", "setting.*", map[string]string{ + "aws_elasticbeanstalk_configuration_template.tf_template", "setting.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs("aws_elasticbeanstalk_configuration_template.tf_template", "setting.*", map[string]string{ "value": "m1.small", }), ), @@ -80,7 +80,7 @@ func testAccCheckBeanstalkConfigurationTemplateDestroy(s *terraform.State) error conn := acctest.Provider.Meta().(*conns.AWSClient).ElasticBeanstalkConn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_elastic_beanstalk_configuration_template" { + if rs.Type != "aws_elasticbeanstalk_configuration_template" { continue } @@ -150,14 +150,14 @@ func testAccCheckBeanstalkConfigurationTemplateExists(n string, config *elasticb func testAccBeanstalkConfigurationTemplateConfig(r string) string { return fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-%s" description = "tf-test-desc-%s" } -resource "aws_elastic_beanstalk_configuration_template" "tf_template" { +resource "aws_elasticbeanstalk_configuration_template" "tf_template" { name = "tf-test-template-config" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux running Python" } `, r, r) @@ -182,14 +182,14 @@ resource "aws_subnet" "main" { } } -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-%s" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_configuration_template" "tf_template" { +resource "aws_elasticbeanstalk_configuration_template" "tf_template" { name = "tf-test-%s" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux running Python" @@ -210,14 +210,14 @@ resource "aws_elastic_beanstalk_configuration_template" "tf_template" { func testAccBeanstalkConfigurationTemplateConfig_Setting(name string) string { return fmt.Sprintf(` -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-%s" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_configuration_template" "tf_template" { +resource "aws_elasticbeanstalk_configuration_template" "tf_template" { name = "tf-test-%s" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux running Python" diff --git a/internal/service/elasticbeanstalk/environment_test.go b/internal/service/elasticbeanstalk/environment_test.go index f091135c4d48..ef5f2283b090 100644 --- a/internal/service/elasticbeanstalk/environment_test.go +++ b/internal/service/elasticbeanstalk/environment_test.go @@ -22,7 +22,7 @@ import ( func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_basic(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) beanstalkAsgNameRegexp := regexp.MustCompile("awseb.+?AutoScalingGroup[^,]+") @@ -66,7 +66,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_tier(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription beanstalkQueuesNameRegexp := regexp.MustCompile("https://sqs.+?awseb[^,]+") - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -98,7 +98,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_tier(t *testing.T) { func TestAccElasticBeanstalkEnvironment_BeanstalkEnvCNAME_prefix(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) beanstalkCnameRegexp := regexp.MustCompile("^" + rName + ".+?elasticbeanstalk.com$") @@ -132,7 +132,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnvCNAME_prefix(t *testing.T) { func TestAccElasticBeanstalkEnvironment_beanstalkEnv(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -179,7 +179,7 @@ func TestAccElasticBeanstalkEnvironment_beanstalkEnv(t *testing.T) { func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_resource(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -210,7 +210,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_resource(t *testing.T) { func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_tags(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -256,7 +256,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_tags(t *testing.T) { func TestAccElasticBeanstalkEnvironment_BeanstalkEnvTemplate_change(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -290,7 +290,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnvTemplate_change(t *testing.T func TestAccElasticBeanstalkEnvironment_BeanstalkEnvSettings_update(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -334,7 +334,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnvSettings_update(t *testing.T func TestAccElasticBeanstalkEnvironment_BeanstalkEnvVersion_label(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -371,7 +371,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnvVersion_label(t *testing.T) func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_settingWithJSONValue(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) publicKey, _, err := sdkacctest.RandSSHKeyPair(acctest.DefaultEmailAddress) if err != nil { @@ -406,7 +406,7 @@ func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_settingWithJSONValue(t *tes func TestAccElasticBeanstalkEnvironment_BeanstalkEnv_platformARN(t *testing.T) { var app elasticbeanstalk.EnvironmentDescription - resourceName := "aws_elastic_beanstalk_environment.test" + resourceName := "aws_elasticbeanstalk_environment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -491,7 +491,7 @@ func testAccCheckBeanstalkEnvDestroy(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ElasticBeanstalkConn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_elastic_beanstalk_environment" { + if rs.Type != "aws_elasticbeanstalk_environment" { continue } @@ -700,7 +700,7 @@ data "aws_availability_zones" "available" { } } -data "aws_elastic_beanstalk_solution_stack" "test" { +data "aws_elasticbeanstalk_solution_stack" "test" { most_recent = true name_regex = "64bit Amazon Linux .* running Python .*" } @@ -742,7 +742,7 @@ resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_elastic_beanstalk_application" "test" { +resource "aws_elasticbeanstalk_application" "test" { description = "tf-test-desc" name = %[1]q } @@ -821,10 +821,10 @@ resource "aws_iam_instance_profile" "test" { func testAccBeanstalkEnvConfig(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -867,8 +867,8 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkEnvConfig_platform_arn(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q platform_arn = "arn:${data.aws_partition.current.partition}:elasticbeanstalk:${data.aws_region.current.name}::platform/Python 3.6 running on 64bit Amazon Linux/2.9.6" @@ -913,10 +913,10 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkEnvConfig_settings(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -998,10 +998,10 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkWorkerEnvConfig(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name tier = "Worker" setting { @@ -1045,11 +1045,11 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkEnvCnamePrefixConfig(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name cname_prefix = %[1]q name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -1092,16 +1092,16 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkConfigTemplate(rName string, cfgTplValue int) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - template_name = aws_elastic_beanstalk_configuration_template.test.name + template_name = aws_elasticbeanstalk_configuration_template.test.name } -resource "aws_elastic_beanstalk_configuration_template" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_configuration_template" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -1150,10 +1150,10 @@ resource "aws_elastic_beanstalk_configuration_template" "test" { func testAccBeanstalkResourceOptionSetting(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -1217,10 +1217,10 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkTagsTemplate(rName, firstTag, secondTag string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -1268,10 +1268,10 @@ resource "aws_elastic_beanstalk_environment" "test" { func testAccBeanstalkEnv_TemplateChange_stack(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name setting { namespace = "aws:ec2:vpc" @@ -1310,20 +1310,20 @@ resource "aws_elastic_beanstalk_environment" "test" { } } -resource "aws_elastic_beanstalk_configuration_template" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_configuration_template" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name } `, rName) } func testAccBeanstalkEnv_TemplateChange_temp(rName string) string { return testAccBeanstalkEnvConfigBase(rName) + fmt.Sprintf(` -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - template_name = aws_elastic_beanstalk_configuration_template.test.name + template_name = aws_elasticbeanstalk_configuration_template.test.name setting { namespace = "aws:ec2:vpc" @@ -1362,10 +1362,10 @@ resource "aws_elastic_beanstalk_environment" "test" { } } -resource "aws_elastic_beanstalk_configuration_template" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_configuration_template" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name } `, rName) } @@ -1382,18 +1382,18 @@ resource "aws_s3_bucket_object" "test" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application_version" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_application_version" "test" { + application = aws_elasticbeanstalk_application.test.name bucket = aws_s3_bucket.test.id key = aws_s3_bucket_object.test.id name = "%[1]s-1" } -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name - version_label = aws_elastic_beanstalk_application_version.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name + version_label = aws_elasticbeanstalk_application_version.test.name setting { namespace = "aws:ec2:vpc" @@ -1446,18 +1446,18 @@ resource "aws_s3_bucket_object" "test" { source = "test-fixtures/python-v1.zip" } -resource "aws_elastic_beanstalk_application_version" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_application_version" "test" { + application = aws_elasticbeanstalk_application.test.name bucket = aws_s3_bucket.test.id key = aws_s3_bucket_object.test.id name = "%[1]s-2" } -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name - version_label = aws_elastic_beanstalk_application_version.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name + version_label = aws_elasticbeanstalk_application_version.test.name setting { namespace = "aws:ec2:vpc" @@ -1509,10 +1509,10 @@ resource "aws_key_pair" "test" { public_key = %[2]q } -resource "aws_elastic_beanstalk_environment" "test" { - application = aws_elastic_beanstalk_application.test.name +resource "aws_elasticbeanstalk_environment" "test" { + application = aws_elasticbeanstalk_application.test.name name = %[1]q - solution_stack_name = data.aws_elastic_beanstalk_solution_stack.test.name + solution_stack_name = data.aws_elasticbeanstalk_solution_stack.test.name tier = "Worker" setting { diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source_test.go b/internal/service/elasticbeanstalk/hosted_zone_data_source_test.go index e69a3f26b913..202cacc2f786 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source_test.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source_test.go @@ -13,7 +13,7 @@ import ( ) func TestAccElasticBeanstalkHostedZoneDataSource_basic(t *testing.T) { - dataSourceName := "data.aws_elastic_beanstalk_hosted_zone.test" + dataSourceName := "data.aws_elasticbeanstalk_hosted_zone.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -31,7 +31,7 @@ func TestAccElasticBeanstalkHostedZoneDataSource_basic(t *testing.T) { } func TestAccElasticBeanstalkHostedZoneDataSource_region(t *testing.T) { - dataSourceName := "data.aws_elastic_beanstalk_hosted_zone.test" + dataSourceName := "data.aws_elasticbeanstalk_hosted_zone.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -71,12 +71,12 @@ func testAccCheckHostedZone(resourceName string, region string) resource.TestChe } const testAccCheckAWSElasticBeanstalkHostedZoneDataSource_currentRegion = ` -data "aws_elastic_beanstalk_hosted_zone" "test" {} +data "aws_elasticbeanstalk_hosted_zone" "test" {} ` func testAccCheckHostedZoneDataSource_byRegion(r string) string { return fmt.Sprintf(` -data "aws_elastic_beanstalk_hosted_zone" "test" { +data "aws_elasticbeanstalk_hosted_zone" "test" { region = "%s" } `, r) diff --git a/internal/service/elasticbeanstalk/solution_stack_data_source.go b/internal/service/elasticbeanstalk/solution_stack_data_source.go index 56147658953a..d0419b7a2786 100644 --- a/internal/service/elasticbeanstalk/solution_stack_data_source.go +++ b/internal/service/elasticbeanstalk/solution_stack_data_source.go @@ -69,7 +69,7 @@ func dataSourceSolutionStackRead(d *schema.ResourceData, meta interface{}) error solutionStack = filteredSolutionStacks[0] } else { recent := d.Get("most_recent").(bool) - log.Printf("[DEBUG] aws_elastic_beanstalk_solution_stack - multiple results found and `most_recent` is set to: %t", recent) + log.Printf("[DEBUG] aws_elasticbeanstalk_solution_stack - multiple results found and `most_recent` is set to: %t", recent) if recent { solutionStack = mostRecentSolutionStack(filteredSolutionStacks) } else { @@ -78,7 +78,7 @@ func dataSourceSolutionStackRead(d *schema.ResourceData, meta interface{}) error } } - log.Printf("[DEBUG] aws_elastic_beanstalk_solution_stack - Single solution stack found: %s", *solutionStack) + log.Printf("[DEBUG] aws_elasticbeanstalk_solution_stack - Single solution stack found: %s", *solutionStack) return solutionStackDescriptionAttributes(d, solutionStack) } diff --git a/internal/service/elasticbeanstalk/solution_stack_data_source_test.go b/internal/service/elasticbeanstalk/solution_stack_data_source_test.go index 7ad3feaf4f19..78bba8229bce 100644 --- a/internal/service/elasticbeanstalk/solution_stack_data_source_test.go +++ b/internal/service/elasticbeanstalk/solution_stack_data_source_test.go @@ -20,8 +20,8 @@ func TestAccElasticBeanstalkSolutionStackDataSource_basic(t *testing.T) { { Config: testAccCheckAWSElasticBeanstalkSolutionStackDataSourceConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckSolutionStackIDDataSource("data.aws_elastic_beanstalk_solution_stack.multi_docker"), - resource.TestMatchResourceAttr("data.aws_elastic_beanstalk_solution_stack.multi_docker", "name", regexp.MustCompile("^64bit Amazon Linux (.*) Multi-container Docker (.*)$")), + testAccCheckSolutionStackIDDataSource("data.aws_elasticbeanstalk_solution_stack.multi_docker"), + resource.TestMatchResourceAttr("data.aws_elasticbeanstalk_solution_stack.multi_docker", "name", regexp.MustCompile("^64bit Amazon Linux (.*) Multi-container Docker (.*)$")), ), }, }, @@ -44,7 +44,7 @@ func testAccCheckSolutionStackIDDataSource(n string) resource.TestCheckFunc { } const testAccCheckAWSElasticBeanstalkSolutionStackDataSourceConfig = ` -data "aws_elastic_beanstalk_solution_stack" "multi_docker" { +data "aws_elasticbeanstalk_solution_stack" "multi_docker" { most_recent = true name_regex = "^64bit Amazon Linux (.*) Multi-container Docker (.*)$" } diff --git a/internal/service/elasticbeanstalk/sweep.go b/internal/service/elasticbeanstalk/sweep.go index 66328d0b27e1..81633de3bc80 100644 --- a/internal/service/elasticbeanstalk/sweep.go +++ b/internal/service/elasticbeanstalk/sweep.go @@ -18,14 +18,14 @@ import ( ) func init() { - resource.AddTestSweepers("aws_elastic_beanstalk_application", &resource.Sweeper{ - Name: "aws_elastic_beanstalk_application", - Dependencies: []string{"aws_elastic_beanstalk_environment"}, + resource.AddTestSweepers("aws_elasticbeanstalk_application", &resource.Sweeper{ + Name: "aws_elasticbeanstalk_application", + Dependencies: []string{"aws_elasticbeanstalk_environment"}, F: sweepApplications, }) - resource.AddTestSweepers("aws_elastic_beanstalk_environment", &resource.Sweeper{ - Name: "aws_elastic_beanstalk_environment", + resource.AddTestSweepers("aws_elasticbeanstalk_environment", &resource.Sweeper{ + Name: "aws_elasticbeanstalk_environment", F: sweepEnvironments, }) } diff --git a/internal/service/iam/sweep.go b/internal/service/iam/sweep.go index 88411458766f..3dbf51ae7bd7 100644 --- a/internal/service/iam/sweep.go +++ b/internal/service/iam/sweep.go @@ -61,8 +61,8 @@ func init() { "aws_db_instance", "aws_db_option_group", "aws_eks_cluster", - "aws_elastic_beanstalk_application", - "aws_elastic_beanstalk_environment", + "aws_elasticbeanstalk_application", + "aws_elasticbeanstalk_environment", "aws_elasticsearch_domain", "aws_glue_crawler", "aws_glue_job", diff --git a/internal/service/sqs/sweep.go b/internal/service/sqs/sweep.go index d136a31b29fe..f40e78c834fc 100644 --- a/internal/service/sqs/sweep.go +++ b/internal/service/sqs/sweep.go @@ -22,7 +22,7 @@ func init() { Dependencies: []string{ "aws_autoscaling_group", "aws_cloudwatch_event_rule", - "aws_elastic_beanstalk_environment", + "aws_elasticbeanstalk_environment", "aws_iot_topic_rule", "aws_lambda_function", "aws_s3_bucket", diff --git a/website/docs/d/elastic_beanstalk_application.html.markdown b/website/docs/d/elasticbeanstalk_application.html.markdown similarity index 79% rename from website/docs/d/elastic_beanstalk_application.html.markdown rename to website/docs/d/elasticbeanstalk_application.html.markdown index ee1186f0e57a..aa715f625475 100644 --- a/website/docs/d/elastic_beanstalk_application.html.markdown +++ b/website/docs/d/elasticbeanstalk_application.html.markdown @@ -1,28 +1,28 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_application" +page_title: "AWS: aws_elasticbeanstalk_application" description: |- Retrieve information about an Elastic Beanstalk Application --- -# Data Source: aws_elastic_beanstalk_application +# Data Source: aws_elasticbeanstalk_application Retrieve information about an Elastic Beanstalk Application. ## Example Usage ```terraform -data "aws_elastic_beanstalk_application" "example" { +data "aws_elasticbeanstalk_application" "example" { name = "example" } output "arn" { - value = data.aws_elastic_beanstalk_application.example.arn + value = data.aws_elasticbeanstalk_application.example.arn } output "description" { - value = data.aws_elastic_beanstalk_application.example.description + value = data.aws_elasticbeanstalk_application.example.description } ``` diff --git a/website/docs/d/elastic_beanstalk_hosted_zone.html.markdown b/website/docs/d/elasticbeanstalk_hosted_zone.html.markdown similarity index 77% rename from website/docs/d/elastic_beanstalk_hosted_zone.html.markdown rename to website/docs/d/elasticbeanstalk_hosted_zone.html.markdown index a3e7251d6aee..be8adac123bf 100644 --- a/website/docs/d/elastic_beanstalk_hosted_zone.html.markdown +++ b/website/docs/d/elasticbeanstalk_hosted_zone.html.markdown @@ -1,19 +1,19 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_hosted_zone" +page_title: "AWS: aws_elasticbeanstalk_hosted_zone" description: |- Get an elastic beanstalk hosted zone. --- -# Data Source: aws_elastic_beanstalk_hosted_zone +# Data Source: aws_elasticbeanstalk_hosted_zone Use this data source to get the ID of an [elastic beanstalk hosted zone](http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region). ## Example Usage ```terraform -data "aws_elastic_beanstalk_hosted_zone" "current" {} +data "aws_elasticbeanstalk_hosted_zone" "current" {} ``` ## Argument Reference diff --git a/website/docs/d/elastic_beanstalk_solution_stack.html.markdown b/website/docs/d/elasticbeanstalk_solution_stack.html.markdown similarity index 86% rename from website/docs/d/elastic_beanstalk_solution_stack.html.markdown rename to website/docs/d/elasticbeanstalk_solution_stack.html.markdown index f0f6d7ae2058..63440c5f5248 100644 --- a/website/docs/d/elastic_beanstalk_solution_stack.html.markdown +++ b/website/docs/d/elasticbeanstalk_solution_stack.html.markdown @@ -1,19 +1,19 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_solution_stack" +page_title: "AWS: aws_elasticbeanstalk_solution_stack" description: |- Get an elastic beanstalk solution stack. --- -# Data Source: aws_elastic_beanstalk_solution_stack +# Data Source: aws_elasticbeanstalk_solution_stack Use this data source to get the name of a elastic beanstalk solution stack. ## Example Usage ```terraform -data "aws_elastic_beanstalk_solution_stack" "multi_docker" { +data "aws_elasticbeanstalk_solution_stack" "multi_docker" { most_recent = true name_regex = "^64bit Amazon Linux (.*) Multi-container Docker (.*)$" diff --git a/website/docs/r/elastic_beanstalk_application.html.markdown b/website/docs/r/elasticbeanstalk_application.html.markdown similarity index 91% rename from website/docs/r/elastic_beanstalk_application.html.markdown rename to website/docs/r/elasticbeanstalk_application.html.markdown index 8a42518979bc..d1f34eda7719 100644 --- a/website/docs/r/elastic_beanstalk_application.html.markdown +++ b/website/docs/r/elasticbeanstalk_application.html.markdown @@ -1,12 +1,12 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_application" +page_title: "AWS: aws_elasticbeanstalk_application" description: |- Provides an Elastic Beanstalk Application Resource --- -# Resource: aws_elastic_beanstalk_application +# Resource: aws_elasticbeanstalk_application Provides an Elastic Beanstalk Application Resource. Elastic Beanstalk allows you to deploy and manage applications in the AWS cloud without worrying about @@ -18,7 +18,7 @@ This resource creates an application that has one configuration template named ## Example Usage ```terraform -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-name" description = "tf-test-desc" @@ -58,5 +58,5 @@ In addition to all arguments above, the following attributes are exported: Elastic Beanstalk Applications can be imported using the `name`, e.g., ``` -$ terraform import aws_elastic_beanstalk_application.tf_test tf-test-name +$ terraform import aws_elasticbeanstalk_application.tf_test tf-test-name ``` diff --git a/website/docs/r/elastic_beanstalk_application_version.html.markdown b/website/docs/r/elasticbeanstalk_application_version.html.markdown similarity index 86% rename from website/docs/r/elastic_beanstalk_application_version.html.markdown rename to website/docs/r/elasticbeanstalk_application_version.html.markdown index 9a88dbc07803..7c376fef6b99 100644 --- a/website/docs/r/elastic_beanstalk_application_version.html.markdown +++ b/website/docs/r/elasticbeanstalk_application_version.html.markdown @@ -1,12 +1,12 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_application_version" +page_title: "AWS: aws_elasticbeanstalk_application_version" description: |- Provides an Elastic Beanstalk Application Version Resource --- -# Resource: aws_elastic_beanstalk_application_version +# Resource: aws_elasticbeanstalk_application_version Provides an Elastic Beanstalk Application Version Resource. Elastic Beanstalk allows you to deploy and manage applications in the AWS cloud without worrying about @@ -18,7 +18,7 @@ Environment. ~> **NOTE on Application Version Resource:** When using the Application Version resource with multiple [Elastic Beanstalk Environments](elastic_beanstalk_environment.html) it is possible that an error may be returned when attempting to delete an Application Version while it is still in use by a different environment. -To work around this you can either create each environment in a separate AWS account or create your `aws_elastic_beanstalk_application_version` resources with a unique names in your Elastic Beanstalk Application. For example <revision>-<environment>. +To work around this you can either create each environment in a separate AWS account or create your `aws_elasticbeanstalk_application_version` resources with a unique names in your Elastic Beanstalk Application. For example <revision>-<environment>. ## Example Usage @@ -33,12 +33,12 @@ resource "aws_s3_bucket_object" "default" { source = "go-v1.zip" } -resource "aws_elastic_beanstalk_application" "default" { +resource "aws_elasticbeanstalk_application" "default" { name = "tf-test-name" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_application_version" "default" { +resource "aws_elasticbeanstalk_application_version" "default" { name = "tf-test-version-label" application = "tf-test-name" description = "application version created by terraform" diff --git a/website/docs/r/elastic_beanstalk_configuration_template.html.markdown b/website/docs/r/elasticbeanstalk_configuration_template.html.markdown similarity index 86% rename from website/docs/r/elastic_beanstalk_configuration_template.html.markdown rename to website/docs/r/elasticbeanstalk_configuration_template.html.markdown index e0c5ad36e13b..5eaf81d31401 100644 --- a/website/docs/r/elastic_beanstalk_configuration_template.html.markdown +++ b/website/docs/r/elasticbeanstalk_configuration_template.html.markdown @@ -1,12 +1,12 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_configuration_template" +page_title: "AWS: aws_elasticbeanstalk_configuration_template" description: |- Provides an Elastic Beanstalk Configuration Template --- -# Resource: aws_elastic_beanstalk_configuration_template +# Resource: aws_elasticbeanstalk_configuration_template Provides an Elastic Beanstalk Configuration Template, which are associated with a specific application and are used to deploy different versions of the @@ -15,14 +15,14 @@ application with the same configuration settings. ## Example Usage ```terraform -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-name" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_configuration_template" "tf_template" { +resource "aws_elasticbeanstalk_configuration_template" "tf_template" { name = "tf-test-template-config" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux 2015.09 v2.0.8 running Go 1.4" } ``` diff --git a/website/docs/r/elastic_beanstalk_environment.html.markdown b/website/docs/r/elasticbeanstalk_environment.html.markdown similarity index 91% rename from website/docs/r/elastic_beanstalk_environment.html.markdown rename to website/docs/r/elasticbeanstalk_environment.html.markdown index 8803e8b001ad..f6079f5b846e 100644 --- a/website/docs/r/elastic_beanstalk_environment.html.markdown +++ b/website/docs/r/elasticbeanstalk_environment.html.markdown @@ -1,12 +1,12 @@ --- subcategory: "Elastic Beanstalk" layout: "aws" -page_title: "AWS: aws_elastic_beanstalk_environment" +page_title: "AWS: aws_elasticbeanstalk_environment" description: |- Provides an Elastic Beanstalk Environment Resource --- -# Resource: aws_elastic_beanstalk_environment +# Resource: aws_elasticbeanstalk_environment Provides an Elastic Beanstalk Environment Resource. Elastic Beanstalk allows you to deploy and manage applications in the AWS cloud without worrying about @@ -18,14 +18,14 @@ Environments are often things such as `development`, `integration`, or ## Example Usage ```terraform -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-name" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_environment" "tfenvtest" { +resource "aws_elasticbeanstalk_environment" "tfenvtest" { name = "tf-test-name" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux 2015.03 v2.0.3 running Go 1.4" } ``` @@ -80,14 +80,14 @@ The `setting` and `all_settings` mappings support the following format: ### Example With Options ```terraform -resource "aws_elastic_beanstalk_application" "tftest" { +resource "aws_elasticbeanstalk_application" "tftest" { name = "tf-test-name" description = "tf-test-desc" } -resource "aws_elastic_beanstalk_environment" "tfenvtest" { +resource "aws_elasticbeanstalk_environment" "tfenvtest" { name = "tf-test-name" - application = aws_elastic_beanstalk_application.tftest.name + application = aws_elasticbeanstalk_application.tftest.name solution_stack_name = "64bit Amazon Linux 2015.03 v2.0.3 running Go 1.4" setting { @@ -138,5 +138,5 @@ In addition to all arguments above, the following attributes are exported: Elastic Beanstalk Environments can be imported using the `id`, e.g., ``` -$ terraform import aws_elastic_beanstalk_environment.prodenv e-rpqsewtp2j +$ terraform import aws_elasticbeanstalk_environment.prodenv e-rpqsewtp2j ``` From 45a9158662afccba1e15a3c3a5ab8bbec812b5dd Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 2 Nov 2021 13:20:05 -0400 Subject: [PATCH 2/3] Add changelog --- .changelog/21592.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .changelog/21592.txt diff --git a/.changelog/21592.txt b/.changelog/21592.txt new file mode 100644 index 000000000000..1b0d7f68c39d --- /dev/null +++ b/.changelog/21592.txt @@ -0,0 +1,27 @@ +```release-note:enhancement +data-source/aws_elastic_beanstalk_application: Rename data source to aws_elasticbeanstalk_application (with alias for aws_elastic_beanstalk_application) +``` + +```release-note:enhancement +data-source/aws_elastic_beanstalk_hosted_zone: Rename data source to aws_elasticbeanstalk_hosted_zone (with alias for aws_elastic_beanstalk_hosted_zone) +``` + +```release-note:enhancement +data-source/aws_elastic_beanstalk_solution_stack: Rename data source to aws_elasticbeanstalk_solution_stack (with alias for aws_elastic_beanstalk_solution_stack) +``` + +```release-note:enhancement +resource/aws_elastic_beanstalk_application: Rename resource to aws_elasticbeanstalk_application (with alias for aws_elastic_beanstalk_application) +``` + +```release-note:enhancement +resource/aws_elastic_beanstalk_application_version: Rename resource to aws_elasticbeanstalk_application_version (with alias for aws_elastic_beanstalk_application_version) +``` + +```release-note:enhancement +resource/aws_elastic_beanstalk_configuration_template: Rename resource to aws_elasticbeanstalk_configuration_template (with alias for aws_elastic_beanstalk_configuration_template) +``` + +```release-note:enhancement +resource/aws_elastic_beanstalk_environment: Rename resource to aws_elasticbeanstalk_environment (with alias for aws_elastic_beanstalk_environment) +``` From 7f4e3d7a66c7d3a3778ea8170babd03099a09617 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 2 Nov 2021 14:28:45 -0400 Subject: [PATCH 3/3] Ignore docs for aliases --- .github/workflows/terraform_provider.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index cbaa27418556..cb93655be345 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -311,8 +311,8 @@ jobs: tfproviderdocs check \ -allowed-resource-subcategories-file website/allowed-subcategories.txt \ -enable-contents-check \ - -ignore-file-missing-data-sources aws_alb,aws_alb_listener,aws_alb_target_group \ - -ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment \ + -ignore-file-missing-data-sources aws_alb,aws_alb_listener,aws_alb_target_group,aws_elastic_beanstalk_application,aws_elastic_beanstalk_hosted_zone,aws_elastic_beanstalk_solution_stack \ + -ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment,aws_elastic_beanstalk_application,aws_elastic_beanstalk_application_version,aws_elastic_beanstalk_configuration_template,aws_elastic_beanstalk_environment \ -provider-source registry.terraform.io/hashicorp/aws \ -providers-schema-json terraform-providers-schema/schema.json \ -require-resource-subcategory