update to main

.ci/.semgrep-service-name0.yml

@@ -2940,7 +2940,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)ConfigService"
     severity: WARNING
-<<<<<<< HEAD:.ci/.semgrep-service-name0.yml
   - id: configservice-in-var-name
     languages:
       - go
@@ -2986,5 +2985,3 @@ rules:
             - pattern-not-regex: "^TestAccConnect"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-=======
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name0.yml

.ci/.semgrep-service-name1.yml

@@ -1,53 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-<<<<<<< HEAD:.ci/.semgrep-service-name1.yml
-=======
-  - 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
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name1.yml
   - id: connect-in-const-name
     languages:
       - go
@@ -3005,7 +2957,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)ImageBuilder"
     severity: WARNING
-<<<<<<< HEAD:.ci/.semgrep-service-name1.yml
   - id: inspector-in-func-name
     languages:
       - go
@@ -3036,5 +2987,3 @@ rules:
             - pattern-not-regex: "^TestAccInspector"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-=======
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name1.yml

.ci/.semgrep-service-name2.yml

@@ -1,38 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-<<<<<<< HEAD:.ci/.semgrep-service-name2.yml
-=======
-  - 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
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name2.yml
   - id: inspector-in-const-name
     languages:
       - go
@@ -2943,7 +2910,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)RDS"
     severity: WARNING
-<<<<<<< HEAD:.ci/.semgrep-service-name2.yml
   - id: rds-in-var-name
     languages:
       - go
@@ -3016,5 +2982,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)Redshift"
     severity: WARNING
-=======
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name2.yml

.ci/.semgrep-service-name3.yml

@@ -1,6 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-<<<<<<< HEAD:.ci/.semgrep-service-name3.yml
   - id: redshiftdata-in-func-name
     languages:
       - go
@@ -46,9 +45,6 @@ rules:
             - pattern-regex: "(?i)RedshiftData"
     severity: WARNING
   - id: redshiftdata-in-var-name
-=======
-  - id: rds-in-var-name
->>>>>>> b1d89910e6 (add Transcribe language model):.semgrep-service-name3.yml
     languages:
       - go
     message: Do not use "RedshiftData" in var name inside redshiftdata package

go.sum

@@ -56,13 +56,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 h1:Uw5wBybFQ1UeA9ts0Y07gbv0ncZn
 github.com/aws/aws-sdk-go-v2/service/sso v1.11.4/go.mod h1:cPDwJwsP4Kff9mldCXAmddjJL6JGQqtA3Mzer2zyr88=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 h1:+xtV90n3abQmgzk1pS++FdxZTrPEDgQng6e4/56WR2A=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.4/go.mod h1:lfSYenAXtavyX2A1LsViglqlG9eEFYxNryTZS5rn3QE=
-<<<<<<< HEAD
 github.com/aws/aws-sdk-go-v2/service/transcribe v1.20.3 h1:JLL1VVt8JuktbSa26rjxizyZxF2iYWg4cuaBhk/1JBs=
 github.com/aws/aws-sdk-go-v2/service/transcribe v1.20.3/go.mod h1:ojx+dJuqQFFX0EApdKHRPLvQvhmGKj+b0evbL7Uu19U=
-=======
-github.com/aws/aws-sdk-go-v2/service/transcribe v1.20.2 h1:VsukhCyWr7HzhNArTgHMVofraVXkBMIYE2FtrsxfYw8=
-github.com/aws/aws-sdk-go-v2/service/transcribe v1.20.2/go.mod h1:HQI0HFDMT3ToqRJgsjG4nbu+39NiW63foozPr+lKzmI=
->>>>>>> b1d89910e6 (add Transcribe language model)
 github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
 github.com/aws/smithy-go v1.12.0 h1:gXpeZel/jPoWQ7OEmLIgCUnhkFftqNfwWUwAHSlp1v0=
 github.com/aws/smithy-go v1.12.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
@@ -421,4 +416,4 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=