Realign inconsistent elasticbeanstalk names

.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)
+```

.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:

.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

.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

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`

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(),

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",

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))
 }

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"