diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 533f72f2e2b..7b2b24a7034 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,6 @@ name: Build on: - push: - branches: [master] pull_request: types: [opened, synchronize, reopened] branches-ignore: ['l10n_master*'] @@ -13,31 +11,32 @@ on: workflows: ['Compress images'] types: [completed] +env: + php-version: 7.4 + node-version: 14 + jobs: ############# # Build ############# build: runs-on: ubuntu-latest - name: Build (PHP ${{ matrix.php-version }}) + name: Build Assets strategy: fail-fast: false - matrix: - php-version: [7.4] - - env: - node-version: 14 steps: - name: Checkout sources uses: actions/checkout@v2 + with: + fetch-depth: 0 - - name: Setup PHP ${{ matrix.php-version }} + - name: Setup PHP ${{ env.php-version }} uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-version }} - extensions: imagick, mbstring, dom, fileinfo, ${{ matrix.connection }} + php-version: ${{ env.php-version }} + extensions: imagick, mbstring, dom, fileinfo coverage: none - name: Check PHP Version run: php -v @@ -57,10 +56,10 @@ jobs: uses: actions/cache@v2.1.4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} - ${{ runner.os }}-composer-${{ matrix.php-version }} + ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} + ${{ runner.os }}-composer-${{ env.php-version }} ${{ runner.os }}-composer- - name: Install composer dependencies @@ -91,11 +90,13 @@ jobs: run: yarn run production - name: Check if there is any file update needed + id: check run: | status=$(git status --porcelain) if [ -z "$status" ]; then echo "Nothing to push, already up to date." else echo -e "Waiting modifications:\n$status" + echo "::error::Assets are not up to date. Please rebuild with: 'yarn run lint:all' and 'yarn run prod'." exit -1 fi diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 5a145a3d3de..9bca2cf7d5e 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -4,6 +4,10 @@ on: pull_request: types: [labeled, opened, synchronize, reopened] +env: + node-version: 14 + + jobs: cypress: runs-on: ubuntu-latest @@ -17,9 +21,6 @@ jobs: browser: [chrome] containers: [1, 2, 3, 4, 5, 6, 7, 8] - env: - node-version: 14 - steps: - name: Checkout sources uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd7187a4dc0..3572a0c81e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,11 @@ on: workflow_dispatch: +env: + php-version: 7.4 + node-version: 14 + + jobs: #################### # Semantic release @@ -58,10 +63,6 @@ jobs: name: Package release if: needs.semantic.outputs.new_release_published == 'true' - env: - php-version: 7.4 - node-version: 14 - steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index bbedd43074d..c3df79a33d3 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -8,21 +8,21 @@ on: workflows: ['Compress images'] types: [completed] +env: + php-version: 7.4 + + jobs: psalm: runs-on: ubuntu-latest - strategy: - matrix: - php-version: [7.4] - steps: - name: Checkout sources uses: actions/checkout@v2 - - name: Setup PHP ${{ matrix.php-version }} + - name: Setup PHP ${{ env.php-version }} uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-version }} + php-version: ${{ env.php-version }} extensions: imagick, mbstring, dom, fileinfo coverage: none @@ -33,10 +33,10 @@ jobs: uses: actions/cache@v2.1.4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} - ${{ runner.os }}-composer-${{ matrix.php-version }} + ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} + ${{ runner.os }}-composer-${{ env.php-version }} ${{ runner.os }}-composer- - name: Install dependencies @@ -48,18 +48,14 @@ jobs: phpstan: runs-on: ubuntu-latest - strategy: - matrix: - php-version: [7.4] - steps: - name: Checkout sources uses: actions/checkout@v2 - - name: Setup PHP ${{ matrix.php-version }} + - name: Setup PHP ${{ env.php-version }} uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-version }} + php-version: ${{ env.php-version }} extensions: imagick, mbstring, dom, fileinfo coverage: none @@ -70,10 +66,10 @@ jobs: uses: actions/cache@v2.1.4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }} - ${{ runner.os }}-composer-${{ matrix.php-version }} + ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }} + ${{ runner.os }}-composer-${{ env.php-version }} ${{ runner.os }}-composer- - name: Install dependencies diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 94c83681666..50e60c7dd40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,13 +13,18 @@ on: workflows: ['Compress images'] types: [completed] +env: + default-php-version: 7.4 + node-version: 14 + + jobs: ############# # Run tests ############# tests: runs-on: ubuntu-latest - name: Unit tests on ${{ matrix.connection }} Testsuite ${{ matrix.testsuite }} (PHP ${{ matrix.php-version }}) + name: Testsuite ${{ matrix.testsuite }} with PHP ${{ matrix.php-version }} (${{ matrix.connection }}) strategy: fail-fast: false @@ -106,25 +111,26 @@ jobs: # Test - name: Run Unit test suite - if: matrix.php-version == '7.4' - run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --testsuite ${{ matrix.testsuite }} --log-junit ./results/junit/results${{ matrix.testsuite }}.xml --coverage-clover ./results/coverage${{ matrix.testsuite }}.xml + if: matrix.php-version == env.default-php-version + run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --testsuite ${{ matrix.testsuite }} --log-junit ./results/junit/results${{ matrix.testsuite }}.xml --coverage-clover ./results/coverage/coverage${{ matrix.testsuite }}.xml env: DB_CONNECTION: ${{ matrix.connection }} - name: Run Unit test suite - if: matrix.php-version != '7.4' - run: vendor/bin/phpunit -c phpunit.xml --testsuite ${{ matrix.testsuite }} + if: matrix.php-version != env.default-php-version + run: vendor/bin/phpunit -c phpunit.xml --testsuite ${{ matrix.testsuite }} --log-junit ./results/junit/results${{ matrix.testsuite }}.xml env: DB_CONNECTION: ${{ matrix.connection }} - name: Fix results files - if: matrix.php-version == '7.4' - run: sed -i -e "s%$GITHUB_WORKSPACE/%%g" results/*/*.xml + if: matrix.php-version == env.default-php-version + run: sed -i -e "s%$GITHUB_WORKSPACE/%%g" **/*.xml + working-directory: results - name: Store results - if: matrix.php-version == '7.4' && always() + if: always() uses: actions/upload-artifact@v2 with: - name: results${{ matrix.testsuite }} + name: results path: results @@ -133,17 +139,14 @@ jobs: ################### tests_browser: runs-on: ubuntu-latest - name: Tests browser on ${{ matrix.connection }} (PHP ${{ matrix.php-version }}) + name: Tests browser with PHP ${{ matrix.php-version }} (${{ matrix.connection }}) strategy: fail-fast: false matrix: - php-version: [7.4] + php-version: [7.4, 8.0] connection: [mysql] - env: - node-version: 14 - steps: - name: Checkout sources uses: actions/checkout@v2 @@ -207,7 +210,7 @@ jobs: run: | cp scripts/ci/.env.${{ matrix.connection }} .env touch config/.version config/.release .sentry-release .sentry-commit - mkdir -p results/coverage results/console + mkdir -p results/coverage results/cov results/console chmod -R 777 storage bootstrap/cache - name: Generate key @@ -252,14 +255,18 @@ jobs: - name: Fix coverage run: | - vendor/bin/phpcov merge --clover=results/coverage0.xml results/coverage/ - rm -rf results/coverage + vendor/bin/phpcov merge --clover=results/coverage/coverageBrowser.xml results/cov/ + rm -rf results/cov + + - name: Fix results files + run: sed -i -e "s%$GITHUB_WORKSPACE/%%g" **/*.xml + working-directory: results - name: Store results if: always() uses: actions/upload-artifact@v2 with: - name: results0 + name: results path: results @@ -278,21 +285,11 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - name: Checkout HEAD - if: github.event_name == 'pull_request' - run: git checkout HEAD^2 - - name: Download results uses: actions/download-artifact@v2 with: path: results - - - name: Fix results paths - run: | - pushd results - for f in $(ls); do cp -rf $f/* .; rm -rf $f; done + name: results - name: Merge junit files run: | @@ -303,9 +300,15 @@ jobs: id: version run: | version=$(git tag --points-at HEAD) - test -z "$version" && version="main" + test -z "$version" && version="master" echo "::set-output name=value::$version" + - name: Set coverage list + id: coverage + run: | + SONAR_COVERAGE=$(ls -m --format=comma results/coverage/coverage*.xml | sed -e ':a;N;$!ba;s/\n//g; s/ //g;') + echo "::set-output name=list::$SONAR_COVERAGE" + - name: SonarCloud Scan if: env.SONAR_TOKEN != '' uses: SonarSource/sonarcloud-github-action@v1.5 @@ -315,3 +318,5 @@ jobs: with: args: | -Dsonar.projectVersion=${{ steps.version.outputs.value }} + -Dsonar.php.tests.reportPath=./results/results.xml + -Dsonar.php.coverage.reportPaths=${{ steps.coverage.outputs.list }} diff --git a/app/Http/Resources/Journal/Entry.php b/app/Http/Resources/Journal/Entry.php index 452d0689736..080378b278e 100644 --- a/app/Http/Resources/Journal/Entry.php +++ b/app/Http/Resources/Journal/Entry.php @@ -23,6 +23,7 @@ public function toArray($request) 'object' => 'entry', 'title' => $this->title, 'post' => $this->post, + 'date' => $this->date, 'url' => route('api.entry', $this->id), 'account' => [ 'id' => $this->account_id, diff --git a/composer.lock b/composer.lock index 49b1036829b..87f33a80c35 100644 --- a/composer.lock +++ b/composer.lock @@ -3045,16 +3045,16 @@ }, { "name": "laravel/passport", - "version": "v10.1.0", + "version": "v10.1.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4" + "reference": "2ed01909228b049f6ea0aa2d4b0ae78d3b27bee3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4", - "reference": "c2b93a7d8d93cf303bb1eefbfa5610f084f9bdd4", + "url": "https://api.github.com/repos/laravel/passport/zipball/2ed01909228b049f6ea0aa2d4b0ae78d3b27bee3", + "reference": "2ed01909228b049f6ea0aa2d4b0ae78d3b27bee3", "shasum": "" }, "require": { @@ -3073,7 +3073,7 @@ "league/oauth2-server": "^8.2", "nyholm/psr7": "^1.3", "php": "^7.3|^8.0", - "phpseclib/phpseclib": "^2.0", + "phpseclib/phpseclib": "^3.0", "symfony/psr-http-message-bridge": "^2.0" }, "require-dev": { @@ -3118,7 +3118,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2020-11-26T07:57:30+00:00" + "time": "2021-02-23T20:45:29+00:00" }, { "name": "laravel/socialite", @@ -6125,24 +6125,26 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.30", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36" + "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/136b9ca7eebef78be14abf90d65c5e57b6bc5d36", - "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7c751ea006577e4c2e83326d90c8b1e8c11b8ede", + "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede", "shasum": "" }, "require": { - "php": ">=5.3.3" + "paragonie/constant_time_encoding": "^1|^2", + "paragonie/random_compat": "^1.4|^2.0|^9.99.99", + "php": ">=5.6.1" }, "require-dev": { "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", + "phpunit/phpunit": "^5.7|^6.0|^9.4", "squizlabs/php_codesniffer": "~2.0" }, "suggest": { @@ -6157,7 +6159,7 @@ "phpseclib/bootstrap.php" ], "psr-4": { - "phpseclib\\": "phpseclib/" + "phpseclib3\\": "phpseclib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -6214,7 +6216,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.30" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.5" }, "funding": [ { @@ -6230,7 +6232,7 @@ "type": "tidelift" } ], - "time": "2020-12-17T05:42:04+00:00" + "time": "2021-02-12T16:18:16+00:00" }, { "name": "pragmarx/coollection", @@ -14244,16 +14246,16 @@ }, { "name": "mockery/mockery", - "version": "1.4.2", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "20cab678faed06fac225193be281ea0fddb43b93" + "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/20cab678faed06fac225193be281ea0fddb43b93", - "reference": "20cab678faed06fac225193be281ea0fddb43b93", + "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea", + "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea", "shasum": "" }, "require": { @@ -14310,9 +14312,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/master" + "source": "https://github.com/mockery/mockery/tree/1.4.3" }, - "time": "2020-08-11T18:10:13+00:00" + "time": "2021-02-24T09:51:49+00:00" }, { "name": "myclabs/deep-copy", diff --git a/scripts/tests/server-cc.php b/scripts/tests/server-cc.php index 586421e7335..a3074a8ea16 100644 --- a/scripts/tests/server-cc.php +++ b/scripts/tests/server-cc.php @@ -5,7 +5,7 @@ */ /** Coverage files destination. */ -const STORAGE = '/results/coverage'; +const STORAGE = '/results/cov'; $root = realpath(__DIR__.'/../../'); diff --git a/yarn.lock b/yarn.lock index 7a5423deb48..2cfac112857 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3237,7 +3237,7 @@ debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: dependencies: ms "2.1.2" -debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -4997,6 +4997,15 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hcl-to-json@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/hcl-to-json/-/hcl-to-json-0.1.1.tgz#39674aa2a5a4d2b4c2b6762c8196af4af4f12903" + integrity sha512-sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A== + dependencies: + debug "^3.0.1" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + he@1.2.0, he@1.2.x, he@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -9112,10 +9121,10 @@ snyk-cpp-plugin@2.2.1: hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@4.17.2: - version "4.17.2" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz#e22c7633311a1b17b89d125d0af638e1fa5c5167" - integrity sha512-fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ== +snyk-docker-plugin@4.17.3: + version "4.17.3" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz#669f5705b52e9754a1777ac3d4b75628cb0ca8ac" + integrity sha512-Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" @@ -9155,10 +9164,10 @@ snyk-go-plugin@1.16.5: tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.13.0: - version "3.13.0" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.13.0.tgz#3c31d539d9763866ef1f41034cd8e97d6236731f" - integrity sha512-t7tibuRHMX0ot5woZlFpblTH20j8BKWxO4wwC7+dGsvS9VtXrlG73moeE5EXfOPb2E8OA7STPKGsEibVIl/j2w== +snyk-gradle-plugin@3.13.2: + version "3.13.2" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.13.2.tgz#c5166f6a9416702cf024cc11e3b88acf198111c8" + integrity sha512-t7lBFgWwS3KU7SgmAeTJnTR44Wew84/IvNbNZ2fF0f+lXd1kZxMG1Ty2brETvxpl+U2JxC8ISILohGXsET+ySg== dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.23.1" @@ -9249,7 +9258,7 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" -snyk-poetry-lockfile-parser@^1.1.5: +snyk-poetry-lockfile-parser@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz#bab5a279c103cbcca8eb86ab87717b115592881e" integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== @@ -9275,13 +9284,13 @@ snyk-policy@1.14.1: snyk-try-require "^1.3.1" then-fs "^2.0.0" -snyk-python-plugin@1.19.4: - version "1.19.4" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz#03b70c12c0adfd5104839e0d9d9ba7083271e905" - integrity sha512-d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w== +snyk-python-plugin@1.19.5: + version "1.19.5" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz#1b04756039b98994ce15fe89a1853000ba002c33" + integrity sha512-wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw== dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.5" + snyk-poetry-lockfile-parser "^1.1.6" tmp "0.0.33" snyk-resolve-deps@4.7.2: @@ -9350,9 +9359,9 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: then-fs "^2.0.0" snyk@^1.410.3: - version "1.458.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.458.0.tgz#33db237bdad2e58632252165c9da7e4a50602a65" - integrity sha512-w/ZCb8rOyFDn09OmoyuLDQcmW63rSfbVsXINM+bvT9UJ4ML4JRWA2qKURcaMy9RnkXEK3gPYstly7ezb9iF82g== + version "1.464.0" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.464.0.tgz#ddabc9d117d195a33d524dfcd6ba8294a14d652a" + integrity sha512-BlkmTbbAMH2Ip6wy3aZGAttV9S5HVEqDFDx0jwbQwtNBUb3QgetZ+IjgjxdypBZHDqL6jzfZwoJnxrH9vPI3yA== dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" @@ -9368,6 +9377,7 @@ snyk@^1.410.3: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" + hcl-to-json "^0.1.1" lodash.assign "^4.2.0" lodash.camelcase "^4.3.0" lodash.clonedeep "^4.5.0" @@ -9395,16 +9405,16 @@ snyk@^1.410.3: semver "^6.0.0" snyk-config "4.0.0-rc.2" snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.17.2" + snyk-docker-plugin "4.17.3" snyk-go-plugin "1.16.5" - snyk-gradle-plugin "3.13.0" + snyk-gradle-plugin "3.13.2" snyk-module "3.1.0" snyk-mvn-plugin "2.25.3" snyk-nodejs-lockfile-parser "1.30.2" snyk-nuget-plugin "1.21.0" snyk-php-plugin "1.9.2" snyk-policy "1.14.1" - snyk-python-plugin "1.19.4" + snyk-python-plugin "1.19.5" snyk-resolve "1.0.1" snyk-resolve-deps "4.7.2" snyk-sbt-plugin "2.11.0"