Merge pull request #28315 from mattburgess/opensearchserverless-service

Add OpenSearchServerless Service
hashicorp · Dec 19, 2022 · 3287dc6 · 3287dc6
2 parents d166262 + 82459f6
commit 3287dc6
Show file tree

Hide file tree

Showing 19 changed files with 254 additions and 75 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -3187,3 +3187,18 @@ rules:
             - 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
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,20 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - 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
@@ -3176,3 +3161,31 @@ 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
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,33 +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
@@ -2432,6 +2404,64 @@ rules:
           patterns:
             - pattern-regex: "(?i)OpenSearch"
     severity: WARNING
+  - id: opensearchserverless-in-func-name
+    languages:
+      - go
+    message: Do not use "OpenSearchServerless" in func name inside opensearchserverless package
+    paths:
+      include:
+        - internal/service/opensearchserverless
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchServerless"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: opensearchserverless-in-test-name
+    languages:
+      - go
+    message: Include "OpenSearchServerless" in test name
+    paths:
+      include:
+        - internal/service/opensearchserverless/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccOpenSearchServerless"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: opensearchserverless-in-const-name
+    languages:
+      - go
+    message: Do not use "OpenSearchServerless" in const name inside opensearchserverless package
+    paths:
+      include:
+        - internal/service/opensearchserverless
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchServerless"
+    severity: WARNING
+  - id: opensearchserverless-in-var-name
+    languages:
+      - go
+    message: Do not use "OpenSearchServerless" in var name inside opensearchserverless package
+    paths:
+      include:
+        - internal/service/opensearchserverless
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchServerless"
+    severity: WARNING
   - id: opensearchservice-in-func-name
     languages:
       - go
@@ -3156,18 +3186,3 @@ rules:
             - pattern-regex: "(?i)Redshift"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: redshift-in-test-name
-    languages:
-      - go
-    message: Include "Redshift" in test name
-    paths:
-      include:
-        - internal/service/redshift/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccRedshift"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,5 +1,20 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: redshift-in-test-name
+    languages:
+      - go
+    message: Include "Redshift" in test name
+    paths:
+      include:
+        - internal/service/redshift/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccRedshift"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: redshift-in-const-name
     languages:
       - go

diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
@@ -449,6 +449,8 @@ service/nimble:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_nimble_'
 service/opensearch:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_opensearch_'
+service/opensearchserverless:
+  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_opensearchserverless_'
 service/opsworks:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_opsworks_'
 service/opsworkscm:

diff --git a/.github/labeler-pr-triage.yml b/.github/labeler-pr-triage.yml
@@ -736,6 +736,9 @@ service/nimble:
 service/opensearch:
   - 'internal/service/opensearch/**/*'
   - 'website/**/opensearch_*'
+service/opensearchserverless:
+  - 'internal/service/opensearchserverless/**/*'
+  - 'website/**/opensearchserverless_*'
 service/opsworks:
   - 'internal/service/opsworks/**/*'
   - 'website/**/opsworks_*'

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -127,6 +127,7 @@ val services = mapOf(
     "networkfirewall" to ServiceSpec("Network Firewall", vpcLock = true),
     "networkmanager" to ServiceSpec("Network Manager"),
     "opensearch" to ServiceSpec("OpenSearch"),
+    "opensearchserverless" to ServiceSpec("OpenSearch Serverless"),
     "opsworks" to ServiceSpec("OpsWorks", vpcLock = true),
     "organizations" to ServiceSpec("Organizations"),
     "outposts" to ServiceSpec("Outposts"),

diff --git a/go.mod b/go.mod
@@ -80,6 +80,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.20 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.0.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -78,6 +78,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.36.1 h1:kkzPhuVpcuz7N7910XGgnczYd
 github.com/aws/aws-sdk-go-v2/service/kendra v1.36.1/go.mod h1:EazC06zRCDZjeYInlIURLpvGsqURkYT24vCm7dbuL5A=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.26.0 h1:efAz2VZcBg1YG5evAq1vzS6fij5I8knb5q3w6sKSJbQ=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.26.0/go.mod h1:3wXEWmABxeDt9FqiMCjGqr+/eNjhbRqTLO3LHg+Z814=
+github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.0.2 h1:bcn8Z+cB86OGQbJGheFywFieMDAVY7mKxH369HvnMmU=
+github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.0.2/go.mod h1:r1aTV/abw3nJTZQgpKQv1wb3tTX+LahVRYULEh+WNRI=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.0.1 h1:fnoi3/dnqmgq4NEG6h8OZf6gPE0QVsNAMyDrdNHvuT4=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.0.1/go.mod h1:v7oTSuRooh6pHa3YitvBTCzwCch8cfdKI0sg/FVKwyo=
 github.com/aws/aws-sdk-go-v2/service/rds v1.35.0 h1:S583sAvE4bAtZYJyDWwSmcx2TG093Kreum+uIQ7V8ic=

diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf
@@ -212,6 +212,7 @@ variable "service_labels" {
     "networkmanager",
     "nimble",
     "opensearch",
+    "opensearchserverless",
     "opsworks",
     "opsworkscm",
     "organizations",

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/conns/config_gen.go b/internal/conns/config_gen.go
diff --git a/internal/service/opensearchserverless/generate.go b/internal/service/opensearchserverless/generate.go
@@ -0,0 +1,4 @@
+//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ServiceTagsSlice -UpdateTags
+// ONLY generate directives and package declaration! Do not add anything else to this file.
+
+package opensearchserverless
diff --git a/internal/service/opensearchserverless/tags_gen.go b/internal/service/opensearchserverless/tags_gen.go