ci: reduce duplication of fips checks

Author: cardoso

.github/actions/build-docker/action.yml

@@ -133,7 +133,7 @@ runs:
         cat /tmp/meta.json
 
         if [[ "${{ inputs.publish-image }}" == 'true' ]]; then
-          SERVICE_SUFFIX=${{ (inputs.service == 'rocketchat' && inputs.type == 'coverage' && (github.event_name == 'release' || github.ref == 'refs/heads/develop')) && '-cov' || ((inputs.service == 'ddp-streamer-service' || inputs.service == 'presence-service') && inputs.type == 'fips' && '-fips' || '') }}
+          SERVICE_SUFFIX=${{ (inputs.service == 'rocketchat' && inputs.type == 'coverage' && (github.event_name == 'release' || github.ref == 'refs/heads/develop')) && '-cov' || (inputs.type == 'fips' && '-fips' || '') }}
 
           mkdir -p /tmp/manifests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}
 

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ concurrency:
 
 env:
   TOOL_NODE_FLAGS: ${{ vars.TOOL_NODE_FLAGS }}
+  FIPS_ENABLED_SERVICES: '["ddp-streamer-service","presence-service"]'
 
 jobs:
   release-versions:
@@ -318,8 +319,8 @@ jobs:
         env:
           # add suffix for the extra images with coverage if building for production
           DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ matrix.type == 'coverage' && (github.event_name == 'release' || github.ref == 'refs/heads/develop') && '-cov' || '' }}
-          DOCKER_TAG_SUFFIX_FIPS: ${{ (matrix.service[0] == 'ddp-streamer-service' || matrix.service[0] == 'presence-service') && matrix.type == 'fips' && '-fips' || '' }}
-          BUILD_TARGET: ${{ (matrix.service[0] == 'ddp-streamer-service' || matrix.service[0] == 'presence-service') && matrix.type == 'fips' && 'release-fips' || '' }}
+          DOCKER_TAG_SUFFIX_FIPS: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[0]) && matrix.type == 'fips' && '-fips' || '' }}
+          BUILD_TARGET: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[0]) && matrix.type == 'fips' && 'release-fips' || '' }}
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
@@ -336,8 +337,8 @@ jobs:
         if: matrix.service[1] && github.actor != 'dependabot[bot]'
         env:
           DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ matrix.type == 'coverage' && '-cov' || '' }}
-          DOCKER_TAG_SUFFIX_FIPS: ${{ (matrix.service[1] == 'ddp-streamer-service' || matrix.service[1] == 'presence-service') && matrix.type == 'fips' && '-fips' || '' }}
-          BUILD_TARGET: ${{ (matrix.service[1] == 'ddp-streamer-service' || matrix.service[1] == 'presence-service') && matrix.type == 'fips' && 'release-fips' || '' }}
+          DOCKER_TAG_SUFFIX_FIPS: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[1]) && matrix.type == 'fips' && '-fips' || '' }}
+          BUILD_TARGET: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[1]) && matrix.type == 'fips' && 'release-fips' || '' }}
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
@@ -355,8 +356,8 @@ jobs:
         if: matrix.service[2] && github.actor != 'dependabot[bot]'
         env:
           DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ matrix.type == 'coverage' && '-cov' || '' }}
-          DOCKER_TAG_SUFFIX_FIPS: ${{ (matrix.service[2] == 'ddp-streamer-service' || matrix.service[2] == 'presence-service') && matrix.type == 'fips' && '-fips' || '' }}
-          BUILD_TARGET: ${{ (matrix.service[2] == 'ddp-streamer-service' || matrix.service[2] == 'presence-service') && matrix.type == 'fips' && 'release-fips' || '' }}
+          DOCKER_TAG_SUFFIX_FIPS: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[2]) && matrix.type == 'fips' && '-fips' || '' }}
+          BUILD_TARGET: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[2]) && matrix.type == 'fips' && 'release-fips' || '' }}
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
@@ -374,8 +375,8 @@ jobs:
         if: matrix.service[3] && github.actor != 'dependabot[bot]'
         env:
           DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ matrix.type == 'coverage' && '-cov' || '' }}
-          DOCKER_TAG_SUFFIX_FIPS: ${{ (matrix.service[3] == 'ddp-streamer-service' || matrix.service[3] == 'presence-service') && matrix.type == 'fips' && '-fips' || '' }}
-          BUILD_TARGET: ${{ (matrix.service[3] == 'ddp-streamer-service' || matrix.service[3] == 'presence-service') && matrix.type == 'fips' && 'release-fips' || '' }}
+          DOCKER_TAG_SUFFIX_FIPS: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[3]) && matrix.type == 'fips' && '-fips' || '' }}
+          BUILD_TARGET: ${{ contains(fromJSON(env.FIPS_ENABLED_SERVICES), matrix.service[3]) && matrix.type == 'fips' && 'release-fips' || '' }}
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
@@ -444,10 +445,9 @@ jobs:
             # Get image name from docker-compose-ci.yml since rocketchat image is different from service name (rocket.chat)
             if [ "$service" == "rocketchat-cov" ]; then
               IMAGE=$(docker compose -f docker-compose-ci.yml config --format json 2>/dev/null | jq -r --arg s "rocketchat" '.services[$s].image')-cov
-            elif [ "$service" == "presence-service-fips" ]; then
-              IMAGE=$(docker compose -f docker-compose-ci.yml config --format json 2>/dev/null | jq -r --arg s "presence-service" '.services[$s].image')-fips
-            elif [ "$service" == "ddp-streamer-service-fips" ]; then
-              IMAGE=$(docker compose -f docker-compose-ci.yml config --format json 2>/dev/null | jq -r --arg s "ddp-streamer-service" '.services[$s].image')-fips
+            elif [[ "$service" == *"-fips" ]]; then
+              base_service="${service%-fips}"
+              IMAGE=$(docker compose -f docker-compose-ci.yml config --format json 2>/dev/null | jq -r --arg s "$base_service" '.services[$s].image')-fips
             else
               IMAGE=$(docker compose -f docker-compose-ci.yml config --format json 2>/dev/null | jq -r --arg s "$service" '.services[$s].image')
             fi