Skip to content

Commit 9668983

Browse files
Merge branch 'main' into tylerwolf/project-agent-pools
2 parents 4baa411 + 249013d commit 9668983

File tree

281 files changed

+6853
-6252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+6853
-6252
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
go-version: ${{ steps.get-go-version.outputs.go-version }}
3030
steps:
3131
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
32+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3333
with:
3434
go-version-file: 'go.mod'
3535
- name: Detect Go version

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
needs: [ tests ]
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
65+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
6666
with:
6767
node-version: 20
6868

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737
- name: Set up Go
38-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
38+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3939
with:
4040
go-version-file: go.mod
4141
cache: true
@@ -81,7 +81,7 @@ jobs:
8181
key: ${{ runner.os }}-integration-yarn-${{ hashFiles('**/yarn.lock') }}
8282

8383
- name: Setup Node.js
84-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
84+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
8585
with:
8686
node-version: "20.x"
8787

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100

101101
- name: Set up Go
102102
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
103+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
103104
with:
104105
go-version-file: go.mod
105106
check-latest: true

CHANGELOG.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
## Unreleased
22

3+
FEATURES:
4+
* `d/tfe_agent_pool`: Adds the `allowed_project_ids` and `excluded_workspace_ids` attributes, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
5+
* `r/tfe_agent_pool_allowed_projects`: Adds support for scoping agent pools to projects, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
6+
* `r/tfe_agent_pool_excluded_workspaces`: Adds support for excluding workspaces from the scope of agent pools, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
7+
* `r/tfe_project_settings`: Adds support for managing project settings. This initially supports setting a `default_execution_mode` and `default_agent_pool_id` which override the organization defaults. When not specified in the configuration, the organization defaults will be used and can be read from the resource. by @JarrettSpiker [#1822](Thttps://github.com/hashicorp/terraform-provider-tfe/pull/1822)
8+
9+
BUG FIXES:
10+
* `r/tfe_workspace_settings`: Prevent unintended clearing of workspace-level tags on the first apply when tags is unset by making tag updates sparse. By @shwetamurali [#1851](https://github.com/hashicorp/terraform-provider-tfe/pull/1851)
11+
12+
## v0.69.0
13+
14+
BREAKING CHANGES:
15+
16+
All resources have been upgraded to use the [latest Terraform plugin protocol](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol). This provider now requires a Terraform version of v1.0.0 or later.
17+
18+
ENHANCEMENTS:
19+
* `r/tfe_oauth_client`: The `oauth_token` attribute no longer triggers resource replacement unless combined with other replacement-triggering attributes. Use `terraform apply -replace` to force replacement. By @lilincmu [#1825](https://github.com/hashicorp/terraform-provider-tfe/pull/1825)
20+
321
FEATURES:
422

523
* `r/tfe_registry_module`: Add `source_directory` and `tag_prefix` registry module support for private registry monorepository, which is a beta feature and not available to all users, by @jillirami ([#1800](https://github.com/hashicorp/terraform-provider-tfe/pull/1800))
24+
* `r/tfe_stack` Adds support for managing agent pools on a Stack, by @maed223 [#1836](https://github.com/hashicorp/terraform-provider-tfe/pull/1836)
625
* `r/tfe_terraform_version`: Adds support for specifying architecture-specific binaries using the `archs` attribute, by @kelsi-hoyle [1762](https://github.com/hashicorp/terraform-provider-tfe/pull/1762)
726
* `r/tfe_opa_version`: Adds support for specifying architecture-specific binaries using the `archs` attribute, by @kelsi-hoyle [1762](https://github.com/hashicorp/terraform-provider-tfe/pull/1762)
827
* `r/tfe_sentinel_version`: Adds support for specifying architecture-specific binaries using the `archs` attribute, by @kelsi-hoyle [1762](https://github.com/hashicorp/terraform-provider-tfe/pull/1762)
@@ -13,19 +32,15 @@ DEPRECATIONS:
1332
* `r/tfe_opa_version`: The `url` and `sha` attributes are deprecated and will be removed in a future version. Use the `archs` attribute to specify architecture-specific binaries going forward, by @kelsi-hoyle [1762](https://github.com/hashicorp/terraform-provider-tfe/pull/1762)
1433
* `r/tfe_sentinel_version`: The `url` and `sha` attributes are deprecated and will be removed in a future version. Use the `archs` attribute to specify architecture-specific binaries going forward, by @kelsi-hoyle [1762](https://github.com/hashicorp/terraform-provider-tfe/pull/1762)
1534
* `r/tfe_oauth_client`: The `oauth_token` attribute no longer triggers resource replacement unless combined with other replacement-triggering attributes. Use `terraform apply -replace` to force replacement. By @lilincmu [#1825](https://github.com/hashicorp/terraform-provider-tfe/pull/1825)
16-
* `d/tfe_agent_pool`: Adds the `allowed_project_ids` and `excluded_workspace_ids` attributes, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
17-
* `r/tfe_agent_pool_allowed_projects`: Adds support for scoping agent pools to projects, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
18-
* `r/tfe_agent_pool_excluded_workspaces`: Adds support for excluding workspaces from the scope of agent pools, by @tylerworlf [#1822](https://github.com/hashicorp/terraform-provider-tfe/pull/1822)
19-
* `r/tfe_project_settings`: Adds support for managing project settings. This initially supports setting a `default_execution_mode` and `default_agent_pool_id` which override the organization defaults. When not specified in the configuration, the organization defaults will be used and can be read from the resource. by @JarrettSpiker [#1822](Thttps://github.com/hashicorp/terraform-provider-tfe/pull/1822)
2035
* `r/tfe_test_variable`: Add missing argument reference and attributes documentation ([#1625](https://github.com/hashicorp/terraform-provider-tfe/issues/1625))
2136

2237
## v0.68.3
2338
BUG FIXES:
2439

2540
* `r/tfe_notification_configuration`: update url attribute to be sensitive, by @jillirami [#1799](https://github.com/hashicorp/terraform-provider-tfe/pull/1799)
2641
* `d/tfe_project`: fixes: 'duplicate set element' error, as workspaces can appear multiple times in get /workspaces, by @lewis-catley [#1817](https://github.com/hashicorp/terraform-provider-tfe/pull/1817)
27-
* `r/tfe_workspace`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
28-
* `r/tfe_workspace_run`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
42+
* `r/tfe_workspace`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
43+
* `r/tfe_workspace_run`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
2944

3045
## v0.68.2
3146

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Declare the provider in your configuration and `terraform init` will automatical
2828
terraform {
2929
required_providers {
3030
tfe = {
31-
version = "~> 0.68.3"
31+
version = "~> 0.69.0"
3232
}
3333
}
3434
}
@@ -44,13 +44,15 @@ The above snippet using `required_providers` is for Terraform 0.13+; if you are
4444

4545
```hcl
4646
provider "tfe" {
47-
version = "~> 0.68.0"
47+
version = "~> 0.69.0"
4848
...
4949
}
5050
```
5151

5252
Since v0.24.0, this provider requires [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 0.12
5353

54+
Since v0.69.0, this provider requires [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 1.0
55+
5456
For more information on provider installation and constraining provider versions, see the [Provider Requirements documentation](https://developer.hashicorp.com/terraform/language/providers/requirements).
5557

5658
## Usage

go.mod

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-tfe
22

33
go 1.24.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.4
66

77
require (
88
github.com/agext/levenshtein v1.2.3 // indirect
@@ -14,40 +14,40 @@ require (
1414
github.com/hashicorp/go-multierror v1.1.1 // indirect
1515
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
1616
github.com/hashicorp/go-slug v0.16.7
17-
github.com/hashicorp/go-tfe v1.92.0
17+
github.com/hashicorp/go-tfe v1.93.0
1818
github.com/hashicorp/go-version v1.7.0
1919
github.com/hashicorp/hcl v1.0.0
20-
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
20+
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
2121
github.com/hashicorp/terraform-plugin-framework v1.15.1
2222
github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
23-
github.com/hashicorp/terraform-plugin-go v0.28.0
23+
github.com/hashicorp/terraform-plugin-go v0.29.0
2424
github.com/hashicorp/terraform-plugin-mux v0.20.0
25-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
25+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
2626
github.com/hashicorp/terraform-svchost v0.1.1
2727
github.com/mattn/go-isatty v0.0.20 // indirect
2828
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
29-
github.com/zclconf/go-cty v1.16.3 // indirect
30-
golang.org/x/crypto v0.41.0 // indirect
29+
github.com/zclconf/go-cty v1.17.0 // indirect
30+
golang.org/x/crypto v0.42.0 // indirect
3131
golang.org/x/net v0.43.0 // indirect
32-
golang.org/x/oauth2 v0.29.0 // indirect
33-
golang.org/x/sys v0.35.0 // indirect
34-
golang.org/x/text v0.28.0 // indirect
32+
golang.org/x/oauth2 v0.30.0 // indirect
33+
golang.org/x/sys v0.36.0 // indirect
34+
golang.org/x/text v0.29.0 // indirect
3535
golang.org/x/time v0.12.0 // indirect
36-
google.golang.org/protobuf v1.36.6 // indirect
36+
google.golang.org/protobuf v1.36.9 // indirect
3737
)
3838

3939
require (
40-
github.com/davecgh/go-spew v1.1.1 // indirect
40+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4141
github.com/google/go-cmp v0.7.0 // indirect
4242
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
4343
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4444
github.com/hashicorp/go-cty v1.5.0 // indirect
45-
github.com/hashicorp/go-plugin v1.6.3 // indirect
45+
github.com/hashicorp/go-plugin v1.7.0 // indirect
4646
github.com/hashicorp/go-uuid v1.0.3
4747
github.com/hashicorp/jsonapi v1.5.0
4848
github.com/hashicorp/logutils v1.0.0 // indirect
49-
github.com/hashicorp/terraform-exec v0.23.0 // indirect
50-
github.com/hashicorp/terraform-json v0.25.0 // indirect
49+
github.com/hashicorp/terraform-exec v0.23.1 // indirect
50+
github.com/hashicorp/terraform-json v0.27.1 // indirect
5151
github.com/hashicorp/yamux v0.1.2 // indirect
5252
github.com/mattn/go-colorable v0.1.14 // indirect
5353
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/oklog/run v1.1.0 // indirect
5858
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
5959
google.golang.org/appengine v1.6.8 // indirect
60-
google.golang.org/grpc v1.72.1 // indirect
60+
google.golang.org/grpc v1.75.1 // indirect
6161
)
6262

6363
require (
@@ -74,15 +74,14 @@ require (
7474
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
7575
github.com/cloudflare/circl v1.6.1 // indirect
7676
github.com/hashicorp/hc-install v0.9.2 // indirect
77-
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
77+
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
7878
github.com/kr/text v0.2.0 // indirect
79-
github.com/pmezard/go-difflib v1.0.0 // indirect
79+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8080
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
8181
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
8282
golang.org/x/mod v0.27.0 // indirect
8383
golang.org/x/sync v0.17.0 // indirect
8484
golang.org/x/tools v0.36.0 // indirect
85-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
86-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
85+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
8786
gopkg.in/yaml.v3 v3.0.1 // indirect
8887
)

0 commit comments

Comments
 (0)