Skip to content

Commit

Permalink
Revert "Enable automerging for Fastly routes." (#2637)
Browse files Browse the repository at this point in the history
Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
  • Loading branch information
api-clients-generation-pipeline[bot] and ci.datadog-api-spec authored Aug 19, 2024
1 parent 9be29f2 commit a3b504c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 83 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-16 13:40:36.303655",
"spec_repo_commit": "1b56c3ba"
"regenerated": "2024-08-16 20:36:51.240342",
"spec_repo_commit": "9c789d05"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-16 13:40:36.321785",
"spec_repo_commit": "1b56c3ba"
"regenerated": "2024-08-16 20:36:51.258646",
"spec_repo_commit": "9c789d05"
}
}
}
7 changes: 0 additions & 7 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8075,10 +8075,6 @@ components:
FastlyAccounResponseAttributes:
description: Attributes object of a Fastly account.
properties:
api_key:
description: The FastlyAccounResponseAttributes api_key.
type: string
writeOnly: true
name:
description: The name of the Fastly account.
example: test-name
Expand Down Expand Up @@ -8176,9 +8172,6 @@ components:
description: The API key of the Fastly account.
example: ABCDEFG123
type: string
name:
description: The FastlyAccountUpdateRequestAttributes name.
type: string
type: object
FastlyAccountUpdateRequestData:
description: Data object for updating a Fastly account.
Expand Down
37 changes: 1 addition & 36 deletions api/datadogV2/model_fastly_accoun_response_attributes.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (

// FastlyAccounResponseAttributes Attributes object of a Fastly account.
type FastlyAccounResponseAttributes struct {
// The FastlyAccounResponseAttributes api_key.
ApiKey *string `json:"api_key,omitempty"`
// The name of the Fastly account.
Name string `json:"name"`
// A list of services belonging to the parent account.
Expand Down Expand Up @@ -41,34 +39,6 @@ func NewFastlyAccounResponseAttributesWithDefaults() *FastlyAccounResponseAttrib
return &this
}

// GetApiKey returns the ApiKey field value if set, zero value otherwise.
func (o *FastlyAccounResponseAttributes) GetApiKey() string {
if o == nil || o.ApiKey == nil {
var ret string
return ret
}
return *o.ApiKey
}

// GetApiKeyOk returns a tuple with the ApiKey field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *FastlyAccounResponseAttributes) GetApiKeyOk() (*string, bool) {
if o == nil || o.ApiKey == nil {
return nil, false
}
return o.ApiKey, true
}

// HasApiKey returns a boolean if a field has been set.
func (o *FastlyAccounResponseAttributes) HasApiKey() bool {
return o != nil && o.ApiKey != nil
}

// SetApiKey gets a reference to the given string and assigns it to the ApiKey field.
func (o *FastlyAccounResponseAttributes) SetApiKey(v string) {
o.ApiKey = &v
}

// GetName returns the Name field value.
func (o *FastlyAccounResponseAttributes) GetName() string {
if o == nil {
Expand Down Expand Up @@ -126,9 +96,6 @@ func (o FastlyAccounResponseAttributes) MarshalJSON() ([]byte, error) {
if o.UnparsedObject != nil {
return datadog.Marshal(o.UnparsedObject)
}
if o.ApiKey != nil {
toSerialize["api_key"] = o.ApiKey
}
toSerialize["name"] = o.Name
if o.Services != nil {
toSerialize["services"] = o.Services
Expand All @@ -143,7 +110,6 @@ func (o FastlyAccounResponseAttributes) MarshalJSON() ([]byte, error) {
// UnmarshalJSON deserializes the given payload.
func (o *FastlyAccounResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
all := struct {
ApiKey *string `json:"api_key,omitempty"`
Name *string `json:"name"`
Services []FastlyService `json:"services,omitempty"`
}{}
Expand All @@ -155,11 +121,10 @@ func (o *FastlyAccounResponseAttributes) UnmarshalJSON(bytes []byte) (err error)
}
additionalProperties := make(map[string]interface{})
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
datadog.DeleteKeys(additionalProperties, &[]string{"api_key", "name", "services"})
datadog.DeleteKeys(additionalProperties, &[]string{"name", "services"})
} else {
return err
}
o.ApiKey = all.ApiKey
o.Name = *all.Name
o.Services = all.Services

Expand Down
37 changes: 1 addition & 36 deletions api/datadogV2/model_fastly_account_update_request_attributes.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (
type FastlyAccountUpdateRequestAttributes struct {
// The API key of the Fastly account.
ApiKey *string `json:"api_key,omitempty"`
// The FastlyAccountUpdateRequestAttributes name.
Name *string `json:"name,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{} `json:"-"`
Expand Down Expand Up @@ -64,34 +62,6 @@ func (o *FastlyAccountUpdateRequestAttributes) SetApiKey(v string) {
o.ApiKey = &v
}

// GetName returns the Name field value if set, zero value otherwise.
func (o *FastlyAccountUpdateRequestAttributes) GetName() string {
if o == nil || o.Name == nil {
var ret string
return ret
}
return *o.Name
}

// GetNameOk returns a tuple with the Name field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *FastlyAccountUpdateRequestAttributes) GetNameOk() (*string, bool) {
if o == nil || o.Name == nil {
return nil, false
}
return o.Name, true
}

// HasName returns a boolean if a field has been set.
func (o *FastlyAccountUpdateRequestAttributes) HasName() bool {
return o != nil && o.Name != nil
}

// SetName gets a reference to the given string and assigns it to the Name field.
func (o *FastlyAccountUpdateRequestAttributes) SetName(v string) {
o.Name = &v
}

// MarshalJSON serializes the struct using spec logic.
func (o FastlyAccountUpdateRequestAttributes) MarshalJSON() ([]byte, error) {
toSerialize := map[string]interface{}{}
Expand All @@ -101,9 +71,6 @@ func (o FastlyAccountUpdateRequestAttributes) MarshalJSON() ([]byte, error) {
if o.ApiKey != nil {
toSerialize["api_key"] = o.ApiKey
}
if o.Name != nil {
toSerialize["name"] = o.Name
}

for key, value := range o.AdditionalProperties {
toSerialize[key] = value
Expand All @@ -115,19 +82,17 @@ func (o FastlyAccountUpdateRequestAttributes) MarshalJSON() ([]byte, error) {
func (o *FastlyAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err error) {
all := struct {
ApiKey *string `json:"api_key,omitempty"`
Name *string `json:"name,omitempty"`
}{}
if err = datadog.Unmarshal(bytes, &all); err != nil {
return datadog.Unmarshal(bytes, &o.UnparsedObject)
}
additionalProperties := make(map[string]interface{})
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
datadog.DeleteKeys(additionalProperties, &[]string{"api_key", "name"})
datadog.DeleteKeys(additionalProperties, &[]string{"api_key"})
} else {
return err
}
o.ApiKey = all.ApiKey
o.Name = all.Name

if len(additionalProperties) > 0 {
o.AdditionalProperties = additionalProperties
Expand Down

0 comments on commit a3b504c

Please sign in to comment.