From f57f1d30ce1c4ec96c8e3596ae0daf2156668d6d Mon Sep 17 00:00:00 2001
From: Sergei Starostin <starostin89@gmail.com>
Date: Wed, 22 Oct 2025 10:12:40 +0300
Subject: [PATCH] fix: correct generic OIDC provider

---
 rancher2/config.go                                     | 2 ++
 rancher2/resource_rancher2_auth_config_generic_oidc.go | 4 ++--
 rancher2/structure_auth_config_generic_oidc.go         | 6 +++---
 rancher2/structure_auth_config_generic_oidc_test.go    | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rancher2/config.go b/rancher2/config.go
index 78297995..be2f4264 100644
--- a/rancher2/config.go
+++ b/rancher2/config.go
@@ -1258,6 +1258,8 @@ func getAuthConfigObject(kind string) (interface{}, error) {
 		return &managementClient.KeyCloakConfig{}, nil
 	case managementClient.GenericOIDCConfigType:
 		return &managementClient.GenericOIDCConfig{}, nil
+	case managementClient.OIDCConfigType:
+		return &managementClient.OIDCConfig{}, nil
 	case managementClient.OKTAConfigType:
 		return &managementClient.OKTAConfig{}, nil
 	case managementClient.OpenLdapConfigType:
diff --git a/rancher2/resource_rancher2_auth_config_generic_oidc.go b/rancher2/resource_rancher2_auth_config_generic_oidc.go
index 4cdffdb3..0645935b 100644
--- a/rancher2/resource_rancher2_auth_config_generic_oidc.go
+++ b/rancher2/resource_rancher2_auth_config_generic_oidc.go
@@ -45,7 +45,7 @@ func resourceRancher2AuthConfigGenericOIDCCreate(d *schema.ResourceData, meta in
 		}
 	}
 
-	newAuth := &managementClient.OIDCConfig{}
+	newAuth := &managementClient.GenericOIDCConfig{}
 	err = meta.(*Config).UpdateAuthConfig(auth.Links["self"], authOIDC, newAuth)
 	if err != nil {
 		return fmt.Errorf("[ERROR] Updating Auth Config %s: %s", AuthConfigGenericOIDCName, err)
@@ -76,7 +76,7 @@ func resourceRancher2AuthConfigGenericOIDCRead(d *schema.ResourceData, meta inte
 		return err
 	}
 
-	err = flattenAuthConfigGenericOIDC(d, authOIDC.(*managementClient.OIDCConfig))
+	err = flattenAuthConfigGenericOIDC(d, authOIDC.(*managementClient.GenericOIDCConfig))
 	if err != nil {
 		return err
 	}
diff --git a/rancher2/structure_auth_config_generic_oidc.go b/rancher2/structure_auth_config_generic_oidc.go
index adea94fb..8dc040c4 100644
--- a/rancher2/structure_auth_config_generic_oidc.go
+++ b/rancher2/structure_auth_config_generic_oidc.go
@@ -9,7 +9,7 @@ import (
 
 // Flatteners
 
-func flattenAuthConfigGenericOIDC(d *schema.ResourceData, in *managementClient.OIDCConfig) error {
+func flattenAuthConfigGenericOIDC(d *schema.ResourceData, in *managementClient.GenericOIDCConfig) error {
 	d.SetId(AuthConfigGenericOIDCName)
 	d.Set("name", AuthConfigGenericOIDCName)
 	d.Set("type", managementClient.GenericOIDCConfigType)
@@ -51,8 +51,8 @@ func flattenAuthConfigGenericOIDC(d *schema.ResourceData, in *managementClient.O
 
 // Expanders
 
-func expandAuthConfigGenericOIDC(in *schema.ResourceData) (*managementClient.OIDCConfig, error) {
-	obj := &managementClient.OIDCConfig{}
+func expandAuthConfigGenericOIDC(in *schema.ResourceData) (*managementClient.GenericOIDCConfig, error) {
+	obj := &managementClient.GenericOIDCConfig{}
 	if in == nil {
 		return nil, fmt.Errorf("expanding %s Auth Config: Input ResourceData is nil", AuthConfigGenericOIDCName)
 	}
diff --git a/rancher2/structure_auth_config_generic_oidc_test.go b/rancher2/structure_auth_config_generic_oidc_test.go
index 2d909d94..168e71bf 100644
--- a/rancher2/structure_auth_config_generic_oidc_test.go
+++ b/rancher2/structure_auth_config_generic_oidc_test.go
@@ -9,13 +9,13 @@ import (
 )
 
 var (
-	testAuthConfigGenericOIDCConf      *managementClient.OIDCConfig
+	testAuthConfigGenericOIDCConf      *managementClient.GenericOIDCConfig
 	testAuthConfigGenericOIDCInterface map[string]interface{}
 	groupSearchEnabled                 = true
 )
 
 func init() {
-	testAuthConfigGenericOIDCConf = &managementClient.OIDCConfig{
+	testAuthConfigGenericOIDCConf = &managementClient.GenericOIDCConfig{
 		Name:                AuthConfigGenericOIDCName,
 		Type:                managementClient.GenericOIDCConfigType,
 		AccessMode:          "access",
@@ -57,7 +57,7 @@ func init() {
 
 func TestFlattenAuthConfigGenericOIDC(t *testing.T) {
 	cases := []struct {
-		Input          *managementClient.OIDCConfig
+		Input          *managementClient.GenericOIDCConfig
 		ExpectedOutput map[string]interface{}
 	}{
 		{
@@ -83,7 +83,7 @@ func TestFlattenAuthConfigGenericOIDC(t *testing.T) {
 func TestExpandAuthConfigGenericOIDC(t *testing.T) {
 	cases := []struct {
 		Input          map[string]interface{}
-		ExpectedOutput *managementClient.OIDCConfig
+		ExpectedOutput *managementClient.GenericOIDCConfig
 	}{
 		{
 			testAuthConfigGenericOIDCInterface,