V0.23.0 release

CHANGELOG.md

@@ -2,9 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## [v0.23.0](https://github.com/buildkite/terraform-provider-buildkite/compare/v0.22.0...v0.23.0)
 
-- SUP-1305: Test Suite Team Resource addition[[PR #346](https://github.com/buildkite/terraform-provider-buildkite/pull/346)] @james2791
+### Added
+
+- SUP-1305: Test Suite Team Resource addition [[PR #346](https://github.com/buildkite/terraform-provider-buildkite/pull/346)] @james2791
+- SUP-1301: Deletion protection deprecation warning [[PR #342](https://github.com/buildkite/terraform-provider-buildkite/pull/342)] @mcncl
+
+### Fixed
+
+- Fixed a bug in `buildkite_test_suite` resources where `team_owner_id` could be set to the `access_level` instead @james2791 @jradtilbrook
 
 ## [v0.22.0](https://github.com/buildkite/terraform-provider-buildkite/compare/v0.21.2...v0.22.0)
 

README.md

@@ -29,7 +29,7 @@ terraform {
   required_providers {
     buildkite = {
       source = "buildkite/buildkite"
-      version = "0.22.0"
+      version = "0.23.0"
     }
   }
 }

buildkite/resource_test_suite.go

@@ -132,15 +132,23 @@ func (ts *testSuiteResource) Read(ctx context.Context, req resource.ReadRequest,
 	teamToFind := state.TeamOwnerId.ValueString()
 	// Find either the team ID from the state (if set) or the first team linked with MANAGE_AND_READ
 	if suite, ok := graphqlResponse.Suite.(*getTestSuiteSuite); ok {
+		var found *getTestSuiteSuiteTeamsTeamSuiteConnectionEdgesTeamSuiteEdge
 		for _, teamSuite := range suite.Teams.Edges {
 			if teamSuite.Node.Team.Id == teamToFind {
+				found = &teamSuite
 				break
 			}
-			if teamSuite.Node.AccessLevel == SuiteAccessLevelsManageAndRead {
-				state.TeamOwnerId = types.StringValue(string(teamSuite.Node.Team.Id))
-				break
+			if teamSuite.Node.AccessLevel == SuiteAccessLevelsManageAndRead && found == nil {
+				found = &teamSuite
 			}
 		}
+		if found != nil {
+			state.TeamOwnerId = types.StringValue(string(found.Node.Team.Id))
+		} else {
+			// team from state doesnt exist
+			// and we didnt find another team with MANAGE_AND_READ
+			state.TeamOwnerId = types.StringUnknown()
+		}
 	}
 
 	if state.TeamOwnerId.IsUnknown() {
@@ -216,15 +224,16 @@ func (ts *testSuiteResource) Update(ctx context.Context, req resource.UpdateRequ
 	state.Slug = types.StringValue(response.Slug)
 
 	// If the planned team_owner_id differs from the state, add the new one and remove the old one
-	if !plan.TeamOwnerId.Equal(state.TeamOwnerId) {
+	if plan.TeamOwnerId.ValueString() != state.TeamOwnerId.ValueString() {
 		graphqlResponse, err := createTestSuiteTeam(ts.client.genqlient, plan.TeamOwnerId.ValueString(), state.ID.ValueString(), SuiteAccessLevelsManageAndRead)
 		if err != nil {
 			resp.Diagnostics.AddError("Could not add new owner team", err.Error())
 			return
 		}
+		previousOwnerId := state.TeamOwnerId.ValueString()
 		state.TeamOwnerId = types.StringValue(graphqlResponse.TeamSuiteCreate.TeamSuite.Team.Id)
 		for _, team := range graphqlResponse.TeamSuiteCreate.Suite.Teams.Edges {
-			if team.Node.Team.Id == state.TeamOwnerId.ValueString() {
+			if team.Node.Team.Id == previousOwnerId {
 				_, err = deleteTestSuiteTeam(ts.client.genqlient, team.Node.Id)
 				if err != nil {
 					resp.Diagnostics.AddError("Failed to delete team owner", err.Error())

buildkite/resource_test_suite_test.go

@@ -112,6 +112,88 @@ func TestAcc_testSuiteUpdate(t *testing.T) {
 	})
 }
 
+func TestAcc_testSuiteTeamOwnerResolution(t *testing.T) {
+	t.Parallel()
+	var suite getTestSuiteSuite
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: protoV6ProviderFactories(),
+		CheckDestroy:             testTestSuiteDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: `
+				resource "buildkite_team" "ateam" {
+					name = "a team"
+					default_team = false
+					privacy = "VISIBLE"
+					default_member_role = "MAINTAINER"
+				}
+				resource "buildkite_team" "bteam" {
+					name = "b team"
+					default_team = false
+					privacy = "VISIBLE"
+					default_member_role = "MAINTAINER"
+				}
+				resource "buildkite_test_suite" "suite" {
+					name = "test suite update"
+					default_branch = "main"
+					team_owner_id = resource.buildkite_team.bteam.id
+				}
+				`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "id"),
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "api_token"),
+					resource.TestCheckResourceAttr("buildkite_test_suite.suite", "default_branch", "main"),
+					resource.TestCheckResourceAttr("buildkite_test_suite.suite", "name", "test suite update"),
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "team_owner_id"),
+					resource.TestCheckResourceAttrPair("buildkite_test_suite.suite", "team_owner_id", "buildkite_team.bteam", "id"),
+					checkTestSuiteExists("buildkite_test_suite.suite", &suite),
+					checkTestSuiteRemoteValue(&suite, "Name", "test suite update"),
+					checkTestSuiteRemoteValue(&suite, "DefaultBranch", "main"),
+				),
+			},
+			{
+				Config: `
+				resource "buildkite_team" "ateam" {
+					name = "a team"
+					default_team = false
+					privacy = "VISIBLE"
+					default_member_role = "MAINTAINER"
+				}
+				resource "buildkite_team" "bteam" {
+					name = "b team"
+					default_team = false
+					privacy = "VISIBLE"
+					default_member_role = "MAINTAINER"
+				}
+				resource "buildkite_test_suite" "suite" {
+					name = "test suite update"
+					default_branch = "main"
+					team_owner_id = resource.buildkite_team.bteam.id
+				}
+				resource "buildkite_test_suite_team" "team-a" {
+					test_suite_id = buildkite_test_suite.suite.id
+					team_id = buildkite_team.ateam.id
+					access_level = "MANAGE_AND_READ"
+				}
+				`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "id"),
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "api_token"),
+					resource.TestCheckResourceAttr("buildkite_test_suite.suite", "default_branch", "main"),
+					resource.TestCheckResourceAttr("buildkite_test_suite.suite", "name", "test suite update"),
+					resource.TestCheckResourceAttrSet("buildkite_test_suite.suite", "team_owner_id"),
+					resource.TestCheckResourceAttrPair("buildkite_test_suite.suite", "team_owner_id", "buildkite_team.bteam", "id"),
+					checkTestSuiteExists("buildkite_test_suite.suite", &suite),
+					checkTestSuiteRemoteValue(&suite, "Name", "test suite update"),
+					checkTestSuiteRemoteValue(&suite, "DefaultBranch", "main"),
+				),
+			},
+		},
+	})
+}
+
 func checkTestSuiteRemoteValue(suite *getTestSuiteSuite, property, value string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if obj := reflect.ValueOf(*suite).FieldByName(property).String(); obj != value {

docs/index.md

@@ -16,7 +16,7 @@ terraform {
   required_providers {
     buildkite = {
       source  = "buildkite/buildkite"
-      version = "0.22.0"
+      version = "0.23.0"
     }
   }
 }