to split pr setting the main branch correctly

split-pr setup

Author: ab-cs13

.ci/.semgrep-service-name0.yml

@@ -4376,18 +4376,3 @@ rules:
       - focus-metavariable: $NAME
       - pattern-not: func $NAME($T *testing.T)
     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

.ci/.semgrep-service-name1.yml

@@ -1,5 +1,20 @@
 # 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
@@ -4365,21 +4380,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)Invoicing"
     severity: WARNING
-  - id: iot-in-func-name
-    languages:
-      - go
-    message: Do not use "IoT" in func name inside iot package
-    paths:
-      include:
-        - internal/service/iot
-      exclude:
-        - internal/service/iot/list_pages_gen.go
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)IoT"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T)
-    severity: WARNING

.ci/.semgrep-service-name2.yml

@@ -1,5 +1,23 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: iot-in-func-name
+    languages:
+      - go
+    message: Do not use "IoT" in func name inside iot package
+    paths:
+      include:
+        - internal/service/iot
+      exclude:
+        - internal/service/iot/list_pages_gen.go
+    patterns:
+      - pattern: func $NAME( ... )
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)IoT"
+      - focus-metavariable: $NAME
+      - pattern-not: func $NAME($T *testing.T)
+    severity: WARNING
   - id: iot-in-test-name
     languages:
       - go
@@ -3003,67 +3021,6 @@ rules:
           patterns:
             - pattern-regex: "(?i)ObservabilityAccessManager"
     severity: WARNING
-  - id: odb-in-func-name
-    languages:
-      - go
-    message: Do not use "ODB" in func name inside odb package
-    paths:
-      include:
-        - internal/service/odb
-      exclude:
-        - internal/service/odb/list_pages_gen.go
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ODB"
-      - focus-metavariable: $NAME
-      - pattern-not: func $NAME($T *testing.T)
-    severity: WARNING
-  - id: odb-in-test-name
-    languages:
-      - go
-    message: Include "ODB" in test name
-    paths:
-      include:
-        - internal/service/odb/*_test.go
-    patterns:
-      - pattern: func $NAME( ... )
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccODB"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
-  - id: odb-in-const-name
-    languages:
-      - go
-    message: Do not use "ODB" in const name inside odb package
-    paths:
-      include:
-        - internal/service/odb
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ODB"
-    severity: WARNING
-  - id: odb-in-var-name
-    languages:
-      - go
-    message: Do not use "ODB" in var name inside odb package
-    paths:
-      include:
-        - internal/service/odb
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ODB"
-    severity: WARNING
   - id: opensearch-in-func-name
     languages:
       - go
@@ -4399,3 +4356,17 @@ rules:
           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

.ci/.semgrep-service-name3.yml

@@ -1,19 +1,5 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
-  - 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: recyclebin-in-func-name
     languages:
       - go

.github/labeler-issue-triage.yml

@@ -505,8 +505,6 @@ service/notificationscontacts:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_notificationscontacts_'
 service/oam:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_oam_'
-service/odb:
-  - '((\*|-)\s*`?|(data|resource)\s+"?)aws_odb_'
 service/opensearch:
   - '((\*|-)\s*`?|(data|resource)\s+"?)aws_opensearch_'
 service/opensearchserverless:

.github/labeler-pr-triage.yml

@@ -1602,12 +1602,6 @@ service/oam:
           - any-glob-to-any-file:
               - 'internal/service/oam/**/*'
               - 'website/**/oam_*'
-service/odb:
-  - any:
-      - changed-files:
-          - any-glob-to-any-file:
-              - 'internal/service/odb/**/*'
-              - 'website/**/odb_*'
 service/opensearch:
   - any:
       - changed-files:

.teamcity/components/generated/services_all.kt

@@ -168,7 +168,6 @@ val services = mapOf(
     "notifications" to ServiceSpec("User Notifications"),
     "notificationscontacts" to ServiceSpec("User Notifications Contacts"),
     "oam" to ServiceSpec("CloudWatch Observability Access Manager"),
-    "odb" to ServiceSpec("Oracle Database@AWS"),
     "opensearch" to ServiceSpec("OpenSearch", vpcLock = true),
     "opensearchserverless" to ServiceSpec("OpenSearch Serverless"),
     "organizations" to ServiceSpec("Organizations"),

infrastructure/repository/labels-service.tf

@@ -240,7 +240,6 @@ variable "service_labels" {
     "notifications",
     "notificationscontacts",
     "oam",
-    "odb",
     "opensearch",
     "opensearchserverless",
     "opsworks",