Merge branch 'main' into add_tfe_organization_teams_data_source

Author: isaacmcollins

.github/workflows/create-release-pr.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - name: Set up Go
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version-file: go.mod
           cache: true

.github/workflows/nightly-tfe-test.yml

@@ -99,7 +99,7 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Set up Go
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version-file: go.mod
           check-latest: true

CHANGELOG.md

@@ -1,7 +1,8 @@
 ## Unreleased
 
-* **New Data Source**: `d/tfe_teams` is a new data source to return names and IDs of Teams in an Organization, by @isaacmcollins [992] https://github.com/hashicorp/terraform-provider-tfe/pull/992
-
+FEATURES:
+* `d/tfe_variable_set`: Add `project_ids` attribute, by @Netra2104 [994](https://github.com/hashicorp/terraform-provider-tfe/pull/994)
+* **New Data Source**: `d/tfe_teams` is a new data source to return names and IDs of Teams in an Organization, by @isaacmcollins [992](https://github.com/hashicorp/terraform-provider-tfe/pull/992)
 ## v0.48.0 (August 7, 2023)
 
 BUG FIXES:

tfe/data_source_variable_set.go

@@ -48,6 +48,13 @@ func dataSourceTFEVariableSet() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+
+			"project_ids": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }
@@ -104,6 +111,12 @@ func dataSourceTFEVariableSetRead(d *schema.ResourceData, meta interface{}) erro
 				}
 				d.Set("variable_ids", variables)
 
+				var projects []interface{}
+				for _, project := range vs.Projects {
+					projects = append(projects, project.ID)
+				}
+				d.Set("project_ids", projects)
+
 				d.SetId(vs.ID)
 				return nil
 			}

tfe/data_source_variable_set_test.go

@@ -56,6 +56,8 @@ func TestAccTFEVariableSetsDataSource_full(t *testing.T) {
 						"data.tfe_variable_set.foobar", "workspace_ids.#", "1"),
 					resource.TestCheckResourceAttr(
 						"data.tfe_variable_set.foobar", "variable_ids.#", "1"),
+					resource.TestCheckResourceAttr(
+						"data.tfe_variable_set.foobar", "project_ids.#", "1"),
 				),
 			},
 		},
@@ -94,13 +96,23 @@ resource "tfe_workspace" "foobar" {
   organization = tfe_organization.foobar.id
 }
 
+resource "tfe_project" "foobar" {
+  name         = "project-foo-%d"
+  organization = tfe_organization.foobar.id
+}
+
 resource "tfe_variable_set" "foobar" {
   name = "varset-foo-%d"
 	description = "a description"
 	organization = tfe_organization.foobar.id
 	workspace_ids = [tfe_workspace.foobar.id]
 }
 
+resource "tfe_project_variable_set" "foobar" {
+	variable_set_id = tfe_variable_set.foobar.id
+	project_id = tfe_project.foobar.id
+}
+
 resource "tfe_variable" "envfoo" {
 	key          = "vfoo"
 	value        = "bar"
@@ -112,5 +124,5 @@ data "tfe_variable_set" "foobar" {
   name = tfe_variable_set.foobar.name
 	organization = tfe_variable_set.foobar.organization
 	depends_on = [tfe_variable.envfoo]
-}`, rInt, rInt, rInt)
+}`, rInt, rInt, rInt, rInt)
 }

website/docs/d/variable_set.html.markdown

@@ -36,3 +36,4 @@ The following arguments are supported:
 * `global` - Whether or not the variable set applies to all workspaces in the organization.
 * `workspace_ids` - IDs of the workspaces that use the variable set.
 * `variable_ids` - IDs of the variables attached to the variable set.
+* `project_ids` - IDs of the projects that use the variable set.