switch from global to per-rule continue option (#3924)

graphql2/graph/univkeys.graphqls

@@ -49,11 +49,6 @@ extend type Mutation {
 }
 
 type KeyConfig {
-  """
-  Stop evaluating rules after the first rule that matches.
-  """
-  stopAtFirstRule: Boolean!
-
   rules: [KeyRule!]!
 
   """
@@ -79,16 +74,16 @@ type KeyRule {
   conditionExpr: ExprBooleanExpression!
 
   actions: [Action!]!
+
+  """
+  Continue evaluating rules after this rule matches.
+  """
+  continueAfterMatch: Boolean!
 }
 
 input UpdateKeyConfigInput {
   keyID: ID!
 
-  """
-  Stop evaluating rules after the first rule that matches.
-  """
-  stopAtFirstRule: Boolean
-
   rules: [KeyRuleInput!]
 
   """
@@ -122,6 +117,13 @@ input KeyRuleInput {
   conditionExpr: ExprBooleanExpression!
 
   actions: [ActionInput!]!
+
+  """
+  Continue evaluating rules after this rule matches.
+
+  If this is set to false (default), no further rules will be evaluated after this rule matches.
+  """
+  continueAfterMatch: Boolean!
 }
 
 input ActionInput {

graphql2/graphqlapp/integrationkey.go

@@ -100,10 +100,6 @@ func (m *Mutation) UpdateKeyConfig(ctx context.Context, input graphql2.UpdateKey
 			return err
 		}
 
-		if input.StopAtFirstRule != nil {
-			cfg.StopAfterFirstMatchingRule = *input.StopAtFirstRule
-		}
-
 		if input.Rules != nil {
 			cfg.Rules = make([]integrationkey.Rule, 0, len(input.Rules))
 			for _, r := range input.Rules {
@@ -121,6 +117,8 @@ func (m *Mutation) UpdateKeyConfig(ctx context.Context, input graphql2.UpdateKey
 					Description:   r.Description,
 					ConditionExpr: r.ConditionExpr,
 					Actions:       actionsGQLToGo(r.Actions),
+
+					ContinueAfterMatch: r.ContinueAfterMatch,
 				})
 			}
 		}
@@ -213,18 +211,18 @@ func (key *IntegrationKey) Config(ctx context.Context, raw *integrationkey.Integ
 	var rules []graphql2.KeyRule
 	for _, r := range cfg.Rules {
 		rules = append(rules, graphql2.KeyRule{
-			ID:            r.ID.String(),
-			Name:          r.Name,
-			Description:   r.Description,
-			ConditionExpr: r.ConditionExpr,
-			Actions:       actionsGoToGQL(r.Actions),
+			ID:                 r.ID.String(),
+			Name:               r.Name,
+			Description:        r.Description,
+			ConditionExpr:      r.ConditionExpr,
+			Actions:            actionsGoToGQL(r.Actions),
+			ContinueAfterMatch: r.ContinueAfterMatch,
 		})
 	}
 
 	return &graphql2.KeyConfig{
-		StopAtFirstRule: cfg.StopAfterFirstMatchingRule,
-		Rules:           rules,
-		DefaultActions:  actionsGoToGQL(cfg.DefaultActions),
+		Rules:          rules,
+		DefaultActions: actionsGoToGQL(cfg.DefaultActions),
 	}, nil
 }