Skip to content

Commit a525dbf

Browse files
committed
Merge branch 'helenjw/TF-28672/oidc-configurations' into helenjw/TF-28671/hyok-configurations
# Conflicts: # CHANGELOG.md # internal/provider/provider_next.go # internal/provider/resource_tfe_aws_oidc_configuration.go # internal/provider/resource_tfe_aws_oidc_configuration_test.go # internal/provider/resource_tfe_azure_oidc_configuration.go # internal/provider/resource_tfe_azure_oidc_configuration_test.go # internal/provider/resource_tfe_gcp_oidc_configuration.go # internal/provider/resource_tfe_gcp_oidc_configuration_test.go # internal/provider/resource_tfe_vault_oidc_configuration.go # internal/provider/resource_tfe_vault_oidc_configuration_test.go
2 parents 99097c7 + 944abc1 commit a525dbf

File tree

394 files changed

+9086
-7015
lines changed

Some content is hidden

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

394 files changed

+9086
-7015
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: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,41 @@ FEATURES:
33
* **New resource**: `r/tfe_vault_oidc_configuration` for managing Vault OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
44
* **New resource**: `r/tfe_aws_oidc_configuration` for managing AWS OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
55
* **New resource**: `r/tfe_gcp_oidc_configuration` for managing GCP OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
6-
* **New resource**: `r/tfe_azure_oidc_configuration` for managing Azure OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
7-
* **New resource**: `r/tfe_hyok_configuration` for managing HYOK configurations, by @helenjw. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1841)
6+
* **New resource**: `r/tfe_azure_oidc_configuration` for managing Azure OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
7+
* **New resource**: `r/tfe_hyok_configuration` for managing HYOK configurations, by @helenjw. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1841)
88

9-
## v0.68.3
9+
## v0.69.0
10+
11+
BREAKING CHANGES:
12+
13+
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.
14+
15+
ENHANCEMENTS:
16+
* `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)
17+
18+
FEATURES:
19+
20+
* `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))
21+
* `r/tfe_stack` Adds support for managing agent pools on a Stack, by @maed223 [#1836](https://github.com/hashicorp/terraform-provider-tfe/pull/1836)
22+
* `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)
23+
* `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)
24+
* `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)
25+
26+
DEPRECATIONS:
27+
28+
* `r/tfe_terraform_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)
29+
* `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)
30+
* `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)
31+
* `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)
32+
* `r/tfe_test_variable`: Add missing argument reference and attributes documentation ([#1625](https://github.com/hashicorp/terraform-provider-tfe/issues/1625))
1033

1134
BUG FIXES:
35+
1236
* `r/tfe_notification_configuration`: update url attribute to be sensitive, by @jillirami [#1799](https://github.com/hashicorp/terraform-provider-tfe/pull/1799)
13-
* `r/tfe_workspace`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
14-
* `r/tfe_workspace_run`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
37+
* `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)
38+
* `r/tfe_workspace`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
39+
* `r/tfe_workspace_run`: fixed documentation Example Usages to use the `tfe_organization.test-organization.name` as organization name
1540

16-
1741
## v0.68.2
1842

1943
BUG FIXES:

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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/hashicorp/terraform-provider-tfe
22

