Merge pull request #33414 from hashicorp/b-fix-lexv2models

Fix markdown-link checks and Lex V2 in names

.ci/.markdownlinkcheck.json

@@ -26,19 +26,11 @@
         },
         {
             "pattern": "^(custom-service-endpoints|resource-tagging|version-2-upgrade|version-3-upgrade).html.markdown(#.*)?$",
-            "replacement": "file:///github/workspace/website/docs/guides/$1.html.md$2"
+            "replacement": "file:///github/workspace/website/docs/guides/$1.html.markdown$2"
         },
         {
             "pattern": "^file:///github/workspace/website/docs/guides/(.*)\\.markdown(#.*)?$",
-            "replacement": "file:///github/workspace/website/docs/guides/$1.md$2"
-        },
-        {
-            "pattern": "^file:///github/workspace/website/docs/d/(cognito_user_pools)\\.html\\.markdown(#.*)?$",
-            "replacement": "file:///github/workspace/website/docs/d/$1.markdown$2"
-        },
-        {
-            "pattern": "^file:///github/workspace/website/docs/r/(cognito_identity_pool|cognito_user_pool|iam_role_policy_attachment|iam_user_policy_attachment|network_interface|ram_principal_association|ram_resource_share|ram_resource_share_accepter)\\.html\\.markdown(#.*)?$",
-            "replacement": "file:///github/workspace/website/docs/r/$1.markdown$2"
+            "replacement": "file:///github/workspace/website/docs/guides/$1.markdown$2"
         }
     ]
 }

.ci/.semgrep-service-name0.yml

@@ -3448,3 +3448,18 @@ rules:
           patterns:
             - pattern-regex: "(?i)ComputeOptimizer"
     severity: WARNING
+  - id: configservice-in-func-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in func name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING

.ci/.semgrep-service-name1.yml

@@ -1,20 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: configservice-in-func-name
-    languages:
-      - go
-    message: Do not use "ConfigService" in func name inside configservice package
-    paths:
-      include:
-        - internal/service/configservice
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ConfigService"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
   - id: configservice-in-test-name
     languages:
       - go
@@ -3424,3 +3409,60 @@ rules:
             - pattern-not-regex: "^TestAccInspector2"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: inspector2-in-const-name
+    languages:
+      - go
+    message: Do not use "Inspector2" in const name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Inspector2"
+    severity: WARNING
+  - id: inspector2-in-var-name
+    languages:
+      - go
+    message: Do not use "Inspector2" in var name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Inspector2"
+    severity: WARNING
+  - id: inspectorv2-in-func-name
+    languages:
+      - go
+    message: Do not use "inspectorv2" in func name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - 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,62 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: inspector2-in-const-name
-    languages:
-      - go
-    message: Do not use "Inspector2" in const name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Inspector2"
-    severity: WARNING
-  - id: inspector2-in-var-name
-    languages:
-      - go
-    message: Do not use "Inspector2" in var name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Inspector2"
-    severity: WARNING
-  - id: inspectorv2-in-func-name
-    languages:
-      - go
-    message: Do not use "inspectorv2" in func name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - 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
   - id: inspectorv2-in-var-name
     languages:
       - go
@@ -1259,6 +1202,107 @@ rules:
           patterns:
             - pattern-regex: "(?i)LexModels"
     severity: WARNING
+  - id: lexmodelsv2-in-func-name
+    languages:
+      - go
+    message: Do not use "lexmodelsv2" in func name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)lexmodelsv2"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: lexmodelsv2-in-const-name
+    languages:
+      - go
+    message: Do not use "lexmodelsv2" in const name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)lexmodelsv2"
+    severity: WARNING
+  - id: lexmodelsv2-in-var-name
+    languages:
+      - go
+    message: Do not use "lexmodelsv2" in var name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)lexmodelsv2"
+    severity: WARNING
+  - id: lexv2models-in-func-name
+    languages:
+      - go
+    message: Do not use "LexV2Models" in func name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LexV2Models"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: lexv2models-in-test-name
+    languages:
+      - go
+    message: Include "LexV2Models" in test name
+    paths:
+      include:
+        - internal/service/lexv2models/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccLexV2Models"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: lexv2models-in-const-name
+    languages:
+      - go
+    message: Do not use "LexV2Models" in const name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LexV2Models"
+    severity: WARNING
+  - id: lexv2models-in-var-name
+    languages:
+      - go
+    message: Do not use "LexV2Models" in var name inside lexv2models package
+    paths:
+      include:
+        - internal/service/lexv2models
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LexV2Models"
+    severity: WARNING
   - id: licensemanager-in-func-name
     languages:
       - go
