Skip to content

fix: Correct genericoidc provider implementation and tests #1691

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
+11 −9
Open

fix: Correct genericoidc provider implementation and tests #1691

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions rancher2/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions rancher2/resource_rancher2_auth_config_generic_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions rancher2/structure_auth_config_generic_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions rancher2/structure_auth_config_generic_oidc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -57,7 +57,7 @@ func init() {

func TestFlattenAuthConfigGenericOIDC(t *testing.T) {
cases := []struct {
Input *managementClient.OIDCConfig
Input *managementClient.GenericOIDCConfig
ExpectedOutput map[string]interface{}
}{
{
Expand All @@ -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,
Expand Down