Merge pull request #31058 from hashicorp/f-remove-maciev1

Macie Classic retirement: Remove resources

.changelog/31058.txt

@@ -0,0 +1,7 @@
+```release-note:breaking-change
+provider: With the retirement of Macie Classic the `aws_macie_member_account_association` resource has been removed
+```
+
+```release-note:breaking-change
+provider: With the retirement of Macie Classic the `aws_macie_s3_bucket_association` resource has been removed
+```

.ci/.semgrep-service-name0.yml

@@ -3405,18 +3405,3 @@ rules:
             - pattern-regex: "(?i)ConfigService"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: configservice-in-test-name
-    languages:
-      - go
-    message: Include "ConfigService" in test name
-    paths:
-      include:
-        - internal/service/configservice/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccConfigService"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING

.ci/.semgrep-service-name1.yml

@@ -1,5 +1,20 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: configservice-in-test-name
+    languages:
+      - go
+    message: Include "ConfigService" in test name
+    paths:
+      include:
+        - internal/service/configservice/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccConfigService"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: configservice-in-const-name
     languages:
       - go
@@ -3379,17 +3394,3 @@ rules:
             - pattern-regex: "(?i)inspectorv2"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: inspectorv2-in-const-name
-    languages:
-      - go
-    message: Do not use "inspectorv2" in const name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)inspectorv2"
-    severity: WARNING

.ci/.semgrep-service-name2.yml

@@ -1,5 +1,19 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: inspectorv2-in-const-name
+    languages:
+      - go
+    message: Do not use "inspectorv2" in const name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)inspectorv2"
+    severity: WARNING
   - id: inspectorv2-in-var-name
     languages:
       - go
@@ -1477,64 +1491,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)Logs"
     severity: WARNING
-  - id: macie-in-func-name
-    languages:
-      - go
-    message: Do not use "Macie" in func name inside macie package
-    paths:
-      include:
-        - internal/service/macie
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Macie"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
-  - id: macie-in-test-name
-    languages:
-      - go
-    message: Include "Macie" in test name
-    paths:
-      include:
-        - internal/service/macie/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccMacie"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
-  - id: macie-in-const-name
-    languages:
-      - go
-    message: Do not use "Macie" in const name inside macie package
-    paths:
-      include:
-        - internal/service/macie
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Macie"
-    severity: WARNING
-  - id: macie-in-var-name
-    languages:
-      - go
-    message: Do not use "Macie" in var name inside macie package
-    paths:
-      include:
-        - internal/service/macie
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Macie"
-    severity: WARNING
   - id: macie2-in-func-name
     languages:
       - go
@@ -3407,3 +3363,32 @@ rules:
           patterns:
             - pattern-regex: "(?i)Redshift"
     severity: WARNING
+  - id: redshift-in-var-name
+    languages:
+      - go
+    message: Do not use "Redshift" in var name inside redshift package
+    paths:
+      include:
+        - internal/service/redshift
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Redshift"
+    severity: WARNING
+  - id: redshiftdata-in-func-name
+    languages:
+      - go
+    message: Do not use "RedshiftData" in func name inside redshiftdata package
+    paths:
+      include:
+        - internal/service/redshiftdata
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)RedshiftData"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING

.ci/.semgrep-service-name3.yml

@@ -1,34 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: redshift-in-var-name
-    languages:
-      - go
-    message: Do not use "Redshift" in var name inside redshift package
-    paths:
-      include:
-        - internal/service/redshift
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Redshift"
-    severity: WARNING
-  - id: redshiftdata-in-func-name
-    languages:
-      - go
-    message: Do not use "RedshiftData" in func name inside redshiftdata package
-    paths:
-      include:
-        - internal/service/redshiftdata
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)RedshiftData"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
   - id: redshiftdata-in-test-name
     languages:
       - go

.teamcity/components/generated/services_all.kt

@@ -120,7 +120,6 @@ val services = mapOf(
     "lightsail" to ServiceSpec("Lightsail", regionOverride = "us-east-1"),
     "location" to ServiceSpec("Location"),
     "logs" to ServiceSpec("CloudWatch Logs"),
-    "macie" to ServiceSpec("Macie Classic"),
     "macie2" to ServiceSpec("Macie"),
     "mediaconnect" to ServiceSpec("Elemental MediaConnect"),
     "mediaconvert" to ServiceSpec("Elemental MediaConvert"),