Merge pull request #1303 from hashicorp/zainq11/bitbucket-data-center

Add Bitbucket Data Center support

Author: zainq11

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Unreleased
+
+ENHANCEMENTS:
+* `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)
+
 ## v0.55.0
 
 FEATURES:

internal/provider/data_source_oauth_client.go

@@ -45,6 +45,7 @@ func dataSourceTFEOAuthClient() *schema.Resource {
 						string(tfe.ServiceProviderAzureDevOpsServer),
 						string(tfe.ServiceProviderAzureDevOpsServices),
 						string(tfe.ServiceProviderBitbucket),
+						string(tfe.ServiceProviderBitbucketDataCenter),
 						string(tfe.ServiceProviderBitbucketServer),
 						string(tfe.ServiceProviderBitbucketServerLegacy),
 						string(tfe.ServiceProviderGithub),

internal/provider/resource_tfe_oauth_client.go

@@ -84,7 +84,7 @@ func resourceTFEOAuthClient() *schema.Resource {
 				Type:     schema.TypeString,
 				ForceNew: true,
 				Optional: true,
-				// this field is only for BitBucket Server, and requires these other
+				// this field is only for BitBucket Data Center, and requires these other
 				RequiredWith: []string{"secret", "key"},
 			},
 
@@ -98,6 +98,7 @@ func resourceTFEOAuthClient() *schema.Resource {
 						string(tfe.ServiceProviderAzureDevOpsServices),
 						string(tfe.ServiceProviderBitbucket),
 						string(tfe.ServiceProviderBitbucketServer),
+						string(tfe.ServiceProviderBitbucketDataCenter),
 						string(tfe.ServiceProviderGithub),
 						string(tfe.ServiceProviderGithubEE),
 						string(tfe.ServiceProviderGitlab),
@@ -157,7 +158,7 @@ func resourceTFEOAuthClientCreate(d *schema.ResourceData, meta interface{}) erro
 	if serviceProvider == tfe.ServiceProviderAzureDevOpsServer {
 		options.PrivateKey = tfe.String(privateKey)
 	}
-	if serviceProvider == tfe.ServiceProviderBitbucketServer {
+	if serviceProvider == tfe.ServiceProviderBitbucketServer || serviceProvider == tfe.ServiceProviderBitbucketDataCenter {
 		options.RSAPublicKey = tfe.String(rsaPublicKey)
 		options.Secret = tfe.String(secret)
 	}

internal/provider/resource_tfe_oauth_client_test.go

@@ -93,11 +93,11 @@ func TestAccTFEOAuthClient_rsaKeys(t *testing.T) {
 					testAccCheckTFEOAuthClientExists("tfe_oauth_client.foobar", oc),
 					testAccCheckTFEOAuthClientAttributes(oc),
 					resource.TestCheckResourceAttr(
-						"tfe_oauth_client.foobar", "api_url", "https://bbs.example.com"),
+						"tfe_oauth_client.foobar", "api_url", "https://bbdc.example.com"),
 					resource.TestCheckResourceAttr(
-						"tfe_oauth_client.foobar", "http_url", "https://bbs.example.com"),
+						"tfe_oauth_client.foobar", "http_url", "https://bbdc.example.com"),
 					resource.TestCheckResourceAttr(
-						"tfe_oauth_client.foobar", "service_provider", "bitbucket_server"),
+						"tfe_oauth_client.foobar", "service_provider", "bitbucket_data_center"),
 					resource.TestCheckResourceAttr(
 						"tfe_oauth_client.foobar", "key", "1e4843e138b0d44911a50d15e0f7cee4"),
 					resource.TestCheckResourceAttr(
@@ -200,9 +200,9 @@ resource "tfe_organization" "foobar" {
 resource "tfe_oauth_client" "foobar" {
   organization     = tfe_organization.foobar.id
 	name 						 = "foobar_oauth"
-  api_url          = "https://bbs.example.com"
-  http_url         = "https://bbs.example.com"
-  service_provider = "bitbucket_server"
+  api_url          = "https://bbdc.example.com"
+  http_url         = "https://bbdc.example.com"
+  service_provider = "bitbucket_data_center"
   key       			 = "1e4843e138b0d44911a50d15e0f7cee4"
   secret           = <<EOT
 -----BEGIN RSA PRIVATE KEY-----

website/docs/cdktf/csharp/d/oauth_client.html.markdown

@@ -81,7 +81,7 @@ be set.
 * `OauthClientId` - (Optional) ID of the OAuth client.
 * `Organization` - (Optional) The name of the organization in which to search.
 * `ServiceProvider` - (Optional) The API identifier of the OAuth service provider. If set,
-  must be one of: `AdoServer`, `AdoServices`, `BitbucketHosted`, `BitbucketServer`,
+  must be one of: `AdoServer`, `AdoServices`,`BitbucketDataCenter`, `BitbucketHosted`, `BitbucketServer`(deprecated),
   `Github`, `GithubEnterprise`, `GitlabHosted`, `GitlabCommunityEdition`, or
   `GitlabEnterpriseEdition`.
 

website/docs/cdktf/csharp/r/oauth_client.html.markdown

@@ -70,11 +70,11 @@ class MyConvertedCode : TerraformStack
 }
 ```
 
