Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove required unmarshal in models #2057

Merged
merged 3 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Rebase
  • Loading branch information
therve committed Jun 26, 2023
commit ccea5e4f645daa50629788e34e58acb7774336a6
129 changes: 3 additions & 126 deletions api/datadogV2/model_ci_app_pipeline_event_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -721,50 +721,13 @@ func (o CIAppPipelineEventJob) MarshalJSON() ([]byte, error) {
// UnmarshalJSON deserializes the given payload.
func (o *CIAppPipelineEventJob) UnmarshalJSON(bytes []byte) (err error) {
raw := map[string]interface{}{}
<<<<<<< HEAD
required := struct {
End *time.Time `json:"end"`
Git NullableCIAppGitInfo `json:"git"`
Id *string `json:"id"`
Level *CIAppPipelineEventJobLevel `json:"level"`
Name *string `json:"name"`
PipelineName *string `json:"pipeline_name"`
PipelineUniqueId *string `json:"pipeline_unique_id"`
Start *time.Time `json:"start"`
Status *CIAppPipelineEventJobStatus `json:"status"`
Url *string `json:"url"`
}{}
||||||| parent of 04c075be8 (Remove required unmarshal in models)
required := struct {
End *time.Time `json:"end"`
Id *string `json:"id"`
Level *CIAppPipelineEventJobLevel `json:"level"`
Name *string `json:"name"`
PipelineName *string `json:"pipeline_name"`
PipelineUniqueId *string `json:"pipeline_unique_id"`
Start *time.Time `json:"start"`
Status *CIAppPipelineEventJobStatus `json:"status"`
Url *string `json:"url"`
}{}
=======
>>>>>>> 04c075be8 (Remove required unmarshal in models)
all := struct {
Dependencies datadog.NullableList[string] `json:"dependencies,omitempty"`
End *time.Time `json:"end"`
Error NullableCIAppCIError `json:"error,omitempty"`
<<<<<<< HEAD
Git NullableCIAppGitInfo `json:"git"`
Id string `json:"id"`
Level CIAppPipelineEventJobLevel `json:"level"`
||||||| parent of 04c075be8 (Remove required unmarshal in models)
Git NullableCIAppGitInfo `json:"git,omitempty"`
Id string `json:"id"`
Level CIAppPipelineEventJobLevel `json:"level"`
=======
Git NullableCIAppGitInfo `json:"git,omitempty"`
Id *string `json:"id"`
Level *CIAppPipelineEventJobLevel `json:"level"`
>>>>>>> 04c075be8 (Remove required unmarshal in models)
Metrics datadog.NullableList[string] `json:"metrics,omitempty"`
Name *string `json:"name"`
Node NullableCIAppHostInfo `json:"node,omitempty"`
Expand All @@ -777,90 +740,9 @@ func (o *CIAppPipelineEventJob) UnmarshalJSON(bytes []byte) (err error) {
Start *time.Time `json:"start"`
Status *CIAppPipelineEventJobStatus `json:"status"`
Tags datadog.NullableList[string] `json:"tags,omitempty"`
<<<<<<< HEAD
Url string `json:"url"`
||||||| parent of 04c075be8 (Remove required unmarshal in models)
Url string `json:"url"`
User NullableCIAppUserInfo `json:"user,omitempty"`
=======
Url *string `json:"url"`
User NullableCIAppUserInfo `json:"user,omitempty"`
>>>>>>> 04c075be8 (Remove required unmarshal in models)
}{}
<<<<<<< HEAD
err = json.Unmarshal(bytes, &required)
if err != nil {
return err
}
if required.End == nil {
return fmt.Errorf("required field end missing")
}
if !required.Git.IsSet() {
return fmt.Errorf("required field git missing")
}
if required.Id == nil {
return fmt.Errorf("required field id missing")
}
if required.Level == nil {
return fmt.Errorf("required field level missing")
}
if required.Name == nil {
return fmt.Errorf("required field name missing")
}
if required.PipelineName == nil {
return fmt.Errorf("required field pipeline_name missing")
}
if required.PipelineUniqueId == nil {
return fmt.Errorf("required field pipeline_unique_id missing")
}
if required.Start == nil {
return fmt.Errorf("required field start missing")
}
if required.Status == nil {
return fmt.Errorf("required field status missing")
}
if required.Url == nil {
return fmt.Errorf("required field url missing")
}
err = json.Unmarshal(bytes, &all)
if err != nil {
||||||| parent of 04c075be8 (Remove required unmarshal in models)
err = json.Unmarshal(bytes, &required)
if err != nil {
return err
}
if required.End == nil {
return fmt.Errorf("required field end missing")
}
if required.Id == nil {
return fmt.Errorf("required field id missing")
}
if required.Level == nil {
return fmt.Errorf("required field level missing")
}
if required.Name == nil {
return fmt.Errorf("required field name missing")
}
if required.PipelineName == nil {
return fmt.Errorf("required field pipeline_name missing")
}
if required.PipelineUniqueId == nil {
return fmt.Errorf("required field pipeline_unique_id missing")
}
if required.Start == nil {
return fmt.Errorf("required field start missing")
}
if required.Status == nil {
return fmt.Errorf("required field status missing")
}
if required.Url == nil {
return fmt.Errorf("required field url missing")
}
err = json.Unmarshal(bytes, &all)
if err != nil {
=======
if err = json.Unmarshal(bytes, &all); err != nil {
>>>>>>> 04c075be8 (Remove required unmarshal in models)
err = json.Unmarshal(bytes, &raw)
if err != nil {
return err
Expand All @@ -871,6 +753,9 @@ func (o *CIAppPipelineEventJob) UnmarshalJSON(bytes []byte) (err error) {
if all.End == nil {
return fmt.Errorf("required field end missing")
}
if !all.Git.IsSet() {
return fmt.Errorf("required field git missing")
}
if all.Id == nil {
return fmt.Errorf("required field id missing")
}
Expand Down Expand Up @@ -935,15 +820,7 @@ func (o *CIAppPipelineEventJob) UnmarshalJSON(bytes []byte) (err error) {
o.Start = *all.Start
o.Status = *all.Status
o.Tags = all.Tags
<<<<<<< HEAD
o.Url = all.Url
||||||| parent of 04c075be8 (Remove required unmarshal in models)
o.Url = all.Url
o.User = all.User
=======
o.Url = *all.Url
o.User = all.User
>>>>>>> 04c075be8 (Remove required unmarshal in models)
if len(additionalProperties) > 0 {
o.AdditionalProperties = additionalProperties
}
Expand Down
115 changes: 3 additions & 112 deletions api/datadogV2/model_ci_app_pipeline_event_pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -774,31 +774,6 @@ func (o CIAppPipelineEventPipeline) MarshalJSON() ([]byte, error) {
// UnmarshalJSON deserializes the given payload.
func (o *CIAppPipelineEventPipeline) UnmarshalJSON(bytes []byte) (err error) {
raw := map[string]interface{}{}
<<<<<<< HEAD
required := struct {
End *time.Time `json:"end"`
Git NullableCIAppGitInfo `json:"git"`
Level *CIAppPipelineEventPipelineLevel `json:"level"`
Name *string `json:"name"`
PartialRetry *bool `json:"partial_retry"`
Start *time.Time `json:"start"`
Status *CIAppPipelineEventPipelineStatus `json:"status"`
UniqueId *string `json:"unique_id"`
Url *string `json:"url"`
}{}
||||||| parent of 04c075be8 (Remove required unmarshal in models)
required := struct {
End *time.Time `json:"end"`
Level *CIAppPipelineEventPipelineLevel `json:"level"`
Name *string `json:"name"`
PartialRetry *bool `json:"partial_retry"`
Start *time.Time `json:"start"`
Status *CIAppPipelineEventPipelineStatus `json:"status"`
UniqueId *string `json:"unique_id"`
Url *string `json:"url"`
}{}
=======
>>>>>>> 04c075be8 (Remove required unmarshal in models)
all := struct {
End *time.Time `json:"end"`
Error NullableCIAppCIError `json:"error,omitempty"`
Expand All @@ -818,87 +793,10 @@ func (o *CIAppPipelineEventPipeline) UnmarshalJSON(bytes []byte) (err error) {
Start *time.Time `json:"start"`
Status *CIAppPipelineEventPipelineStatus `json:"status"`
Tags datadog.NullableList[string] `json:"tags,omitempty"`
<<<<<<< HEAD
UniqueId string `json:"unique_id"`
Url string `json:"url"`
||||||| parent of 04c075be8 (Remove required unmarshal in models)
UniqueId string `json:"unique_id"`
Url string `json:"url"`
User NullableCIAppUserInfo `json:"user,omitempty"`
=======
UniqueId *string `json:"unique_id"`
Url *string `json:"url"`
User NullableCIAppUserInfo `json:"user,omitempty"`
>>>>>>> 04c075be8 (Remove required unmarshal in models)
}{}
<<<<<<< HEAD
err = json.Unmarshal(bytes, &required)
if err != nil {
return err
}
if required.End == nil {
return fmt.Errorf("required field end missing")
}
if !required.Git.IsSet() {
return fmt.Errorf("required field git missing")
}
if required.Level == nil {
return fmt.Errorf("required field level missing")
}
if required.Name == nil {
return fmt.Errorf("required field name missing")
}
if required.PartialRetry == nil {
return fmt.Errorf("required field partial_retry missing")
}
if required.Start == nil {
return fmt.Errorf("required field start missing")
}
if required.Status == nil {
return fmt.Errorf("required field status missing")
}
if required.UniqueId == nil {
return fmt.Errorf("required field unique_id missing")
}
if required.Url == nil {
return fmt.Errorf("required field url missing")
}
err = json.Unmarshal(bytes, &all)
if err != nil {
||||||| parent of 04c075be8 (Remove required unmarshal in models)
err = json.Unmarshal(bytes, &required)
if err != nil {
return err
}
if required.End == nil {
return fmt.Errorf("required field end missing")
}
if required.Level == nil {
return fmt.Errorf("required field level missing")
}
if required.Name == nil {
return fmt.Errorf("required field name missing")
}
if required.PartialRetry == nil {
return fmt.Errorf("required field partial_retry missing")
}
if required.Start == nil {
return fmt.Errorf("required field start missing")
}
if required.Status == nil {
return fmt.Errorf("required field status missing")
}
if required.UniqueId == nil {
return fmt.Errorf("required field unique_id missing")
}
if required.Url == nil {
return fmt.Errorf("required field url missing")
}
err = json.Unmarshal(bytes, &all)
if err != nil {
=======
if err = json.Unmarshal(bytes, &all); err != nil {
>>>>>>> 04c075be8 (Remove required unmarshal in models)
err = json.Unmarshal(bytes, &raw)
if err != nil {
return err
Expand All @@ -909,6 +807,9 @@ func (o *CIAppPipelineEventPipeline) UnmarshalJSON(bytes []byte) (err error) {
if all.End == nil {
return fmt.Errorf("required field end missing")
}
if !all.Git.IsSet() {
return fmt.Errorf("required field git missing")
}
if all.Level == nil {
return fmt.Errorf("required field level missing")
}
Expand Down Expand Up @@ -970,18 +871,8 @@ func (o *CIAppPipelineEventPipeline) UnmarshalJSON(bytes []byte) (err error) {
o.Start = *all.Start
o.Status = *all.Status
o.Tags = all.Tags
<<<<<<< HEAD
o.UniqueId = all.UniqueId
o.Url = all.Url
||||||| parent of 04c075be8 (Remove required unmarshal in models)
o.UniqueId = all.UniqueId
o.Url = all.Url
o.User = all.User
=======
o.UniqueId = *all.UniqueId
o.Url = *all.Url
o.User = all.User
>>>>>>> 04c075be8 (Remove required unmarshal in models)
if len(additionalProperties) > 0 {
o.AdditionalProperties = additionalProperties
}
Expand Down
Loading