Merge pull request #3361 from bcgov/fix-trailing-dashes-on-feat-release-

fix: trailing dashes on feature env
bcgov · Jun 13, 2024 · 5210693 · 5210693
2 parents bdbb15f + eacf2d5
commit 5210693
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/feature/action.yaml b/.github/actions/feature/action.yaml
@@ -119,8 +119,8 @@ runs:
     # full name override should match db name as it is used in some secret creations
     # as well as deployments
     - run: |
-        FEATURE_NAME_LOWER=$(echo "${{ inputs.feature_name }}" | tr '[:upper:]' '[:lower:]')
-        FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30)
+        FEATURE_NAME_LOWER=$(echo "${{ inputs.feature_name }}" | tr '[:upper:]' '[:lower:]' | sed 's/-*$//')
+        FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30 | sed 's/-*$//')
         chmod +x ./lib/app_deploy_feature.sh
         ./lib/app_deploy_feature.sh -n ${{ inputs.openshift_app_namespace }} \
           --set fullnameOverride="$FEATURE_NAME_LOWER_SHORT" \

diff --git a/.github/workflows/deploy_feature.yaml b/.github/workflows/deploy_feature.yaml
@@ -126,8 +126,8 @@ jobs:
       - name: Update JIRA Issue
         # JIRA_AUTH must be passed pre encoded
         run: |
-          FEATURE_NAME_LOWER=$(echo $FEATURE_NAME | tr '[:upper:]' '[:lower:]')
-          FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30)
+          FEATURE_NAME_LOWER=$(echo $FEATURE_NAME | tr '[:upper:]' '[:lower:]' | sed 's/-*$//')
+          FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30 | sed 's/-*$//')
           curl -X POST \
             -H "Authorization: Basic ${{ secrets.JIRA_AUTH }}" \
             -H "Content-Type: application/json" \

diff --git a/.github/workflows/jira-feat.yaml b/.github/workflows/jira-feat.yaml
@@ -23,8 +23,8 @@ jobs:
       - name: Update JIRA Issue
         # JIRA_AUTH must be passed pre encoded
         run: |
-          FEATURE_NAME_LOWER=$(echo $FEATURE_NAME | tr '[:upper:]' '[:lower:]')
-          FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30)
+          FEATURE_NAME_LOWER=$(echo $FEATURE_NAME | tr '[:upper:]' '[:lower:]' | sed 's/-*$//')
+          FEATURE_NAME_LOWER_SHORT=$(echo $FEATURE_NAME_LOWER | cut -c -30 | sed 's/-*$//')
           curl -X POST \
             -H "Authorization: Basic ${{ secrets.JIRA_AUTH }}" \
             -H "Content-Type: application/json" \