From 45124ce6118fe325e9c5f2663707408b22eb59b5 Mon Sep 17 00:00:00 2001 From: Victor van Herpt Date: Fri, 16 Jan 2026 08:24:41 +0100 Subject: [PATCH] fix authentication_flow_binding_overrides's browserIdRef being replaced --- .../v1alpha1/zz_generated.managed.go | 258 ------------------ .../v1alpha1/zz_generated.managedlist.go | 53 ---- config/openidclient/config.go | 4 + config/samlclient/config.go | 5 + 4 files changed, 9 insertions(+), 311 deletions(-) delete mode 100644 apis/cluster/authenticationflow/v1alpha1/zz_generated.managed.go delete mode 100644 apis/cluster/authenticationflow/v1alpha1/zz_generated.managedlist.go diff --git a/apis/cluster/authenticationflow/v1alpha1/zz_generated.managed.go b/apis/cluster/authenticationflow/v1alpha1/zz_generated.managed.go deleted file mode 100644 index 04861e61..00000000 --- a/apis/cluster/authenticationflow/v1alpha1/zz_generated.managed.go +++ /dev/null @@ -1,258 +0,0 @@ -/* -Copyright 2022 Upbound Inc. -*/ -// Code generated by angryjet. DO NOT EDIT. - -package v1alpha1 - -import xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1" - -// GetCondition of this Bindings. -func (mg *Bindings) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this Bindings. -func (mg *Bindings) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetManagementPolicies of this Bindings. -func (mg *Bindings) GetManagementPolicies() xpv1.ManagementPolicies { - return mg.Spec.ManagementPolicies -} - -// GetProviderConfigReference of this Bindings. -func (mg *Bindings) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -// GetWriteConnectionSecretToReference of this Bindings. -func (mg *Bindings) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this Bindings. -func (mg *Bindings) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this Bindings. -func (mg *Bindings) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetManagementPolicies of this Bindings. -func (mg *Bindings) SetManagementPolicies(r xpv1.ManagementPolicies) { - mg.Spec.ManagementPolicies = r -} - -// SetProviderConfigReference of this Bindings. -func (mg *Bindings) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -// SetWriteConnectionSecretToReference of this Bindings. -func (mg *Bindings) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} - -// GetCondition of this Execution. -func (mg *Execution) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this Execution. -func (mg *Execution) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetManagementPolicies of this Execution. -func (mg *Execution) GetManagementPolicies() xpv1.ManagementPolicies { - return mg.Spec.ManagementPolicies -} - -// GetProviderConfigReference of this Execution. -func (mg *Execution) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -// GetWriteConnectionSecretToReference of this Execution. -func (mg *Execution) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this Execution. -func (mg *Execution) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this Execution. -func (mg *Execution) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetManagementPolicies of this Execution. -func (mg *Execution) SetManagementPolicies(r xpv1.ManagementPolicies) { - mg.Spec.ManagementPolicies = r -} - -// SetProviderConfigReference of this Execution. -func (mg *Execution) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -// SetWriteConnectionSecretToReference of this Execution. -func (mg *Execution) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} - -// GetCondition of this ExecutionConfig. -func (mg *ExecutionConfig) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this ExecutionConfig. -func (mg *ExecutionConfig) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetManagementPolicies of this ExecutionConfig. -func (mg *ExecutionConfig) GetManagementPolicies() xpv1.ManagementPolicies { - return mg.Spec.ManagementPolicies -} - -// GetProviderConfigReference of this ExecutionConfig. -func (mg *ExecutionConfig) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -// GetWriteConnectionSecretToReference of this ExecutionConfig. -func (mg *ExecutionConfig) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this ExecutionConfig. -func (mg *ExecutionConfig) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this ExecutionConfig. -func (mg *ExecutionConfig) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetManagementPolicies of this ExecutionConfig. -func (mg *ExecutionConfig) SetManagementPolicies(r xpv1.ManagementPolicies) { - mg.Spec.ManagementPolicies = r -} - -// SetProviderConfigReference of this ExecutionConfig. -func (mg *ExecutionConfig) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -// SetWriteConnectionSecretToReference of this ExecutionConfig. -func (mg *ExecutionConfig) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} - -// GetCondition of this Flow. -func (mg *Flow) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this Flow. -func (mg *Flow) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetManagementPolicies of this Flow. -func (mg *Flow) GetManagementPolicies() xpv1.ManagementPolicies { - return mg.Spec.ManagementPolicies -} - -// GetProviderConfigReference of this Flow. -func (mg *Flow) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -// GetWriteConnectionSecretToReference of this Flow. -func (mg *Flow) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this Flow. -func (mg *Flow) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this Flow. -func (mg *Flow) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetManagementPolicies of this Flow. -func (mg *Flow) SetManagementPolicies(r xpv1.ManagementPolicies) { - mg.Spec.ManagementPolicies = r -} - -// SetProviderConfigReference of this Flow. -func (mg *Flow) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -// SetWriteConnectionSecretToReference of this Flow. -func (mg *Flow) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} - -// GetCondition of this Subflow. -func (mg *Subflow) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this Subflow. -func (mg *Subflow) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetManagementPolicies of this Subflow. -func (mg *Subflow) GetManagementPolicies() xpv1.ManagementPolicies { - return mg.Spec.ManagementPolicies -} - -// GetProviderConfigReference of this Subflow. -func (mg *Subflow) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -// GetWriteConnectionSecretToReference of this Subflow. -func (mg *Subflow) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this Subflow. -func (mg *Subflow) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this Subflow. -func (mg *Subflow) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetManagementPolicies of this Subflow. -func (mg *Subflow) SetManagementPolicies(r xpv1.ManagementPolicies) { - mg.Spec.ManagementPolicies = r -} - -// SetProviderConfigReference of this Subflow. -func (mg *Subflow) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -// SetWriteConnectionSecretToReference of this Subflow. -func (mg *Subflow) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} diff --git a/apis/cluster/authenticationflow/v1alpha1/zz_generated.managedlist.go b/apis/cluster/authenticationflow/v1alpha1/zz_generated.managedlist.go deleted file mode 100644 index 46775cd2..00000000 --- a/apis/cluster/authenticationflow/v1alpha1/zz_generated.managedlist.go +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2022 Upbound Inc. -*/ -// Code generated by angryjet. DO NOT EDIT. - -package v1alpha1 - -import resource "github.com/crossplane/crossplane-runtime/v2/pkg/resource" - -// GetItems of this BindingsList. -func (l *BindingsList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} - -// GetItems of this ExecutionConfigList. -func (l *ExecutionConfigList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} - -// GetItems of this ExecutionList. -func (l *ExecutionList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} - -// GetItems of this FlowList. -func (l *FlowList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} - -// GetItems of this SubflowList. -func (l *SubflowList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} diff --git a/config/openidclient/config.go b/config/openidclient/config.go index 4cf955ec..406c9169 100644 --- a/config/openidclient/config.go +++ b/config/openidclient/config.go @@ -30,6 +30,10 @@ func Configure(p *config.Provider) { TerraformName: "keycloak_authentication_flow", } + // Avoid removing BrowserIdRef + r.LateInitializer = config.LateInitializer{ + IgnoredFields: []string{"authentication_flow_binding_overrides"}, + } }) p.AddResourceConfigurator("keycloak_openid_client_default_scopes", func(r *config.Resource) { diff --git a/config/samlclient/config.go b/config/samlclient/config.go index 6e7f6725..96f6a056 100644 --- a/config/samlclient/config.go +++ b/config/samlclient/config.go @@ -31,6 +31,11 @@ func Configure(p *config.Provider) { if s, ok := r.TerraformResource.Schema["signing_private_key"]; ok { s.Sensitive = true } + + // Avoid removing BrowserIdRef + r.LateInitializer = config.LateInitializer{ + IgnoredFields: []string{"authentication_flow_binding_overrides"}, + } }) p.AddResourceConfigurator("keycloak_saml_client_default_scopes", func(r *config.Resource) {