Merge branch 'main' into registry-get-module

Author: paladin-devops

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Enhancements
 
 * Add support for proxied Terraform Registry endpoints for reading detailed module information by @paladin-devops [#1057](https://github.com/hashicorp/go-tfe/pull/1057) 
+* Adds `DefaultProject` to `OrganizationUpdateOptions` to support updating an organization's default project. This provides BETA support, which is EXPERIMENTAL, SUBJECT TO CHANGE, and may not be available to all users, by @mkam [#1056](https://github.com/hashicorp/go-tfe/pull/1056)
 
 ## Bug fixes
 

organization.go

@@ -311,6 +311,10 @@ type OrganizationUpdateOptions struct {
 	// Optional: StacksEnabled toggles whether stacks are enabled for the organization. This setting
 	// is considered BETA, SUBJECT TO CHANGE, and likely unavailable to most users.
 	StacksEnabled *bool `jsonapi:"attr,stacks-enabled,omitempty"`
+
+	// Optional: DefaultProject is the default project that workspaces are created in when no project is specified.
+	// This setting is considered BETA, SUBJECT TO CHANGE, and likely unavailable to most users.
+	DefaultProject *Project `jsonapi:"relation,default-project,omitempty"`
 }
 
 // ReadRunQueueOptions represents the options for showing the queue.

organization_integration_test.go

@@ -388,6 +388,27 @@ func TestOrganizationsUpdate(t *testing.T) {
 
 		t.Cleanup(orgAgentTestCleanup)
 	})
+
+	t.Run("with different default project", func(t *testing.T) {
+		skipUnlessBeta(t)
+
+		// Create an organization and a second project in the organization
+		org, orgCleanup := createOrganization(t, client)
+		t.Cleanup(orgCleanup)
+
+		proj, _ := createProject(t, client, org) // skip cleanup because default project cannot be deleted
+
+		// Update the default project and verify the change
+		updated, err := client.Organizations.Update(ctx, org.Name, OrganizationUpdateOptions{
+			DefaultProject: proj,
+		})
+		require.NoError(t, err)
+		require.Equal(t, proj.ID, updated.DefaultProject.ID)
+
+		fetched, err := client.Organizations.Read(ctx, org.Name)
+		require.NoError(t, err)
+		require.Equal(t, proj.ID, fetched.DefaultProject.ID)
+	})
 }
 
 func TestOrganizationsDelete(t *testing.T) {