@@ -3420,18 +3464,3 @@ rules:
           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,5 +1,20 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - 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

.ci/scripts/markdown-link-check.sh

@@ -36,7 +36,7 @@ docker run --rm -i -t \
   -w /github/workspace \
   --entrypoint /usr/bin/find \
   "${link_check_container}" \
-  website \( -type f -name "*.md" -or -name "*.markdown" \) -exec /src/markdown-link-check --config .ci/.markdownlinkcheck.json --quiet --verbose {} \; \
+  website \( -type f -name "*.md" -or -name "*.markdown" \) -not -path "website/docs/cdktf/*" -exec /src/markdown-link-check --config .ci/.markdownlinkcheck.json --quiet --verbose {} \; \
   | tee -a "${output_file}"
 
 touch "${error_file}"

.github/labeler-issue-triage.yml

@@ -377,12 +377,12 @@ service/lambda:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lambda_'
 service/lexmodels:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lex_'
-service/lexmodelsv2:
-  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lexv2models_'
 service/lexruntime:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lexruntime_'
 service/lexruntimev2:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lexruntimev2_'
+service/lexv2models:
+  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_lexv2models_'
 service/licensemanager:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_licensemanager_'
 service/lightsail:

.github/labeler-pr-triage.yml

@@ -623,15 +623,15 @@ service/lambda:
 service/lexmodels:
   - 'internal/service/lexmodels/**/*'
   - 'website/**/lex_*'
-service/lexmodelsv2:
-  - 'internal/service/lexmodelsv2/**/*'
-  - 'website/**/lexmodelsv2_*'
 service/lexruntime:
   - 'internal/service/lexruntime/**/*'
   - 'website/**/lexruntime_*'
 service/lexruntimev2:
   - 'internal/service/lexruntimev2/**/*'
   - 'website/**/lexruntimev2_*'
+service/lexv2models:
+  - 'internal/service/lexv2models/**/*'
+  - 'website/**/lexv2models_*'
 service/licensemanager:
   - 'internal/service/licensemanager/**/*'
   - 'website/**/licensemanager_*'

.teamcity/components/generated/services_all.kt

@@ -118,6 +118,7 @@ val services = mapOf(
     "lakeformation" to ServiceSpec("Lake Formation"),
     "lambda" to ServiceSpec("Lambda", vpcLock = true),
     "lexmodels" to ServiceSpec("Lex Model Building"),
+    "lexv2models" to ServiceSpec("Lex V2 Models"),
     "licensemanager" to ServiceSpec("License Manager"),
     "lightsail" to ServiceSpec("Lightsail", regionOverride = "us-east-1"),
     "location" to ServiceSpec("Location"),

docs/prioritization.md

@@ -8,7 +8,7 @@ This document describes how we handle prioritization of work from a variety of i
 
 ### What this document is not
 
-Due to the variety of input sources, the scale of the provider, and resource constraints, it is impossible to give a hard number on how each of the factors outlined in this document are weighted. Instead, the goal of the document is to give a transparent, but generalized assessment of each of the sources of input so that the community has a better idea of why things are prioritized the way they are. Additional information may be found in the [FAQ](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/faq.md#how-do-you-decide-what-gets-merged-for-each-release).
+Due to the variety of input sources, the scale of the provider, and resource constraints, it is impossible to give a hard number on how each of the factors outlined in this document are weighted. Instead, the goal of the document is to give a transparent, but generalized assessment of each of the sources of input so that the community has a better idea of why things are prioritized the way they are. Additional information may be found in the [FAQ](faq.md#how-do-you-decide-what-gets-merged-for-each-release).
 
 ## Prioritization