Skip to content

Commit b283095

Browse files
brandoncbrandonc
authored
Merge branch 'main' into sebasslash/enable-onprem-ci
2 parents 65bf671 + 1d447dd commit b283095

30 files changed

+124
-112
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
16+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1717
- uses: ./.github/actions/lint-provider-tfe
1818

1919
tests:
@@ -35,7 +35,7 @@ jobs:
3535
organization: hashicorp-v2
3636
workspace: tflocal-terraform-provider-tfe
3737

38-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
38+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3939

4040
- uses: ./.github/actions/test-provider-tfe
4141
with:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
outputs:
1818
version: ${{ steps.remove-leading-v.outputs.version }}
1919
steps:
20-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
20+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2121

2222
- uses: actions-ecosystem/action-get-latest-tag@b7c32daec3395a9616f88548363a42652b22d435 # v1.6.0
2323
id: get-latest-tag
@@ -33,7 +33,7 @@ jobs:
3333
buildBinary:
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
36+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3737
- name: Set up Go
3838
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3939
with:
@@ -68,7 +68,7 @@ jobs:
6868
CHECKPOINT_DISABLE: "1"
6969
timeout-minutes: 120
7070
steps:
71-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
71+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
7272
- run: git config --global user.email "[email protected]"
7373
- run: git config --global user.name "Brandon Croft"
7474
- name: Get yarn cache directory path

‎.github/workflows/mkdocs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout main
14-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
14+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1515

1616
- name: Deploy docs
1717
uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
organization: hashicorp-v2
3737
workspace: tflocal-terraform-provider-tfe-nightly
3838

39-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
39+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4040

4141
- uses: ./.github/actions/test-provider-tfe
4242
with:
@@ -96,7 +96,7 @@ jobs:
9696
needs: [tests-summarize]
9797
if: "${{ always() }}"
9898
steps:
99-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
99+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
100100

101101
- name: Set up Go
102102
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
release-notes:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
15+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1616
with:
1717
fetch-depth: 0
1818
- name: Generate Release Notes

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
## Unreleased
2+
3+
ENHANCEMENTS:
4+
* `r/tfe_oauth_client`: Add Bitbucket Data Center support with the `bitbucket_data_center` option for `service_provider` by @zainq11 [#1303](https://github.com/hashicorp/terraform-provider-tfe/pull/1304)
5+
16
## v0.55.0
27

38
FEATURES:
49
* `r/tfe_team`: Add attributes `manage_teams`, `manage_organization_access`, and `access_secret_teams` to `organization_access` on `tfe_team` by @juliannatetreault [#1313](https://github.com/hashicorp/terraform-provider-tfe/pull/1313)
510

11+
ENHANCEMENTS:
12+
* `r/tfe_project`: Increase the Project name length from 36 to 40 characters @hs26gill [#1351](https://github.com/hashicorp/terraform-provider-tfe/pull/1351)
13+
614
## v0.54.0
715

816
ENHANCEMENTS:

‎META.d/_summary.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) HashiCorp, Inc.
2+
# SPDX-License-Identifier: MPL-2.0
3+
14
---
25

36
schema: 1.1

‎internal/provider/data_source_oauth_client.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func dataSourceTFEOAuthClient() *schema.Resource {
4545
string(tfe.ServiceProviderAzureDevOpsServer),
4646
string(tfe.ServiceProviderAzureDevOpsServices),
4747
string(tfe.ServiceProviderBitbucket),
48+
string(tfe.ServiceProviderBitbucketDataCenter),
4849
string(tfe.ServiceProviderBitbucketServer),
4950
string(tfe.ServiceProviderBitbucketServerLegacy),
5051
string(tfe.ServiceProviderGithub),

‎internal/provider/resource_tfe_oauth_client.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func resourceTFEOAuthClient() *schema.Resource {
8484
Type: schema.TypeString,
8585
ForceNew: true,
8686
Optional: true,
87-
// this field is only for BitBucket Server, and requires these other
87+
// this field is only for BitBucket Data Center, and requires these other
8888
RequiredWith: []string{"secret", "key"},
8989
},
9090

@@ -98,6 +98,7 @@ func resourceTFEOAuthClient() *schema.Resource {
9898
string(tfe.ServiceProviderAzureDevOpsServices),
9999
string(tfe.ServiceProviderBitbucket),
100100
string(tfe.ServiceProviderBitbucketServer),
101+
string(tfe.ServiceProviderBitbucketDataCenter),
101102
string(tfe.ServiceProviderGithub),
102103
string(tfe.ServiceProviderGithubEE),
103104
string(tfe.ServiceProviderGitlab),
@@ -157,7 +158,7 @@ func resourceTFEOAuthClientCreate(d *schema.ResourceData, meta interface{}) erro
157158
if serviceProvider == tfe.ServiceProviderAzureDevOpsServer {
158159
options.PrivateKey = tfe.String(privateKey)
159160
}
160-
if serviceProvider == tfe.ServiceProviderBitbucketServer {
161+
if serviceProvider == tfe.ServiceProviderBitbucketServer || serviceProvider == tfe.ServiceProviderBitbucketDataCenter {
161162
options.RSAPublicKey = tfe.String(rsaPublicKey)
162163
options.Secret = tfe.String(secret)
163164
}

‎internal/provider/resource_tfe_oauth_client_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ func TestAccTFEOAuthClient_rsaKeys(t *testing.T) {
9393
testAccCheckTFEOAuthClientExists("tfe_oauth_client.foobar", oc),
9494
testAccCheckTFEOAuthClientAttributes(oc),
9595
resource.TestCheckResourceAttr(
96-
"tfe_oauth_client.foobar", "api_url", "https://bbs.example.com"),
96+
"tfe_oauth_client.foobar", "api_url", "https://bbdc.example.com"),
9797
resource.TestCheckResourceAttr(
98-
"tfe_oauth_client.foobar", "http_url", "https://bbs.example.com"),
98+
"tfe_oauth_client.foobar", "http_url", "https://bbdc.example.com"),
9999
resource.TestCheckResourceAttr(
100-
"tfe_oauth_client.foobar", "service_provider", "bitbucket_server"),
100+
"tfe_oauth_client.foobar", "service_provider", "bitbucket_data_center"),
101101
resource.TestCheckResourceAttr(
102102
"tfe_oauth_client.foobar", "key", "1e4843e138b0d44911a50d15e0f7cee4"),
103103
resource.TestCheckResourceAttr(
@@ -200,9 +200,9 @@ resource "tfe_organization" "foobar" {
200200
resource "tfe_oauth_client" "foobar" {
201201
organization = tfe_organization.foobar.id
202202
name = "foobar_oauth"
203-
api_url = "https://bbs.example.com"
204-
http_url = "https://bbs.example.com"
205-
service_provider = "bitbucket_server"
203+
api_url = "https://bbdc.example.com"
204+
http_url = "https://bbdc.example.com"
205+
service_provider = "bitbucket_data_center"
206206
key = "1e4843e138b0d44911a50d15e0f7cee4"
207207
secret = <<EOT
208208
-----BEGIN RSA PRIVATE KEY-----

0 commit comments

Comments
 (0)