Skip to content

[WIP] RHTAP-6071 Change BitBucket AppPassword to Token #1698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkopriva wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] RHTAP-6071 Change BitBucket AppPassword to Token #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ integrations() {
fi
if [[ -n "${BITBUCKET:-}" ]]; then
tssc_cli integration bitbucket --force \
--app-password='"$BITBUCKET__APP_PASSWORD"' \
--token='"$BITBUCKET__TOKEN"' \
--host='"$BITBUCKET__HOST"' \
--username='"$BITBUCKET__USERNAME"'
fi
Expand Down
4 changes: 2 additions & 2 deletions hack/private.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ACS__CENTRAL_ENDPOINT=foo.bar.com:443
# SCM
#

# bitbucket.org
BITBUCKET__APP_PASSWORD=foo****bar
# bitbucket.org (use API token)
BITBUCKET__TOKEN=foo****bar
BITBUCKET__HOST=bitbucket.org
BITBUCKET__USERNAME=myUser
BITBUCKET__PROJECT=myProject
Expand Down
2 changes: 1 addition & 1 deletion hack/reset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ action() {
CURL=(
"curl"
"--fail"
"--header" "Authorization: Basic $(echo -n "$BITBUCKET__USERNAME:$BITBUCKET__APP_PASSWORD" | base64)" \
"--header" "Authorization: Basic $(echo -n "$BITBUCKET__USERNAME:$BITBUCKET__TOKEN" | base64)" \
"--header" "Content-Type: application/json"
"--silent"
)
Expand Down
2 changes: 1 addition & 1 deletion installer/charts/tssc-app-namespaces/templates/secrets/bitbucket-auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: bitbucket-auth-secret
namespace: {{ $namespace }}-ci
data:
password: {{ $secretData.appPassword }}
password: {{ $secretData.token }}
username: {{ $secretData.username }}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions installer/charts/tssc-dh/templates/app-config-content.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ integrations:
{{- end }}
{{- if $bbSecretObj }}
bitbucketCloud:
- appPassword: ${BITBUCKET__APP_PASSWORD}
username: ${BITBUCKET__USERNAME}
- username: ${BITBUCKET__USERNAME}
token: ${BITBUCKET__TOKEN}
{{- end }}
{{- if $githubSecretObj }}
github:
Expand Down
2 changes: 1 addition & 1 deletion installer/charts/tssc-dh/templates/extra-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ data:
{{- $bbSecretObj := (lookup "v1" "Secret" $integrationNamespace "tssc-bitbucket-integration") }}
{{- $bbSecretData := ($bbSecretObj.data | default dict) }}
{{- if $bbSecretData }}
BITBUCKET__APP_PASSWORD: {{ $bbSecretData.appPassword }}
BITBUCKET__TOKEN: {{ $bbSecretData.token }}
BITBUCKET__USERNAME: {{ $bbSecretData.username }}
{{- end }}
DEVELOPER_HUB__CATALOG__URL: {{
Expand Down
2 changes: 1 addition & 1 deletion installer/charts/tssc-integrations/templates/gitops/bitbucket-auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{- if $secretData -}}
apiVersion: v1
data:
password: {{ $secretData.appPassword }}
password: {{ $secretData.token }}
username: {{ $secretData.username }}
kind: Secret
metadata:
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ In order to succesfully run this integration test one must:
* `acs-api-token`
* `rhdh-github-client-secret`
* `bitbucket-username`
* `bitbucket-app-password`
* `bitbucket-token`
* `rhdh-github-webhook-secret`
* `github-username`
* `github-password`
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/scripts/.ci-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export AZURE_HOST=
export AZURE_ORGANIZATION=

#### Bitbucket
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.3/html-single/installing_red_hat_trusted_application_pipeline/index#optional_integrating_bitbucket
# API token
export BITBUCKET_USERNAME=
export BITBUCKET_APP_PASSWORD=
export BITBUCKET_TOKEN=
export BITBUCKET_HOST="bitbucket.org"

#### TPA
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/scripts/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ export AZURE_HOST=
export AZURE_ORGANIZATION=

#### Bitbucket
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.3/html-single/installing_red_hat_trusted_application_pipeline/index#optional_integrating_bitbucket
# API token
export BITBUCKET_USERNAME=
export BITBUCKET_APP_PASSWORD=
export BITBUCKET_TOKEN=
export BITBUCKET_HOST="bitbucket.org"

#### TPA
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ bitbucket_integration() {
echo "[INFO] Configure Bitbucket integration into TSSC"

BITBUCKET_USERNAME="${BITBUCKET_USERNAME:-$(cat /usr/local/rhtap-cli-install/bitbucket-username)}"
BITBUCKET_APP_PASSWORD="${BITBUCKET_APP_PASSWORD:-$(cat /usr/local/rhtap-cli-install/bitbucket-app-password)}"
BITBUCKET_TOKEN="${BITBUCKET_TOKEN:-$(cat /usr/local/rhtap-cli-install/bitbucket-token)}"

"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" bitbucket --host="${BITBUCKET_HOST}" --username="${BITBUCKET_USERNAME}" --app-password="${BITBUCKET_APP_PASSWORD}" --force
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" bitbucket --host="${BITBUCKET_HOST}" --username="${BITBUCKET_USERNAME}" --token="${BITBUCKET_TOKEN}" --force
fi
}

Expand Down
22 changes: 11 additions & 11 deletions vendor/github.com/redhat-appstudio/helmet/internal/integration/bitbucket.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.