From 85ae2ecff6bb9d84aa57cf564a6af7dd1596ff19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 26 Apr 2024 13:28:44 -0400 Subject: [PATCH] Run 'make gen'. --- .ci/.semgrep-service-name0.yml | 108 ++++++++++-------- .ci/.semgrep-service-name1.yml | 62 +++++++--- .ci/.semgrep-service-name2.yml | 33 +++--- .ci/.semgrep-service-name3.yml | 18 +++ .github/labeler-issue-triage.yml | 2 + .github/labeler-pr-triage.yml | 6 + .../components/generated/services_all.kt | 1 + 7 files changed, 150 insertions(+), 80 deletions(-) diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml index cb886294d4d0..51577aa81c36 100644 --- 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 index fec6253f23cb..e5254ed3e775 100644 --- 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 index f3e09f52ec1e..dffe9ebf05fd 100644 --- 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 index 46951e761691..a7f30ac6b9b7 100644 --- 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 index 2bba1a827738..acbad5e492e6 100644 --- 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 index 01bca485e955..2b0b6a62db82 100644 --- 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 index 375f1a303a4b..8cd74d9caa72 100644 --- 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"),