Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ACM-8739: ACM Policy that applies stringdata in a secret regression with templates #179

Merged
merged 1 commit into from
Nov 23, 2023
Merged

ACM-8739: ACM Policy that applies stringdata in a secret regression with templates #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions controllers/configurationpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2410,27 +2410,29 @@ func handleSingleKey(
}

if key == "stringData" && existingObj.GetKind() == "Secret" {
// override automatic conversion from stringData to data prior to evaluation
existingValue = existingObj.UnstructuredContent()["data"]

// override automatic conversion from stringData to data before evaluation
encodedValue, _, err := unstructured.NestedStringMap(existingObj.Object, "data")
if err != nil {
message := "Error accessing encoded data"

return message, false, mergedValue, false
}

for k, value := range encodedValue {
decodedVal, err := base64.StdEncoding.DecodeString(value)
decodedValue := make(map[string]interface{}, len(encodedValue))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we change this

config-policy-controller/controllers/configurationpolicy_controller.go

Line 2432 in 34c5a93

existingValue.(map[string]interface{})[k] = string(decodedVal)
? because of this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/open-cluster-management-io/config-policy-controller/blob/34c5a931b272a414aed605cafac95687e0c6b859/controllers/configurationpolicy_controller.go#L2382C2-L2391C4 maybe affect here if existingValue is still interface{}

for k, encoded := range encodedValue {
decoded, err := base64.StdEncoding.DecodeString(encoded)
if err != nil {
secretName := existingObj.GetName()
message := fmt.Sprintf("Error decoding secret: %s", secretName)

return message, false, mergedValue, false
}

existingValue.(map[string]interface{})[k] = string(decodedVal)
decodedValue[k] = string(decoded)
}

existingValue = decodedValue
}

// sort objects before checking equality to ensure they're in the same order
Expand Down