Add allowed_project_ids and excluded_workspace_ids to agent pool data source

Author: tylerwolf

internal/provider/data_source_agent_pool.go

@@ -37,6 +37,18 @@ func dataSourceTFEAgentPool() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+
+			"allowed_project_ids": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+
+			"excluded_workspace_ids": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }
@@ -59,11 +71,23 @@ func dataSourceTFEAgentPoolRead(d *schema.ResourceData, meta interface{}) error
 	d.SetId(pool.ID)
 	d.Set("organization_scoped", pool.OrganizationScoped)
 
+	var allowedProjectIDs []string
+	for _, allowedProjectID := range pool.AllowedProjects {
+		allowedProjectIDs = append(allowedProjectIDs, allowedProjectID.ID)
+	}
+	d.Set("allowed_project_ids", allowedProjectIDs)
+
 	var allowedWorkspaceIDs []string
 	for _, allowedWorkspaceID := range pool.AllowedWorkspaces {
 		allowedWorkspaceIDs = append(allowedWorkspaceIDs, allowedWorkspaceID.ID)
 	}
 	d.Set("allowed_workspace_ids", allowedWorkspaceIDs)
 
+	var excludedWorkspaceIDs []string
+	for _, excludedWorkspaceID := range pool.ExcludedWorkspaces {
+		excludedWorkspaceIDs = append(excludedWorkspaceIDs, excludedWorkspaceID.ID)
+	}
+	d.Set("excluded_workspace_ids", excludedWorkspaceIDs)
+
 	return nil
 }

internal/provider/data_source_agent_pool_test.go

@@ -89,6 +89,90 @@ func TestAccTFEAgentPoolDataSource_allowed_workspaces(t *testing.T) {
 	})
 }
 
+func TestAccTFEAgentPoolDataSource_allowed_projects(t *testing.T) {
+	skipIfEnterprise(t)
+
+	tfeClient, err := getClientUsingEnv()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	org, orgCleanup := createBusinessOrganization(t, tfeClient)
+	t.Cleanup(orgCleanup)
+
+	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
+
+	ws, err := tfeClient.Projects.Create(ctx, org.Name, tfe.ProjectCreateOptions{
+		Name: fmt.Sprintf("tst-proj-test-%d", rInt),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTFEAgentPoolDataSourceAllowedProjectsConfig(org.Name, rInt, ws.ID),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.tfe_agent_pool.foobar", "id"),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "name", fmt.Sprintf("agent-pool-test-%d", rInt)),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "organization", org.Name),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "organization_scoped", "false"),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "allowed_project_ids.0", ws.ID),
+				),
+			},
+		},
+	})
+}
+
+func TestAccTFEAgentPoolDataSource_excluded_workspaces(t *testing.T) {
+	skipIfEnterprise(t)
+
+	tfeClient, err := getClientUsingEnv()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	org, orgCleanup := createBusinessOrganization(t, tfeClient)
+	t.Cleanup(orgCleanup)
+
+	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
+
+	ws, err := tfeClient.Workspaces.Create(ctx, org.Name, tfe.WorkspaceCreateOptions{
+		Name: tfe.String(fmt.Sprintf("tst-workspace-test-%d", rInt)),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTFEAgentPoolDataSourceExcludedWorkspacesConfig(org.Name, rInt, ws.ID),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.tfe_agent_pool.foobar", "id"),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "name", fmt.Sprintf("agent-pool-test-%d", rInt)),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "organization", org.Name),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "organization_scoped", "false"),
+					resource.TestCheckResourceAttr(
+						"data.tfe_agent_pool.foobar", "excluded_workspace_ids.0", ws.ID),
+				),
+			},
+		},
+	})
+}
+
 func testAccTFEAgentPoolDataSourceConfig(organization string, rInt int) string {
 	return fmt.Sprintf(`
 resource "tfe_agent_pool" "foobar" {
@@ -121,3 +205,43 @@ data "tfe_agent_pool" "foobar" {
 	depends_on = [ tfe_agent_pool_allowed_workspaces.foobar ]
 }`, rInt, organization, workspaceID, organization)
 }
+
+func testAccTFEAgentPoolDataSourceAllowedProjectsConfig(organization string, rInt int, projectID string) string {
+	return fmt.Sprintf(`
+resource "tfe_agent_pool" "foobar" {
+  name                  = "agent-pool-test-%d"
+  organization          = "%s"
+  organization_scoped   = false
+}
+
+resource "tfe_agent_pool_allowed_projects" "foobar" {
+	agent_pool_id = tfe_agent_pool.foobar.id
+  allowed_project_ids = ["%s"]
+}
+
+data "tfe_agent_pool" "foobar" {
+  name         = tfe_agent_pool.foobar.name
+  organization = "%s"
+	depends_on = [ tfe_agent_pool_allowed_projects.foobar ]
+}`, rInt, organization, projectID, organization)
+}
+
+func testAccTFEAgentPoolDataSourceExcludedWorkspacesConfig(organization string, rInt int, workspaceID string) string {
+	return fmt.Sprintf(`
+resource "tfe_agent_pool" "foobar" {
+  name                  = "agent-pool-test-%d"
+  organization          = "%s"
+  organization_scoped   = false
+}
+
+resource "tfe_agent_pool_excluded_workspaces" "foobar" {
+	agent_pool_id = tfe_agent_pool.foobar.id
+  excluded_workspace_ids = ["%s"]
+}
+
+data "tfe_agent_pool" "foobar" {
+  name         = tfe_agent_pool.foobar.name
+  organization = "%s"
+	depends_on = [ tfe_agent_pool_excluded_workspaces.foobar ]
+}`, rInt, organization, workspaceID, organization)
+}