diff --git a/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go index 7d728fcfd2..395f0dd901 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go @@ -13,6 +13,7 @@ import ( ) func TestGenerate(t *testing.T) { + t.Parallel() maxSize := helpers.GetPointer[ngfAPI.Size]("10m") bodyTimeout := helpers.GetPointer[ngfAPI.Duration]("600ms") keepaliveRequests := helpers.GetPointer[int32](900) @@ -149,9 +150,9 @@ func TestGenerate(t *testing.T) { }, } - g := NewWithT(t) - - checkResults := func(resFiles policies.GenerateResultFiles, expStrings []string) { + checkResults := func(t *testing.T, resFiles policies.GenerateResultFiles, expStrings []string) { + t.Helper() + g := NewWithT(t) g.Expect(resFiles).To(HaveLen(1)) for _, str := range expStrings { @@ -160,22 +161,24 @@ func TestGenerate(t *testing.T) { } for _, test := range tests { - t.Run(test.name, func(_ *testing.T) { + t.Run(test.name, func(t *testing.T) { + t.Parallel() generator := clientsettings.NewGenerator() resFiles := generator.GenerateForServer([]policies.Policy{test.policy}, http.Server{}) - checkResults(resFiles, test.expStrings) + checkResults(t, resFiles, test.expStrings) resFiles = generator.GenerateForLocation([]policies.Policy{test.policy}, http.Location{}) - checkResults(resFiles, test.expStrings) + checkResults(t, resFiles, test.expStrings) resFiles = generator.GenerateForInternalLocation([]policies.Policy{test.policy}) - checkResults(resFiles, test.expStrings) + checkResults(t, resFiles, test.expStrings) }) } } func TestGenerateNoPolicies(t *testing.T) { + t.Parallel() g := NewWithT(t) generator := clientsettings.NewGenerator() diff --git a/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go index 9cb5884b6e..1be2eff100 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go @@ -53,6 +53,7 @@ func createModifiedPolicy(mod policyModFunc) *ngfAPI.ClientSettingsPolicy { } func TestValidator_Validate(t *testing.T) { + t.Parallel() tests := []struct { name string policy *ngfAPI.ClientSettingsPolicy @@ -133,6 +134,7 @@ func TestValidator_Validate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + t.Parallel() g := NewWithT(t) conds := v.Validate(test.policy, nil) @@ -142,6 +144,7 @@ func TestValidator_Validate(t *testing.T) { } func TestValidator_ValidatePanics(t *testing.T) { + t.Parallel() v := clientsettings.NewValidator(nil) validate := func() { @@ -154,6 +157,7 @@ func TestValidator_ValidatePanics(t *testing.T) { } func TestValidator_Conflicts(t *testing.T) { + t.Parallel() tests := []struct { polA *ngfAPI.ClientSettingsPolicy polB *ngfAPI.ClientSettingsPolicy @@ -256,6 +260,7 @@ func TestValidator_Conflicts(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + t.Parallel() g := NewWithT(t) g.Expect(v.Conflicts(test.polA, test.polB)).To(Equal(test.conflicts)) @@ -264,6 +269,7 @@ func TestValidator_Conflicts(t *testing.T) { } func TestValidator_ConflictsPanics(t *testing.T) { + t.Parallel() v := clientsettings.NewValidator(nil) conflicts := func() { diff --git a/internal/mode/static/nginx/config/policies/observability/generator_test.go b/internal/mode/static/nginx/config/policies/observability/generator_test.go index 4faa880c0d..bee1df4e84 100644 --- a/internal/mode/static/nginx/config/policies/observability/generator_test.go +++ b/internal/mode/static/nginx/config/policies/observability/generator_test.go @@ -15,6 +15,7 @@ import ( ) func TestGenerate(t *testing.T) { + t.Parallel() ratio := helpers.GetPointer[int32](25) zeroRatio := helpers.GetPointer[int32](0) context := helpers.GetPointer[ngfAPI.TraceContext](ngfAPI.TraceContextExtract) @@ -242,6 +243,7 @@ func TestGenerate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + t.Parallel() g := NewWithT(t) generator := observability.NewGenerator(test.telemetryConf) @@ -280,6 +282,7 @@ func TestGenerate(t *testing.T) { } func TestGenerateNoPolicies(t *testing.T) { + t.Parallel() g := NewWithT(t) generator := observability.NewGenerator(dataplane.Telemetry{}) diff --git a/internal/mode/static/nginx/config/policies/observability/validator_test.go b/internal/mode/static/nginx/config/policies/observability/validator_test.go index 9f8976e4c2..53aa9c19ef 100644 --- a/internal/mode/static/nginx/config/policies/observability/validator_test.go +++ b/internal/mode/static/nginx/config/policies/observability/validator_test.go @@ -52,6 +52,7 @@ func createModifiedPolicy(mod policyModFunc) *ngfAPI.ObservabilityPolicy { } func TestValidator_Validate(t *testing.T) { + t.Parallel() globalSettings := &policies.GlobalSettings{ NginxProxyValid: true, TelemetryEnabled: true, @@ -185,6 +186,7 @@ func TestValidator_Validate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + t.Parallel() g := NewWithT(t) conds := v.Validate(test.policy, test.globalSettings) @@ -194,6 +196,7 @@ func TestValidator_Validate(t *testing.T) { } func TestValidator_ValidatePanics(t *testing.T) { + t.Parallel() v := observability.NewValidator(nil) validate := func() { @@ -206,6 +209,7 @@ func TestValidator_ValidatePanics(t *testing.T) { } func TestValidator_Conflicts(t *testing.T) { + t.Parallel() tests := []struct { polA *ngfAPI.ObservabilityPolicy polB *ngfAPI.ObservabilityPolicy @@ -244,6 +248,7 @@ func TestValidator_Conflicts(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + t.Parallel() g := NewWithT(t) g.Expect(v.Conflicts(test.polA, test.polB)).To(Equal(test.conflicts)) @@ -252,6 +257,7 @@ func TestValidator_Conflicts(t *testing.T) { } func TestValidator_ConflictsPanics(t *testing.T) { + t.Parallel() v := observability.NewValidator(nil) conflicts := func() { diff --git a/internal/mode/static/nginx/config/policies/policies_suite_test.go b/internal/mode/static/nginx/config/policies/policies_suite_test.go index 6703df23f1..a22933037a 100644 --- a/internal/mode/static/nginx/config/policies/policies_suite_test.go +++ b/internal/mode/static/nginx/config/policies/policies_suite_test.go @@ -8,6 +8,7 @@ import ( ) func TestPolicies(t *testing.T) { + t.Parallel() RegisterFailHandler(Fail) RunSpecs(t, "Policies Suite") } diff --git a/internal/mode/static/nginx/config/validation/common_test.go b/internal/mode/static/nginx/config/validation/common_test.go index f7c2f3be74..da3059e4c4 100644 --- a/internal/mode/static/nginx/config/validation/common_test.go +++ b/internal/mode/static/nginx/config/validation/common_test.go @@ -6,6 +6,7 @@ import ( ) func TestValidateEscapedString(t *testing.T) { + t.Parallel() validator := func(value string) error { return validateEscapedString(value, []string{"example"}) } testValidValuesForSimpleValidator( @@ -25,6 +26,7 @@ func TestValidateEscapedString(t *testing.T) { } func TestValidateEscapedStringNoVarExpansion(t *testing.T) { + t.Parallel() validator := func(value string) error { return validateEscapedStringNoVarExpansion(value, []string{"example"}) } testValidValuesForSimpleValidator( @@ -45,6 +47,7 @@ func TestValidateEscapedStringNoVarExpansion(t *testing.T) { } func TestValidateValidHeaderName(t *testing.T) { + t.Parallel() validator := func(value string) error { return validateHeaderName(value) } testValidValuesForSimpleValidator( diff --git a/internal/mode/static/nginx/config/validation/framework_test.go b/internal/mode/static/nginx/config/validation/framework_test.go index 58e727fbc7..7e0ff5d0ce 100644 --- a/internal/mode/static/nginx/config/validation/framework_test.go +++ b/internal/mode/static/nginx/config/validation/framework_test.go @@ -79,6 +79,7 @@ func testInvalidValuesForSupportedValuesValidator[T configValue]( } func TestValidateInSupportedValues(t *testing.T) { + t.Parallel() supportedValues := map[string]struct{}{ "value1": {}, "value2": {}, @@ -105,6 +106,7 @@ func TestValidateInSupportedValues(t *testing.T) { } func TestValidateNoUnsupportedValues(t *testing.T) { + t.Parallel() unsupportedValues := map[string]struct{}{ "badvalue1": {}, "badvalue2": {}, @@ -133,6 +135,7 @@ func TestValidateNoUnsupportedValues(t *testing.T) { } func TestGetSortedKeysAsString(t *testing.T) { + t.Parallel() values := map[string]struct{}{ "value3": {}, "value1": {}, diff --git a/internal/mode/static/nginx/config/validation/generic_test.go b/internal/mode/static/nginx/config/validation/generic_test.go index 86903bfa38..6934372c0f 100644 --- a/internal/mode/static/nginx/config/validation/generic_test.go +++ b/internal/mode/static/nginx/config/validation/generic_test.go @@ -3,6 +3,7 @@ package validation import "testing" func TestGenericValidator_ValidateEscapedStringNoVarExpansion(t *testing.T) { + t.Parallel() validator := GenericValidator{} testValidValuesForSimpleValidator( @@ -24,6 +25,7 @@ func TestGenericValidator_ValidateEscapedStringNoVarExpansion(t *testing.T) { } func TestValidateServiceName(t *testing.T) { + t.Parallel() validator := GenericValidator{} testValidValuesForSimpleValidator( @@ -45,6 +47,7 @@ func TestValidateServiceName(t *testing.T) { } func TestValidateNginxDuration(t *testing.T) { + t.Parallel() validator := GenericValidator{} testValidValuesForSimpleValidator( @@ -65,6 +68,7 @@ func TestValidateNginxDuration(t *testing.T) { } func TestValidateNginxSize(t *testing.T) { + t.Parallel() validator := GenericValidator{} testValidValuesForSimpleValidator( @@ -86,6 +90,7 @@ func TestValidateNginxSize(t *testing.T) { } func TestValidateEndpoint(t *testing.T) { + t.Parallel() validator := GenericValidator{} testValidValuesForSimpleValidator( diff --git a/internal/mode/static/nginx/config/validation/http_filters_test.go b/internal/mode/static/nginx/config/validation/http_filters_test.go index d58716599c..bd06ed2b41 100644 --- a/internal/mode/static/nginx/config/validation/http_filters_test.go +++ b/internal/mode/static/nginx/config/validation/http_filters_test.go @@ -6,6 +6,7 @@ import ( ) func TestValidateRedirectScheme(t *testing.T) { + t.Parallel() validator := HTTPRedirectValidator{} testValidValuesForSupportedValuesValidator( @@ -24,6 +25,7 @@ func TestValidateRedirectScheme(t *testing.T) { } func TestValidateRedirectPort(t *testing.T) { + t.Parallel() validator := HTTPRedirectValidator{} testValidValuesForSimpleValidator( @@ -35,6 +37,7 @@ func TestValidateRedirectPort(t *testing.T) { } func TestValidateRedirectStatusCode(t *testing.T) { + t.Parallel() validator := HTTPRedirectValidator{} testValidValuesForSupportedValuesValidator( @@ -52,6 +55,7 @@ func TestValidateRedirectStatusCode(t *testing.T) { } func TestValidateHostname(t *testing.T) { + t.Parallel() validator := HTTPRedirectValidator{} testValidValuesForSimpleValidator( @@ -68,6 +72,7 @@ func TestValidateHostname(t *testing.T) { } func TestValidateRewritePath(t *testing.T) { + t.Parallel() validator := HTTPURLRewriteValidator{} testValidValuesForSimpleValidator( @@ -89,6 +94,7 @@ func TestValidateRewritePath(t *testing.T) { } func TestValidateFilterHeaderName(t *testing.T) { + t.Parallel() validator := HTTPHeaderValidator{} testValidValuesForSimpleValidator( @@ -102,6 +108,7 @@ func TestValidateFilterHeaderName(t *testing.T) { } func TestValidateFilterHeaderValue(t *testing.T) { + t.Parallel() validator := HTTPHeaderValidator{} testValidValuesForSimpleValidator( diff --git a/internal/mode/static/nginx/config/validation/http_njs_match_test.go b/internal/mode/static/nginx/config/validation/http_njs_match_test.go index 6856dea988..70293060f8 100644 --- a/internal/mode/static/nginx/config/validation/http_njs_match_test.go +++ b/internal/mode/static/nginx/config/validation/http_njs_match_test.go @@ -5,6 +5,7 @@ import ( ) func TestValidatePathInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSimpleValidator( @@ -28,6 +29,7 @@ func TestValidatePathInMatch(t *testing.T) { } func TestValidateHeaderNameInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSimpleValidator( @@ -50,6 +52,7 @@ func TestValidateHeaderNameInMatch(t *testing.T) { } func TestValidateHeaderValueInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSimpleValidator( @@ -70,6 +73,7 @@ func TestValidateHeaderValueInMatch(t *testing.T) { } func TestValidateQueryParamNameInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSimpleValidator( @@ -85,6 +89,7 @@ func TestValidateQueryParamNameInMatch(t *testing.T) { } func TestValidateQueryParamValueInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSimpleValidator( @@ -100,6 +105,7 @@ func TestValidateQueryParamValueInMatch(t *testing.T) { } func TestValidateMethodInMatch(t *testing.T) { + t.Parallel() validator := HTTPNJSMatchValidator{} testValidValuesForSupportedValuesValidator( @@ -123,6 +129,7 @@ func TestValidateMethodInMatch(t *testing.T) { } func TestValidateCommonMatchPart(t *testing.T) { + t.Parallel() testValidValuesForSimpleValidator( t, validateCommonNJSMatchPart,