ci: Add inspector2

hashicorp · Sep 27, 2022 · ecee8bd · ecee8bd
1 parent 63ea209
commit ecee8bd
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 43 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -2998,3 +2998,17 @@ rules:
           patterns:
             - pattern-regex: "(?i)ConfigService"
     severity: WARNING
+  - 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
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,19 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - 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
@@ -3002,3 +2988,33 @@ rules:
           patterns:
             - pattern-regex: "(?i)ImageBuilder"
     severity: WARNING
+  - 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
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,62 +1,90 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: inspector-in-func-name
+  - id: inspector-in-const-name
     languages:
       - go
-    message: Do not use "Inspector" in func name inside inspector package
+    message: Do not use "Inspector" in const name inside inspector package
     paths:
       include:
         - internal/service/inspector
     patterns:
-      - pattern: func $NAME( ... ) { ... }
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Inspector"
+    severity: WARNING
+  - id: inspector-in-var-name
+    languages:
+      - go
+    message: Do not use "Inspector" in var name inside inspector package
+    paths:
+      include:
+        - internal/service/inspector
+    patterns:
+      - pattern: var $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
             - pattern-regex: "(?i)Inspector"
+    severity: WARNING
+  - id: inspector2-in-func-name
+    languages:
+      - go
+    message: Do not use "Inspector2" in func name inside inspector2 package
+    paths:
+      include:
+        - internal/service/inspector2
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Inspector2"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: inspector-in-test-name
+  - id: inspector2-in-test-name
     languages:
       - go
-    message: Include "Inspector" in test name
+    message: Include "Inspector2" in test name
     paths:
       include:
-        - internal/service/inspector/*_test.go
+        - internal/service/inspector2/*_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-not-regex: "^TestAccInspector"
+            - pattern-not-regex: "^TestAccInspector2"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-  - id: inspector-in-const-name
+  - id: inspector2-in-const-name
     languages:
       - go
-    message: Do not use "Inspector" in const name inside inspector package
+    message: Do not use "Inspector2" in const name inside inspector2 package
     paths:
       include:
-        - internal/service/inspector
+        - internal/service/inspector2
     patterns:
       - pattern: const $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)Inspector"
+            - pattern-regex: "(?i)Inspector2"
     severity: WARNING
-  - id: inspector-in-var-name
+  - id: inspector2-in-var-name
     languages:
       - go
-    message: Do not use "Inspector" in var name inside inspector package
+    message: Do not use "Inspector2" in var name inside inspector2 package
     paths:
       include:
-        - internal/service/inspector
+        - internal/service/inspector2
     patterns:
       - pattern: var $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)Inspector"
+            - pattern-regex: "(?i)Inspector2"
     severity: WARNING
   - id: iot-in-func-name
     languages:
@@ -2984,17 +3012,3 @@ rules:
             - 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,19 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - 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/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -90,6 +90,7 @@ val services = mapOf(
     "identitystore" to ServiceSpec("SSO Identity Store"),
     "imagebuilder" to ServiceSpec("EC2 Image Builder"),
     "inspector" to ServiceSpec("Inspector"),
+    "inspector2" to ServiceSpec("Inspector V2"),
     "iot" to ServiceSpec("IoT Core"),
     "iotanalytics" to ServiceSpec("IoT Analytics"),
     "iotevents" to ServiceSpec("IoT Events"),