Skip to content

Commit

Permalink
Update verify-config GHA: remove expanded check, update pairs of unde…
Browse files Browse the repository at this point in the history
…rlays that should be in sync.
  • Loading branch information
marikomedlock committed Jul 26, 2023
1 parent 3da4199 commit 6693fe1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 45 deletions.
36 changes: 0 additions & 36 deletions .github/tools/verify_config_has_been_expanded.sh

This file was deleted.

8 changes: 4 additions & 4 deletions .github/tools/verify_config_in_sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

configs_to_compare_list="
cms_synpuf broad/cms_synpuf verily/cms_synpuf\n
aou_synthetic broad/aou_synthetic verily/aou_synthetic\n
sdd vumc/sdd verily/sdd
sdd vumc/sdd verily/sdd\n
sdd_refresh0323 vumc/sdd_refresh0323 verily/sdd_refresh0323
"

# Needed for for loop to split only on newline, not on space
Expand All @@ -23,8 +23,8 @@ do
underlay_2=$(echo ${configs_to_compare} | awk '{print $3}')
printf "\nComparing ${underlay_1} to ${underlay_2}\n"

underlay_dir_1=$(echo service/src/main/resources/config/${underlay_1}/original)
underlay_dir_2=$(echo service/src/main/resources/config/${underlay_2}/original)
underlay_dir_1=$(echo service/src/main/resources/config/${underlay_1})
underlay_dir_2=$(echo service/src/main/resources/config/${underlay_2})
# --ignore-all-space because files sometimes have newline and at of file, and sometimes don't
diff_output=$(diff -rq --ignore-all-space --exclude ${underlay_name}.json --exclude sql ${underlay_dir_1} ${underlay_dir_2})

Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/validate-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,3 @@ jobs:
TEST_PROJECT_SA_KEY: ${{ secrets.TEST_PROJECT_SA_KEY }}
- name: Verify configs are in sync, for example vumc/sdd and verily/sdd
run: .github/tools/verify_config_in_sync.sh
- name: Verify underlay configs have been expanded
if: always()
run: .github/tools/verify_config_has_been_expanded.sh
env:
GOOGLE_APPLICATION_CREDENTIALS: ../rendered/broad/tanagra_sa.json

0 comments on commit 6693fe1

Please sign in to comment.