Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/cmd/connection_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 30 additions & 0 deletions pkg/cmd/connection_update_rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
})
}
}