resolve conclicts of generated files

hashicorp · Mar 15, 2023 · 5d4d6f0 · 5d4d6f0
1 parent 48662f0
commit 5d4d6f0
Show file tree

Hide file tree

Showing 5 changed files with 161 additions and 99 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -3260,3 +3260,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
@@ -3249,3 +3235,32 @@ rules:
             - pattern-regex: "(?i)Inspector2"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
+  - id: inspector2-in-test-name
+    languages:
+      - go
+    message: Include "Inspector2" in test name
+    paths:
+      include:
+        - internal/service/inspector2/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - 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
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,34 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: inspector2-in-test-name
-    languages:
-      - go
-    message: Include "Inspector2" in test name
-    paths:
-      include:
-        - internal/service/inspector2/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - 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
@@ -3245,3 +3216,46 @@ rules:
             - pattern-not-regex: "^TestAccRDS"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: rds-in-const-name
+    languages:
+      - go
+    message: Do not use "RDS" in const name inside rds package
+    paths:
+      include:
+        - internal/service/rds
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)RDS"
+    severity: WARNING
+  - id: rds-in-var-name
+    languages:
+      - go
+    message: Do not use "RDS" in var name inside rds package
+    paths:
+      include:
+        - internal/service/rds
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)RDS"
+    severity: WARNING
+  - id: redshift-in-func-name
+    languages:
+      - go
+    message: Do not use "Redshift" in func name inside redshift package
+    paths:
+      include:
+        - internal/service/redshift
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Redshift"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,48 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - id: rds-in-const-name
-    languages:
-      - go
-    message: Do not use "RDS" in const name inside rds package
-    paths:
-      include:
-        - internal/service/rds
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)RDS"
-    severity: WARNING
-  - id: rds-in-var-name
-    languages:
-      - go
-    message: Do not use "RDS" in var name inside rds package
-    paths:
-      include:
-        - internal/service/rds
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)RDS"
-    severity: WARNING
-  - id: redshift-in-func-name
-    languages:
-      - go
-    message: Do not use "Redshift" in func name inside redshift package
-    paths:
-      include:
-        - internal/service/redshift
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Redshift"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
   - id: redshift-in-test-name
     languages:
       - go
@@ -2260,6 +2217,64 @@ rules:
           patterns:
             - pattern-regex: "(?i)SSM"
     severity: WARNING
+  - id: ssmincidents-in-func-name
+    languages:
+      - go
+    message: Do not use "SSMIncidents" in func name inside ssmincidents package
+    paths:
+      include:
+        - internal/service/ssmincidents
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)SSMIncidents"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: ssmincidents-in-test-name
+    languages:
+      - go
+    message: Include "SSMIncidents" in test name
+    paths:
+      include:
+        - internal/service/ssmincidents/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccSSMIncidents"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: ssmincidents-in-const-name
+    languages:
+      - go
+    message: Do not use "SSMIncidents" in const name inside ssmincidents package
+    paths:
+      include:
+        - internal/service/ssmincidents
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)SSMIncidents"
+    severity: WARNING
+  - id: ssmincidents-in-var-name
+    languages:
+      - go
+    message: Do not use "SSMIncidents" in var name inside ssmincidents package
+    paths:
+      include:
+        - internal/service/ssmincidents
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)SSMIncidents"
+    severity: WARNING
   - id: ssoadmin-in-func-name
     languages:
       - go

diff --git a/internal/service/ssmincidents/service_package_gen.go b/internal/service/ssmincidents/service_package_gen.go