Update Run Tasks for global config and stages #865
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Copyright (c) HashiCorp, Inc. | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| package tfe | ||
|
|
||
| // A private struct we need for unmarshalling | ||
| type internalRunTask struct { | ||
| ID string `jsonapi:"primary,tasks"` | ||
| Name string `jsonapi:"attr,name"` | ||
| URL string `jsonapi:"attr,url"` | ||
| Description string `jsonapi:"attr,description"` | ||
| Category string `jsonapi:"attr,category"` | ||
| HMACKey *string `jsonapi:"attr,hmac-key,omitempty"` | ||
| Enabled bool `jsonapi:"attr,enabled"` | ||
| RawGlobal map[string]interface{} `jsonapi:"attr,global-configuration,omitempty"` | ||
|
There was a problem hiding this comment. TIL that jsonapi doesn't automatically decode json annotated attribute object types. It's certainly in spec to have an object within an attribute. I will take a closer look after I finish this review. There was a problem hiding this comment.
DERP ME ... we are using a fork |
||
|
|
||
| Organization *Organization `jsonapi:"relation,organization"` | ||
| WorkspaceRunTasks []*internalWorkspaceRunTask `jsonapi:"relation,workspace-tasks"` | ||
| } | ||
|
|
||
| // Due to https://github.com/google/jsonapi/issues/74 we must first unmarshall using map[string]interface{} | ||
| // and then perform our own conversion from the map into a GlobalRunTask struct | ||
| func (irt internalRunTask) ToRunTask() *RunTask { | ||
| obj := RunTask{ | ||
| ID: irt.ID, | ||
| Name: irt.Name, | ||
| URL: irt.URL, | ||
| Description: irt.Description, | ||
| Category: irt.Category, | ||
| HMACKey: irt.HMACKey, | ||
| Enabled: irt.Enabled, | ||
|
|
||
| Organization: irt.Organization, | ||
| } | ||
|
|
||
| // Convert the WorkspaceRunTasks | ||
| workspaceTasks := make([]*WorkspaceRunTask, len(irt.WorkspaceRunTasks)) | ||
| for idx, rawTask := range irt.WorkspaceRunTasks { | ||
| if rawTask != nil { | ||
| workspaceTasks[idx] = rawTask.ToWorkspaceRunTask() | ||
| } | ||
| } | ||
| obj.WorkspaceRunTasks = workspaceTasks | ||
|
|
||
| // Check if the global configuration exists | ||
| if val, ok := irt.RawGlobal["enabled"]; !ok { | ||
| // The enabled property is required so we can assume now that the | ||
| // global configuration was not supplied | ||
| return &obj | ||
| } else if boolVal, ok := val.(bool); !ok { | ||
| // The enabled property exists but it is invalid (Couldn't cast to boolean) | ||
| // so assume the global configuration was not supplied | ||
| return &obj | ||
| } else { | ||
| obj.Global = &GlobalRunTask{ | ||
| Enabled: boolVal, | ||
| } | ||
| } | ||
|
|
||
| // Global Enforcement Level | ||
| if val, ok := irt.RawGlobal["enforcement-level"]; ok { | ||
| if stringVal, ok := val.(string); ok { | ||
| obj.Global.EnforcementLevel = TaskEnforcementLevel(stringVal) | ||
| } | ||
| } | ||
|
|
||
| // Global Stages | ||
| if val, ok := irt.RawGlobal["stages"]; ok { | ||
| if stringsVal, ok := val.([]interface{}); ok { | ||
| obj.Global.Stages = make([]Stage, len(stringsVal)) | ||
| for idx, stageName := range stringsVal { | ||
| if stringVal, ok := stageName.(string); ok { | ||
| obj.Global.Stages[idx] = Stage(stringVal) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return &obj | ||
| } | ||
|
|
||
| // A private struct we need for unmarshalling | ||
| type internalRunTaskList struct { | ||
| *Pagination | ||
| Items []*internalRunTask | ||
| } | ||
|
|
||
| // Due to https://github.com/google/jsonapi/issues/74 we must first unmarshall using | ||
| // the internal RunTask struct and convert that a RunTask | ||
| func (irt internalRunTaskList) ToRunTaskList() *RunTaskList { | ||
| obj := RunTaskList{ | ||
| Pagination: irt.Pagination, | ||
| Items: make([]*RunTask, len(irt.Items)), | ||
| } | ||
|
|
||
| for idx, src := range irt.Items { | ||
| if src != nil { | ||
| obj.Items[idx] = src.ToRunTask() | ||
| } | ||
| } | ||
|
|
||
| return &obj | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Copyright (c) HashiCorp, Inc. | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| package tfe | ||
|
|
||
| // A private struct we need for unmarshalling | ||
| type internalWorkspaceRunTask struct { | ||
| ID string `jsonapi:"primary,workspace-tasks"` | ||
| EnforcementLevel TaskEnforcementLevel `jsonapi:"attr,enforcement-level"` | ||
| Stage Stage `jsonapi:"attr,stage"` | ||
| Stages []string `jsonapi:"attr,stages"` | ||
|
|
||
| RunTask *RunTask `jsonapi:"relation,task"` | ||
| Workspace *Workspace `jsonapi:"relation,workspace"` | ||
| } | ||
|
|
||
| // Due to https://github.com/google/jsonapi/issues/74 we must first unmarshall using map[string]interface{} | ||
| // and then perform our own conversion for the Stages | ||
| func (irt internalWorkspaceRunTask) ToWorkspaceRunTask() *WorkspaceRunTask { | ||
| obj := WorkspaceRunTask{ | ||
| ID: irt.ID, | ||
| EnforcementLevel: irt.EnforcementLevel, | ||
| Stage: irt.Stage, | ||
| Stages: make([]Stage, len(irt.Stages)), | ||
| RunTask: irt.RunTask, | ||
| Workspace: irt.Workspace, | ||
| } | ||
|
|
||
| for idx, val := range irt.Stages { | ||
| obj.Stages[idx] = Stage(val) | ||
| } | ||
|
|
||
| return &obj | ||
| } | ||
|
|
||
| // A private struct we need for unmarshalling | ||
| type internalWorkspaceRunTaskList struct { | ||
| *Pagination | ||
| Items []*internalWorkspaceRunTask | ||
| } | ||
|
|
||
| // Due to https://github.com/google/jsonapi/issues/74 we must first unmarshall using | ||
| // the internal WorkspaceRunTask struct and convert that a WorkspaceRunTask | ||
| func (irt internalWorkspaceRunTaskList) ToWorkspaceRunTaskList() *WorkspaceRunTaskList { | ||
| obj := WorkspaceRunTaskList{ | ||
| Pagination: irt.Pagination, | ||
| Items: make([]*WorkspaceRunTask, len(irt.Items)), | ||
| } | ||
|
|
||
| for idx, src := range irt.Items { | ||
| if src != nil { | ||
| obj.Items[idx] = src.ToWorkspaceRunTask() | ||
| } | ||
| } | ||
|
|
||
| return &obj | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice!! 👍