Default CLOUDSMITH_DOWNLOADS_DOMAIN to packages.ft.com

Author: robgodfrey

src/commands/set_env_vars_for_pip.yml

@@ -11,9 +11,14 @@ steps:
   - authenticate_with_oidc:
       service_identifier: <<parameters.service_identifier>>
   - run:
-      name: Prepare script parameters
+      name: Configure Cloudsmith domains
+      command: | 
+        <<include(scripts/configure_cloudsmith_domains.sh)>>
+  - run:
+      name: Configure Cloudsmith repository
       command: |
         echo "export CLOUDSMITH_REPOSITORY_IDENTIFIER=\"<<parameters.repository_identifier>>\"" >> $BASH_ENV
   - run:
       name: Set environment variables for pip
-      command: <<include(scripts/set_env_vars_for_pip.sh)>>
+      command: | 
+        <<include(scripts/set_env_vars_for_pip.sh)>>

src/scripts/configure_cloudsmith_domains.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -z "$CLOUDSMITH_DOWNLOADS_DOMAIN" ]
+then
+  echo "export CLOUDSMITH_DOWNLOADS_DOMAIN=\"packages.ft.com\"" >> $BASH_ENV
+fi
+

src/scripts/set_env_vars_for_pip.sh

@@ -7,7 +7,7 @@ set +e
 
 if [ -z "$CLOUDSMITH_SERVICE_IDENTIFIER" ] || [ -z "$CLOUDSMITH_OIDC_TOKEN" ]
 then
-  echo "Unable to find an OIDC token to use. Please ensure the authenticate-with-oidc command has been run before this command."
+  echo "Unable to find an OIDC token to use. Please ensure the authenticate_with_oidc command has been run before this command."
   exit 1
 fi
 
@@ -17,10 +17,17 @@ then
   exit 1
 fi
 
-CLOUDSMITH_PIP_INDEX_URL="https://$CLOUDSMITH_SERVICE_IDENTIFIER:$CLOUDSMITH_OIDC_TOKEN@packages.ft.com/basic/$CLOUDSMITH_REPOSITORY_IDENTIFIER/python/simple/"
+if [ -z "$CLOUDSMITH_DOWNLOADS_DOMAIN" ]
+then
+  echo "Unable to set environment variables for pip. Env var CLOUDSMITH_DOWNLOADS_DOMAIN is not defined."
+  exit 1
+fi
+
+
+CLOUDSMITH_PIP_INDEX_URL="https://$CLOUDSMITH_SERVICE_IDENTIFIER:$CLOUDSMITH_OIDC_TOKEN@$CLOUDSMITH_DOWNLOADS_DOMAIN/basic/$CLOUDSMITH_REPOSITORY_IDENTIFIER/python/simple/"
 
 echo "export CLOUDSMITH_PIP_INDEX_URL=\"$CLOUDSMITH_PIP_INDEX_URL\"" >> "$BASH_ENV"
 
 echo "The following environment variables have been exported. Note, the OIDC token has been masked below."
 echo ""
-echo "CLOUDSMITH_PIP_INDEX_URL=https://$CLOUDSMITH_SERVICE_IDENTIFIER:********@packages.ft.com/basic/$CLOUDSMITH_REPOSITORY_IDENTIFIER/python/simple/"
+echo "CLOUDSMITH_PIP_INDEX_URL=https://$CLOUDSMITH_SERVICE_IDENTIFIER:********@$CLOUDSMITH_DOWNLOADS_DOMAIN/basic/$CLOUDSMITH_REPOSITORY_IDENTIFIER/python/simple/"