Merge branch 'main' into WAYP-3564-read-module-url

Author: paladin-devops

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* Add support for HCP Terraform `/api/v2/workspaces/{external_id}/all-vars` API endpoint to fetch the list of all variables available to a workspace (include inherited variables from varsets) by @debrin-hc [#1105](https://github.com/hashicorp/go-tfe/pull/1105)
+
+* Adds BETA support for listing `StackDeploymentGroups`, which is EXPERIMENTAL, SUBJECT TO CHANGE, and may not be available to all users by @hwatkins05-hashicorp [#1128](https://github.com/hashicorp/go-tfe/pull/1128)
 
 # v1.82.0
 

helper_test.go

@@ -2209,19 +2209,48 @@ func createTeamTokenWithOptions(t *testing.T, client *Client, tm *Team, options
 }
 
 func createVariable(t *testing.T, client *Client, w *Workspace) (*Variable, func()) {
+	options := VariableCreateOptions{
+		Key:         String(randomString(t)),
+		Value:       String(randomString(t)),
+		Category:    Category(CategoryTerraform),
+		Description: String(randomString(t)),
+	}
+	return createVariableWithOptions(t, client, w, options)
+}
+
+func createVariableWithOptions(t *testing.T, client *Client, w *Workspace, options VariableCreateOptions) (*Variable, func()) {
 	var wCleanup func()
 
 	if w == nil {
 		w, wCleanup = createWorkspace(t, client, nil)
 	}
 
+	if options.Key == nil {
+		options.Key = String(randomString(t))
+	}
+
+	if options.Value == nil {
+		options.Value = String(randomString(t))
+	}
+
+	if options.Description == nil {
+		options.Description = String(randomString(t))
+	}
+
+	if options.Category == nil {
+		options.Category = Category(CategoryTerraform)
+	}
+
+	if options.HCL == nil {
+		options.HCL = Bool(false)
+	}
+
+	if options.Sensitive == nil {
+		options.Sensitive = Bool(false)
+	}
+
 	ctx := context.Background()
-	v, err := client.Variables.Create(ctx, w.ID, VariableCreateOptions{
-		Key:         String(randomString(t)),
-		Value:       String(randomString(t)),
-		Category:    Category(CategoryTerraform),
-		Description: String(randomString(t)),
-	})
+	v, err := client.Variables.Create(ctx, w.ID, options)
 	if err != nil {
 		t.Fatal(err)
 	}

mocks/variable_mocks.go

@@ -0,0 +1,77 @@
+package tfe
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+)
+
+// StackDeploymentGroups describes all the stack-deployment-groups related methods that the HCP Terraform API supports.
+type StackDeploymentGroups interface {
+	// List returns a list of Deployment Groups in a stack.
+	List(ctx context.Context, stackConfigID string, options *StackDeploymentGroupListOptions) (*StackDeploymentGroupList, error)
+}
+
+type DeploymentGroupStatus string
+
+const (
+	DeploymentGroupStatusPending   DeploymentGroupStatus = "pending"
+	DeploymentGroupStatusDeploying DeploymentGroupStatus = "deploying"
+	DeploymentGroupStatusSucceeded DeploymentGroupStatus = "succeeded"
+	DeploymentGroupStatusFailed    DeploymentGroupStatus = "failed"
+	DeploymentGroupStatusAbandoned DeploymentGroupStatus = "abandoned"
+)
+
+// stackDeploymentGroups implements StackDeploymentGroups.
+type stackDeploymentGroups struct {
+	client *Client
+}
+
+var _ StackDeploymentGroups = &stackDeploymentGroups{}
+
+// StackDeploymentGroup represents a stack deployment group.
+type StackDeploymentGroup struct {
+	ID        string                `jsonapi:"primary,stacks-deployment-groups"`
+	Name      string                `jsonapi:"attr,name"`
+	Status    DeploymentGroupStatus `jsonapi:"attr,status"`
+	CreatedAt string                `jsonapi:"attr,created-at"`
+	UpdatedAt string                `jsonapi:"attr,updated-at"`
+
+	// Relationships
+	StackConfiguration StackConfiguration `jsonapi:"relation,stack-configurations"`
+}
+
+// StackDeploymentGroupList represents a list of stack deployment groups.
+type StackDeploymentGroupList struct {
+	*Pagination
+	Items []*StackDeploymentGroup
+}
+
+// StackDeploymentGroupListOptions represents additional options when listing stack deployment groups.
+type StackDeploymentGroupListOptions struct {
+	ListOptions
+}
+
+// List returns a list of Deployment Groups in a stack, optionally filtered by additional parameters.
+func (s stackDeploymentGroups) List(ctx context.Context, stackConfigID string, options *StackDeploymentGroupListOptions) (*StackDeploymentGroupList, error) {
+	if !validStringID(&stackConfigID) {
+		return nil, fmt.Errorf("invalid stack configuration ID: %s", stackConfigID)
+	}
+
+	if options == nil {
+		options = &StackDeploymentGroupListOptions{}
+	}
+
+	req, err := s.client.NewRequest("GET", fmt.Sprintf("stack-configurations/%s/stack-deployment-groups", url.PathEscape(stackConfigID)), options)
+	if err != nil {
+		return nil, err
+	}
+
+	sdgl := &StackDeploymentGroupList{}
+	err = req.Do(ctx, sdgl)
+	if err != nil {
+		return nil, err
+	}
+
+	return sdgl, nil
+}

stack_deployment_groups.go

@@ -0,0 +1,75 @@
+package tfe
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStackDeploymentGroupsList(t *testing.T) {
+	skipUnlessBeta(t)
+	client := testClient(t)
+	ctx := context.Background()
+
+	orgTest, orgTestCleanup := createOrganization(t, client)
+	t.Cleanup(orgTestCleanup)
+
+	oauthClient, cleanup := createOAuthClient(t, client, orgTest, nil)
+	t.Cleanup(cleanup)
+
+	stack, err := client.Stacks.Create(ctx, StackCreateOptions{
+		Name: "test-stack",
+		VCSRepo: &StackVCSRepoOptions{
+			Identifier:   "hashicorp-guides/pet-nulls-stack",
+			OAuthTokenID: oauthClient.OAuthTokens[0].ID,
+		},
+		Project: &Project{
+			ID: orgTest.DefaultProject.ID,
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, stack)
+
+	stackUpdated, err := client.Stacks.UpdateConfiguration(ctx, stack.ID)
+	require.NoError(t, err)
+	require.NotNil(t, stackUpdated)
+	require.NotEmpty(t, stackUpdated.LatestStackConfiguration.ID)
+
+	stackUpdated = pollStackDeployments(t, ctx, client, stackUpdated.ID)
+	require.NotNil(t, stackUpdated.LatestStackConfiguration)
+
+	t.Run("List with valid stack configuration ID", func(t *testing.T) {
+		sdgl, err := client.StackDeploymentGroups.List(ctx, stackUpdated.LatestStackConfiguration.ID, nil)
+		require.NoError(t, err)
+		require.NotNil(t, sdgl)
+		for _, item := range sdgl.Items {
+			assert.NotNil(t, item.ID)
+			assert.NotEmpty(t, item.Name)
+			assert.NotEmpty(t, item.Status)
+			assert.NotNil(t, item.CreatedAt)
+			assert.NotNil(t, item.UpdatedAt)
+		}
+		require.Len(t, sdgl.Items, 2)
+	})
+
+	t.Run("List with invalid stack configuration ID", func(t *testing.T) {
+		_, err := client.StackDeploymentGroups.List(ctx, "", nil)
+		require.Error(t, err)
+	})
+
+	t.Run("List with pagination", func(t *testing.T) {
+		options := &StackDeploymentGroupListOptions{
+			ListOptions: ListOptions{
+				PageNumber: 1,
+				PageSize:   1,
+			},
+		}
+		sdgl, err := client.StackDeploymentGroups.List(ctx, stackUpdated.LatestStackConfiguration.ID, options)
+		require.NoError(t, err)
+		require.NotNil(t, sdgl)
+		require.Len(t, sdgl.Items, 1)
+	})
+}

stack_deployment_groups_integration_test.go

@@ -164,6 +164,7 @@ type Client struct {
 	Stacks                     Stacks
 	StackConfigurations        StackConfigurations
 	StackDeployments           StackDeployments
+	StackDeploymentGroups      StackDeploymentGroups
 	StackPlans                 StackPlans
 	StackPlanOperations        StackPlanOperations
 	StackSources               StackSources
@@ -492,6 +493,7 @@ func NewClient(cfg *Config) (*Client, error) {
 	client.Stacks = &stacks{client: client}
 	client.StackConfigurations = &stackConfigurations{client: client}
 	client.StackDeployments = &stackDeployments{client: client}
+	client.StackDeploymentGroups = &stackDeploymentGroups{client: client}
 	client.StackPlans = &stackPlans{client: client}
 	client.StackPlanOperations = &stackPlanOperations{client: client}
 	client.StackSources = &stackSources{client: client}

tfe.go

@@ -17,9 +17,12 @@ var _ Variables = (*variables)(nil)
 //
 // TFE API docs: https://developer.hashicorp.com/terraform/cloud-docs/api-docs/workspace-variables
 type Variables interface {
-	// List all the variables associated with the given workspace.
+	// List all the variables associated with the given workspace (doesn't include variables inherited from varsets).
 	List(ctx context.Context, workspaceID string, options *VariableListOptions) (*VariableList, error)
 
+	// ListAll all the variables associated with the given workspace including variables inherited from varsets.
+	ListAll(ctx context.Context, workspaceID string, options *VariableListOptions) (*VariableList, error)
+
 	// Create is used to create a new variable.
 	Create(ctx context.Context, workspaceID string, options VariableCreateOptions) (*Variable, error)
 
@@ -128,13 +131,22 @@ type VariableUpdateOptions struct {
 	Sensitive *bool `jsonapi:"attr,sensitive,omitempty"`
 }
 
-// List all the variables associated with the given workspace.
+// List all the variables associated with the given workspace (doesn't include variables inherited from varsets).
 func (s *variables) List(ctx context.Context, workspaceID string, options *VariableListOptions) (*VariableList, error) {
+	return s.getList(ctx, workspaceID, options, "workspaces/%s/vars")
+}
+
+// ListAll the variables associated with the given workspace including variables inherited from varsets.
+func (s *variables) ListAll(ctx context.Context, workspaceID string, options *VariableListOptions) (*VariableList, error) {
+	return s.getList(ctx, workspaceID, options, "workspaces/%s/all-vars")
+}
+
+func (s *variables) getList(ctx context.Context, workspaceID string, options *VariableListOptions, path string) (*VariableList, error) {
 	if !validStringID(&workspaceID) {
 		return nil, ErrInvalidWorkspaceID
 	}
 
-	u := fmt.Sprintf("workspaces/%s/vars", url.PathEscape(workspaceID))
+	u := fmt.Sprintf(path, url.PathEscape(workspaceID))
 	req, err := s.client.NewRequest("GET", u, options)
 	if err != nil {
 		return nil, err