Merge pull request #1214 from hashicorp/TF-25152/stack-agent-pool-support

Stack agent pool support

Author: Maed223

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+## Enhancements
+
+* Adds support for managing agent pools on `Stacks` by @maed223 [#1214](https://github.com/hashicorp/go-tfe/pull/1214)
+
 ## Bug Fixes
 
 * Fixes arch validation on Terraform, OPA, and Sentinel Tool Versions when providing top level `url` and `sha` with multiple `archs` by @kelsi-hoyle [#1212](https://github.com/hashicorp/go-tfe/pull/1212)

stack.go

@@ -97,6 +97,7 @@ type Stack struct {
 	UpdatedAt          time.Time     `jsonapi:"attr,updated-at,iso8601"`
 
 	// Relationships
+	AgentPool                *AgentPool          `jsonapi:"relation,agent-pool"`
 	Project                  *Project            `jsonapi:"relation,project"`
 	LatestStackConfiguration *StackConfiguration `jsonapi:"relation,latest-stack-configuration"`
 }
@@ -189,13 +190,15 @@ type StackCreateOptions struct {
 	Description *string              `jsonapi:"attr,description,omitempty"`
 	VCSRepo     *StackVCSRepoOptions `jsonapi:"attr,vcs-repo"`
 	Project     *Project             `jsonapi:"relation,project"`
+	AgentPool   *AgentPool           `jsonapi:"relation,agent-pool"`
 }
 
 // StackUpdateOptions represents the options for updating a stack.
 type StackUpdateOptions struct {
 	Name        *string              `jsonapi:"attr,name,omitempty"`
 	Description *string              `jsonapi:"attr,description,omitempty"`
 	VCSRepo     *StackVCSRepoOptions `jsonapi:"attr,vcs-repo"`
+	AgentPool   *AgentPool           `jsonapi:"relation,agent-pool"`
 }
 
 // WaitForStatusResult is the data structure that is sent over the channel

stack_integration_test.go

@@ -141,6 +141,11 @@ func TestStackReadUpdateDelete(t *testing.T) {
 	oauthClient, cleanup := createOAuthClient(t, client, orgTest, nil)
 	t.Cleanup(cleanup)
 
+	initialPool, err := client.AgentPools.Create(ctx, orgTest.Name, AgentPoolCreateOptions{
+		Name: String("initial-test-pool"),
+	})
+	require.NoError(t, err)
+
 	stack, err := client.Stacks.Create(ctx, StackCreateOptions{
 		Name: "test-stack",
 		VCSRepo: &StackVCSRepoOptions{
@@ -151,6 +156,7 @@ func TestStackReadUpdateDelete(t *testing.T) {
 		Project: &Project{
 			ID: orgTest.DefaultProject.ID,
 		},
+		AgentPool: initialPool,
 	})
 
 	require.NoError(t, err)
@@ -164,20 +170,27 @@ func TestStackReadUpdateDelete(t *testing.T) {
 	require.Equal(t, stack.VCSRepo.Identifier, stackRead.VCSRepo.Identifier)
 	require.Equal(t, stack.VCSRepo.OAuthTokenID, stackRead.VCSRepo.OAuthTokenID)
 	require.Equal(t, stack.VCSRepo.Branch, stackRead.VCSRepo.Branch)
-
+	require.Equal(t, stack.AgentPool.ID, stackRead.AgentPool.ID)
 	assert.Equal(t, stack, stackRead)
 
+	updatedPool, err := client.AgentPools.Create(ctx, orgTest.Name, AgentPoolCreateOptions{
+		Name: String("updated-test-pool"),
+	})
+	require.NoError(t, err)
+
 	stackUpdated, err := client.Stacks.Update(ctx, stack.ID, StackUpdateOptions{
 		Description: String("updated description"),
 		VCSRepo: &StackVCSRepoOptions{
 			Identifier:   "brandonc/pet-nulls-stack",
 			OAuthTokenID: oauthClient.OAuthTokens[0].ID,
 			Branch:       "main",
 		},
+		AgentPool: updatedPool,
 	})
 
 	require.NoError(t, err)
 	require.Equal(t, "updated description", stackUpdated.Description)
+	require.Equal(t, updatedPool.ID, stackUpdated.AgentPool.ID)
 
 	stackUpdatedConfig, err := client.Stacks.UpdateConfiguration(ctx, stack.ID)
 	require.NoError(t, err)