Merge pull request #34350 from farhanangullia/f-osis-service-client

OSIS Service Client
hashicorp · Nov 10, 2023 · 2f0d5dd · 2f0d5dd
2 parents 899e02f + a7e42f6
commit 2f0d5dd
Show file tree

Hide file tree

Showing 16 changed files with 230 additions and 100 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -3478,3 +3478,31 @@ rules:
             - pattern-not-regex: "^TestAccComputeOptimizer"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: computeoptimizer-in-const-name
+    languages:
+      - go
+    message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package
+    paths:
+      include:
+        - internal/service/computeoptimizer
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ComputeOptimizer"
+    severity: WARNING
+  - id: computeoptimizer-in-var-name
+    languages:
+      - go
+    message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package
+    paths:
+      include:
+        - internal/service/computeoptimizer
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ComputeOptimizer"
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,33 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: computeoptimizer-in-const-name
-    languages:
-      - go
-    message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package
-    paths:
-      include:
-        - internal/service/computeoptimizer
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ComputeOptimizer"
-    severity: WARNING
-  - id: computeoptimizer-in-var-name
-    languages:
-      - go
-    message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package
-    paths:
-      include:
-        - internal/service/computeoptimizer
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ComputeOptimizer"
-    severity: WARNING
   - id: configservice-in-func-name
     languages:
       - go
@@ -3480,3 +3452,46 @@ rules:
           patterns:
             - pattern-regex: "(?i)Inspector2"
     severity: WARNING
+  - id: inspectorv2-in-func-name
+    languages:
+      - go
+    message: Do not use "inspectorv2" in func name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)inspectorv2"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: inspectorv2-in-const-name
+    languages:
+      - go
+    message: Do not use "inspectorv2" in const name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)inspectorv2"
+    severity: WARNING
+  - id: inspectorv2-in-var-name
+    languages:
+      - go
+    message: Do not use "inspectorv2" in var name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)inspectorv2"
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,48 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: inspectorv2-in-func-name
-    languages:
-      - go
-    message: Do not use "inspectorv2" in func name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)inspectorv2"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
-  - id: inspectorv2-in-const-name
-    languages:
-      - go
-    message: Do not use "inspectorv2" in const name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)inspectorv2"
-    severity: WARNING
-  - id: inspectorv2-in-var-name
-    languages:
-      - go
-    message: Do not use "inspectorv2" in var name inside inspector2 package
-    paths:
-      include:
-        - internal/service/inspector2
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)inspectorv2"
-    severity: WARNING
   - id: internetmonitor-in-func-name
     languages:
       - go
@@ -2563,6 +2520,49 @@ rules:
           patterns:
             - pattern-regex: "(?i)OpenSearch"
     severity: WARNING
+  - id: opensearchingestion-in-func-name
+    languages:
+      - go
+    message: Do not use "opensearchingestion" in func name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)opensearchingestion"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: opensearchingestion-in-const-name
+    languages:
+      - go
+    message: Do not use "opensearchingestion" in const name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)opensearchingestion"
+    severity: WARNING
+  - id: opensearchingestion-in-var-name
+    languages:
+      - go
+    message: Do not use "opensearchingestion" in var name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)opensearchingestion"
+    severity: WARNING
   - id: opensearchserverless-in-func-name
     languages:
       - go
@@ -2780,6 +2780,64 @@ rules:
           patterns:
             - pattern-regex: "(?i)Organizations"
     severity: WARNING
+  - id: osis-in-func-name
+    languages:
+      - go
+    message: Do not use "OpenSearchIngestion" in func name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchIngestion"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: osis-in-test-name
+    languages:
+      - go
+    message: Include "OpenSearchIngestion" in test name
+    paths:
+      include:
+        - internal/service/osis/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccOpenSearchIngestion"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: osis-in-const-name
+    languages:
+      - go
+    message: Do not use "OpenSearchIngestion" in const name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchIngestion"
+    severity: WARNING
+  - id: osis-in-var-name
+    languages:
+      - go
+    message: Do not use "OpenSearchIngestion" in var name inside osis package
+    paths:
+      include:
+        - internal/service/osis
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)OpenSearchIngestion"
+    severity: WARNING
   - id: outposts-in-func-name
     languages:
       - go
