From 8d15748bd8c10b49dda47e89b0bae72595c10a41 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Wed, 29 Jun 2022 11:05:04 +0800 Subject: [PATCH] Update run tasks as not beta Previously Run Tasks was marked as beta in go-tfe. However Run Tasks is now Generally Available. This commit updates go-tfe to mark Run Tasks as not Beta. --- CHANGELOG.md | 4 ++-- helper_test.go | 11 +++++++---- run_task.go | 9 ++++----- run_task_integration_test.go | 12 ++++++------ workspace_run_task_integration_test.go | 10 +++++----- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ce6d9beb..fc399a313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Enhancements * Adds `RetryServerErrors` field to the `Config` object by @sebasslash [#439](https://github.com/hashicorp/go-tfe/pull/439) * [beta] Renames the optional StateVersion field `ExtState` to `JSONState` and changes to string for base64 encoding by @annawinkler [#444](https://github.com/hashicorp/go-tfe/pull/444) +* Remove beta messaging for Run Tasks by @glennsarti [#447](https://github.com/hashicorp/go-tfe/pull/447) + # v1.3.0 ## Enhancements @@ -24,7 +26,6 @@ * Adds `Emails` query param field to `OrganizationMembershipListOptions` by @sebasslash [#393](https://github.com/hashicorp/go-tfe/pull/393) * Adds Run Tasks API support by @glennsarti [#381](https://github.com/hashicorp/go-tfe/pull/381), [#382](https://github.com/hashicorp/go-tfe/pull/382) and [#383](https://github.com/hashicorp/go-tfe/pull/383) - ## Bug fixes * Fixes ignored comment when performing apply, discard, cancel, and force-cancel run actions [#388](https://github.com/hashicorp/go-tfe/pull/388) @@ -46,7 +47,6 @@ * The `ID` field in Create/Update option structs has been renamed to `Type` in accordance with the JSON:API spec by @omarismail, @uturunku1 [#190](https://github.com/hashicorp/go-tfe/pull/190), [#323](https://github.com/hashicorp/go-tfe/pull/323), [#332](https://github.com/hashicorp/go-tfe/pull/332) * Nested URL params (consisting of an organization, module and provider name) used to identify a `RegistryModule` have been refactored into a struct `RegistryModuleID` by @sebasslash [#337](https://github.com/hashicorp/go-tfe/pull/337) - ## Enhancements * Added missing include fields for `AdminRuns`, `AgentPools`, `ConfigurationVersions`, `OAuthClients`, `Organizations`, `PolicyChecks`, `PolicySets`, `Policies` and `RunTriggers` by @uturunku1 [#339](https://github.com/hashicorp/go-tfe/pull/339) * Cleanup documentation and improve consistency by @uturunku1 [#331](https://github.com/hashicorp/go-tfe/pull/331) diff --git a/helper_test.go b/helper_test.go index cb3b8c2c6..08dbe1a02 100644 --- a/helper_test.go +++ b/helper_test.go @@ -1189,11 +1189,14 @@ func createWorkspaceWithOptions(t *testing.T, client *Client, org *Organization, return w, func() { if err := client.Workspaces.Delete(ctx, org.Name, w.Name); err != nil { - t.Errorf("Error destroying workspace! WARNING: Dangling resources\n"+ - "may exist! The full error is shown below.\n\n"+ - "Workspace: %s\nError: %s", w.Name, err) + if errors.Is(err, ErrResourceNotFound) { + t.Logf("Cannot cleanup Workspace %s as it does not exist.", w.Name) + } else { + t.Errorf("Error destroying workspace! WARNING: Dangling resources\n"+ + "may exist! The full error is shown below.\n\n"+ + "Workspace: %s\nError: %s", w.Name, err) + } } - if orgCleanup != nil { orgCleanup() } diff --git a/run_task.go b/run_task.go index ffbaf0d17..63e66f7f1 100644 --- a/run_task.go +++ b/run_task.go @@ -11,8 +11,7 @@ var _ RunTasks = (*runTasks)(nil) // RunTasks represents all the run task related methods in the context of an organization // that the Terraform Cloud/Enterprise API supports. -// **Note: This API is still in BETA and subject to change.** -// https://www.terraform.io/cloud-docs/api-docs/run-tasks#run-tasks-api +// https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#run-tasks-api type RunTasks interface { // Create a run task for an organization Create(ctx context.Context, organization string, options RunTaskCreateOptions) (*RunTask, error) @@ -61,7 +60,7 @@ type RunTaskList struct { } // RunTaskIncludeOpt represents the available options for include query params. -// https://www.terraform.io/cloud-docs/api-docs/run-tasks#list-run-tasks +// https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#list-run-tasks type RunTaskIncludeOpt string const ( @@ -73,14 +72,14 @@ const ( type RunTaskListOptions struct { ListOptions // Optional: A list of relations to include with a run task. See available resources: - // https://www.terraform.io/cloud-docs/api-docs/run-tasks#list-run-tasks + // https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#list-run-tasks Include []RunTaskIncludeOpt `url:"include,omitempty"` } // RunTaskReadOptions represents the set of options for reading a run task type RunTaskReadOptions struct { // Optional: A list of relations to include with a run task. See available resources: - // https://www.terraform.io/cloud-docs/api-docs/run-tasks#list-run-tasks + // https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#list-run-tasks Include []RunTaskIncludeOpt `url:"include,omitempty"` } diff --git a/run_task_integration_test.go b/run_task_integration_test.go index e9d08a4d3..baf9ab6d8 100644 --- a/run_task_integration_test.go +++ b/run_task_integration_test.go @@ -13,7 +13,7 @@ import ( ) func TestRunTasksCreate(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -49,7 +49,7 @@ func TestRunTasksCreate(t *testing.T) { } func TestRunTasksList(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -75,7 +75,7 @@ func TestRunTasksList(t *testing.T) { } func TestRunTasksRead(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -125,7 +125,7 @@ func TestRunTasksRead(t *testing.T) { } func TestRunTasksUpdate(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -151,7 +151,7 @@ func TestRunTasksUpdate(t *testing.T) { } func TestRunTasksDelete(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -181,7 +181,7 @@ func TestRunTasksDelete(t *testing.T) { } func TestRunTasksAttachToWorkspace(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() diff --git a/workspace_run_task_integration_test.go b/workspace_run_task_integration_test.go index 234033588..87eae63fc 100644 --- a/workspace_run_task_integration_test.go +++ b/workspace_run_task_integration_test.go @@ -12,7 +12,7 @@ import ( ) func TestWorkspaceRunTasksCreate(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -43,7 +43,7 @@ func TestWorkspaceRunTasksCreate(t *testing.T) { } func TestWorkspaceRunTasksList(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -77,7 +77,7 @@ func TestWorkspaceRunTasksList(t *testing.T) { } func TestWorkspaceRunTasksRead(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -112,7 +112,7 @@ func TestWorkspaceRunTasksRead(t *testing.T) { } func TestWorkspaceRunTasksUpdate(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background() @@ -143,7 +143,7 @@ func TestWorkspaceRunTasksUpdate(t *testing.T) { } func TestWorkspaceRunTasksDelete(t *testing.T) { - skipIfBeta(t) + skipIfFreeOnly(t) client := testClient(t) ctx := context.Background()