Merge pull request #37122 from madhavvishnubhatta/f-aws-chatbot-servi…

…ce-client-addition Added service client for the service AWS Chatbot
hashicorp · Apr 26, 2024 · b48f493 · b48f493
2 parents 9ac7282 + 85ae2ec
commit b48f493
Show file tree

Hide file tree

Showing 23 changed files with 755 additions and 93 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -2005,6 +2005,67 @@ rules:
             - pattern-not-regex: "[Ss]ervice"
             - pattern-not-regex: "[Cc]ancel"
     severity: WARNING
+  - id: chatbot-in-func-name
+    languages:
+      - go
+    message: Do not use "Chatbot" in func name inside chatbot package
+    paths:
+      include:
+        - internal/service/chatbot
+      exclude:
+        - internal/service/chatbot/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Chatbot"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T) { ... }
+    severity: WARNING
+  - id: chatbot-in-test-name
+    languages:
+      - go
+    message: Include "Chatbot" in test name
+    paths:
+      include:
+        - internal/service/chatbot/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccChatbot"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: chatbot-in-const-name
+    languages:
+      - go
+    message: Do not use "Chatbot" in const name inside chatbot package
+    paths:
+      include:
+        - internal/service/chatbot
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Chatbot"
+    severity: WARNING
+  - id: chatbot-in-var-name
+    languages:
+      - go
+    message: Do not use "Chatbot" in var name inside chatbot package
+    paths:
+      include:
+        - internal/service/chatbot
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Chatbot"
+    severity: WARNING
   - id: chime-in-func-name
     languages:
       - go
@@ -4052,50 +4113,3 @@ 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
-      exclude:
-        - internal/service/configservice/list_pages_gen.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ConfigService"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T) { ... }
-    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
-  - 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
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,5 +1,52 @@
 # 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
+      exclude:
+        - internal/service/configservice/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T) { ... }
+    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
+  - 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
   - id: configservice-in-var-name
     languages:
       - go
@@ -4079,18 +4126,3 @@ rules:
       - focus-metavariable: $NAME
       - pattern-not: func $NAME($T *testing.T) { ... }
     severity: WARNING
-  - id: iot-in-test-name
-    languages:
-      - go
-    message: Include "IoT" in test name
-    paths:
-      include:
-        - internal/service/iot/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccIoT"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,5 +1,20 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: iot-in-test-name
+    languages:
+      - go
+    message: Include "IoT" in test name
+    paths:
+      include:
+        - internal/service/iot/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccIoT"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: iot-in-const-name
     languages:
       - go
@@ -4093,21 +4108,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)RDS"
     severity: WARNING
-  - id: recyclebin-in-func-name
-    languages:
-      - go
-    message: Do not use "recyclebin" in func name inside rbin package
-    paths:
-      include:
-        - internal/service/rbin
-      exclude:
-        - internal/service/rbin/list_pages_gen.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)recyclebin"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T) { ... }
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,5 +1,23 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: recyclebin-in-func-name
+    languages:
+      - go
+    message: Do not use "recyclebin" in func name inside rbin package
+    paths:
+      include:
+        - internal/service/rbin
+      exclude:
+        - internal/service/rbin/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)recyclebin"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T) { ... }
+    severity: WARNING
   - id: recyclebin-in-const-name
     languages:
       - go

diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
@@ -105,6 +105,8 @@ service/budgets:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_budgets_'
 service/ce:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_ce_'
+service/chatbot:
+  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_chatbot_'
 service/chime:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_chime_'
 service/chimesdkidentity:

diff --git a/.github/labeler-pr-triage.yml b/.github/labeler-pr-triage.yml
@@ -349,6 +349,12 @@ service/ce:
           - any-glob-to-any-file:
               - 'internal/service/ce/**/*'
               - 'website/**/ce_*'
+service/chatbot:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file:
+              - 'internal/service/chatbot/**/*'
+              - 'website/**/chatbot_*'
 service/chime:
   - any:
       - changed-files:

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -30,6 +30,7 @@ val services = mapOf(
     "bedrockagent" to ServiceSpec("Agents for Amazon Bedrock"),
     "budgets" to ServiceSpec("Web Services Budgets"),
     "ce" to ServiceSpec("CE (Cost Explorer)"),
+    "chatbot" to ServiceSpec("Chatbot"),
     "chime" to ServiceSpec("Chime"),
     "chimesdkmediapipelines" to ServiceSpec("Chime SDK Media Pipelines"),
     "chimesdkvoice" to ServiceSpec("Chime SDK Voice"),

diff --git a/go.mod b/go.mod
@@ -34,6 +34,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/bedrock v1.8.0
 	github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.8.0
 	github.com/aws/aws-sdk-go-v2/service/budgets v1.22.4
+	github.com/aws/aws-sdk-go-v2/service/chatbot v1.1.5
 	github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.15.5
 	github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.14.4
 	github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.12.0

diff --git a/go.sum b/go.sum
@@ -88,6 +88,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.8.0 h1:CWprual/fBYNa9Mvf8rl
 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.8.0/go.mod h1:6CwV+GE3wrFqkrU2LB8cajHMWJn7jFFhRtxBQiOZ5kw=
 github.com/aws/aws-sdk-go-v2/service/budgets v1.22.4 h1:sVv+p2Wo+sUXa8dC1pCMJ/+9ncOriq8EiRWvAkOuaLY=
 github.com/aws/aws-sdk-go-v2/service/budgets v1.22.4/go.mod h1:JFS3MaNoisHXHQm5/xRQjj1tICixIgT8Vv32D0lV5NE=
+github.com/aws/aws-sdk-go-v2/service/chatbot v1.1.5 h1:ZP/RF+wQiit1QP3DAqaJLgCJDXpJXu2xvdsgrh5ds+s=
+github.com/aws/aws-sdk-go-v2/service/chatbot v1.1.5/go.mod h1:Lc//jOTNN9f39SHfFxtRSzfy1Do4GSz+1jZHT2hKdMs=
 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.15.5 h1:FgeK3aPbB/ARkhxUXfSn9d2ibb4Q9kUhHl/dWwqIy8Y=
 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.15.5/go.mod h1:yPGCqtEO6NNwd6kebco4VSvyHkKbjjwd7K6g49Ze/Uw=
 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.14.4 h1:rea/sazWAyaUXPcbSCBDGKM1Kb6YiU25xvNnN0p7AyM=

diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf
@@ -39,6 +39,7 @@ variable "service_labels" {
     "braket",
     "budgets",
     "ce",
+    "chatbot",
     "chime",
     "chimesdkidentity",
     "chimesdkmediapipelines",

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/provider/service_packages_gen.go b/internal/provider/service_packages_gen.go
diff --git a/internal/service/chatbot/generate.go b/internal/service/chatbot/generate.go
@@ -0,0 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+//go:generate go run ../../generate/servicepackage/main.go
+// ONLY generate directives and package declaration! Do not add anything else to this file.
+
+package chatbot