-#### BitBucket Server Usage
+#### BitBucket Data Center Usage
 
-See [documentation for HCP Terraform and Terraform Enterprise setup](https://developer.hashicorp.com/terraform/cloud-docs/vcs/bitbucket-server).
+See [documentation for HCP Terraform and Terraform Enterprise setup](https://developer.hashicorp.com/terraform/cloud-docs/vcs/bitbucket-data-center).
 
-When using BitBucket Server, you must use three required fields: `Key`, `Secret`, `RsaPublicKey`.
+When using BitBucket Data Center, you must use three required fields: `Key`, `Secret`, `RsaPublicKey`.
 
 
 ```csharp
@@ -88,10 +88,10 @@ class MyConvertedCode : TerraformStack
     public MyConvertedCode(Construct scope, string name) : base(scope, name)
     {
         new OauthClient.OauthClient(this, "test", new OauthClientConfig {
-            ApiUrl = "https://bbs.example.com",
-            HttpUrl = "https://bss.example.com",
+            ApiUrl = "https://bbdc.example.com",
+            HttpUrl = "https://bbdc.example.com",
             Key = "<consumer key>",
-            Name = "my-bbs-oauth-client",
+            Name = "my-bbdc-oauth-client",
             Organization = "my-org-name",
             RsaPublicKey = @"-----BEGIN PUBLIC KEY-----
             content
@@ -101,7 +101,7 @@ class MyConvertedCode : TerraformStack
             content
             -----END RSA PRIVATE KEY-----
             ",
-            ServiceProvider = "bitbucket_server"
+            ServiceProvider = "bitbucket_data_center"
         });
     }
 }
@@ -121,20 +121,20 @@ The following arguments are supported:
 * `PrivateKey` - (Required for `AdoServer`) The text of the private key associated with your Azure DevOps Server account
 * `Key` - The OAuth Client key can refer to a Consumer Key, Application Key,
   or another type of client key for the VCS provider.
-* `Secret` - (Required for `BitbucketServer`) The OAuth Client secret is used for BitBucket Server, this secret is the
-  the text of the SSH private key associated with your BitBucket Server
+* `Secret` - (Required for `BitbucketDataCenter`) The OAuth Client secret is used for BitBucket Data Center, this secret is the
+  the text of the SSH private key associated with your BitBucket Data Center
 Application Link.
-* `RsaPublicKey` - (Required for `BitbucketServer`) Required for BitBucket
-  Server in conjunction with the secret. Not used for any other providers. The
-text of the SSH public key associated with your BitBucket Server Application
+* `RsaPublicKey` - (Required for `BitbucketDataCenter`) Required for BitBucket
+  Data Center in conjunction with the secret. Not used for any other providers. The
+text of the SSH public key associated with your BitBucket Data Center Application
 Link.
 * `ServiceProvider` - (Required) The VCS provider being connected with. Valid
-  options are `AdoServer`, `AdoServices`, `BitbucketHosted`, `BitbucketServer`, `Github`, `GithubEnterprise`, `GitlabHosted`,
+  options are `AdoServer`, `AdoServices`, `BitbucketHosted`, `BitbucketDataCenter`, `BitbucketServer`(deprecated), `Github`, `GithubEnterprise`, `GitlabHosted`,
   `GitlabCommunityEdition`, or `GitlabEnterpriseEdition`.
 
 ## Attributes Reference
 
 * `Id` - The ID of the OAuth client.
 * `OauthTokenId` - The ID of the OAuth token associated with the OAuth client.
 
-<!-- cache-key: cdktf-0.17.0-pre.15 input-0dea494ef76c038939d94b5ae6a0e741e36a87509a350f558cd11d098bf1bde9 -->
+<!-- cache-key: cdktf-0.17.0-pre.15 input-0dea494ef76c038939d94b5ae6a0e741e36a87509a350f558cd11d098bf1bde9 -->

website/docs/cdktf/csharp/r/registry_module.html.markdown

@@ -223,7 +223,7 @@ The `VcsRepo` block supports:
   For most VCS providers outside of BitBucket Cloud and Azure DevOps, this will match the `Identifier`
   string.
 * `Identifier` - (Required) A reference to your VCS repository in the format
-  `<organization>/<repository>` where `<organization>` and `<repository>` refer to the organization (or project key, for Bitbucket Server)
+  `<organization>/<repository>` where `<organization>` and `<repository>` refer to the organization (or project key, for Bitbucket Data Center)
   and repository in your VCS provider. The format for Azure DevOps is `<ado organization>/<ado project>/_git/<ado repository>`.
 * `OauthTokenId` - (Optional) Token ID of the VCS Connection (OAuth Connection Token) to use. This conflicts with `GithubAppInstallationId` and can only be used if `GithubAppInstallationId` is not used.
 * `GithubAppInstallationId` - (Optional) The installation id of the Github App. This conflicts with `OauthTokenId` and can only be used if `OauthTokenId` is not used.

website/docs/cdktf/go/d/oauth_client.html.markdown

@@ -90,7 +90,7 @@ be set.
 * `OauthClientId` - (Optional) ID of the OAuth client.
 * `Organization` - (Optional) The name of the organization in which to search.
 * `ServiceProvider` - (Optional) The API identifier of the OAuth service provider. If set,
-  must be one of: `AdoServer`, `AdoServices`, `BitbucketHosted`, `BitbucketServer`,
+  must be one of: `AdoServer`, `AdoServices`, `BitbucketDataCenter`, `BitbucketHosted`, `BitbucketServer`(deprecated),
   `Github`, `GithubEnterprise`, `GitlabHosted`, `GitlabCommunityEdition`, or
   `GitlabEnterpriseEdition`.
 
@@ -109,4 +109,4 @@ In addition to all arguments above, the following attributes are exported:
 * `ServiceProvider` - The API identifier of the OAuth service provider.
 * `ServiceProviderDisplayName` - The display name of the OAuth service provider.
 
-<!-- cache-key: cdktf-0.17.0-pre.15 input-59b4bcbbb310e7ee913a245f3c751829442542dbcf1bbb4c87ac286043b69348 -->
+<!-- cache-key: cdktf-0.17.0-pre.15 input-59b4bcbbb310e7ee913a245f3c751829442542dbcf1bbb4c87ac286043b69348 -->

website/docs/cdktf/go/r/oauth_client.html.markdown

@@ -73,11 +73,11 @@ func newMyConvertedCode(scope construct, name *string) *myConvertedCode {
 }
 ```
 
-#### BitBucket Server Usage
+#### BitBucket Data Center Usage
 
-See [documentation for HCP Terraform and Terraform Enterprise setup](https://developer.hashicorp.com/terraform/cloud-docs/vcs/bitbucket-server).
+See [documentation for HCP Terraform and Terraform Enterprise setup](https://developer.hashicorp.com/terraform/cloud-docs/vcs/bitbucket-data-center).
 
-When using BitBucket Server, you must use three required fields: `Key`, `Secret`, `RsaPublicKey`.
+When using BitBucket Data Center, you must use three required fields: `Key`, `Secret`, `RsaPublicKey`.
 
 
 ```go
@@ -94,14 +94,14 @@ func newMyConvertedCode(scope construct, name *string) *myConvertedCode {
 	this := &myConvertedCode{}
 	cdktf.NewTerraformStack_Override(this, scope, name)
 	oauthClient.NewOauthClient(this, jsii.String("test"), &oauthClientConfig{
-		apiUrl: jsii.String("https://bbs.example.com"),
-		httpUrl: jsii.String("https://bss.example.com"),
+		apiUrl: jsii.String("https://bbdc.example.com"),
+		httpUrl: jsii.String("https://bbdc.example.com"),
 		key: jsii.String("<consumer key>"),
-		name: jsii.String("my-bbs-oauth-client"),
+		name: jsii.String("my-bbdc-oauth-client"),
 		organization: jsii.String("my-org-name"),
 		rsaPublicKey: jsii.String("-----BEGIN PUBLIC KEY-----\ncontent\n-----END PUBLIC KEY-----\n"),
 		secret: jsii.String("-----BEGIN RSA PRIVATE KEY-----\ncontent\n-----END RSA PRIVATE KEY-----\n"),
-		serviceProvider: jsii.String("bitbucket_server"),
+		serviceProvider: jsii.String("bitbucket_data_center"),
 	})
 	return this
 }
@@ -121,20 +121,20 @@ The following arguments are supported:
 * `PrivateKey` - (Required for `AdoServer`) The text of the private key associated with your Azure DevOps Server account
 * `Key` - The OAuth Client key can refer to a Consumer Key, Application Key,
   or another type of client key for the VCS provider.
-* `Secret` - (Required for `BitbucketServer`) The OAuth Client secret is used for BitBucket Server, this secret is the
-  the text of the SSH private key associated with your BitBucket Server
+* `Secret` - (Required for `BitbucketDataCenter`) The OAuth Client secret is used for Bitbucket Data Center, this secret is the
+  the text of the SSH private key associated with your Bitbucket Data Center
 Application Link.
-* `RsaPublicKey` - (Required for `BitbucketServer`) Required for BitBucket
-  Server in conjunction with the secret. Not used for any other providers. The
-text of the SSH public key associated with your BitBucket Server Application
+* `RsaPublicKey` - (Required for `BitbucketDataCenter`) Required for Bitbucket Data Center
+   in conjunction with the secret. Not used for any other providers. The
+text of the SSH public key associated with your Bitbucket Data Center Application
 Link.
 * `ServiceProvider` - (Required) The VCS provider being connected with. Valid
-  options are `AdoServer`, `AdoServices`, `BitbucketHosted`, `BitbucketServer`, `Github`, `GithubEnterprise`, `GitlabHosted`,
+  options are `AdoServer`, `AdoServices`, `BitbucketDataCenter`, `BitbucketHosted`, `BitbucketServer`(deprecated), `Github`, `GithubEnterprise`, `GitlabHosted`,
   `GitlabCommunityEdition`, or `GitlabEnterpriseEdition`.
 
 ## Attributes Reference
 
 * `Id` - The ID of the OAuth client.
 * `OauthTokenId` - The ID of the OAuth token associated with the OAuth client.
 
-<!-- cache-key: cdktf-0.17.0-pre.15 input-0dea494ef76c038939d94b5ae6a0e741e36a87509a350f558cd11d098bf1bde9 -->
+<!-- cache-key: cdktf-0.17.0-pre.15 input-0dea494ef76c038939d94b5ae6a0e741e36a87509a350f558cd11d098bf1bde9 -->

website/docs/cdktf/go/r/registry_module.html.markdown

@@ -253,7 +253,7 @@ The `VcsRepo` block supports:
   For most VCS providers outside of BitBucket Cloud and Azure DevOps, this will match the `Identifier`
   string.
 * `Identifier` - (Required) A reference to your VCS repository in the format
-  `<organization>/<repository>` where `<organization>` and `<repository>` refer to the organization (or project key, for Bitbucket Server)
+  `<organization>/<repository>` where `<organization>` and `<repository>` refer to the organization (or project key, for Bitbucket Data Center)
   and repository in your VCS provider. The format for Azure DevOps is `<ado organization>/<ado project>/_git/<ado repository>`.
 * `OauthTokenId` - (Optional) Token ID of the VCS Connection (OAuth Connection Token) to use. This conflicts with `GithubAppInstallationId` and can only be used if `GithubAppInstallationId` is not used.
 * `GithubAppInstallationId` - (Optional) The installation id of the Github App. This conflicts with `OauthTokenId` and can only be used if `OauthTokenId` is not used.