From b427aaa1cefb3ce8bf3e36b332a6f9d0b0438301 Mon Sep 17 00:00:00 2001 From: Treetreewu Date: Fri, 4 Mar 2022 11:32:24 +0800 Subject: [PATCH] Change LDAP domain config param user_pass_attribute --- keystone.yaml | 2 +- openapi/docs/DomainConfigLDAP.md | 26 +++++++++--------- openapi/model_domain_config_ldap.go | 42 ++++++++++++++--------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/keystone.yaml b/keystone.yaml index b2d542e..8ad49f2 100644 --- a/keystone.yaml +++ b/keystone.yaml @@ -2538,7 +2538,7 @@ components: example: mail default: mail description: The LDAP attribute mapped to user emails in keystone. - user_password_attribute: + user_pass_attribute: type: string example: userPassword default: userPassword diff --git a/openapi/docs/DomainConfigLDAP.md b/openapi/docs/DomainConfigLDAP.md index f85485b..aa5c1b2 100644 --- a/openapi/docs/DomainConfigLDAP.md +++ b/openapi/docs/DomainConfigLDAP.md @@ -14,7 +14,7 @@ Name | Type | Description | Notes **UserIdAttribute** | Pointer to **string** | The LDAP attribute mapped to user IDs in keystone. This must NOT be a multivalued attribute. User IDs are expected to be globally unique across keystone domains and URL-safe. | [optional] [default to "cn"] **UserNameAttribute** | Pointer to **string** | The LDAP attribute mapped to user names in keystone. User names are expected to be unique only within a keystone domain and are not expected to be URL-safe. | [optional] [default to "sn"] **UserMailAttribute** | Pointer to **string** | The LDAP attribute mapped to user emails in keystone. | [optional] [default to "mail"] -**UserPasswordAttribute** | Pointer to **string** | The LDAP attribute mapped to user passwords in keystone. | [optional] [default to "userPassword"] +**UserPassAttribute** | Pointer to **string** | The LDAP attribute mapped to user passwords in keystone. | [optional] [default to "userPassword"] **UserEnabledMask** | Pointer to **string** | Bitmask integer to select which bit indicates the enabled value if the LDAP server represents \"enabled\" as a bit on an integer rather than as a discrete boolean. A value of `0` indicates that the mask is not used. If this is not set to `0` the typical value is `2`. This is typically used when `[ldap] user_enabled_attribute = userAccountControl`. Setting this option causes keystone to ignore the value of `[ldap] user_enabled_invert`. | [optional] [default to "2"] **UserEnabledDefault** | Pointer to **string** | The default value to enable users. This should match an appropriate integer value if the LDAP server uses non-boolean (bitmask) values to indicate if a user is enabled or disabled. If this is not set to `True`, then the typical value is `512`. This is typically used when `[ldap] user_enabled_attribute = userAccountControl`. | [optional] [default to "true"] **UserAllowCreate** | Pointer to **string** | If enabled, keystone is allowed to create users in the LDAP server. | [optional] [default to "true"] @@ -292,30 +292,30 @@ SetUserMailAttribute sets UserMailAttribute field to given value. HasUserMailAttribute returns a boolean if a field has been set. -### GetUserPasswordAttribute +### GetUserPassAttribute -`func (o *DomainConfigLdap) GetUserPasswordAttribute() string` +`func (o *DomainConfigLdap) GetUserPassAttribute() string` -GetUserPasswordAttribute returns the UserPasswordAttribute field if non-nil, zero value otherwise. +GetUserPassAttribute returns the UserPassAttribute field if non-nil, zero value otherwise. -### GetUserPasswordAttributeOk +### GetUserPassAttributeOk -`func (o *DomainConfigLdap) GetUserPasswordAttributeOk() (*string, bool)` +`func (o *DomainConfigLdap) GetUserPassAttributeOk() (*string, bool)` -GetUserPasswordAttributeOk returns a tuple with the UserPasswordAttribute field if it's non-nil, zero value otherwise +GetUserPassAttributeOk returns a tuple with the UserPassAttribute field if it's non-nil, zero value otherwise and a boolean to check if the value has been set. -### SetUserPasswordAttribute +### SetUserPassAttribute -`func (o *DomainConfigLdap) SetUserPasswordAttribute(v string)` +`func (o *DomainConfigLdap) SetUserPassAttribute(v string)` -SetUserPasswordAttribute sets UserPasswordAttribute field to given value. +SetUserPassAttribute sets UserPassAttribute field to given value. -### HasUserPasswordAttribute +### HasUserPassAttribute -`func (o *DomainConfigLdap) HasUserPasswordAttribute() bool` +`func (o *DomainConfigLdap) HasUserPassAttribute() bool` -HasUserPasswordAttribute returns a boolean if a field has been set. +HasUserPassAttribute returns a boolean if a field has been set. ### GetUserEnabledMask diff --git a/openapi/model_domain_config_ldap.go b/openapi/model_domain_config_ldap.go index 7891f10..19a4870 100644 --- a/openapi/model_domain_config_ldap.go +++ b/openapi/model_domain_config_ldap.go @@ -34,7 +34,7 @@ type DomainConfigLdap struct { // The LDAP attribute mapped to user emails in keystone. UserMailAttribute *string `json:"user_mail_attribute,omitempty"` // The LDAP attribute mapped to user passwords in keystone. - UserPasswordAttribute *string `json:"user_password_attribute,omitempty"` + UserPassAttribute *string `json:"user_pass_attribute,omitempty"` // Bitmask integer to select which bit indicates the enabled value if the LDAP server represents \"enabled\" as a bit on an integer rather than as a discrete boolean. A value of `0` indicates that the mask is not used. If this is not set to `0` the typical value is `2`. This is typically used when `[ldap] user_enabled_attribute = userAccountControl`. Setting this option causes keystone to ignore the value of `[ldap] user_enabled_invert`. UserEnabledMask *string `json:"user_enabled_mask,omitempty"` // The default value to enable users. This should match an appropriate integer value if the LDAP server uses non-boolean (bitmask) values to indicate if a user is enabled or disabled. If this is not set to `True`, then the typical value is `512`. This is typically used when `[ldap] user_enabled_attribute = userAccountControl`. @@ -64,8 +64,8 @@ func NewDomainConfigLdap() *DomainConfigLdap { this.UserNameAttribute = &userNameAttribute var userMailAttribute string = "mail" this.UserMailAttribute = &userMailAttribute - var userPasswordAttribute string = "userPassword" - this.UserPasswordAttribute = &userPasswordAttribute + var userPassAttribute string = "userPassword" + this.UserPassAttribute = &userPassAttribute var userEnabledMask string = "2" this.UserEnabledMask = &userEnabledMask var userEnabledDefault string = "true" @@ -94,8 +94,8 @@ func NewDomainConfigLdapWithDefaults() *DomainConfigLdap { this.UserNameAttribute = &userNameAttribute var userMailAttribute string = "mail" this.UserMailAttribute = &userMailAttribute - var userPasswordAttribute string = "userPassword" - this.UserPasswordAttribute = &userPasswordAttribute + var userPassAttribute string = "userPassword" + this.UserPassAttribute = &userPassAttribute var userEnabledMask string = "2" this.UserEnabledMask = &userEnabledMask var userEnabledDefault string = "true" @@ -431,36 +431,36 @@ func (o *DomainConfigLdap) SetUserMailAttribute(v string) { o.UserMailAttribute = &v } -// GetUserPasswordAttribute returns the UserPasswordAttribute field value if set, zero value otherwise. -func (o *DomainConfigLdap) GetUserPasswordAttribute() string { - if o == nil || o.UserPasswordAttribute == nil { +// GetUserPassAttribute returns the UserPassAttribute field value if set, zero value otherwise. +func (o *DomainConfigLdap) GetUserPassAttribute() string { + if o == nil || o.UserPassAttribute == nil { var ret string return ret } - return *o.UserPasswordAttribute + return *o.UserPassAttribute } -// GetUserPasswordAttributeOk returns a tuple with the UserPasswordAttribute field value if set, nil otherwise +// GetUserPassAttributeOk returns a tuple with the UserPassAttribute field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *DomainConfigLdap) GetUserPasswordAttributeOk() (*string, bool) { - if o == nil || o.UserPasswordAttribute == nil { +func (o *DomainConfigLdap) GetUserPassAttributeOk() (*string, bool) { + if o == nil || o.UserPassAttribute == nil { return nil, false } - return o.UserPasswordAttribute, true + return o.UserPassAttribute, true } -// HasUserPasswordAttribute returns a boolean if a field has been set. -func (o *DomainConfigLdap) HasUserPasswordAttribute() bool { - if o != nil && o.UserPasswordAttribute != nil { +// HasUserPassAttribute returns a boolean if a field has been set. +func (o *DomainConfigLdap) HasUserPassAttribute() bool { + if o != nil && o.UserPassAttribute != nil { return true } return false } -// SetUserPasswordAttribute gets a reference to the given string and assigns it to the UserPasswordAttribute field. -func (o *DomainConfigLdap) SetUserPasswordAttribute(v string) { - o.UserPasswordAttribute = &v +// SetUserPassAttribute gets a reference to the given string and assigns it to the UserPassAttribute field. +func (o *DomainConfigLdap) SetUserPassAttribute(v string) { + o.UserPassAttribute = &v } // GetUserEnabledMask returns the UserEnabledMask field value if set, zero value otherwise. @@ -719,8 +719,8 @@ func (o DomainConfigLdap) MarshalJSON() ([]byte, error) { if o.UserMailAttribute != nil { toSerialize["user_mail_attribute"] = o.UserMailAttribute } - if o.UserPasswordAttribute != nil { - toSerialize["user_password_attribute"] = o.UserPasswordAttribute + if o.UserPassAttribute != nil { + toSerialize["user_pass_attribute"] = o.UserPassAttribute } if o.UserEnabledMask != nil { toSerialize["user_enabled_mask"] = o.UserEnabledMask