@@ -3450,32 +3508,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
-  - id: redshift-in-const-name
-    languages:
-      - go
-    message: Do not use "Redshift" in const name inside redshift package
-    paths:
-      include:
-        - internal/service/redshift
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Redshift"
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,5 +1,34 @@
 # 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
+    message: Do not use "Redshift" in const name inside redshift package
+    paths:
+      include:
+        - internal/service/redshift
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Redshift"
+    severity: WARNING
   - id: redshift-in-var-name
     languages:
       - go

diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
@@ -473,6 +473,8 @@ service/opsworkscm:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_opsworkscm_'
 service/organizations:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_organizations_'
+service/osis:
+  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_osis_'
 service/outposts:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_outposts_'
 service/panorama:

diff --git a/.github/labeler-pr-triage.yml b/.github/labeler-pr-triage.yml
@@ -775,6 +775,9 @@ service/opsworkscm:
 service/organizations:
   - 'internal/service/organizations/**/*'
   - 'website/**/organizations_*'
+service/osis:
+  - 'internal/service/osis/**/*'
+  - 'website/**/osis_*'
 service/outposts:
   - 'internal/service/outposts/**/*'
   - 'website/**/outposts_*'

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -141,6 +141,7 @@ val services = mapOf(
     "opensearchserverless" to ServiceSpec("OpenSearch Serverless"),
     "opsworks" to ServiceSpec("OpsWorks", vpcLock = true),
     "organizations" to ServiceSpec("Organizations"),
+    "osis" to ServiceSpec("OpenSearch Ingestion"),
     "outposts" to ServiceSpec("Outposts"),
     "pinpoint" to ServiceSpec("Pinpoint"),
     "pipes" to ServiceSpec("EventBridge Pipes"),

diff --git a/go.mod b/go.mod
@@ -49,6 +49,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/mediapackage v1.26.1
 	github.com/aws/aws-sdk-go-v2/service/oam v1.6.1
 	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.8.1
+	github.com/aws/aws-sdk-go-v2/service/osis v1.4.1
 	github.com/aws/aws-sdk-go-v2/service/pipes v1.6.1
 	github.com/aws/aws-sdk-go-v2/service/pricing v1.23.1
 	github.com/aws/aws-sdk-go-v2/service/qldb v1.18.1

diff --git a/go.sum b/go.sum
@@ -136,6 +136,8 @@ github.com/aws/aws-sdk-go-v2/service/oam v1.6.1 h1:O0G4f9dtP3uO6aNVOX/14ss6oZIO4
 github.com/aws/aws-sdk-go-v2/service/oam v1.6.1/go.mod h1:tsBCn9NtXpxDgN+2ur+NQYjkb+hb9x3XWK0P6O1YjJs=
 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.8.1 h1:073ZVUKpoeuDRZOvGIA7YkIzgS34ZuaB4Mjob1JLVmw=
 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.8.1/go.mod h1:tgV68+tguCc9exlCrF8bzpdIr1p5kdX/dscRoREhUPA=
+github.com/aws/aws-sdk-go-v2/service/osis v1.4.1 h1:WGWy/V7hLZ/BpqNAMKypT2H4ozt8vRa+Q8RgRsV2jEg=
+github.com/aws/aws-sdk-go-v2/service/osis v1.4.1/go.mod h1:1URZ6YGhTgBE7B9IOW0on6VGf2rFfGHuNE/rvCjr594=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.6.1 h1:GgXHoyJtU1CbGr9OSnF7IfmV3ySplm1+IHAgBcabnJA=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.6.1/go.mod h1:zHXHbYP7mZ75j9g82PCuGOTzJHTkt5ECE1SRI+A1+ts=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.23.1 h1:PvSF5JF/Xg7pzE8aVYlbf/30DoUvFP/KQ10DyzA3zUk=

diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf
@@ -224,6 +224,7 @@ variable "service_labels" {
     "opsworks",
     "opsworkscm",
     "organizations",
+    "osis",
     "outposts",
     "panorama",
     "personalize",