Linthell

hashicorp · Dec 7, 2023 · ad206e8 · ad206e8
1 parent 6457ae4
commit ad206e8
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 60 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -3579,3 +3579,18 @@ rules:
             - pattern-regex: "(?i)ComputeOptimizer"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
+  - id: computeoptimizer-in-test-name
+    languages:
+      - go
+    message: Include "ComputeOptimizer" in test name
+    paths:
+      include:
+        - internal/service/computeoptimizer/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccComputeOptimizer"
+            - 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: computeoptimizer-in-test-name
-    languages:
-      - go
-    message: Include "ComputeOptimizer" in test name
-    paths:
-      include:
-        - internal/service/computeoptimizer/*_test.go
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-not-regex: "^TestAccComputeOptimizer"
-            - pattern-regex: ^TestAcc.*
-    severity: WARNING
   - id: computeoptimizer-in-const-name
     languages:
       - go
@@ -3568,3 +3553,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
@@ -1650,6 +1621,64 @@ rules:
           patterns:
             - pattern-regex: "(?i)Logs"
     severity: WARNING
+  - id: lookoutmetrics-in-func-name
+    languages:
+      - go
+    message: Do not use "LookoutMetrics" in func name inside lookoutmetrics package
+    paths:
+      include:
+        - internal/service/lookoutmetrics
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LookoutMetrics"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: lookoutmetrics-in-test-name
+    languages:
+      - go
+    message: Include "LookoutMetrics" in test name
+    paths:
+      include:
+        - internal/service/lookoutmetrics/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccLookoutMetrics"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
+  - id: lookoutmetrics-in-const-name
+    languages:
+      - go
+    message: Do not use "LookoutMetrics" in const name inside lookoutmetrics package
+    paths:
+      include:
+        - internal/service/lookoutmetrics
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LookoutMetrics"
+    severity: WARNING
+  - id: lookoutmetrics-in-var-name
+    languages:
+      - go
+    message: Do not use "LookoutMetrics" in var name inside lookoutmetrics package
+    paths:
+      include:
+        - internal/service/lookoutmetrics
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)LookoutMetrics"
+    severity: WARNING
   - id: macie2-in-func-name
     languages:
       - go
@@ -3566,17 +3595,3 @@ 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
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: 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

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -128,6 +128,7 @@ val services = mapOf(
     "lightsail" to ServiceSpec("Lightsail", regionOverride = "us-east-1"),
     "location" to ServiceSpec("Location"),
     "logs" to ServiceSpec("CloudWatch Logs"),
+    "lookoutmetrics" to ServiceSpec("Lookout for Metrics"),
     "macie2" to ServiceSpec("Macie"),
     "mediaconnect" to ServiceSpec("Elemental MediaConnect"),
     "mediaconvert" to ServiceSpec("Elemental MediaConvert"),

diff --git a/internal/framework/flex/autoflex_test.go b/internal/framework/flex/autoflex_test.go
@@ -531,7 +531,7 @@ func TestGenericExpand(t *testing.T) {
 			},
 		},
 		{
-			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolint:contextcheck // false positive
+			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolintlint:contextcheck // false positive
 			TestName: "resource name prefix",
 			Source: &TestFlexTF16{
 				Name: types.StringValue("Ovodoghen"),
@@ -1182,7 +1182,7 @@ func TestGenericFlatten(t *testing.T) {
 			},
 		},
 		{
-			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolint:contextcheck // false positive
+			Context:  context.WithValue(ctx, ResourcePrefix, "Intent"), //nolintlint:contextcheck // false positive
 			TestName: "resource name prefix",
 			Source: &TestFlexAWS18{
 				IntentName: aws.String("Ovodoghen"),