diff --git a/pkg/cmd/connection_common.go b/pkg/cmd/connection_common.go index b68e755b..b6b0d4f2 100644 --- a/pkg/cmd/connection_common.go +++ b/pkg/cmd/connection_common.go @@ -351,11 +351,11 @@ func (f *connectionRuleFlags) validateRules() error { hasJSONRules := f.Rules != "" || f.RulesFile != "" // Check if any individual rule flags are set - hasRetryFlags := f.RuleRetryStrategy != "" || f.RuleRetryCount > 0 || f.RuleRetryInterval > 0 || f.RuleRetryResponseStatusCode != "" + hasRetryFlags := f.RuleRetryStrategy != "" || f.RuleRetryCount != 0 || f.RuleRetryInterval != 0 || f.RuleRetryResponseStatusCode != "" hasFilterFlags := f.RuleFilterBody != "" || f.RuleFilterHeaders != "" || f.RuleFilterQuery != "" || f.RuleFilterPath != "" hasTransformFlags := f.RuleTransformName != "" || f.RuleTransformCode != "" || f.RuleTransformEnv != "" - hasDelayFlags := f.RuleDelay > 0 - hasDeduplicateFlags := f.RuleDeduplicateWindow > 0 || f.RuleDeduplicateIncludeFields != "" || f.RuleDeduplicateExcludeFields != "" + hasDelayFlags := f.RuleDelay != 0 + hasDeduplicateFlags := f.RuleDeduplicateWindow != 0 || f.RuleDeduplicateIncludeFields != "" || f.RuleDeduplicateExcludeFields != "" hasIndividualFlags := hasRetryFlags || hasFilterFlags || hasTransformFlags || hasDelayFlags || hasDeduplicateFlags diff --git a/pkg/cmd/connection_update_rules_test.go b/pkg/cmd/connection_update_rules_test.go index 05b9f2b7..8014a9f6 100644 --- a/pkg/cmd/connection_update_rules_test.go +++ b/pkg/cmd/connection_update_rules_test.go @@ -48,3 +48,33 @@ func TestConnectionUpdateRejectsInvalidRuleFlags(t *testing.T) { }) } } + +// TestConnectionUpdateRejectsNegativeRuleFlags covers negative values given on +// their own. The "has rule flags" checks only counted values > 0, so a lone +// negative --rule-delay, --rule-deduplicate-window or retry count/interval +// skipped validation and was silently ignored; the "must be a positive +// integer" errors only appeared when another rule flag was also set. +func TestConnectionUpdateRejectsNegativeRuleFlags(t *testing.T) { + cases := map[string]struct { + flags []string + want string + }{ + "delay": {[]string{"--rule-delay", "-5"}, "--rule-delay must be a positive integer"}, + "deduplicate": {[]string{"--rule-deduplicate-window", "-5"}, "--rule-deduplicate-window must be a positive integer"}, + "retry count": {[]string{"--rule-retry-strategy", "linear", "--rule-retry-count", "-1"}, "--rule-retry-count must be a positive integer"}, + "retry interval": {[]string{"--rule-retry-strategy", "linear", "--rule-retry-interval", "-1"}, "--rule-retry-interval must be a positive integer"}, + "orphan retry cnt": {[]string{"--rule-retry-count", "-1"}, "--rule-retry-strategy is required"}, + "orphan retry intv": {[]string{"--rule-retry-interval", "-1"}, "--rule-retry-strategy is required"}, + } + for name, tc := range cases { + tc := tc + t.Run(name, func(t *testing.T) { + stub, err := runConnectionCommand(t, storedWithSides(), + append([]string{"gateway", "connection", "update", "web_1"}, tc.flags...)...) + + require.Error(t, err) + require.Contains(t, err.Error(), tc.want) + require.Empty(t, stub.writes()) + }) + } +}