From d01d1612cf2f37fc8d2e52ac38d99f0c39828f0f Mon Sep 17 00:00:00 2001 From: rajashree Date: Wed, 25 Jul 2018 16:28:12 -0700 Subject: [PATCH 1/2] Change field names --- apis/management.cattle.io/v3/authn_types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index 440a22db..8fdea8e2 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -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"` From 459e2758a6a0c5cb4de9f5a6cdcaba5f29119609 Mon Sep 17 00:00:00 2001 From: rajashree Date: Wed, 25 Jul 2018 16:28:33 -0700 Subject: [PATCH 2/2] Generated changes --- client/management/v3/zz_generated_adfs_config.go | 8 ++++---- client/management/v3/zz_generated_ping_config.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/management/v3/zz_generated_adfs_config.go b/client/management/v3/zz_generated_adfs_config.go index c2824c51..26005bae 100644 --- a/client/management/v3/zz_generated_adfs_config.go +++ b/client/management/v3/zz_generated_adfs_config.go @@ -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"` diff --git a/client/management/v3/zz_generated_ping_config.go b/client/management/v3/zz_generated_ping_config.go index d3648651..ea5cb8df 100644 --- a/client/management/v3/zz_generated_ping_config.go +++ b/client/management/v3/zz_generated_ping_config.go @@ -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"`