Merge pull request #88603 from mramendi/RHDEVDOCS-6354

jeana-redhat · web-flow · commit 09ddf7ca1866 · 2025-02-25T15:22:35.000-05:00
RHDEVDOCS 6354 Bitbucket Data Center instead of Server, Bitbucket case fix
diff --git a/modules/op-installing-tekton-hub-with-login-and-rating.adoc b/modules/op-installing-tekton-hub-with-login-and-rating.adoc
@@ -15,13 +15,13 @@ You can install {tekton-hub} on your cluster with custom configuration that supp
 [discrete]
 .Procedure 
 
-. Create an OAuth application with your Git repository hosting provider, and note the Client ID and Client Secret. The supported providers are GitHub, GitLab, and BitBucket.
+. Create an OAuth application with your Git repository hosting provider, and note the Client ID and Client Secret. The supported providers are GitHub, GitLab, and Bitbucket.
 
 ** For a link:https://docs.github.com/en/developers/apps/creating-an-oauth-app[GitHub OAuth application], set the Homepage URL and the Authorization callback URL as `<auth-route>`.
 
 ** For a link:https://docs.gitlab.com/ee/integration/oauth_provider.html#user-owned-applications[GitLab OAuth application], set the `REDIRECT_URI` as `<auth-route>/auth/gitlab/callback`.
 
-** For a link:https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud[BitBucket OAuth application], set the `Callback URL` as `<auth-route>`.
+** For a link:https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud[Bitbucket OAuth application], set the `Callback URL` as `<auth-route>`.
 
 . Edit the `<tekton_hub_root>/config/02-api/20-api-secret.yaml` file to include the {tekton-hub} API secrets. For example:
 +
@@ -51,8 +51,8 @@ stringData:
 <2> The Client Secret from the GitHub OAuth application.
 <3> The Client ID from the GitLab OAuth application.
 <4> The Client Secret from the GitLab OAuth application.
-<5> The Client ID from the BitBucket OAuth application.
-<6> The Client Secret from the BitBucket OAuth application.
+<5> The Client ID from the Bitbucket OAuth application.
+<6> The Client Secret from the Bitbucket OAuth application.
 <7> A long, random string used to sign the JSON Web Token (JWT) created for users.
 <8> Add the time limit after which the access token expires. For example, `1m`, where m denotes minutes. The supported units of time are seconds (`s`), minutes (`m`), hours (`h`), days (`d`), and weeks (`w`).
 <9> Add the time limit after which the refresh token expires. For example, `1m`, where `m` denotes minutes. The supported units of time are seconds (`s`), minutes (`m`), hours (`h`), days (`d`), and weeks (`w`). Ensure that the expiry time set for token refresh is greater than the expiry time set for token access.
diff --git a/modules/op-resolver-git-config-scm.adoc b/modules/op-resolver-git-config-scm.adoc
@@ -13,8 +13,8 @@ You can use Git repository providers that are supported by the `go-scm` library.
 * `github.com` and GitHub Enterprise
 * `gitlab.com` and self-hosted Gitlab
 * Gitea
-* BitBucket Server
-* BitBucket Cloud
+* Bitbucket Data Center
+* Bitbucket Cloud
 
 [NOTE]
 ====
@@ -56,7 +56,7 @@ spec:
 <1> The default Git revision to use if none is specified.
 <2> The maximum time any single Git clone resolution may take, for example, `1m`, `2s`, `700ms`. {pipelines-title} also enforces a global maximum timeout of 1 minute on all resolution requests.
 <3> The SCM provider type.
-<4> The base URL for use with the authenticated SCM API. This setting is not required if you are using `github.com`, `gitlab.com`, or BitBucket Cloud.
+<4> The base URL for use with the authenticated SCM API. This setting is not required if you are using `github.com`, `gitlab.com`, or Bitbucket Cloud.
 <5> The name of the secret that contains the SCM provider API token.
 <6> The key within the token secret that contains the token.
 <7> The namespace containing the token secret, if not `default`.
diff --git a/modules/op-using-pipelines-as-code-with-bitbucket-server.adoc b/modules/op-using-pipelines-as-code-with-bitbucket-server.adoc
@@ -3,17 +3,17 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="using-pipelines-as-code-with-bitbucket-server_{context}"]
-= Using {pac} with Bitbucket Server
+= Using {pac} with Bitbucket Data Center
 
 [role="_abstract"]
-If your organization or project uses Bitbucket Server as the preferred platform, you can use {pac} for your repository with a webhook on Bitbucket Server.
+If your organization or project uses Bitbucket Data Center as the preferred platform, you can use {pac} for your repository with a webhook on Bitbucket Data Center.
 
 [discrete]
 .Prerequisites
 
 * Ensure that {pac} is installed on the cluster.
 
-* Generate a personal access token as the manager of the project on Bitbucket Server, and save a copy of it in an alternate location.
+* Generate a personal access token as the manager of the project on Bitbucket Data Center, and save a copy of it in an alternate location.
 +
 [NOTE]
 ====
