From 8f9ff0b441f81b2fdb8b24b7f37129dff5540d6e Mon Sep 17 00:00:00 2001 From: Serhii Chepela Date: Tue, 18 Jul 2023 09:45:53 +0300 Subject: [PATCH 1/3] ITSEC-115 integrating Snyk into Travis (#8009) ITSEC-115 Snyk integration --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index b45b9475b9..a1bcd1ea28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -206,6 +206,12 @@ _VALIDATION_FRONT_END_SCRIPT: &VALIDATION_FRONT_END_SCRIPT - npm run yves:stylelint - npm run yves:lint +_VALIDATION_SNYK_SCRIPT: &VALIDATION_SNYK_SCRIPT + - echo "_VALIDATION_SNYK_SCRIPT" + - npm install --location=global snyk + - snyk monitor --all-projects --org=c408eea4-f0a4-4d7a-846d-5457aefa0cac + - snyk test --all-projects --org=c408eea4-f0a4-4d7a-846d-5457aefa0cac --severity-threshold=high + _EVALUATOR_SCRIPT: &EVALUATOR_SCRIPT - vendor/bin/evaluator evaluate @@ -354,6 +360,8 @@ stages: - Test jobs: + allow_failures: + - name: Snyk Validation fast_finish: true include: - name: Code generation. @@ -422,6 +430,14 @@ jobs: script: - *VALIDATION_FRONT_END_SCRIPT + - name: Snyk Validation + php: '8.0' + stage: Test + env: + - APPLICATION_STORE=DE + script: + - *VALIDATION_SNYK_SCRIPT + - name: PHP Validation php: '8.0' stage: Test From 1e5555044e26c62769b3a452c0792443c7b4b1ca Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Tue, 18 Jul 2023 11:31:58 +0300 Subject: [PATCH 2/3] FRW-2376 Enabled Dynamic API robot tests. (#8019) FRW-2376 Enabled Dynamic API robot tests. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a1bcd1ea28..0abc5d0b9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -230,6 +230,7 @@ _DOCKER_BUILD_TEMPLATE: &DOCKER_BUILD_TEMPLATE - backend-gateway.de.spryker.local - backoffice.de.spryker.local - glue.de.spryker.local + - glue-backend.de.spryker.local - yves.de.spryker.local - mp.de.spryker.local apt: @@ -1047,6 +1048,7 @@ jobs: - git clone https://github.com/spryker/robotframework-suite-tests.git --single-branch --branch master robotframework-tests - cd robotframework-tests - robot -v env:api_suite --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.suite.glue . + - robot -v env:api_suite --exclude skip-due-to-issueORskip-due-to-refactoring -d results tests/api/suite/bapi after_script: - *AWS_SYNC_CONFIG - | @@ -1080,6 +1082,7 @@ jobs: - git clone https://github.com/spryker/robotframework-suite-tests.git --single-branch --branch master robotframework-tests - cd robotframework-tests - robot -v env:api_suite -v db_engine:psycopg2 --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.suite.glue . + - robot -v env:api_suite -v db_engine:psycopg2 --exclude skip-due-to-issueORskip-due-to-refactoring -d results tests/api/suite/bapi after_script: - *AWS_SYNC_CONFIG - | From 65cac95e53f90736434f9bb6a1021bb9ceb2488a Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Tue, 18 Jul 2023 08:37:10 +0000 Subject: [PATCH 3/3] FRW-2376 Merge nonsplit/master. --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index a4d6d525b3..44e136622b 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.275.7", + "version": "3.275.8", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "54dcef3349c81b46c0f5f6e54b5f9bfb5db19903" + "reference": "18ebb727039c974aa9e997772486b2c869ec2bb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/54dcef3349c81b46c0f5f6e54b5f9bfb5db19903", - "reference": "54dcef3349c81b46c0f5f6e54b5f9bfb5db19903", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/18ebb727039c974aa9e997772486b2c869ec2bb6", + "reference": "18ebb727039c974aa9e997772486b2c869ec2bb6", "shasum": "" }, "require": { @@ -335,9 +335,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.275.7" + "source": "https://github.com/aws/aws-sdk-php/tree/3.275.8" }, - "time": "2023-07-13T18:21:04+00:00" + "time": "2023-07-17T18:32:24+00:00" }, { "name": "brick/math", @@ -72086,12 +72086,12 @@ "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "ac879a1b675e381326d3f2a440b81af3c1a7a374" + "reference": "d26a67b21d57f22886a793b00f7c31ed02692477" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/ac879a1b675e381326d3f2a440b81af3c1a7a374", - "reference": "ac879a1b675e381326d3f2a440b81af3c1a7a374", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/d26a67b21d57f22886a793b00f7c31ed02692477", + "reference": "d26a67b21d57f22886a793b00f7c31ed02692477", "shasum": "" }, "require-dev": { @@ -72127,7 +72127,7 @@ "support": { "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master" }, - "time": "2023-07-16T13:57:52+00:00" + "time": "2023-07-18T08:08:28+00:00" }, { "name": "mikey179/vfsstream",