Rename Inspector and Inspector V2 services to match current AWS branding

.teamcity/components/generated/services_all.kt

@@ -99,8 +99,8 @@ val services = mapOf(
     "iam" to ServiceSpec("IAM (Identity & Access Management)"),
     "identitystore" to ServiceSpec("SSO Identity Store"),
     "imagebuilder" to ServiceSpec("EC2 Image Builder"),
-    "inspector" to ServiceSpec("Inspector"),
-    "inspector2" to ServiceSpec("Inspector V2"),
+    "inspector" to ServiceSpec("Inspector Classic"),
+    "inspector2" to ServiceSpec("Inspector"),
     "iot" to ServiceSpec("IoT Core"),
     "iotanalytics" to ServiceSpec("IoT Analytics"),
     "iotevents" to ServiceSpec("IoT Events"),

GNUmakefile

@@ -132,7 +132,6 @@ gen:
 	rm -f internal/sweep/sweep_test.go
 	rm -f names/caps.md
 	rm -f names/*_gen.go
-	rm -f website/allowed-subcategories.txt
 	rm -f website/docs/guides/custom-service-endpoints.html.md
 	rm -f .ci/.semgrep-caps-aws-ec2.yml
 	rm -f .ci/.semgrep-configs.yml

internal/generate/checknames/main.go

@@ -14,6 +14,7 @@ import (
 	"regexp"
 	"strings"
 
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -188,15 +189,23 @@ func main() {
 	}
 	fmt.Printf("  Performed %d checks on names_data.csv, 0 errors.\n", (allChecks * 36))
 
+	var fileErrs bool
+
 	// DocPrefix needs to be reworked for compatibility with tfproviderdocs, in the meantime skip
 	err = checkDocDir("../../../website/docs/r/", docPrefixes)
 	if err != nil {
-		log.Fatalf("while checking resource doc dir: %s", err)
+		fileErrs = true
+		log.Printf("while checking resource doc dir: %s", err)
 	}
 
 	err = checkDocDir("../../../website/docs/d/", docPrefixes)
 	if err != nil {
-		log.Fatalf("while checking data source doc dir: %s", err)
+		fileErrs = true
+		log.Printf("while checking data source doc dir: %s", err)
+	}
+
+	if fileErrs {
+		os.Exit(1)
 	}
 
 	fmt.Printf("  Checked %d documentation files to ensure filename prefix, resource name, label regex, and subcategory match, 0 errors.\n", allDocs)
@@ -220,6 +229,7 @@ func checkDocDir(dir string, prefixes []DocPrefix) error {
 		log.Fatalf("reading directory (%s): %s", dir, err)
 	}
 
+	var errs error
 	for _, fh := range fs {
 		if fh.IsDir() {
 			continue
@@ -232,11 +242,11 @@ func checkDocDir(dir string, prefixes []DocPrefix) error {
 		allDocs++
 
 		if err := checkDocFile(dir, fh.Name(), prefixes); err != nil {
-			return err
+			errs = multierror.Append(errs, err)
 		}
 	}
 
-	return nil
+	return errs
 }
 
 func checkDocFile(dir, name string, prefixes []DocPrefix) error {

internal/service/inspector/assessment_target.go

@@ -59,7 +59,7 @@ func resourceAssessmentTargetCreate(ctx context.Context, d *schema.ResourceData,
 
 	resp, err := conn.CreateAssessmentTargetWithContext(ctx, input)
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "creating Inspector Assessment Target: %s", err)
+		return sdkdiag.AppendErrorf(diags, "creating Inspector Classic Assessment Target: %s", err)
 	}
 
 	d.SetId(aws.StringValue(resp.AssessmentTargetArn))
@@ -74,11 +74,11 @@ func resourceAssessmentTargetRead(ctx context.Context, d *schema.ResourceData, m
 	assessmentTarget, err := DescribeAssessmentTarget(ctx, conn, d.Id())
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "describing Inspector Assessment Target (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "describing Inspector Classic Assessment Target (%s): %s", d.Id(), err)
 	}
 
 	if assessmentTarget == nil {
-		log.Printf("[WARN] Inspector Assessment Target (%s) not found, removing from state", d.Id())
+		log.Printf("[WARN] Inspector Classic Assessment Target (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return diags
 	}
@@ -105,7 +105,7 @@ func resourceAssessmentTargetUpdate(ctx context.Context, d *schema.ResourceData,
 
 	_, err := conn.UpdateAssessmentTargetWithContext(ctx, &input)
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "updating Inspector Assessment Target (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "updating Inspector Classic Assessment Target (%s): %s", d.Id(), err)
 	}
 
 	return append(diags, resourceAssessmentTargetRead(ctx, d, meta)...)
@@ -134,7 +134,7 @@ func resourceAssessmentTargetDelete(ctx context.Context, d *schema.ResourceData,
 		_, err = conn.DeleteAssessmentTargetWithContext(ctx, input)
 	}
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting Inspector Assessment Target: %s", err)
+		return sdkdiag.AppendErrorf(diags, "deleting Inspector Classic Assessment Target: %s", err)
 	}
 	return diags
 }

internal/service/inspector/assessment_target_test.go

@@ -168,11 +168,11 @@ func testAccCheckTargetAssessmentDestroy(ctx context.Context) resource.TestCheck
 			assessmentTarget, err := tfinspector.DescribeAssessmentTarget(ctx, conn, rs.Primary.ID)
 
 			if err != nil {
-				return fmt.Errorf("Error finding Inspector Assessment Target: %s", err)
+				return fmt.Errorf("finding Inspector Classic Assessment Target: %s", err)
 			}
 
 			if assessmentTarget != nil {
-				return fmt.Errorf("Inspector Assessment Target (%s) still exists", rs.Primary.ID)
+				return fmt.Errorf("Inspector Classic Assessment Target (%s) still exists", rs.Primary.ID)
 			}
 		}
 
@@ -192,11 +192,11 @@ func testAccCheckTargetExists(ctx context.Context, name string, target *inspecto
 		assessmentTarget, err := tfinspector.DescribeAssessmentTarget(ctx, conn, rs.Primary.ID)
 
 		if err != nil {
-			return fmt.Errorf("Error finding Inspector Assessment Target: %s", err)
+			return fmt.Errorf("finding Inspector Classic Assessment Target: %s", err)
 		}
 
 		if assessmentTarget == nil {
-			return fmt.Errorf("Inspector Assessment Target (%s) not found", rs.Primary.ID)
+			return fmt.Errorf("Inspector Classic Assessment Target (%s) not found", rs.Primary.ID)
 		}
 
 		*target = *assessmentTarget

internal/service/inspector/assessment_template.go

@@ -103,13 +103,13 @@ func resourceAssessmentTemplateCreate(ctx context.Context, d *schema.ResourceDat
 	output, err := conn.CreateAssessmentTemplateWithContext(ctx, input)
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "creating Inspector Assessment Template (%s): %s", name, err)
+		return sdkdiag.AppendErrorf(diags, "creating Inspector Classic Assessment Template (%s): %s", name, err)
 	}
 
 	d.SetId(aws.StringValue(output.AssessmentTemplateArn))
 
 	if err := updateTags(ctx, conn, d.Id(), nil, KeyValueTags(ctx, GetTagsIn(ctx))); err != nil {
-		return sdkdiag.AppendErrorf(diags, "setting Inspector Assessment Template (%s) tags: %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "setting Inspector Classic Assessment Template (%s) tags: %s", d.Id(), err)
 	}
 
 	if v, ok := d.GetOk("event_subscription"); ok && v.(*schema.Set).Len() > 0 {
@@ -131,11 +131,11 @@ func resourceAssessmentTemplateRead(ctx context.Context, d *schema.ResourceData,
 		AssessmentTemplateArns: aws.StringSlice([]string{d.Id()}),
 	})
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading Inspector assessment template (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "reading Inspector Classic Assessment Template (%s): %s", d.Id(), err)
 	}
 
 	if resp.AssessmentTemplates == nil || len(resp.AssessmentTemplates) == 0 {
-		log.Printf("[WARN] Inspector assessment template (%s) not found, removing from state", d.Id())
+		log.Printf("[WARN] Inspector Classic Assessment Template (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return diags
 	}
@@ -195,13 +195,13 @@ func resourceAssessmentTemplateDelete(ctx context.Context, d *schema.ResourceDat
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).InspectorConn()
 
-	log.Printf("[INFO] Deleting Inspector Assessment Template: %s", d.Id())
+	log.Printf("[INFO] Deleting Inspector Classic Assessment Template: %s", d.Id())
 	_, err := conn.DeleteAssessmentTemplateWithContext(ctx, &inspector.DeleteAssessmentTemplateInput{
 		AssessmentTemplateArn: aws.String(d.Id()),
 	})
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting Inspector Assessment Template (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "deleting Inspector Classic Assessment Template (%s): %s", d.Id(), err)
 	}
 
 	return diags

internal/service/inspector/assessment_template_test.go

@@ -204,7 +204,7 @@ func testAccCheckTemplateDestroy(ctx context.Context) resource.TestCheckFunc {
 			}
 
 			if err != nil {
-				return fmt.Errorf("Error finding Inspector Assessment Template: %s", err)
+				return fmt.Errorf("finding Inspector Classic Assessment Template: %s", err)
 			}
 
 			if len(resp.AssessmentTemplates) > 0 {
@@ -236,7 +236,7 @@ func testAccCheckTemplateExists(ctx context.Context, name string, v *inspector.A
 		}
 
 		if rs.Primary.ID == "" {
-			return fmt.Errorf("No Inspector assessment template ID is set")
+			return fmt.Errorf("No Inspector Classic Assessment template ID is set")
 		}
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).InspectorConn()
@@ -249,7 +249,7 @@ func testAccCheckTemplateExists(ctx context.Context, name string, v *inspector.A
 		}
 
 		if resp.AssessmentTemplates == nil || len(resp.AssessmentTemplates) == 0 {
-			return fmt.Errorf("Inspector assessment template not found")
+			return fmt.Errorf("Inspector Classic Assessment template not found")
 		}
 
 		*v = *resp.AssessmentTemplates[0]

internal/service/inspector/resource_group.go

@@ -41,11 +41,11 @@ func resourceResourceGroupCreate(ctx context.Context, d *schema.ResourceData, me
 	req := &inspector.CreateResourceGroupInput{
 		ResourceGroupTags: expandResourceGroupTags(d.Get("tags").(map[string]interface{})),
 	}
-	log.Printf("[DEBUG] Creating Inspector resource group: %#v", req)
+	log.Printf("[DEBUG] Creating Inspector Classic Resource Group: %#v", req)
 	resp, err := conn.CreateResourceGroupWithContext(ctx, req)
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "creating Inspector resource group: %s", err)
+		return sdkdiag.AppendErrorf(diags, "creating Inspector Classic Resource Group: %s", err)
 	}
 
 	d.SetId(aws.StringValue(resp.ResourceGroupArn))
@@ -62,22 +62,22 @@ func resourceResourceGroupRead(ctx context.Context, d *schema.ResourceData, meta
 	})
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading Inspector resource group (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "reading Inspector Classic Resource Group (%s): %s", d.Id(), err)
 	}
 
 	if len(resp.ResourceGroups) == 0 {
 		if failedItem, ok := resp.FailedItems[d.Id()]; ok {
 			failureCode := aws.StringValue(failedItem.FailureCode)
 			if failureCode == inspector.FailedItemErrorCodeItemDoesNotExist {
-				log.Printf("[WARN] Inspector resource group (%s) not found, removing from state", d.Id())
+				log.Printf("[WARN] Inspector Classic Resource Group (%s) not found, removing from state", d.Id())
 				d.SetId("")
 				return diags
 			}
 
-			return sdkdiag.AppendErrorf(diags, "reading Inspector resource group (%s): %s", d.Id(), failureCode)
+			return sdkdiag.AppendErrorf(diags, "reading Inspector Classic Resource Group (%s): %s", d.Id(), failureCode)
 		}
 
-		return sdkdiag.AppendErrorf(diags, "reading Inspector resource group (%s): %v", d.Id(), resp.FailedItems)
+		return sdkdiag.AppendErrorf(diags, "reading Inspector Classic Resource Group (%s): %v", d.Id(), resp.FailedItems)
 	}
 
 	resourceGroup := resp.ResourceGroups[0]

internal/service/inspector/resource_group_test.go

@@ -65,7 +65,7 @@ func testAccCheckResourceGroupExists(ctx context.Context, name string, rg *inspe
 			return err
 		}
 		if len(output.ResourceGroups) == 0 {
-			return fmt.Errorf("No matching Inspector resource groups")
+			return fmt.Errorf("No matching Inspector Classic Resource Groups")
 		}
 
 		*rg = *output.ResourceGroups[0]
@@ -77,7 +77,7 @@ func testAccCheckResourceGroupExists(ctx context.Context, name string, rg *inspe
 func testAccCheckResourceGroupRecreated(v1, v2 *inspector.ResourceGroup) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if v2.CreatedAt.Equal(*v1.CreatedAt) {
-			return fmt.Errorf("Inspector resource group not recreated when changing tags")
+			return fmt.Errorf("Inspector Classic Resource Group not recreated when changing tags")
 		}
 
 		return nil

internal/service/inspector/rules_packages_data_source.go

@@ -34,7 +34,7 @@ func dataSourceRulesPackagesRead(ctx context.Context, d *schema.ResourceData, me
 	output, err := findRulesPackageARNs(ctx, conn)
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading Inspector Rules Packages: %s", err)
+		return sdkdiag.AppendErrorf(diags, "reading Inspector Classic Rules Packages: %s", err)
 	}
 
 	arns := aws.StringValueSlice(output)

internal/service/inspector/tags.go

@@ -14,9 +14,9 @@ import (
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 )
 
-// Custom Inspector tag service update functions using the same format as generated code.
+// Custom Inspector Classic tag service update functions using the same format as generated code.
 
-// updateTags updates inspector resource tags.
+// updateTags updates Inspector Classic resource tags.
 // The identifier is the resource ARN.
 func updateTags(ctx context.Context, conn inspectoriface.InspectorAPI, identifier string, oldTagsMap, newTagsMap any) error {
 	oldTags := tftags.New(ctx, oldTagsMap)
@@ -48,7 +48,7 @@ func updateTags(ctx context.Context, conn inspectoriface.InspectorAPI, identifie
 	return nil
 }
 
-// UpdateTags updates inspector service tags.
+// UpdateTags updates Inspector Classic service tags.
 // It is called from outside this package.
 func (p *servicePackage) UpdateTags(ctx context.Context, meta any, identifier string, oldTags, newTags any) error {
 	return updateTags(ctx, meta.(*conns.AWSClient).InspectorConn(), identifier, oldTags, newTags)

internal/service/inspector2/delegated_admin_account.go

@@ -89,7 +89,7 @@ func resourceDelegatedAdminAccountRead(ctx context.Context, d *schema.ResourceDa
 	st, ai, err := FindDelegatedAdminAccountStatusID(ctx, conn, d.Id())
 
 	if !d.IsNewResource() && tfresource.NotFound(err) {
-		log.Printf("[WARN] Inspector V2 Delegated Admin Account (%s) not found, removing from state", d.Id())
+		log.Printf("[WARN] Inspector Delegated Admin Account (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
 	}
@@ -107,7 +107,7 @@ func resourceDelegatedAdminAccountRead(ctx context.Context, d *schema.ResourceDa
 func resourceDelegatedAdminAccountDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn := meta.(*conns.AWSClient).Inspector2Client()
 
-	log.Printf("[INFO] Deleting Inspector2 DelegatedAdminAccount %s", d.Id())
+	log.Printf("[INFO] Deleting Inspector DelegatedAdminAccount %s", d.Id())
 
 	_, err := conn.DisableDelegatedAdminAccount(ctx, &inspector2.DisableDelegatedAdminAccountInput{
 		DelegatedAdminAccountId: aws.String(d.Get("account_id").(string)),