Add bitbucket-base-url to Marketplace instance configuration for ods-api-service (#1382)

Author: jorge-romero

CHANGELOG.md

@@ -8,7 +8,7 @@
 - Jenkins master and agent maintenance. Add Rhel9 variant and make it default ([#1361](https://github.com/opendevstack/ods-core/pull/1361))
 - Update tailor to 1.4.0 ([#1373](https://github.com/opendevstack/ods-core/pull/1373))
 - Update Jenkins java version to jdk 21 ([#1374](https://github.com/opendevstack/ods-core/pull/1374))
-- Add new configuration for the ODS API Service ([1375](https://github.com/opendevstack/ods-core/pull/1375)) ([1377](https://github.com/opendevstack/ods-core/pull/1377))([1378](https://github.com/opendevstack/ods-core/pull/1378))([1379](https://github.com/opendevstack/ods-core/pull/1379))([1380](https://github.com/opendevstack/ods-core/pull/1380))
+- Add new configuration for the ODS API Service ([1375](https://github.com/opendevstack/ods-core/pull/1375)) ([1377](https://github.com/opendevstack/ods-core/pull/1377))([1378](https://github.com/opendevstack/ods-core/pull/1378))([1379](https://github.com/opendevstack/ods-core/pull/1379))([1380](https://github.com/opendevstack/ods-core/pull/1380))([1382](https://github.com/opendevstack/ods-core/pull/1382))
 - Change the way the certificates are installed in the container of ods-api-service to update the cacert ([1381](https://github.com/opendevstack/ods-core/pull/1381))
 
 ### Fixed

ods-api-service/chart/templates/tpl/_application_yaml.tpl

@@ -186,6 +186,7 @@ externalservices:
       {{ $name }}:
         project-components-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROJECT_COMPONENTS_BASE_URL}
         provisioner-actions-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL}
+        bitbucket-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_BITBUCKET_BASE_URL:}
         username: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_USERNAME:}
         password: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PASSWORD:}
         obo-scope: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE:}

ods-api-service/chart/templates/tpl/_env_external_services.tpl

@@ -84,6 +84,7 @@ MARKETPLACE_DEFAULT_INSTANCE: {{ .Values.externalServices.marketplace.defaultIns
 {{- range $name, $instance := .Values.externalServices.marketplace.instances }}
 MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROJECT_COMPONENTS_BASE_URL: {{ $instance.projectComponentsBaseUrl | quote }}
 MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL: {{ $instance.provisionerActionsBaseUrl | quote }}
+MARKETPLACE_{{ $name | upper | replace "-" "_" }}_BITBUCKET_BASE_URL: {{ $instance.bitbucketBaseUrl | quote }}
 MARKETPLACE_{{ $name | upper | replace "-" "_" }}_TRUST_ALL: {{ $instance.trustAllCertificates | quote }}
 MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE: {{ $instance.oboScope | quote }}
 

ods-api-service/chart/templates/tpl/_validations.tpl

@@ -120,6 +120,9 @@ Validate Marketplace instances configuration
   {{- if not $instance.provisionerActionsBaseUrl }}
       {{- fail (printf "provisionerActionsBaseUrl is required for Marketplace instance '%s'" $name) }}
     {{- end }}
+  {{- if not $instance.bitbucketBaseUrl }}
+    {{- fail (printf "bitbucketBaseUrl is required for Marketplace instance '%s'" $name) }}
+  {{- end }}
   {{- if or (not $instance.username) (not $instance.password) }}
     {{- fail (printf "username+password settings are required for Marketplace instance '%s'" $name) }}
   {{- end }}

ods-api-service/chart/values.yaml.template

@@ -275,6 +275,7 @@ externalServices:
     #     projectComponentsBaseUrl: "$MARKETPLACE_DEV_PROJECT_COMPONENTS_BASE_URL"
     #     provisionerActionsBaseUrl: "$MARKETPLACE_DEV_PROVISIONER_ACTIONS_BASE_URL"
     #     oboScope: "$MARKETPLACE_DEV_OBO_SCOPE" 
+    #     bitbucketBaseUrl: "$_BITBUCKET_BASE_URL"
     #     trustAllCertificates: false
     #     username: ""  # Set in secrets.dev.enc.yaml
     #     password: ""  # Set in secrets.dev.enc.yaml