fix: rules filters now considers jobs

tsuru · Sep 26, 2024 · f6eb431 · f6eb431
1 parent b495172
commit f6eb431
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/rule/service.go b/rule/service.go
@@ -121,6 +121,14 @@ func ruleTypeMatch(ruleType types.RuleType, filter types.RuleType) bool {
 			return false
 		}
 	}
+	if filter.TsuruJob != nil {
+		if ruleType.TsuruJob == nil {
+			return false
+		}
+		if filter.TsuruJob.JobName != "" && filter.TsuruJob.JobName != ruleType.TsuruJob.JobName {
+			return false
+		}
+	}
 	if filter.KubernetesService != nil {
 		if ruleType.KubernetesService == nil {
 			return false

diff --git a/rule/service_test.go b/rule/service_test.go
@@ -658,6 +658,39 @@ func Test_RuleService_FindByRule(t *testing.T) {
 				"x": "y",
 			},
 		},
+		{
+			RuleID: "3",
+			Source: types.RuleType{
+				TsuruJob: &types.TsuruJobRule{
+					JobName: "my-job",
+				},
+			},
+			Destination: types.RuleType{
+				ExternalDNS: &types.ExternalDNSRule{
+					Name:  "job-api.com",
+					Ports: []types.ProtoPort{},
+				},
+			},
+			Metadata: map[string]string{
+				"y": "z",
+			},
+		},
+		{
+			RuleID: "4",
+			Source: types.RuleType{
+				TsuruApp: &types.TsuruAppRule{
+					AppName: "myapp",
+				},
+			},
+			Destination: types.RuleType{
+				TsuruJob: &types.TsuruJobRule{
+					JobName: "my-job",
+				},
+			},
+			Metadata: map[string]string{
+				"key": "value",
+			},
+		},
 	}
 	svc := GetService()
 	for _, r := range rules {
@@ -671,7 +704,7 @@ func Test_RuleService_FindByRule(t *testing.T) {
 	}{
 		{
 			filter:          types.Rule{},
-			expectedRuleIDs: []string{"1", "2"},
+			expectedRuleIDs: []string{"1", "2", "3", "4"},
 		},
 		{
 			filter: types.Rule{
@@ -708,7 +741,7 @@ func Test_RuleService_FindByRule(t *testing.T) {
 					TsuruApp: &types.TsuruAppRule{},
 				},
 			},
-			expectedRuleIDs: []string{"1"},
+			expectedRuleIDs: []string{"1", "4"},
 		},
 		{
 			filter: types.Rule{
@@ -740,6 +773,26 @@ func Test_RuleService_FindByRule(t *testing.T) {
 			},
 			expectedRuleIDs: []string{},
 		},
+		{
+			filter: types.Rule{
+				Source: types.RuleType{
+					TsuruJob: &types.TsuruJobRule{
+						JobName: "my-job",
+					},
+				},
+			},
+			expectedRuleIDs: []string{"3"},
+		},
+		{
+			filter: types.Rule{
+				Destination: types.RuleType{
+					TsuruJob: &types.TsuruJobRule{
+						JobName: "my-job",
+					},
+				},
+			},
+			expectedRuleIDs: []string{"4"},
+		},
 	}
 
 	for _, tt := range tests {