resource/aws_comprehend_entity_recognizer: New resource

.changelog/26244.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_comprehend_entity_recognizer
+```

.ci/.semgrep-service-name0.yml

@@ -2896,92 +2896,105 @@ rules:
           patterns:
             - pattern-regex: "(?i)CognitoIDP"
     severity: WARNING
-  - id: configservice-in-func-name
+  - id: comprehend-in-func-name
     languages:
       - go
-    message: Do not use "ConfigService" in func name inside configservice package
+    message: Do not use "Comprehend" in func name inside comprehend package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/comprehend
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)Comprehend"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: configservice-in-test-name
+  - id: comprehend-in-test-name
     languages:
       - go
-    message: Include "ConfigService" in test name
+    message: Include "Comprehend" in test name
     paths:
       include:
-        - internal/service/configservice/*_test.go
+        - internal/service/comprehend/*_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-not-regex: "^TestAccConfigService"
+            - pattern-not-regex: "^TestAccComprehend"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-  - id: configservice-in-const-name
+  - id: comprehend-in-const-name
     languages:
       - go
-    message: Do not use "ConfigService" in const name inside configservice package
+    message: Do not use "Comprehend" in const name inside comprehend package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/comprehend
     patterns:
       - pattern: const $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)Comprehend"
     severity: WARNING
-  - id: configservice-in-var-name
+  - id: comprehend-in-var-name
     languages:
       - go
-    message: Do not use "ConfigService" in var name inside configservice package
+    message: Do not use "Comprehend" in var name inside comprehend package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/comprehend
     patterns:
       - pattern: var $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)Comprehend"
     severity: WARNING
-  - id: connect-in-func-name
+  - id: configservice-in-func-name
     languages:
       - go
-    message: Do not use "Connect" in func name inside connect package
+    message: Do not use "ConfigService" in func name inside configservice package
     paths:
       include:
-        - internal/service/connect
+        - internal/service/configservice
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)Connect"
-            - pattern-not-regex: .*uickConnect.*
+            - pattern-regex: "(?i)ConfigService"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: connect-in-test-name
+  - id: configservice-in-test-name
     languages:
       - go
-    message: Include "Connect" in test name
+    message: Include "ConfigService" in test name
     paths:
       include:
-        - internal/service/connect/*_test.go
+        - internal/service/configservice/*_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-not-regex: "^TestAccConnect"
+            - pattern-not-regex: "^TestAccConfigService"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: configservice-in-const-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in const name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING

.ci/.semgrep-service-name1.yml

@@ -1,5 +1,50 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: configservice-in-var-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in var name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING
+  - id: connect-in-func-name
+    languages:
+      - go
+    message: Do not use "Connect" in func name inside connect package
+    paths:
+      include:
+        - internal/service/connect
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Connect"
+            - pattern-not-regex: .*uickConnect.*
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: connect-in-test-name
+    languages:
+      - go
+    message: Include "Connect" in test name
+    paths:
+      include:
+        - internal/service/connect/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccConnect"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: connect-in-const-name
     languages:
       - go
@@ -2957,33 +3002,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)ImageBuilder"
     severity: WARNING
-  - id: inspector-in-func-name
-    languages:
-      - go
-    message: Do not use "Inspector" in func name inside inspector package
-    paths:
-      include:
-        - internal/service/inspector
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Inspector"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
-  - id: inspector-in-test-name
-    languages:
-      - go
-    message: Include "Inspector" in test name
-    paths:
-      include:
-        - internal/service/inspector/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccInspector"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING

.ci/.semgrep-service-name2.yml

@@ -1,5 +1,35 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: inspector-in-func-name
+    languages:
+      - go
+    message: Do not use "Inspector" in func name inside inspector package
+    paths:
+      include:
+        - internal/service/inspector
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Inspector"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: inspector-in-test-name
+    languages:
+      - go
+    message: Include "Inspector" in test name
+    paths:
+      include:
+        - internal/service/inspector/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccInspector"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: inspector-in-const-name
     languages:
       - go
@@ -2968,17 +2998,3 @@ 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

.ci/.semgrep-service-name3.yml

@@ -1,5 +1,19 @@
 # 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

.ci/.semgrep.yml

@@ -158,16 +158,18 @@ rules:
 
   - id: helper-schema-Set-extraneous-NewSet-with-flattenStringList
     languages: [go]
-    message: Prefer `flex.FlattenStringSet()` function for casting a list of string pointers to a set
+    message: Prefer `flex.FlattenStringSet()` or `flex.FlattenStringValueSet()`
     paths:
       include:
         - internal/
-    pattern: schema.NewSet(schema.HashString, flex.FlattenStringList($APIOBJECT))
+    patterns:
+      - pattern: schema.NewSet(schema.HashString, flex.FlattenStringList($APIOBJECT))
+      - pattern: schema.NewSet(schema.HashString, flex.FlattenStringValueList($APIOBJECT))
     severity: WARNING
 
   - id: helper-schema-Set-extraneous-expandStringList-with-List
     languages: [go]
-    message: Prefer `flex.ExpandStringSet()` function for casting a set to a list of string pointers
+    message: Prefer `flex.ExpandStringSet()` or `flex.ExpandStringValueSet()`
     paths:
       include:
         - internal/
@@ -178,6 +180,11 @@ rules:
               $LIST := $SET.List()
               ...
               flex.ExpandStringList($LIST)
+          - pattern: flex.ExpandStringValueList($SET.List())
+          - pattern: |
+              $LIST := $SET.List()
+              ...
+              flex.ExpandStringValueList($LIST)
     severity: WARNING
 
   - id: helper-schema-ResourceData-GetOk-with-extraneous-conditional

.teamcity/components/generated/services_all.kt

@@ -42,6 +42,7 @@ val services = mapOf(
     "codestarnotifications" to ServiceSpec("CodeStar Notifications"),
     "cognitoidentity" to ServiceSpec("Cognito Identity"),
     "cognitoidp" to ServiceSpec("Cognito IDP (Identity Provider)"),
+    "comprehend" to ServiceSpec("Comprehend", parallelismOverride = 10),
     "configservice" to ServiceSpec("Config"),
     "connect" to ServiceSpec("Connect"),
     "cur" to ServiceSpec("Cost and Usage Report"),

GNUmakefile

@@ -8,6 +8,7 @@ ACCTEST_PARALLELISM ?= 20
 
 ifneq ($(origin PKG), undefined)
 	PKG_NAME = internal/service/$(PKG)
+	TEST = ./$(PKG_NAME)/...
 endif
 
 ifneq ($(origin TESTS), undefined)

docs/resource-name-generation.md

@@ -65,7 +65,7 @@ func TestAccServiceThing_nameGenerated(t *testing.T) {
         Config: testAccThingConfig_nameGenerated(),
         Check: resource.ComposeTestCheckFunc(
           testAccCheckThingExists(resourceName, &thing),
-          create.TestCheckResourceAttrNameGenerated(resourceName, "name"),
+          acctest.CheckResourceAttrNameGenerated(resourceName, "name"),
           resource.TestCheckResourceAttr(resourceName, "name_prefix", resource.UniqueIdPrefix),
         ),
       },
@@ -93,7 +93,7 @@ func TestAccServiceThing_namePrefix(t *testing.T) {
         Config: testAccThingConfig_namePrefix("tf-acc-test-prefix-"),
         Check: resource.ComposeTestCheckFunc(
           testAccCheckThingExists(resourceName, &thing),
-          create.TestCheckResourceAttrNameFromPrefix(resourceName, "name", "tf-acc-test-prefix-"),
+          acctest.CheckResourceAttrNameFromPrefix(resourceName, "name", "tf-acc-test-prefix-"),
           resource.TestCheckResourceAttr(resourceName, "name_prefix", "tf-acc-test-prefix-"),
         ),
       },
@@ -156,4 +156,4 @@ d.Set("name", resp.Name)
 d.Set("name_prefix", create.NamePrefixFromNameWithSuffix(aws.StringValue(resp.Name), ".fifo"))
 ```
 
-There are also functions `create.TestCheckResourceAttrNameWithSuffixGenerated` and `create.TestCheckResourceAttrNameWithSuffixFromPrefix` for use in tests.
+There are also functions `acctest.CheckResourceAttrNameWithSuffixGenerated` and `acctest.CheckResourceAttrNameWithSuffixFromPrefix` for use in tests.