fix: refactor generic ruleset generation

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · Dec 18, 2023 · 7560fd2 · 7560fd2
1 parent 9bdbc30
commit 7560fd2
Showing 1 changed file with 20 additions and 28 deletions.
diff --git a/pkg/tracker/generic/resource_state_json_paths.go b/pkg/tracker/generic/resource_state_json_paths.go
@@ -21,71 +21,62 @@ type ResourceStatusJSONPath struct {
 func initResourceStatusJSONPathsByPriority() {
 	casers := []cases.Caser{cases.Lower(language.Und), cases.Title(language.Und)}
 
-	for _, actionPackByPriority := range [][]string{
+	for _, actionGroupsByPriority := range [][]string{
 		{"ready", "success", "succeeded"},
 		{"complete", "completed", "finished"},
 		{"available"},
 		{"running"},
 		{"started", "initialized", "approved"},
 	} {
-		for _, action := range actionPackByPriority {
+		for _, action := range actionGroupsByPriority {
 			for _, caser := range casers {
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      fmt.Sprintf(`$.status.conditions[?(@.type==%q)].status`, caser.String(action)),
 					HumanPath:     fmt.Sprintf("status.conditions[type=%s].status", caser.String(action)),
 					ReadyValue:    caser.String("true"),
 					PendingValues: []string{caser.String("false"), caser.String("unknown")},
 				})
-			}
-		}
 
-		for _, action := range actionPackByPriority {
-			for _, caser := range casers {
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.phase`,
 					HumanPath:     "status.phase",
 					ReadyValue:    caser.String(action),
 					PendingValues: []string{caser.String("pending"), caser.String("unknown")},
 					FailedValue:   caser.String("failed"),
 				})
+
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.currentPhase`,
 					HumanPath:     "status.currentPhase",
 					ReadyValue:    caser.String(action),
 					PendingValues: []string{caser.String("pending"), caser.String("unknown")},
 					FailedValue:   caser.String("failed"),
 				})
-			}
-		}
 
-		for _, action := range actionPackByPriority {
-			for _, caser := range casers {
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.state`,
 					HumanPath:     "status.state",
 					ReadyValue:    caser.String(action),
 					PendingValues: []string{caser.String("pending"), caser.String("unknown")},
 					FailedValue:   caser.String("failed"),
 				})
+
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.currentState`,
 					HumanPath:     "status.currentState",
 					ReadyValue:    caser.String(action),
 					PendingValues: []string{caser.String("pending"), caser.String("unknown")},
 					FailedValue:   caser.String("failed"),
 				})
-			}
-		}
 
-		for _, action := range actionPackByPriority {
-			for _, caser := range casers {
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.health`,
 					HumanPath:     "status.health",
 					ReadyValue:    caser.String(action),
 					PendingValues: []string{caser.String("pending"), caser.String("unknown")},
 					FailedValue:   caser.String("failed"),
 				})
+
 				ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 					JSONPath:      `$.status.currentHealth`,
 					HumanPath:     "status.currentHealth",
@@ -98,32 +89,33 @@ func initResourceStatusJSONPathsByPriority() {
 	}
 
 	for _, caser := range casers {
+		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
+			JSONPath:      `$.status.state`,
+			HumanPath:     "status.state",
+			ReadyValue:    caser.String("valid"),
+			PendingValues: []string{caser.String("invalid"), caser.String("unknown")},
+		})
+
+		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
+			JSONPath:      `$.status.currentState`,
+			HumanPath:     "status.currentState",
+			ReadyValue:    caser.String("valid"),
+			PendingValues: []string{caser.String("invalid"), caser.String("unknown")},
+		})
+
 		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 			JSONPath:      `$.status.health`,
 			HumanPath:     "status.health",
 			ReadyValue:    caser.String("green"),
 			PendingValues: []string{caser.String("yellow"), caser.String("red"), caser.String("unknown")},
 		})
+
 		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
 			JSONPath:      `$.status.currentHealth`,
 			HumanPath:     "status.currentHealth",
 			ReadyValue:    caser.String("green"),
 			PendingValues: []string{caser.String("yellow"), caser.String("red"), caser.String("unknown")},
 		})
-	}
 
-	for _, caser := range casers {
-		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
-			JSONPath:      `$.status.state`,
-			HumanPath:     "status.state",
-			ReadyValue:    caser.String("valid"),
-			PendingValues: []string{caser.String("invalid"), caser.String("unknown")},
-		})
-		ResourceStatusJSONPathsByPriority = append(ResourceStatusJSONPathsByPriority, ResourceStatusJSONPath{
-			JSONPath:      `$.status.currentState`,
-			HumanPath:     "status.currentState",
-			ReadyValue:    caser.String("valid"),
-			PendingValues: []string{caser.String("invalid"), caser.String("unknown")},
-		})
 	}
 }