tests: Remove numeric constants

.ci/.semgrep-test-constants-temp.yml

@@ -0,0 +1,79 @@
+# All these rules can be removed once inflight PRs are merged that contain:
+#  - acctest.Ct0
+#  - acctest.Ct1
+#  - acctest.Ct2
+#  - acctest.Ct3
+#  - acctest.Ct4
+#  - acctest.Ct10
+rules:
+  - id: literal-Ct0-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "0" for the constant `acctest.Ct0` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct0"
+    fix: '"0"'
+    severity: ERROR
+    options:
+      constant_propagation: false
+
+  - id: literal-Ct1-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "1" for the constant `acctest.Ct1` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct1"
+    fix: '"1"'
+    severity: ERROR
+    options:
+      constant_propagation: false
+
+  - id: literal-Ct2-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "2" for the constant `acctest.Ct2` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct2"
+    fix: '"2"'
+    severity: ERROR
+    options:
+      constant_propagation: false
+
+  - id: literal-Ct3-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "3" for the constant `acctest.Ct3` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct3"
+    fix: '"3"'
+    severity: ERROR
+    options:
+      constant_propagation: false
+
+  - id: literal-Ct4-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "4" for the constant `acctest.Ct4` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct4"
+    fix: '"4"'
+    severity: ERROR
+    options:
+      constant_propagation: false
+
+  - id: literal-Ct10-string-test-constant-temp
+    languages: [go]
+    message: Use the string literal "10" for the constant `acctest.Ct10` in test files
+    paths:
+      include:
+        - "internal/service/**/*_test.go"
+    pattern: "acctest.Ct10"
+    fix: '"10"'
+    severity: ERROR
+    options:
+      constant_propagation: false

.ci/.semgrep-test-constants.yml

@@ -1,86 +1,14 @@
 # Generated by internal/generate/acctestconsts/main.go; DO NOT EDIT.
 rules:
-  - id: literal-0-string-test-constant
+  - id: literal-12Digit-string-test-constant
     languages: [go]
-    message: Use the constant `acctest.Ct0` for the string literal "0" in test files
+    message: Use the constant `acctest.Ct12Digit` for the string literal "123456789012" in test files
     paths:
       include:
         - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"0"'
-      - pattern: 'acctest.CtZero'
+    pattern: '"123456789012"'
     severity: ERROR
-    fix: "acctest.Ct0"
-    options:
-      constant_propagation: false
-
-  - id: literal-1-string-test-constant
-    languages: [go]
-    message: Use the constant `acctest.Ct1` for the string literal "1" in test files
-    paths:
-      include:
-        - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"1"'
-      - pattern: 'acctest.CtOne'
-    severity: ERROR
-    fix: "acctest.Ct1"
-    options:
-      constant_propagation: false
-
-  - id: literal-10-string-test-constant
-    languages: [go]
-    message: Use the constant `acctest.Ct10` for the string literal "10" in test files
-    paths:
-      include:
-        - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"10"'
-      - pattern: 'acctest.CtTen'
-    severity: ERROR
-    fix: "acctest.Ct10"
-    options:
-      constant_propagation: false
-
-  - id: literal-2-string-test-constant
-    languages: [go]
-    message: Use the constant `acctest.Ct2` for the string literal "2" in test files
-    paths:
-      include:
-        - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"2"'
-      - pattern: 'acctest.CtTwo'
-    severity: ERROR
-    fix: "acctest.Ct2"
-    options:
-      constant_propagation: false
-
-  - id: literal-3-string-test-constant
-    languages: [go]
-    message: Use the constant `acctest.Ct3` for the string literal "3" in test files
-    paths:
-      include:
-        - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"3"'
-      - pattern: 'acctest.CtThree'
-    severity: ERROR
-    fix: "acctest.Ct3"
-    options:
-      constant_propagation: false
-
-  - id: literal-4-string-test-constant
-    languages: [go]
-    message: Use the constant `acctest.Ct4` for the string literal "4" in test files
-    paths:
-      include:
-        - "internal/service/**/*_test.go"
-    pattern-either:
-      - pattern: '"4"'
-      - pattern: 'acctest.CtFour'
-    severity: ERROR
-    fix: "acctest.Ct4"
+    fix: "acctest.Ct12Digit"
     options:
       constant_propagation: false
 

GNUmakefile

