diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index c8349576..f0e04c04 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -151,21 +151,3 @@ type ActiveDirectoryTestAndApplyInput struct { Password string `json:"password"` Enabled bool `json:"enabled,omitempty"` } - -type AzureADConfig struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - AuthConfig `json:",inline" mapstructure:",squash"` - - TenantID string `json:"tenantId,omitempty" norman:"required"` - ClientID string `json:"clientId,omitempty" norman:"required"` - Domain string `json:"domain,omitempty" norman:"required"` - ClientSecret string `json:"clientSecret,omitempty"` -} - -type AzureADTestAndApplyInput struct { - AzureADConfig AzureADConfig `json:"azureAdConfig, omitempty"` - Username string `json:"username"` - Password string `json:"password"` - Enabled bool `json:"enabled,omitempty"` -} diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 0f8fe74e..7ef42d4b 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -326,21 +326,7 @@ func authnTypes(schemas *types.Schemas) *types.Schemas { schema.CollectionMethods = []string{} schema.ResourceMethods = []string{http.MethodGet, http.MethodPut} }). - MustImport(&Version, v3.ActiveDirectoryTestAndApplyInput{}). - // AzureAD Config - MustImportAndCustomize(&Version, v3.AzureADConfig{}, func(schema *types.Schema) { - schema.BaseType = "authConfig" - schema.ResourceActions = map[string]types.Action{ - "disable": {}, - "testAndApply": { - Input: "azureADTestAndApplyInput", - }, - } - schema.CollectionMethods = []string{} - schema.ResourceMethods = []string{http.MethodGet, http.MethodPut} - }). - MustImport(&Version, v3.AzureADTestAndApplyInput{}) - + MustImport(&Version, v3.ActiveDirectoryTestAndApplyInput{}) } func userTypes(schema *types.Schemas) *types.Schemas { diff --git a/apis/management.cattle.io/v3public/authn_types.go b/apis/management.cattle.io/v3public/authn_types.go index 8dc5d2cf..dce3fa1b 100644 --- a/apis/management.cattle.io/v3public/authn_types.go +++ b/apis/management.cattle.io/v3public/authn_types.go @@ -49,9 +49,3 @@ type ActiveDirectoryProvider struct { DefaultLoginDomain string `json:"defaultLoginDomain,omitempty"` } - -type AzureADProvider struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - AuthProvider `json:",inline"` -} diff --git a/apis/management.cattle.io/v3public/schema/public_schema.go b/apis/management.cattle.io/v3public/schema/public_schema.go index ee375bbe..00d4050a 100644 --- a/apis/management.cattle.io/v3public/schema/public_schema.go +++ b/apis/management.cattle.io/v3public/schema/public_schema.go @@ -67,17 +67,5 @@ func authProvidersTypes(schemas *types.Schemas) *types.Schemas { } schema.CollectionMethods = []string{} schema.ResourceMethods = []string{http.MethodGet} - }). - // AzureAD provider - MustImportAndCustomize(&PublicVersion, v3public.AzureADProvider{}, func(schema *types.Schema) { - schema.BaseType = "authProvider" - schema.ResourceActions = map[string]types.Action{ - "login": { - Input: "basicLogin", - Output: "token", - }, - } - schema.CollectionMethods = []string{} - schema.ResourceMethods = []string{http.MethodGet} }) }