Skip to content

fix keyring bug #1714

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix keyring bug #1714

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
13 changes: 12 additions & 1 deletion helm/resource_helm_release_stateupgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,17 @@ func (r *HelmRelease) buildUpgradeStateMap(_ context.Context) map[int64]resource
}
}

normalizeKeyring := func(val tftypes.Value) tftypes.Value {
if val.IsNull() {
return tftypes.NewValue(tftypes.String, nil)
}
var str string
if err := val.As(&str); err == nil && str == "" {
return tftypes.NewValue(tftypes.String, nil)
}
return val
}

// Creating new type in FW
newType := tftypes.Object{
AttributeTypes: map[string]tftypes.Type{
Expand Down Expand Up @@ -293,7 +304,7 @@ func (r *HelmRelease) buildUpgradeStateMap(_ context.Context) map[int64]resource
"disable_webhooks": oldState["disable_webhooks"],
"force_update": oldState["force_update"],
"id": oldState["id"],
"keyring": oldState["keyring"],
"keyring": normalizeKeyring(oldState["keyring"]),
"lint": oldState["lint"],
"manifest": oldState["manifest"],
"max_history": oldState["max_history"],
Expand Down
Loading