3-
go 1.24
3+
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
@@ -12,9 +12,9 @@ require (
1212
github.com/hashicorp/errwrap v1.1.0 // indirect
1313
github.com/hashicorp/go-hclog v1.6.3 // indirect
1414
github.com/hashicorp/go-multierror v1.1.1 // indirect
15-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
15+
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.90.0
17+
github.com/hashicorp/go-tfe v1.92.0
1818
github.com/hashicorp/go-version v1.7.0
1919
github.com/hashicorp/hcl v1.0.0
2020
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
@@ -32,7 +32,7 @@ require (
3232
golang.org/x/oauth2 v0.29.0 // indirect
3333
golang.org/x/sys v0.35.0 // indirect
3434
golang.org/x/text v0.28.0 // indirect
35-
golang.org/x/time v0.11.0 // indirect
35+
golang.org/x/time v0.12.0 // indirect
3636
google.golang.org/protobuf v1.36.6 // indirect
3737
)
3838

@@ -65,7 +65,7 @@ require (
6565
github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0
6666
github.com/hashicorp/terraform-plugin-log v0.9.0
6767
github.com/hashicorp/terraform-plugin-testing v1.13.3
68-
github.com/stretchr/testify v1.10.0
68+
github.com/stretchr/testify v1.11.1
6969
go.uber.org/mock v0.6.0
7070
)
7171

@@ -80,7 +80,7 @@ require (
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
83-
golang.org/x/sync v0.16.0 // indirect
83+
golang.org/x/sync v0.17.0 // indirect
8484
golang.org/x/tools v0.36.0 // indirect
8585
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
8686
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
6868
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
6969
github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg=
7070
github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0=
71-
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
72-
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
71+
github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
72+
github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
7373
github.com/hashicorp/go-slug v0.16.7 h1:sBW8y1sX+JKOZKu9a+DQZuWDVaX+U9KFnk6+VDQvKcw=
7474
github.com/hashicorp/go-slug v0.16.7/go.mod h1:X5fm++dL59cDOX8j48CqHr4KARTQau7isGh0ZVxJB5I=
75-
github.com/hashicorp/go-tfe v1.90.0 h1:NHJB8i19QXJEsEqTlRenZ3mWsS11OivkPgokMpg1fSs=
76-
github.com/hashicorp/go-tfe v1.90.0/go.mod h1:6dUFMBKh0jkxlRsrw7bYD2mby0efdwE4dtlAuTogIzA=
75+
github.com/hashicorp/go-tfe v1.92.0 h1:DxJ/ONlNgp4kP5xdglJBLYBeunDeii3CelpgA6PjebM=
76+
github.com/hashicorp/go-tfe v1.92.0/go.mod h1:QwqgCD5seztgp76CP7F0POJPflQNSqjIvBpVohg9X50=
7777
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
7878
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
7979
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -158,8 +158,8 @@ github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnB
158158
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
159159
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
160160
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
161-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
162-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
161+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
162+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
163163
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
164164
github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
165165
github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
@@ -206,8 +206,8 @@ golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT
206206
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
207207
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
208208
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
209-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
210-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
209+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
210+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
211211
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
212212
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
213213
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -229,8 +229,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
229229
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
230230
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
231231
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
232-
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
233-
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
232+
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
233+
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
234234
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
235235
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
236236
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/provider/data_source_agent_pool_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestAccTFEAgentPoolDataSource_basic(t *testing.T) {
2929

3030
resource.Test(t, resource.TestCase{
3131
PreCheck: func() { testAccPreCheck(t) },
32-
ProtoV5ProviderFactories: testAccMuxedProviders,
32+
ProtoV6ProviderFactories: testAccMuxedProviders,
3333
Steps: []resource.TestStep{
3434
{
3535
Config: testAccTFEAgentPoolDataSourceConfig(org.Name, rInt),
@@ -69,7 +69,7 @@ func TestAccTFEAgentPoolDataSource_allowed_workspaces(t *testing.T) {
6969

7070
resource.Test(t, resource.TestCase{
7171
PreCheck: func() { testAccPreCheck(t) },
72-
ProtoV5ProviderFactories: testAccMuxedProviders,
72+
ProtoV6ProviderFactories: testAccMuxedProviders,
7373
Steps: []resource.TestStep{
7474
{
7575
Config: testAccTFEAgentPoolDataSourceAllowedWorkspacesConfig(org.Name, rInt, ws.ID),

internal/provider/data_source_github_app_installation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func testAccTFEGHAInstallationDataSourcePreCheck(t *testing.T) {
2020
func TestAccTFEGHAInstallationDataSource_findByName(t *testing.T) {
2121
resource.Test(t, resource.TestCase{
2222
PreCheck: func() { testAccTFEGHAInstallationDataSourcePreCheck(t) },
23-
ProtoV5ProviderFactories: testAccMuxedProviders,
23+
ProtoV6ProviderFactories: testAccMuxedProviders,
2424
Steps: []resource.TestStep{
2525
{
2626
Config: testAccTFEGHAInstallationDataSourceConfig_findByName(envGithubAppInstallationName),

0 commit comments

Comments
 (0)