@@ -485,7 +485,8 @@ semgrep-constants: semgrep-validate ## Fix constants with Semgrep --autofix
 	@semgrep $(SEMGREP_ARGS) --autofix \
 		$(if $(filter-out $(origin PKG), undefined),--include $(PKG_NAME),) \
 		--config .ci/.semgrep-constants.yml \
-		--config .ci/.semgrep-test-constants.yml
+		--config .ci/.semgrep-test-constants.yml \
+		--config .ci/.semgrep-test-constants-temp.yml
 
 semgrep-docker: semgrep-validate ## Run Semgrep (Legacy, use caution)
 	@echo "make: Legacy target, use caution..."
@@ -601,7 +602,7 @@ t: prereq-go fmt-check ## Run acceptance tests (similar to testacc)
 
 test: prereq-go fmt-check ## Run unit tests
 	@echo "make: Running unit tests..."
-	$(GO_VER) test -count $(TEST_COUNT) $(TEST) $(TESTARGS) -timeout=5m
+	$(GO_VER) test -count $(TEST_COUNT) $(TEST) $(TESTARGS) -timeout=15m
 
 test-compile: prereq-go ## Test package compilation
 	@if [ "$(TEST)" = "./..." ]; then \

internal/acctest/consts.csv

@@ -1,9 +1,4 @@
-0,0
-1,1
-10,10
-2,2
-3,3
-4,4
+123456789012,12Digit
 FALSE,FalseCaps
 TRUE,TrueCaps
 basic,Basic

internal/generate/acctestconsts/main.go

@@ -56,7 +56,7 @@ func main() {
 
 	d := g.NewGoFileDestination(constsFilename)
 
-	if err := d.WriteTemplate("constantlist", constsTmpl, td); err != nil {
+	if err := d.BufferTemplate("constantlist", constsTmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", constsFilename, err)
 	}
 
@@ -69,7 +69,7 @@ func main() {
 
 	d = g.NewGoFileDestination(constOrQuoteFilename)
 
-	if err := d.WriteTemplate("constsOrQuote", constOrQuoteTmpl, td); err != nil {
+	if err := d.BufferTemplate("constsOrQuote", constOrQuoteTmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", constOrQuoteFilename, err)
 	}
 
@@ -82,7 +82,7 @@ func main() {
 
 	d = g.NewUnformattedFileDestination(semgrepFilename)
 
-	if err := d.WriteTemplate("semgrep-constants", semgrepTmpl, td); err != nil {
+	if err := d.BufferTemplate("semgrep-constants", semgrepTmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", semgrepFilename, err)
 	}
 

internal/generate/allowsubcats/main.go

@@ -61,7 +61,7 @@ func main() {
 
 	d := g.NewUnformattedFileDestination(filename)
 
-	if err := d.WriteTemplate("allowsubcats", tmpl, td); err != nil {
+	if err := d.BufferTemplate("allowsubcats", tmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", filename, err)
 	}
 

internal/generate/attrconsts/main.go

@@ -59,7 +59,7 @@ func main() {
 
 	d := g.NewGoFileDestination(constsFilename)
 
-	if err := d.WriteTemplate("constantlist", tmpl, td); err != nil {
+	if err := d.BufferTemplate("constantlist", tmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", constsFilename, err)
 	}
 
@@ -72,7 +72,7 @@ func main() {
 
 	d = g.NewGoFileDestination(constOrQuoteFilename)
 
-	if err := d.WriteTemplate("constOrQuote", constOrQuoteTmpl, td); err != nil {
+	if err := d.BufferTemplate("constOrQuote", constOrQuoteTmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", constOrQuoteFilename, err)
 	}
 
@@ -85,7 +85,7 @@ func main() {
 
 	d = g.NewUnformattedFileDestination(semgrepFilename)
 
-	if err := d.WriteTemplate("semgrep-constants", semgrepTmpl, td); err != nil {
+	if err := d.BufferTemplate("semgrep-constants", semgrepTmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", semgrepFilename, err)
 	}
 

internal/generate/awsclient/main.go

@@ -65,7 +65,7 @@ func main() {
 
 	d := g.NewGoFileDestination(filename)
 
-	if err := d.WriteTemplate("awsclient", tmpl, td); err != nil {
+	if err := d.BufferTemplate("awsclient", tmpl, td); err != nil {
 		g.Fatalf("generating file (%s): %s", filename, err)
 	}