Skip to content

Commit 30da189

Browse files
lsergiosquakez
authored andcommitted
fix(#5706): removing trait prefix from condition type
1 parent 341ab32 commit 30da189

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pkg/trait/trait_condition_types.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,23 @@ func NewIntegrationConditionPlatformDisabledCatalogMissing() *TraitCondition {
7676
}
7777

7878
func (tc *TraitCondition) integrationCondition() (v1.IntegrationConditionType, corev1.ConditionStatus, string, string) {
79-
return v1.IntegrationConditionType(fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType)),
79+
return v1.IntegrationConditionType(tc.typeForCondition()),
8080
tc.conditionStatus,
8181
tc.reason,
8282
tc.message
8383
}
8484

8585
func (tc *TraitCondition) integrationKitCondition() (v1.IntegrationKitConditionType, corev1.ConditionStatus, string, string) {
86-
return v1.IntegrationKitConditionType(fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType)),
86+
return v1.IntegrationKitConditionType(tc.typeForCondition()),
8787
tc.conditionStatus,
8888
tc.reason,
8989
tc.message
9090
}
91+
92+
func (tc *TraitCondition) typeForCondition() string {
93+
conditionType := string(tc.integrationConditionType)
94+
if conditionType == "TraitInfo" {
95+
conditionType = fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType)
96+
}
97+
return conditionType
98+
}

0 commit comments

Comments
 (0)