From e0b7adc0fb9347567227883181edd046ce7d29d2 Mon Sep 17 00:00:00 2001 From: Dave Mihalcik Date: Fri, 10 May 2024 10:38:31 -0400 Subject: [PATCH] chore: format yaml and .sh files (#277) --- .github/workflows/build.yaml | 6 +- .github/workflows/large-tests.yaml | 6 +- .../roundtrip/mocks/mock-secrets.yaml | 115 +++++++++--------- .github/workflows/roundtrip/mocks/values.yaml | 4 +- scripts/add-module-types.sh | 2 +- scripts/bump-version.sh | 4 +- scripts/check-version-is.sh | 6 +- 7 files changed, 71 insertions(+), 72 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f5689969..17f50edd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,5 @@ name: Build, Test, and Deliver Client - env: do_sonarscan: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} @@ -37,7 +36,7 @@ jobs: textReportPath: './lib/coverage/coverage.txt' - run: echo "${MARKDOWN_REPORT}" >> $GITHUB_STEP_SUMMARY env: - MARKDOWN_REPORT: "${{ steps.coverage-md.outputs.markdownReport }}" + MARKDOWN_REPORT: '${{ steps.coverage-md.outputs.markdownReport }}' - run: npm audit --omit dev && npm audit --audit-level high - run: npm run license-check - run: npm run lint @@ -208,7 +207,8 @@ jobs: echo "DIST_TAG=$(.github/workflows/guess-dist-tag.sh)" >> $GITHUB_OUTPUT - run: make test - run: make doc - - run: echo "::notice file=lib/package.json::Will be published to [GitHub Packages](https://github.com/opentdf/client-web/pkgs/npm/client) as ${{ steps.guess-build-metadata.outputs.DIST_TAG }} with version=[${{ steps.guess-build-metadata.outputs.FULL_VERSION }}]" + - run: >- + echo "::notice file=lib/package.json::Will be published to [GitHub Packages](https://github.com/opentdf/client-web/pkgs/npm/client)as ${{ steps.guess-build-metadata.outputs.DIST_TAG }} with version=[${{ steps.guess-build-metadata.outputs.FULL_VERSION }}]" - run: >- .github/workflows/publish-to.sh ${{ steps.guess-build-metadata.outputs.FULL_VERSION }} diff --git a/.github/workflows/large-tests.yaml b/.github/workflows/large-tests.yaml index 019bffa8..29117c05 100644 --- a/.github/workflows/large-tests.yaml +++ b/.github/workflows/large-tests.yaml @@ -2,7 +2,7 @@ name: Build, Test, and Deliver Client on: schedule: - - cron: "0 4 * * 2,4" + - cron: '0 4 * * 2,4' jobs: lib: runs-on: ubuntu-latest @@ -106,8 +106,8 @@ jobs: env: #path relative to the quickstart Tiltfile TEST_SCRIPT: ../../wait-and-test.sh - OPENTDF_INGRESS_HOST_PORT: "5432" - OPENTDF_LOAD_FRONTEND: "false" + OPENTDF_INGRESS_HOST_PORT: '5432' + OPENTDF_LOAD_FRONTEND: 'false' PLAYWRIGHT_TESTS_TO_RUN: huge roundtrip run: |- tilt ci --file opentdf/quickstart/Tiltfile diff --git a/.github/workflows/roundtrip/mocks/mock-secrets.yaml b/.github/workflows/roundtrip/mocks/mock-secrets.yaml index 15b3777b..8eb2f711 100644 --- a/.github/workflows/roundtrip/mocks/mock-secrets.yaml +++ b/.github/workflows/roundtrip/mocks/mock-secrets.yaml @@ -1,62 +1,61 @@ KAS_CERTIFICATE: | - -----BEGIN CERTIFICATE----- - MIICmDCCAYACCQC3BCaSANRhYzANBgkqhkiG9w0BAQsFADAOMQwwCgYDVQQDDANr - YXMwHhcNMjEwOTE1MTQxMTQ4WhcNMjIwOTE1MTQxMTQ4WjAOMQwwCgYDVQQDDANr - YXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOpiotrvV2i5h6clHM - zDGgh3h/kMa0LoGx2OkDPd8jogycUh7pgE5GNiN2lpSmFkjxwYMXnyrwr9ExyczB - WJ7sRGDCDaQg5fjVUIloZ8FJVbn+sEcfQ9iX6vmI9/S++oGK79QM3V8M8cp41r/T - 1YVmuzUHE1say/TLHGhjtGkxHDF8qFy6Z2rYFTCVJQHNqGmwNVGd0qG7gim86Haw - u/CMYj4jG9oITlj8rJtQOaJ6ZqemQVoNmb3j1LkyeUKzRIt+86aoBiz+T3TfOEvX - F6xgBj3XoiOhPYK+abFPYcrArvb6oubT8NjjQoj3j0sXWUnIIMg+e4f+XNVU54Zz - DaLZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABewfZOJ4/KNRE8IQ5TsW/AVn7C1 - l5ty6tUUBSVi8/df7WYts0bHEdQh9yl9agEU5i4rj43y8vMVZNzSeHcurtV/+C0j - fbkHQHeiQ1xn7cq3Sbh4UVRyuu4C5PklEH4AN6gxmgXC3kT15uWw8I4nm/plzYLs - I099IoRfC5djHUYYLMU/VkOIHuPC3sb7J65pSN26eR8bTMVNagk187V/xNwUuvkf - +NUxDO615/5BwQKnAu5xiIVagYnDZqKCOtYS5qhxF33Nlnwlm7hH8iVZ1RI+n52l - wVyElqp317Ksz+GtTIc+DE6oryxK3tZd4hrj9fXT4KiJvQ4pcRjpePgH7B8= - -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- + MIICmDCCAYACCQC3BCaSANRhYzANBgkqhkiG9w0BAQsFADAOMQwwCgYDVQQDDANr + YXMwHhcNMjEwOTE1MTQxMTQ4WhcNMjIwOTE1MTQxMTQ4WjAOMQwwCgYDVQQDDANr + YXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOpiotrvV2i5h6clHM + zDGgh3h/kMa0LoGx2OkDPd8jogycUh7pgE5GNiN2lpSmFkjxwYMXnyrwr9ExyczB + WJ7sRGDCDaQg5fjVUIloZ8FJVbn+sEcfQ9iX6vmI9/S++oGK79QM3V8M8cp41r/T + 1YVmuzUHE1say/TLHGhjtGkxHDF8qFy6Z2rYFTCVJQHNqGmwNVGd0qG7gim86Haw + u/CMYj4jG9oITlj8rJtQOaJ6ZqemQVoNmb3j1LkyeUKzRIt+86aoBiz+T3TfOEvX + F6xgBj3XoiOhPYK+abFPYcrArvb6oubT8NjjQoj3j0sXWUnIIMg+e4f+XNVU54Zz + DaLZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABewfZOJ4/KNRE8IQ5TsW/AVn7C1 + l5ty6tUUBSVi8/df7WYts0bHEdQh9yl9agEU5i4rj43y8vMVZNzSeHcurtV/+C0j + fbkHQHeiQ1xn7cq3Sbh4UVRyuu4C5PklEH4AN6gxmgXC3kT15uWw8I4nm/plzYLs + I099IoRfC5djHUYYLMU/VkOIHuPC3sb7J65pSN26eR8bTMVNagk187V/xNwUuvkf + +NUxDO615/5BwQKnAu5xiIVagYnDZqKCOtYS5qhxF33Nlnwlm7hH8iVZ1RI+n52l + wVyElqp317Ksz+GtTIc+DE6oryxK3tZd4hrj9fXT4KiJvQ4pcRjpePgH7B8= + -----END CERTIFICATE----- KAS_EC_SECP256R1_CERTIFICATE: | - -----BEGIN CERTIFICATE----- - MIIBCzCBsgIJAL1qc/lWpG3HMAoGCCqGSM49BAMCMA4xDDAKBgNVBAMMA2thczAe - Fw0yMTA5MTUxNDExNDlaFw0yMjA5MTUxNDExNDlaMA4xDDAKBgNVBAMMA2thczBZ - MBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2VM7Ws9SVr19rywr/o3fewDBj+170/ - 6y8zo4leVaJqCl76Nd9QfDNy4KjNCtmmjo6ftTS+iFAhnPCeugAJOWUwCgYIKoZI - zj0EAwIDSAAwRQIhAIFdrqhwvgL8ctPjUtmULXmg2ii0PFKg/Mox2GiCVXQdAiAW - UDdeafEoprE+qc4paMmbWoEpRXLlo+3S7rnc5T12Kw== - -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- + MIIBCzCBsgIJAL1qc/lWpG3HMAoGCCqGSM49BAMCMA4xDDAKBgNVBAMMA2thczAe + Fw0yMTA5MTUxNDExNDlaFw0yMjA5MTUxNDExNDlaMA4xDDAKBgNVBAMMA2thczBZ + MBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2VM7Ws9SVr19rywr/o3fewDBj+170/ + 6y8zo4leVaJqCl76Nd9QfDNy4KjNCtmmjo6ftTS+iFAhnPCeugAJOWUwCgYIKoZI + zj0EAwIDSAAwRQIhAIFdrqhwvgL8ctPjUtmULXmg2ii0PFKg/Mox2GiCVXQdAiAW + UDdeafEoprE+qc4paMmbWoEpRXLlo+3S7rnc5T12Kw== + -----END CERTIFICATE----- KAS_EC_SECP256R1_PRIVATE_KEY: | - -----BEGIN PRIVATE KEY----- - MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgOK47RufwyqeWbDdC - ojHYxzkZ+VphXbNzZOt2seMavk2hRANCAAR9lTO1rPUla9fa8sK/6N33sAwY/te9 - P+svM6OJXlWiagpe+jXfUHwzcuCozQrZpo6On7U0vohQIZzwnroACTll - -----END PRIVATE KEY----- + -----BEGIN PRIVATE KEY----- + MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgOK47RufwyqeWbDdC + ojHYxzkZ+VphXbNzZOt2seMavk2hRANCAAR9lTO1rPUla9fa8sK/6N33sAwY/te9 + P+svM6OJXlWiagpe+jXfUHwzcuCozQrZpo6On7U0vohQIZzwnroACTll + -----END PRIVATE KEY----- KAS_PRIVATE_KEY: | - -----BEGIN PRIVATE KEY----- - MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOpiotrvV2i5h6 - clHMzDGgh3h/kMa0LoGx2OkDPd8jogycUh7pgE5GNiN2lpSmFkjxwYMXnyrwr9Ex - yczBWJ7sRGDCDaQg5fjVUIloZ8FJVbn+sEcfQ9iX6vmI9/S++oGK79QM3V8M8cp4 - 1r/T1YVmuzUHE1say/TLHGhjtGkxHDF8qFy6Z2rYFTCVJQHNqGmwNVGd0qG7gim8 - 6Hawu/CMYj4jG9oITlj8rJtQOaJ6ZqemQVoNmb3j1LkyeUKzRIt+86aoBiz+T3Tf - OEvXF6xgBj3XoiOhPYK+abFPYcrArvb6oubT8NjjQoj3j0sXWUnIIMg+e4f+XNVU - 54ZzDaLZAgMBAAECggEBALb0yK0PlMUyzHnEUwXV1y5AIoAWhsYp0qvJ1msHUVKz - +yQ/VJz4+tQQxI8OvGbbnhNkd5LnWdYkYzsIZl7b/kBCPcQw3Zo+4XLCzhUAn1E1 - M+n42c8le1LtN6Z7mVWoZh7DPONy7t+ABvm7b7S1+1i78DPmgCeWYZGeAhIcPXG6 - 5AxWIV3jigxksE6kYY9Y7DmtsZgMRrdV7SU8VtgPtT7tua8z5/U3Av0WINyKBSoM - 0yDHsAg57KnM8znx2JWLtHd0Mk5bBuu2DLbtyKNrVUAUuMPzrLGBh9S9QRd934KU - uFAi1TEfgEachnGgSHJpzVzr2ur1tifABnQ7GNXObe0CgYEA6KowK0subdDY+uGW - ciP2XDAMerbJJeL0/UIGPb/LUmskniio2493UBGgY2FsRyvbzJ+/UAOjIPyIxhj7 - 78ZyVG8BmIzKan1RRVh//O+5yvks/eTOYjWeQ1Lcgqs3q4YAO13CEBZgKWKTUomg - mskFJq04tndeSIyhDaW+BuWaXA8CgYEA42ABz3pql+DH7oL5C4KYBymK6wFBBOqk - dVk+ftyJQ6PzuZKpfsu4aPIjKm71lkTgK6O9o08s3SckAdu6vLukq2TZFF+a+9OI - lu5ww7GvfdMTgLAaFchD4bPlOInh1KVjBc1MwGXpl0ROde5pi8+WUrv9QJuoQfB/ - 4rhYdbJLSpcCgYA41mqSCPm8pgp7r2RbWeGzP6Gs0L5u3PTQcbKonxQCfF4jrPcj - O/b/vm6aGJClClfVsyi/WUQeqNKY4j2Zo7cGXV/cbnh8b0TNVgNePQn8Rcbx91Vb - tJGHDNUFruIYqtGfrxXbbDvtoEExJqHvbjAt9J8oJB0KSCCH/vdfI/QDjQKBgQCD - xLPH5Y24js/O7aAeh4RLQkv7fTKNAt5kE2AgbPYveOhZ9yC7Fpy8VPcENGGmwCuZ - nr7b0ZqSX4iCezBxB92aZktXf0B2CFT0AyLehi7JoHWA8o1rai/MsVB5v45ciawl - RKDiLy18OF2wAoawO5FGSSOvOYX9EL9MSMEbFESF6QKBgCVlZ9pPC+55rGT6AcEL - tUpDs+/wZvcmfsFd8xC5mMUN0DatAVzVAUI95+tQaWU3Uj+bqHq0lC6Wy2VceG0D - D+7EicjdGFN/2WVPXiYX1fblkxasZY+wChYBrPLjA9g0qOzzmXbRBph5QxDuQjJ6 - qcddVKB624a93ZBssn7OivnR - -----END PRIVATE KEY----- - + -----BEGIN PRIVATE KEY----- + MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOpiotrvV2i5h6 + clHMzDGgh3h/kMa0LoGx2OkDPd8jogycUh7pgE5GNiN2lpSmFkjxwYMXnyrwr9Ex + yczBWJ7sRGDCDaQg5fjVUIloZ8FJVbn+sEcfQ9iX6vmI9/S++oGK79QM3V8M8cp4 + 1r/T1YVmuzUHE1say/TLHGhjtGkxHDF8qFy6Z2rYFTCVJQHNqGmwNVGd0qG7gim8 + 6Hawu/CMYj4jG9oITlj8rJtQOaJ6ZqemQVoNmb3j1LkyeUKzRIt+86aoBiz+T3Tf + OEvXF6xgBj3XoiOhPYK+abFPYcrArvb6oubT8NjjQoj3j0sXWUnIIMg+e4f+XNVU + 54ZzDaLZAgMBAAECggEBALb0yK0PlMUyzHnEUwXV1y5AIoAWhsYp0qvJ1msHUVKz + +yQ/VJz4+tQQxI8OvGbbnhNkd5LnWdYkYzsIZl7b/kBCPcQw3Zo+4XLCzhUAn1E1 + M+n42c8le1LtN6Z7mVWoZh7DPONy7t+ABvm7b7S1+1i78DPmgCeWYZGeAhIcPXG6 + 5AxWIV3jigxksE6kYY9Y7DmtsZgMRrdV7SU8VtgPtT7tua8z5/U3Av0WINyKBSoM + 0yDHsAg57KnM8znx2JWLtHd0Mk5bBuu2DLbtyKNrVUAUuMPzrLGBh9S9QRd934KU + uFAi1TEfgEachnGgSHJpzVzr2ur1tifABnQ7GNXObe0CgYEA6KowK0subdDY+uGW + ciP2XDAMerbJJeL0/UIGPb/LUmskniio2493UBGgY2FsRyvbzJ+/UAOjIPyIxhj7 + 78ZyVG8BmIzKan1RRVh//O+5yvks/eTOYjWeQ1Lcgqs3q4YAO13CEBZgKWKTUomg + mskFJq04tndeSIyhDaW+BuWaXA8CgYEA42ABz3pql+DH7oL5C4KYBymK6wFBBOqk + dVk+ftyJQ6PzuZKpfsu4aPIjKm71lkTgK6O9o08s3SckAdu6vLukq2TZFF+a+9OI + lu5ww7GvfdMTgLAaFchD4bPlOInh1KVjBc1MwGXpl0ROde5pi8+WUrv9QJuoQfB/ + 4rhYdbJLSpcCgYA41mqSCPm8pgp7r2RbWeGzP6Gs0L5u3PTQcbKonxQCfF4jrPcj + O/b/vm6aGJClClfVsyi/WUQeqNKY4j2Zo7cGXV/cbnh8b0TNVgNePQn8Rcbx91Vb + tJGHDNUFruIYqtGfrxXbbDvtoEExJqHvbjAt9J8oJB0KSCCH/vdfI/QDjQKBgQCD + xLPH5Y24js/O7aAeh4RLQkv7fTKNAt5kE2AgbPYveOhZ9yC7Fpy8VPcENGGmwCuZ + nr7b0ZqSX4iCezBxB92aZktXf0B2CFT0AyLehi7JoHWA8o1rai/MsVB5v45ciawl + RKDiLy18OF2wAoawO5FGSSOvOYX9EL9MSMEbFESF6QKBgCVlZ9pPC+55rGT6AcEL + tUpDs+/wZvcmfsFd8xC5mMUN0DatAVzVAUI95+tQaWU3Uj+bqHq0lC6Wy2VceG0D + D+7EicjdGFN/2WVPXiYX1fblkxasZY+wChYBrPLjA9g0qOzzmXbRBph5QxDuQjJ6 + qcddVKB624a93ZBssn7OivnR + -----END PRIVATE KEY----- diff --git a/.github/workflows/roundtrip/mocks/values.yaml b/.github/workflows/roundtrip/mocks/values.yaml index 13f2fdf4..19417565 100644 --- a/.github/workflows/roundtrip/mocks/values.yaml +++ b/.github/workflows/roundtrip/mocks/values.yaml @@ -17,7 +17,7 @@ keycloak: password: bXlQb3N0Z3Jlc1Bhc3N3b3Jk kas: auth: - "http://localhost:65432/auth/realms/tdf": - discoveryBaseUrl: "http://keycloak-http/auth/realms/tdf" + 'http://localhost:65432/auth/realms/tdf': + discoveryBaseUrl: 'http://keycloak-http/auth/realms/tdf' entitlementpdp: opaPolicyPullSecret: my-pat diff --git a/scripts/add-module-types.sh b/scripts/add-module-types.sh index e4a46016..3ba859be 100755 --- a/scripts/add-module-types.sh +++ b/scripts/add-module-types.sh @@ -22,7 +22,7 @@ if [[ $# -gt 0 ]]; then m="$1" shift case "$m" in - cjs|commonjs) + cjs | commonjs) fixup "$m" commonjs ;; es* | node*) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 1aa3a2b0..5343ee79 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -37,8 +37,8 @@ done # multiplatform `sed -i`: https://unix.stackexchange.com/a/92907 case $(sed --help 2>&1) in - *GNU*) sed_i () { sed -i "$@"; };; - *) sed_i () { sed -i '' "$@"; };; + *GNU*) sed_i() { sed -i "$@"; } ;; + *) sed_i() { sed -i '' "$@"; } ;; esac if ! sed_i "s/version=${old_version}/version=${new_version}/" "Makefile"; then diff --git a/scripts/check-version-is.sh b/scripts/check-version-is.sh index 5535ac4e..5e6d5cd1 100755 --- a/scripts/check-version-is.sh +++ b/scripts/check-version-is.sh @@ -9,7 +9,7 @@ expected_version="${1:-$lib_version}" if ! grep --fixed-strings --line-regexp --quiet "version=${expected_version}" "Makefile"; then if grep --quiet "^version=" "Makefile"; then - echo "::error file=Makefile,line=$(sed -n '/version/=' $f)::Incorrect version line, should be setting it to [${expected_version}]" + echo "::error file=Makefile,line=$(sed -n '/version/=' $f)::Incorrect version line, should be setting it to [${expected_version}]" else echo "::error file=Makefile::Makefile missing version line [version=${expected_version}]" fi @@ -19,7 +19,7 @@ fi for f in lib{,/tdf3}/src/version.ts; do if ! grep --fixed-strings --line-regexp --quiet "export const version = '${expected_version}';" "$f"; then if grep --quiet "^export const version" "$f"; then - echo "::error file=$f,line=$(sed -n '/export const version/=' $f)::Incorrect version line, should be setting it to [${expected_version}]" + echo "::error file=$f,line=$(sed -n '/export const version/=' $f)::Incorrect version line, should be setting it to [${expected_version}]" else echo "::error file=$f::Missing version line [version=${expected_version}]" fi @@ -36,7 +36,7 @@ for x in lib web-app; do done if [[ "${GITHUB_ACTION:-}" ]]; then - echo "TARGET_VERSION=$expected_version" >> $GITHUB_OUTPUT + echo "TARGET_VERSION=$expected_version" >>$GITHUB_OUTPUT else echo "SUCCESS: TARGET_VERSION=$expected_version" fi