Skip to content

Commit

Permalink
Revert "{WIP} Update run tasks as not beta"
Browse files Browse the repository at this point in the history
This reverts commit afae162.
  • Loading branch information
glennsarti committed Jun 29, 2022
1 parent 48aa64d commit 2635518
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 22 deletions.
11 changes: 4 additions & 7 deletions helper_test.go
Expand Up @@ -1189,14 +1189,11 @@ func createWorkspaceWithOptions(t *testing.T, client *Client, org *Organization,

return w, func() {
if err := client.Workspaces.Delete(ctx, org.Name, w.Name); err != nil {
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)
}
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()
}
Expand Down
9 changes: 5 additions & 4 deletions run_task.go
Expand Up @@ -11,7 +11,8 @@ 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.
// https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#run-tasks-api
// **Note: This API is still in BETA and subject to change.**
// https://www.terraform.io/cloud-docs/api-docs/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)
Expand Down Expand Up @@ -60,7 +61,7 @@ type RunTaskList struct {
}

// RunTaskIncludeOpt represents the available options for include query params.
// https://www.terraform.io/cloud-docs/api-docs/run-tasks/run-tasks#list-run-tasks
// https://www.terraform.io/cloud-docs/api-docs/run-tasks#list-run-tasks
type RunTaskIncludeOpt string

const (
Expand All @@ -72,14 +73,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/run-tasks#list-run-tasks
// https://www.terraform.io/cloud-docs/api-docs/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/run-tasks#list-run-tasks
// https://www.terraform.io/cloud-docs/api-docs/run-tasks#list-run-tasks
Include []RunTaskIncludeOpt `url:"include,omitempty"`
}

Expand Down
12 changes: 6 additions & 6 deletions run_task_integration_test.go
Expand Up @@ -13,7 +13,7 @@ import (
)

func TestRunTasksCreate(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -49,7 +49,7 @@ func TestRunTasksCreate(t *testing.T) {
}

func TestRunTasksList(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand All @@ -75,7 +75,7 @@ func TestRunTasksList(t *testing.T) {
}

func TestRunTasksRead(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -125,7 +125,7 @@ func TestRunTasksRead(t *testing.T) {
}

func TestRunTasksUpdate(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand All @@ -151,7 +151,7 @@ func TestRunTasksUpdate(t *testing.T) {
}

func TestRunTasksDelete(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -181,7 +181,7 @@ func TestRunTasksDelete(t *testing.T) {
}

func TestRunTasksAttachToWorkspace(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down
10 changes: 5 additions & 5 deletions workspace_run_task_integration_test.go
Expand Up @@ -12,7 +12,7 @@ import (
)

func TestWorkspaceRunTasksCreate(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -43,7 +43,7 @@ func TestWorkspaceRunTasksCreate(t *testing.T) {
}

func TestWorkspaceRunTasksList(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -77,7 +77,7 @@ func TestWorkspaceRunTasksList(t *testing.T) {
}

func TestWorkspaceRunTasksRead(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -112,7 +112,7 @@ func TestWorkspaceRunTasksRead(t *testing.T) {
}

func TestWorkspaceRunTasksUpdate(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestWorkspaceRunTasksUpdate(t *testing.T) {
}

func TestWorkspaceRunTasksDelete(t *testing.T) {
skipIfFreeOnly(t)
skipIfBeta(t)

client := testClient(t)
ctx := context.Background()
Expand Down

0 comments on commit 2635518

Please sign in to comment.