1
0
mirror of https://github.com/rancher/types.git synced 2025-06-29 23:16:48 +00:00

Merge pull request #521 from mrajashree/samlConfigInput

Change samlConfig field names to match json tags
This commit is contained in:
Denise 2018-07-26 10:36:02 -07:00 committed by GitHub
commit 61b3cb0386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions

View File

@ -276,8 +276,8 @@ type SamlConfig struct {
AuthConfig `json:",inline" mapstructure:",squash"`
IDPMetadataContent string `json:"idpMetadataContent" norman:"required"`
SPSelfSignedCert string `json:"spCert" norman:"required"`
SPSelfSignedKey string `json:"spKey" norman:"required"`
SpCert string `json:"spCert" norman:"required"`
SpKey string `json:"spKey" norman:"required"`
GroupsField string `json:"groupsField" norman:"required"`
DisplayNameField string `json:"displayNameField" norman:"required"`
UserNameField string `json:"userNameField" norman:"required"`

View File

@ -16,8 +16,8 @@ const (
ADFSConfigFieldOwnerReferences = "ownerReferences"
ADFSConfigFieldRancherAPIHost = "rancherApiHost"
ADFSConfigFieldRemoved = "removed"
ADFSConfigFieldSPSelfSignedCert = "spCert"
ADFSConfigFieldSPSelfSignedKey = "spKey"
ADFSConfigFieldSpCert = "spCert"
ADFSConfigFieldSpKey = "spKey"
ADFSConfigFieldType = "type"
ADFSConfigFieldUIDField = "uidField"
ADFSConfigFieldUUID = "uuid"
@ -39,8 +39,8 @@ type ADFSConfig struct {
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"`
RancherAPIHost string `json:"rancherApiHost,omitempty" yaml:"rancherApiHost,omitempty"`
Removed string `json:"removed,omitempty" yaml:"removed,omitempty"`
SPSelfSignedCert string `json:"spCert,omitempty" yaml:"spCert,omitempty"`
SPSelfSignedKey string `json:"spKey,omitempty" yaml:"spKey,omitempty"`
SpCert string `json:"spCert,omitempty" yaml:"spCert,omitempty"`
SpKey string `json:"spKey,omitempty" yaml:"spKey,omitempty"`
Type string `json:"type,omitempty" yaml:"type,omitempty"`
UIDField string `json:"uidField,omitempty" yaml:"uidField,omitempty"`
UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"`

View File

@ -16,8 +16,8 @@ const (
PingConfigFieldOwnerReferences = "ownerReferences"
PingConfigFieldRancherAPIHost = "rancherApiHost"
PingConfigFieldRemoved = "removed"
PingConfigFieldSPSelfSignedCert = "spCert"
PingConfigFieldSPSelfSignedKey = "spKey"
PingConfigFieldSpCert = "spCert"
PingConfigFieldSpKey = "spKey"
PingConfigFieldType = "type"
PingConfigFieldUIDField = "uidField"
PingConfigFieldUUID = "uuid"
@ -39,8 +39,8 @@ type PingConfig struct {
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"`
RancherAPIHost string `json:"rancherApiHost,omitempty" yaml:"rancherApiHost,omitempty"`
Removed string `json:"removed,omitempty" yaml:"removed,omitempty"`
SPSelfSignedCert string `json:"spCert,omitempty" yaml:"spCert,omitempty"`
SPSelfSignedKey string `json:"spKey,omitempty" yaml:"spKey,omitempty"`
SpCert string `json:"spCert,omitempty" yaml:"spCert,omitempty"`
SpKey string `json:"spKey,omitempty" yaml:"spKey,omitempty"`
Type string `json:"type,omitempty" yaml:"type,omitempty"`
UIDField string `json:"uidField,omitempty" yaml:"uidField,omitempty"`
UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"`