@@ -31,7 +31,7 @@ If your organization or project uses Bitbucket Server as the preferred platform,
 $ echo https://$(oc get route -n openshift-pipelines pipelines-as-code-controller -o jsonpath='{.spec.host}')
 ----
 
-. On Bitbucket Server, perform the following steps:
+. On Bitbucket Data Center, perform the following steps:
 
 .. Use the left navigation pane of your Bitbucket Data Center repository to go to *Repository settings* –> *Webhooks* and click *Add webhook*.
 
@@ -59,7 +59,7 @@ $ openssl rand -hex 20
 +
 [source,terminal]
 ----
-$ oc -n target-namespace create secret generic bitbucket-server-webhook-config \
+$ oc -n target-namespace create secret generic bitbucket-datacenter-webhook-config \
   --from-literal provider.token="<PERSONAL_TOKEN>" \
   --from-literal webhook.secret="<WEBHOOK_SECRET>"
 ----
@@ -77,20 +77,20 @@ metadata:
 spec:
   url: "https://bitbucket.com/workspace/repo"
   git_provider:
-    url: "https://bitbucket.server.api.url/rest" <1>
+    url: "https://bitbucket.datacenter.api.url/rest" <1>
     user: "<BITBUCKET_USERNAME>" <2>
     secret: <3>
-      name: "bitbucket-server-webhook-config"
+      name: "bitbucket-datacenter-webhook-config"
       key: "provider.token" # Set this if you have a different key in your secret
     webhook_secret:
-      name: "bitbucket-server-webhook-config"
+      name: "bitbucket-datacenter-webhook-config"
       key: "webhook.secret" # Set this if you have a different key for your secret
 ----
-<1> Ensure that you have the right Bitbucket Server API URL without the `/api/v1.0` suffix. Usually, the default install has a `/rest` suffix.
+<1> Ensure that you have the right Bitbucket Data Center API URL without the `/api/v1.0` suffix. Usually, the default install has a `/rest` suffix.
 <2> You can only reference a user by the `ACCOUNT_ID` in an owner file.
 <3> {pac} assumes that the secret referred in the `git_provider.secret` spec and the `Repository` CR is in the same namespace.
 +
 [NOTE]
 ====
-The `tkn pac create` and `tkn pac bootstrap` commands are not supported on Bitbucket Server.
+The `tkn pac create` and `tkn pac bootstrap` commands are not supported on Bitbucket Data Center.
 ====
diff --git a/pac/about-pipelines-as-code.adoc b/pac/about-pipelines-as-code.adoc
@@ -24,4 +24,4 @@ With {pac}, cluster administrators and users with the required privileges can de
 * Retrieval of configurations using GitHub blobs and objects API.
 * Access Control List (ACL) over a GitHub organization or using a Prow style `OWNERS` file.
 * The `tkn pac` CLI plugin for managing bootstrapping and {pac} repositories.
-* Support for GitHub App, GitHub Webhook, Bitbucket Server, and Bitbucket Cloud.
+* Support for GitHub App, GitHub Webhook, Bitbucket Data Center, and Bitbucket Cloud.
diff --git a/pac/using-pipelines-as-code-repos.adoc b/pac/using-pipelines-as-code-repos.adoc
@@ -11,7 +11,7 @@ After installing {pac}, cluster administrators can configure a Git repository ho
 * GitHub App
 * GitHub Webhook
 * GitLab
-* Bitbucket Server
+* Bitbucket Data Center
 * Bitbucket Cloud
 
 [NOTE]
@@ -53,15 +53,15 @@ include::modules/op-using-pipelines-as-code-with-bitbucket-cloud.adoc[leveloffse
 
 .Additional resources
 
-* link:https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/[Creating app password on Bitbucket Cloud]
-* link:https://developer.atlassian.com/cloud/bitbucket/bitbucket-api-changes-gdpr/#introducing-atlassian-account-id-and-nicknames[Introducing Altassian Account ID and Nicknames]
+* link:https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/[Creating app password on Bitbucket Cloud] (Atlassian documentation)
+* link:https://developer.atlassian.com/cloud/bitbucket/bitbucket-api-changes-gdpr/#introducing-atlassian-account-id-and-nicknames[Introducing Altassian Account ID and Nicknames] in the Atlassian documentation
 
 include::modules/op-using-pipelines-as-code-with-bitbucket-server.adoc[leveloffset=+1]
 
 .Additional resources
 
-* link:https://confluence.atlassian.com/bitbucketserver/personal-access-tokens-939515499.html[Creating personal tokens on Bitbucket Server]
-* link:https://support.atlassian.com/bitbucket-cloud/docs/manage-webhooks/#Create-webhooks[Creating webhooks on Bitbucket server]
+* link:https://confluence.atlassian.com/bitbucketserver/personal-access-tokens-939515499.html[Creating personal tokens on Bitbucket Data Center] (Atlassian documentation)
+* link:https://confluence.atlassian.com/bitbucketserver/manage-webhooks-938025878.html[Managing webhooks on Bitbucket Data Center] (Atlassian documentation)
 
 include::modules/op-interfacing-pipelines-as-code-with-custom-certificates.adoc[leveloffset=+1]
 
