Skip to content

Commit a262a97

Browse files
committed
Merge branch 'helenjw/TF-28672/oidc-configurations' into helenjw/TF-28671/hyok-configurations
# Conflicts: # CHANGELOG.md # docs/testing.md # internal/provider/helper_test.go # internal/provider/provider_next.go
2 parents 0c0b305 + 53293df commit a262a97

File tree

208 files changed

+7542
-4336
lines changed

Some content is hidden

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

208 files changed

+7542
-4336
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818

1919
tests:
2020
name: run
21+
if: "!startsWith(github.head_ref, 'changelog/')"
2122
runs-on: ubuntu-latest
2223
timeout-minutes: 60
2324
strategy:
@@ -59,6 +60,7 @@ jobs:
5960

6061
tests-combine-summaries:
6162
name: Combine Test Reports
63+
if: "!startsWith(github.head_ref, 'changelog/')"
6264
needs: [ tests ]
6365
runs-on: ubuntu-latest
6466
steps:
@@ -83,9 +85,9 @@ jobs:
8385

8486
tests-summarize:
8587
name: Summarize Tests
88+
if: "!startsWith(github.head_ref, 'changelog/') && always()"
8689
needs: [ tests ]
8790
runs-on: ubuntu-latest
88-
if: ${{ always() }}
8991
steps:
9092
- name: Check tests Status
9193
run: |

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@ 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)
6+
* **New resource**: `r/tfe_azure_oidc_configuration` for managing Azure OIDC configurations. [#1835](https://github.com/hashicorp/terraform-provider-tfe/pull/1835)
77
* **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.70.0
10+
11+
FEATURES:
12+
* `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)
13+
* `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)
14+
* `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)
15+
* `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)
16+
17+
BUG FIXES:
18+
* `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)
19+
20+
DEPRECATIONS:
21+
* `r/tfe_stack` The `deployment_names` has been removed, by @maed223 [#1855](https://github.com/hashicorp/terraform-provider-tfe/pull/1855)
22+
923
## v0.69.0
1024

1125
BREAKING CHANGES:

README.md

Lines changed: 3 additions & 3 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.69.0"
31+
version = "~> 0.70.0"
3232
}
3333
}
3434
}
@@ -44,14 +44,14 @@ The above snippet using `required_providers` is for Terraform 0.13+; if you are
4444

4545
```hcl
4646
provider "tfe" {
47-
version = "~> 0.69.0"
47+
version = "~> 0.70.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
54+
Since v0.70.0, this provider requires [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 1.0
5555

5656
For more information on provider installation and constraining provider versions, see the [Provider Requirements documentation](https://developer.hashicorp.com/terraform/language/providers/requirements).
5757

docs/testing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ these values with the environment variables specified below:
4949
1. `RUN_TASKS_HMAC` - The optional HMAC Key that should be used for Run Task operations. The default is no key.
5050
1. `GITHUB_APP_INSTALLATION_ID` - GitHub App installation internal id in the format `ghain-xxxxxxx`. Required for running any tests that use GitHub App VCS (workspace, policy sets, registry module).
5151
1. `GITHUB_APP_INSTALLATION_NAME` - GitHub App installation name. Required for running tfe_github_app_installation data source test.
52+
1. `ENABLE_HYOK` - Set `ENABLE_HYOK=1` to enable HYOK-related tests.
5253
1. `HYOK_ORGANIZATION_NAME` - Name of an organization entitled to use HYOK. Required to run tests for HYOK resources and data sources.
5354

5455
**Note:** In order to run integration tests for **Paid** features you will need a token `TFE_TOKEN` with HCP Terraform or Terraform Enterprise administrator privileges, otherwise the attempt to upgrade an organization's feature set will fail.

go.mod

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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)