diff --git a/.apigentools-info b/.apigentools-info index f4e999816cc..7e5f57c153e 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.2", - "regenerated": "2022-05-20 17:09:19.398639", - "spec_repo_commit": "37954eaf" + "regenerated": "2022-05-23 07:09:54.505653", + "spec_repo_commit": "4797abcd" }, "v2": { "apigentools_version": "1.6.2", - "regenerated": "2022-05-20 17:09:19.413235", - "spec_repo_commit": "37954eaf" + "regenerated": "2022-05-23 07:09:54.518470", + "spec_repo_commit": "4797abcd" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 9dba9bdce3e..18363c9c5a1 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -850,11 +850,6 @@ components: description: ID of the AuthN Mapping. example: 3653d3c6-0c75-11ea-ad28-fb5701eabc7d type: string - included: - description: Included data in the AuthN Mapping response. - items: - $ref: '#/components/schemas/AuthNMappingIncluded' - type: array relationships: $ref: '#/components/schemas/AuthNMappingRelationships' type: @@ -888,10 +883,8 @@ components: type: string saml_assertion_attribute_id: description: The ID of the SAML assertion attribute. - example: 0 - format: int32 - maximum: 2147483647 - type: integer + example: '0' + type: string type: object AuthNMappingCreateAttributes: description: Key/Value pair of attributes used for create request. @@ -953,6 +946,11 @@ components: properties: data: $ref: '#/components/schemas/AuthNMapping' + included: + description: Included data in the AuthN Mapping response. + items: + $ref: '#/components/schemas/AuthNMappingIncluded' + type: array type: object AuthNMappingUpdateAttributes: description: Key/Value pair of attributes used for update request. @@ -1007,6 +1005,11 @@ components: items: $ref: '#/components/schemas/AuthNMapping' type: array + included: + description: Included data in the AuthN Mapping response. + items: + $ref: '#/components/schemas/AuthNMappingIncluded' + type: array meta: $ref: '#/components/schemas/ResponseMetaAttributes' type: object @@ -5473,10 +5476,8 @@ components: properties: id: description: The ID of the SAML assertion attribute. - example: 0 - format: int32 - maximum: 2147483647 - type: integer + example: '0' + type: string type: $ref: '#/components/schemas/SAMLAssertionAttributesType' required: @@ -5778,10 +5779,8 @@ components: $ref: '#/components/schemas/SAMLAssertionAttributeAttributes' id: description: The ID of the SAML assertion attribute. - example: 0 - format: int32 - maximum: 2147483647 - type: integer + example: '0' + type: string type: $ref: '#/components/schemas/SAMLAssertionAttributesType' required: diff --git a/api/v2/datadog/model_auth_n_mapping.go b/api/v2/datadog/model_auth_n_mapping.go index 0733658eea3..e9e9be7f4fd 100644 --- a/api/v2/datadog/model_auth_n_mapping.go +++ b/api/v2/datadog/model_auth_n_mapping.go @@ -17,8 +17,6 @@ type AuthNMapping struct { Attributes *AuthNMappingAttributes `json:"attributes,omitempty"` // ID of the AuthN Mapping. Id string `json:"id"` - // Included data in the AuthN Mapping response. - Included []AuthNMappingIncluded `json:"included,omitempty"` // All relationships associated with AuthN Mapping. Relationships *AuthNMappingRelationships `json:"relationships,omitempty"` // AuthN Mappings resource type. @@ -104,38 +102,6 @@ func (o *AuthNMapping) SetId(v string) { o.Id = v } -// GetIncluded returns the Included field value if set, zero value otherwise. -func (o *AuthNMapping) GetIncluded() []AuthNMappingIncluded { - if o == nil || o.Included == nil { - var ret []AuthNMappingIncluded - return ret - } - return o.Included -} - -// GetIncludedOk returns a tuple with the Included field value if set, nil otherwise -// and a boolean to check if the value has been set. -func (o *AuthNMapping) GetIncludedOk() (*[]AuthNMappingIncluded, bool) { - if o == nil || o.Included == nil { - return nil, false - } - return &o.Included, true -} - -// HasIncluded returns a boolean if a field has been set. -func (o *AuthNMapping) HasIncluded() bool { - if o != nil && o.Included != nil { - return true - } - - return false -} - -// SetIncluded gets a reference to the given []AuthNMappingIncluded and assigns it to the Included field. -func (o *AuthNMapping) SetIncluded(v []AuthNMappingIncluded) { - o.Included = v -} - // GetRelationships returns the Relationships field value if set, zero value otherwise. func (o *AuthNMapping) GetRelationships() AuthNMappingRelationships { if o == nil || o.Relationships == nil { @@ -200,9 +166,6 @@ func (o AuthNMapping) MarshalJSON() ([]byte, error) { toSerialize["attributes"] = o.Attributes } toSerialize["id"] = o.Id - if o.Included != nil { - toSerialize["included"] = o.Included - } if o.Relationships != nil { toSerialize["relationships"] = o.Relationships } @@ -223,7 +186,6 @@ func (o *AuthNMapping) UnmarshalJSON(bytes []byte) (err error) { all := struct { Attributes *AuthNMappingAttributes `json:"attributes,omitempty"` Id string `json:"id"` - Included []AuthNMappingIncluded `json:"included,omitempty"` Relationships *AuthNMappingRelationships `json:"relationships,omitempty"` Type AuthNMappingsType `json:"type"` }{} @@ -263,7 +225,6 @@ func (o *AuthNMapping) UnmarshalJSON(bytes []byte) (err error) { } o.Attributes = all.Attributes o.Id = all.Id - o.Included = all.Included if all.Relationships != nil && all.Relationships.UnparsedObject != nil && o.UnparsedObject == nil { err = json.Unmarshal(bytes, &raw) if err != nil { diff --git a/api/v2/datadog/model_auth_n_mapping_attributes.go b/api/v2/datadog/model_auth_n_mapping_attributes.go index c044f56371f..e2f57733d01 100644 --- a/api/v2/datadog/model_auth_n_mapping_attributes.go +++ b/api/v2/datadog/model_auth_n_mapping_attributes.go @@ -22,7 +22,7 @@ type AuthNMappingAttributes struct { // Time of last AuthN Mapping modification. ModifiedAt *time.Time `json:"modified_at,omitempty"` // The ID of the SAML assertion attribute. - SamlAssertionAttributeId *int32 `json:"saml_assertion_attribute_id,omitempty"` + SamlAssertionAttributeId *string `json:"saml_assertion_attribute_id,omitempty"` // UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct UnparsedObject map[string]interface{} `json:-` AdditionalProperties map[string]interface{} @@ -174,9 +174,9 @@ func (o *AuthNMappingAttributes) SetModifiedAt(v time.Time) { } // GetSamlAssertionAttributeId returns the SamlAssertionAttributeId field value if set, zero value otherwise. -func (o *AuthNMappingAttributes) GetSamlAssertionAttributeId() int32 { +func (o *AuthNMappingAttributes) GetSamlAssertionAttributeId() string { if o == nil || o.SamlAssertionAttributeId == nil { - var ret int32 + var ret string return ret } return *o.SamlAssertionAttributeId @@ -184,7 +184,7 @@ func (o *AuthNMappingAttributes) GetSamlAssertionAttributeId() int32 { // GetSamlAssertionAttributeIdOk returns a tuple with the SamlAssertionAttributeId field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *AuthNMappingAttributes) GetSamlAssertionAttributeIdOk() (*int32, bool) { +func (o *AuthNMappingAttributes) GetSamlAssertionAttributeIdOk() (*string, bool) { if o == nil || o.SamlAssertionAttributeId == nil { return nil, false } @@ -200,8 +200,8 @@ func (o *AuthNMappingAttributes) HasSamlAssertionAttributeId() bool { return false } -// SetSamlAssertionAttributeId gets a reference to the given int32 and assigns it to the SamlAssertionAttributeId field. -func (o *AuthNMappingAttributes) SetSamlAssertionAttributeId(v int32) { +// SetSamlAssertionAttributeId gets a reference to the given string and assigns it to the SamlAssertionAttributeId field. +func (o *AuthNMappingAttributes) SetSamlAssertionAttributeId(v string) { o.SamlAssertionAttributeId = &v } @@ -247,7 +247,7 @@ func (o *AuthNMappingAttributes) UnmarshalJSON(bytes []byte) (err error) { AttributeValue *string `json:"attribute_value,omitempty"` CreatedAt *time.Time `json:"created_at,omitempty"` ModifiedAt *time.Time `json:"modified_at,omitempty"` - SamlAssertionAttributeId *int32 `json:"saml_assertion_attribute_id,omitempty"` + SamlAssertionAttributeId *string `json:"saml_assertion_attribute_id,omitempty"` }{} err = json.Unmarshal(bytes, &all) if err != nil { diff --git a/api/v2/datadog/model_auth_n_mapping_response.go b/api/v2/datadog/model_auth_n_mapping_response.go index 96327c8bfb3..b661ebde2fe 100644 --- a/api/v2/datadog/model_auth_n_mapping_response.go +++ b/api/v2/datadog/model_auth_n_mapping_response.go @@ -14,6 +14,8 @@ import ( type AuthNMappingResponse struct { // The AuthN Mapping object returned by API. Data *AuthNMapping `json:"data,omitempty"` + // Included data in the AuthN Mapping response. + Included []AuthNMappingIncluded `json:"included,omitempty"` // UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct UnparsedObject map[string]interface{} `json:-` AdditionalProperties map[string]interface{} @@ -68,6 +70,38 @@ func (o *AuthNMappingResponse) SetData(v AuthNMapping) { o.Data = &v } +// GetIncluded returns the Included field value if set, zero value otherwise. +func (o *AuthNMappingResponse) GetIncluded() []AuthNMappingIncluded { + if o == nil || o.Included == nil { + var ret []AuthNMappingIncluded + return ret + } + return o.Included +} + +// GetIncludedOk returns a tuple with the Included field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *AuthNMappingResponse) GetIncludedOk() (*[]AuthNMappingIncluded, bool) { + if o == nil || o.Included == nil { + return nil, false + } + return &o.Included, true +} + +// HasIncluded returns a boolean if a field has been set. +func (o *AuthNMappingResponse) HasIncluded() bool { + if o != nil && o.Included != nil { + return true + } + + return false +} + +// SetIncluded gets a reference to the given []AuthNMappingIncluded and assigns it to the Included field. +func (o *AuthNMappingResponse) SetIncluded(v []AuthNMappingIncluded) { + o.Included = v +} + func (o AuthNMappingResponse) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if o.UnparsedObject != nil { @@ -76,6 +110,9 @@ func (o AuthNMappingResponse) MarshalJSON() ([]byte, error) { if o.Data != nil { toSerialize["data"] = o.Data } + if o.Included != nil { + toSerialize["included"] = o.Included + } for key, value := range o.AdditionalProperties { toSerialize[key] = value @@ -86,7 +123,8 @@ func (o AuthNMappingResponse) MarshalJSON() ([]byte, error) { func (o *AuthNMappingResponse) UnmarshalJSON(bytes []byte) (err error) { raw := map[string]interface{}{} all := struct { - Data *AuthNMapping `json:"data,omitempty"` + Data *AuthNMapping `json:"data,omitempty"` + Included []AuthNMappingIncluded `json:"included,omitempty"` }{} err = json.Unmarshal(bytes, &all) if err != nil { @@ -105,5 +143,6 @@ func (o *AuthNMappingResponse) UnmarshalJSON(bytes []byte) (err error) { o.UnparsedObject = raw } o.Data = all.Data + o.Included = all.Included return nil } diff --git a/api/v2/datadog/model_auth_n_mappings_response.go b/api/v2/datadog/model_auth_n_mappings_response.go index 6705909a930..69f073dbe94 100644 --- a/api/v2/datadog/model_auth_n_mappings_response.go +++ b/api/v2/datadog/model_auth_n_mappings_response.go @@ -14,6 +14,8 @@ import ( type AuthNMappingsResponse struct { // Array of returned AuthN Mappings. Data []AuthNMapping `json:"data,omitempty"` + // Included data in the AuthN Mapping response. + Included []AuthNMappingIncluded `json:"included,omitempty"` // Object describing meta attributes of response. Meta *ResponseMetaAttributes `json:"meta,omitempty"` // UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct @@ -70,6 +72,38 @@ func (o *AuthNMappingsResponse) SetData(v []AuthNMapping) { o.Data = v } +// GetIncluded returns the Included field value if set, zero value otherwise. +func (o *AuthNMappingsResponse) GetIncluded() []AuthNMappingIncluded { + if o == nil || o.Included == nil { + var ret []AuthNMappingIncluded + return ret + } + return o.Included +} + +// GetIncludedOk returns a tuple with the Included field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *AuthNMappingsResponse) GetIncludedOk() (*[]AuthNMappingIncluded, bool) { + if o == nil || o.Included == nil { + return nil, false + } + return &o.Included, true +} + +// HasIncluded returns a boolean if a field has been set. +func (o *AuthNMappingsResponse) HasIncluded() bool { + if o != nil && o.Included != nil { + return true + } + + return false +} + +// SetIncluded gets a reference to the given []AuthNMappingIncluded and assigns it to the Included field. +func (o *AuthNMappingsResponse) SetIncluded(v []AuthNMappingIncluded) { + o.Included = v +} + // GetMeta returns the Meta field value if set, zero value otherwise. func (o *AuthNMappingsResponse) GetMeta() ResponseMetaAttributes { if o == nil || o.Meta == nil { @@ -110,6 +144,9 @@ func (o AuthNMappingsResponse) MarshalJSON() ([]byte, error) { if o.Data != nil { toSerialize["data"] = o.Data } + if o.Included != nil { + toSerialize["included"] = o.Included + } if o.Meta != nil { toSerialize["meta"] = o.Meta } @@ -123,8 +160,9 @@ func (o AuthNMappingsResponse) MarshalJSON() ([]byte, error) { func (o *AuthNMappingsResponse) UnmarshalJSON(bytes []byte) (err error) { raw := map[string]interface{}{} all := struct { - Data []AuthNMapping `json:"data,omitempty"` - Meta *ResponseMetaAttributes `json:"meta,omitempty"` + Data []AuthNMapping `json:"data,omitempty"` + Included []AuthNMappingIncluded `json:"included,omitempty"` + Meta *ResponseMetaAttributes `json:"meta,omitempty"` }{} err = json.Unmarshal(bytes, &all) if err != nil { @@ -136,6 +174,7 @@ func (o *AuthNMappingsResponse) UnmarshalJSON(bytes []byte) (err error) { return nil } o.Data = all.Data + o.Included = all.Included if all.Meta != nil && all.Meta.UnparsedObject != nil && o.UnparsedObject == nil { err = json.Unmarshal(bytes, &raw) if err != nil { diff --git a/api/v2/datadog/model_relationship_to_saml_assertion_attribute_data.go b/api/v2/datadog/model_relationship_to_saml_assertion_attribute_data.go index 6dc96268b90..f987c2c0755 100644 --- a/api/v2/datadog/model_relationship_to_saml_assertion_attribute_data.go +++ b/api/v2/datadog/model_relationship_to_saml_assertion_attribute_data.go @@ -14,7 +14,7 @@ import ( // RelationshipToSAMLAssertionAttributeData Data of AuthN Mapping relationship to SAML Assertion Attribute. type RelationshipToSAMLAssertionAttributeData struct { // The ID of the SAML assertion attribute. - Id int32 `json:"id"` + Id string `json:"id"` // SAML assertion attributes resource type. Type SAMLAssertionAttributesType `json:"type"` // UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct @@ -26,7 +26,7 @@ type RelationshipToSAMLAssertionAttributeData struct { // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewRelationshipToSAMLAssertionAttributeData(id int32, type_ SAMLAssertionAttributesType) *RelationshipToSAMLAssertionAttributeData { +func NewRelationshipToSAMLAssertionAttributeData(id string, type_ SAMLAssertionAttributesType) *RelationshipToSAMLAssertionAttributeData { this := RelationshipToSAMLAssertionAttributeData{} this.Id = id this.Type = type_ @@ -44,9 +44,9 @@ func NewRelationshipToSAMLAssertionAttributeDataWithDefaults() *RelationshipToSA } // GetId returns the Id field value -func (o *RelationshipToSAMLAssertionAttributeData) GetId() int32 { +func (o *RelationshipToSAMLAssertionAttributeData) GetId() string { if o == nil { - var ret int32 + var ret string return ret } return o.Id @@ -54,7 +54,7 @@ func (o *RelationshipToSAMLAssertionAttributeData) GetId() int32 { // GetIdOk returns a tuple with the Id field value // and a boolean to check if the value has been set. -func (o *RelationshipToSAMLAssertionAttributeData) GetIdOk() (*int32, bool) { +func (o *RelationshipToSAMLAssertionAttributeData) GetIdOk() (*string, bool) { if o == nil { return nil, false } @@ -62,7 +62,7 @@ func (o *RelationshipToSAMLAssertionAttributeData) GetIdOk() (*int32, bool) { } // SetId sets field value -func (o *RelationshipToSAMLAssertionAttributeData) SetId(v int32) { +func (o *RelationshipToSAMLAssertionAttributeData) SetId(v string) { o.Id = v } @@ -106,11 +106,11 @@ func (o RelationshipToSAMLAssertionAttributeData) MarshalJSON() ([]byte, error) func (o *RelationshipToSAMLAssertionAttributeData) UnmarshalJSON(bytes []byte) (err error) { raw := map[string]interface{}{} required := struct { - Id *int32 `json:"id"` + Id *string `json:"id"` Type *SAMLAssertionAttributesType `json:"type"` }{} all := struct { - Id int32 `json:"id"` + Id string `json:"id"` Type SAMLAssertionAttributesType `json:"type"` }{} err = json.Unmarshal(bytes, &required) diff --git a/api/v2/datadog/model_saml_assertion_attribute.go b/api/v2/datadog/model_saml_assertion_attribute.go index 3336211f8f7..61799cf8896 100644 --- a/api/v2/datadog/model_saml_assertion_attribute.go +++ b/api/v2/datadog/model_saml_assertion_attribute.go @@ -16,7 +16,7 @@ type SAMLAssertionAttribute struct { // Key/Value pair of attributes used in SAML assertion attributes. Attributes *SAMLAssertionAttributeAttributes `json:"attributes,omitempty"` // The ID of the SAML assertion attribute. - Id int32 `json:"id"` + Id string `json:"id"` // SAML assertion attributes resource type. Type SAMLAssertionAttributesType `json:"type"` // UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct @@ -28,7 +28,7 @@ type SAMLAssertionAttribute struct { // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewSAMLAssertionAttribute(id int32, type_ SAMLAssertionAttributesType) *SAMLAssertionAttribute { +func NewSAMLAssertionAttribute(id string, type_ SAMLAssertionAttributesType) *SAMLAssertionAttribute { this := SAMLAssertionAttribute{} this.Id = id this.Type = type_ @@ -78,9 +78,9 @@ func (o *SAMLAssertionAttribute) SetAttributes(v SAMLAssertionAttributeAttribute } // GetId returns the Id field value -func (o *SAMLAssertionAttribute) GetId() int32 { +func (o *SAMLAssertionAttribute) GetId() string { if o == nil { - var ret int32 + var ret string return ret } return o.Id @@ -88,7 +88,7 @@ func (o *SAMLAssertionAttribute) GetId() int32 { // GetIdOk returns a tuple with the Id field value // and a boolean to check if the value has been set. -func (o *SAMLAssertionAttribute) GetIdOk() (*int32, bool) { +func (o *SAMLAssertionAttribute) GetIdOk() (*string, bool) { if o == nil { return nil, false } @@ -96,7 +96,7 @@ func (o *SAMLAssertionAttribute) GetIdOk() (*int32, bool) { } // SetId sets field value -func (o *SAMLAssertionAttribute) SetId(v int32) { +func (o *SAMLAssertionAttribute) SetId(v string) { o.Id = v } @@ -143,12 +143,12 @@ func (o SAMLAssertionAttribute) MarshalJSON() ([]byte, error) { func (o *SAMLAssertionAttribute) UnmarshalJSON(bytes []byte) (err error) { raw := map[string]interface{}{} required := struct { - Id *int32 `json:"id"` + Id *string `json:"id"` Type *SAMLAssertionAttributesType `json:"type"` }{} all := struct { Attributes *SAMLAssertionAttributeAttributes `json:"attributes,omitempty"` - Id int32 `json:"id"` + Id string `json:"id"` Type SAMLAssertionAttributesType `json:"type"` }{} err = json.Unmarshal(bytes, &required)