fix Service Name Scan

hashicorp · Aug 11, 2024 · 9cfc870 · 9cfc870
1 parent c718675
commit 9cfc870
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/internal/service/cloudtrail/cloudtrail_organization_admin_account.go b/internal/service/cloudtrail/cloudtrail_organization_admin_account.go
@@ -25,11 +25,11 @@ import (
 )
 
 const (
-	ResNameCloudTrailOrganizationAdminAccount = "CloudTrailOrganizationAdminAccount"
+	ResNameOrganizationAdminAccount = "CloudTrailOrganizationAdminAccount"
 )
 
 // @FrameworkResource("aws_cloudtrail_organization_admin_account", name="CloudTrail Organization Admin Account")
-func newResourceCloudTrailOrganizationAdminAccount(_ context.Context) (resource.ResourceWithConfigure, error) {
+func newResourceOrganizationAdminAccount(_ context.Context) (resource.ResourceWithConfigure, error) {
 	return &resourceCloudTrailOrganizationAdminAccount{}, nil
 }
 
@@ -89,7 +89,7 @@ func (r *resourceCloudTrailOrganizationAdminAccount) Create(ctx context.Context,
 	_, err := cloudTrailConn.RegisterOrganizationDelegatedAdmin(ctx, input)
 	if err != nil {
 		resp.Diagnostics.AddError(
-			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionCreating, ResNameCloudTrailOrganizationAdminAccount, plan.DelegatedAdminAccountID.String(), nil),
+			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionCreating, ResNameOrganizationAdminAccount, plan.DelegatedAdminAccountID.String(), nil),
 			err.Error(),
 		)
 		return
@@ -99,7 +99,7 @@ func (r *resourceCloudTrailOrganizationAdminAccount) Create(ctx context.Context,
 	readOutput, err := FindDelegatedAccountByAccountID(ctx, organizationsConn, plan.DelegatedAdminAccountID.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
-			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionCreating, ResNameCloudTrailOrganizationAdminAccount, plan.DelegatedAdminAccountID.String(), err),
+			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionCreating, ResNameOrganizationAdminAccount, plan.DelegatedAdminAccountID.String(), err),
 			err.Error(),
 		)
 		return
@@ -136,7 +136,7 @@ func (r *resourceCloudTrailOrganizationAdminAccount) Read(ctx context.Context, r
 
 	if err != nil {
 		resp.Diagnostics.AddError(
-			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionSetting, ResNameCloudTrailOrganizationAdminAccount, state.ID.String(), err),
+			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionSetting, ResNameOrganizationAdminAccount, state.ID.String(), err),
 			err.Error(),
 		)
 		return
@@ -172,7 +172,7 @@ func (r *resourceCloudTrailOrganizationAdminAccount) Delete(ctx context.Context,
 			return
 		}
 		resp.Diagnostics.AddError(
-			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionDeleting, ResNameCloudTrailOrganizationAdminAccount, state.ID.String(), nil),
+			create.ProblemStandardMessage(names.CloudTrail, create.ErrActionDeleting, ResNameOrganizationAdminAccount, state.ID.String(), nil),
 			err.Error(),
 		)
 	}

diff --git a/internal/service/cloudtrail/cloudtrail_organization_admin_account_test.go b/internal/service/cloudtrail/cloudtrail_organization_admin_account_test.go
@@ -36,12 +36,12 @@ func TestAccCloudTrailOrganizationAdminAccount_basic(t *testing.T) {
 		},
 		ErrorCheck:               acctest.ErrorCheck(t, names.OrganizationsServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCheckCloudTrailOrganizationAdminAccountDestroy(ctx),
+		CheckDestroy:             testAccCheckOrganizationAdminAccountDestroy(ctx),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCloudTrailOrganizationAdminAccountConfig(),
+				Config: testAccOrganizationAdminAccountConfig(),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckCloudTrailOrganizationAdminAccountExists(ctx, resourceName, &organization),
+					testAccCheckOrganizationAdminAccountExists(ctx, resourceName, &organization),
 					acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile("account/.+")),
 					resource.TestCheckResourceAttrPair(resourceName, names.AttrID, organizationData, "non_master_accounts.0.id"),
 					resource.TestCheckResourceAttr(resourceName, "service_principal", cloudtrail.ServicePrincipal),
@@ -68,21 +68,21 @@ func TestAccCloudTrailOrganizationAdminAccount_disappears(t *testing.T) {
 		},
 		ErrorCheck:               acctest.ErrorCheck(t, names.OrganizationsServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCheckCloudTrailOrganizationAdminAccountDestroy(ctx),
+		CheckDestroy:             testAccCheckOrganizationAdminAccountDestroy(ctx),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCloudTrailOrganizationAdminAccountConfig(),
+				Config: testAccOrganizationAdminAccountConfig(),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckCloudTrailOrganizationAdminAccountExists(ctx, resourceName, &organization),
-					acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, cloudtrail.ResourceCloudTrailOrganizationAdminAccount, resourceName),
+					testAccCheckOrganizationAdminAccountExists(ctx, resourceName, &organization),
+					acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, cloudtrail.ResourceOrganizationAdminAccount, resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
 		},
 	})
 }
 
-func testAccCheckCloudTrailOrganizationAdminAccountDestroy(ctx context.Context) resource.TestCheckFunc {
+func testAccCheckOrganizationAdminAccountDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := acctest.Provider.Meta().(*conns.AWSClient).OrganizationsClient(ctx)
 
@@ -108,7 +108,7 @@ func testAccCheckCloudTrailOrganizationAdminAccountDestroy(ctx context.Context)
 	}
 }
 
-func testAccCheckCloudTrailOrganizationAdminAccountExists(ctx context.Context, n string, v *organizationstypes.DelegatedAdministrator) resource.TestCheckFunc {
+func testAccCheckOrganizationAdminAccountExists(ctx context.Context, n string, v *organizationstypes.DelegatedAdministrator) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
@@ -129,7 +129,7 @@ func testAccCheckCloudTrailOrganizationAdminAccountExists(ctx context.Context, n
 	}
 }
 
-func testAccCloudTrailOrganizationAdminAccountConfig() string {
+func testAccOrganizationAdminAccountConfig() string {
 	return fmt.Sprint(`
 data "aws_organizations_organization" "test" {}
 

diff --git a/internal/service/cloudtrail/exports_test.go b/internal/service/cloudtrail/exports_test.go
@@ -8,8 +8,8 @@ var (
 	ResourceEventDataStore = resourceEventDataStore
 	ResourceTrail          = resourceTrail
 
-	FindEventDataStoreByARN                    = findEventDataStoreByARN
-	FindTrailByARN                             = findTrailByARN
-	ServiceAccountPerRegionMap                 = serviceAccountPerRegionMap
-	ResourceCloudTrailOrganizationAdminAccount = newResourceCloudTrailOrganizationAdminAccount
+	FindEventDataStoreByARN          = findEventDataStoreByARN
+	FindTrailByARN                   = findTrailByARN
+	ServiceAccountPerRegionMap       = serviceAccountPerRegionMap
+	ResourceOrganizationAdminAccount = newResourceOrganizationAdminAccount
 )
diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go