From 313a19f1f4bef4a70a0fd3c2cd4cee954fc0e717 Mon Sep 17 00:00:00 2001 From: ebronson68 <111298136+ebronson68@users.noreply.github.com> Date: Fri, 15 Dec 2023 12:58:08 -0600 Subject: [PATCH 1/3] [DEVOPS-349] Move Jira ticket id to end of app name --- .github/workflows/ephemeral-deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ephemeral-deploy.yaml b/.github/workflows/ephemeral-deploy.yaml index a4a3fce4..0806df7e 100644 --- a/.github/workflows/ephemeral-deploy.yaml +++ b/.github/workflows/ephemeral-deploy.yaml @@ -107,9 +107,9 @@ jobs: id: checksum run: | CHECKSUM=$(echo -n '${{ steps.repository-name.outputs.repositoryName }}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}' | sha256sum | awk '{print $1}') - URL="${{ steps.jira-ticket.outputs.jiraTicketIdLc }}-${CHECKSUM}" - SHORT_URL=${URL:0:32} - echo "containerAppName=${SHORT_URL}" >> $GITHUB_OUTPUT + SHORT_CHECKSUM=${CHECKSUM:0:16} + CONTAINER_APP_NAME="${SHORT_CHECKSUM}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}" + echo "containerAppName=${CONTAINER_APP_NAME}" >> $GITHUB_OUTPUT outputs: environment: ${{ steps.environment.outputs.environment }} jiraTicketId: ${{ steps.jira-ticket.outputs.jiraTicketId }} From e7eef7b30d06a8328ec4bbb4b299d6f843a6ae7a Mon Sep 17 00:00:00 2001 From: ebronson68 <111298136+ebronson68@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:10:34 -0600 Subject: [PATCH 2/3] Switch to md5sum to generate checksum --- .github/workflows/ephemeral-deploy.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ephemeral-deploy.yaml b/.github/workflows/ephemeral-deploy.yaml index 0806df7e..81ec1637 100644 --- a/.github/workflows/ephemeral-deploy.yaml +++ b/.github/workflows/ephemeral-deploy.yaml @@ -82,13 +82,6 @@ jobs: echo "jiraTicketIdLc=${JIRA_TICKET_ID_LC}" >> $GITHUB_OUTPUT echo "jiraTicketId=${JIRA_TICKET_ID}" >> $GITHUB_OUTPUT - - name: Fix repository name - id: repository-name - run: | - REPOSITORY_NAME="${{ inputs.repositoryName }}" - REPO_NAME_SHORT=$(echo "${REPOSITORY_NAME:0:21}" | tr '[:upper:]' '[:lower:]' | tr "_" "-") - echo "repositoryName=${REPO_NAME_SHORT}" >> $GITHUB_OUTPUT - - name: Get Environment id: environment shell: bash @@ -106,15 +99,15 @@ jobs: - name: Generate container app name id: checksum run: | - CHECKSUM=$(echo -n '${{ steps.repository-name.outputs.repositoryName }}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}' | sha256sum | awk '{print $1}') - SHORT_CHECKSUM=${CHECKSUM:0:16} + REPOSITORY_NAME="${{ inputs.repositoryName }}" + CHECKSUM=$(echo -n '${REPOSITORY_NAME}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]//g' | sed 's/--/-/g' | sed 's/^-//;s/-$//' | cut -c1-31 | md5sum | cut -d' ' -f1 | sed 's/^\([0-9]\)/a\1/') + SHORT_CHECKSUM=${CHECKSUM:0:20} CONTAINER_APP_NAME="${SHORT_CHECKSUM}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}" echo "containerAppName=${CONTAINER_APP_NAME}" >> $GITHUB_OUTPUT outputs: environment: ${{ steps.environment.outputs.environment }} jiraTicketId: ${{ steps.jira-ticket.outputs.jiraTicketId }} jiraTicketIdLc: ${{ steps.jira-ticket.outputs.jiraTicketIdLc }} - repositoryName: ${{ steps.repository-name.outputs.repositoryName }} containerAppName: ${{ steps.checksum.outputs.containerAppName }} deploy: From be6825c68c080b9e2d7a45bd3d9b8da494a2baff Mon Sep 17 00:00:00 2001 From: ebronson68 <111298136+ebronson68@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:15:01 -0600 Subject: [PATCH 3/3] Just add repositoryName input to checksum var --- .github/workflows/ephemeral-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ephemeral-deploy.yaml b/.github/workflows/ephemeral-deploy.yaml index 81ec1637..3bedbb1e 100644 --- a/.github/workflows/ephemeral-deploy.yaml +++ b/.github/workflows/ephemeral-deploy.yaml @@ -99,8 +99,7 @@ jobs: - name: Generate container app name id: checksum run: | - REPOSITORY_NAME="${{ inputs.repositoryName }}" - CHECKSUM=$(echo -n '${REPOSITORY_NAME}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]//g' | sed 's/--/-/g' | sed 's/^-//;s/-$//' | cut -c1-31 | md5sum | cut -d' ' -f1 | sed 's/^\([0-9]\)/a\1/') + CHECKSUM=$(echo -n '${{ inputs.repositoryName }}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]//g' | sed 's/--/-/g' | sed 's/^-//;s/-$//' | cut -c1-31 | md5sum | cut -d' ' -f1 | sed 's/^\([0-9]\)/a\1/') SHORT_CHECKSUM=${CHECKSUM:0:20} CONTAINER_APP_NAME="${SHORT_CHECKSUM}-${{ steps.jira-ticket.outputs.jiraTicketIdLc }}" echo "containerAppName=${CONTAINER_APP_NAME}" >> $GITHUB_OUTPUT