From f0d14ff7da9a5e6de46c2f7e1572859d55345a0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:44:26 +0000 Subject: [PATCH 1/4] Bump pytest from 7.4.0 to 7.4.2 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...7.4.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index b0f99d742..5f78769b1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3053,13 +3053,13 @@ files = [ [[package]] name = "pytest" -version = "7.4.0" +version = "7.4.2" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"}, - {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"}, + {file = "pytest-7.4.2-py3-none-any.whl", hash = "sha256:1d881c6124e08ff0a1bb75ba3ec0bfd8b5354a01c194ddd5a0a870a48d99b002"}, + {file = "pytest-7.4.2.tar.gz", hash = "sha256:a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069"}, ] [package.dependencies] @@ -4265,4 +4265,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "5e3a03d00aefc5f58140174c708b19887c9593a05a786466a0e1d423f8581cf5" +content-hash = "65bfc1af0c12473f0cc7e5f0b99928b63d9f00e4eb5d35d02fb02ad54d69530b" diff --git a/pyproject.toml b/pyproject.toml index 5dbb0ecf1..bdb568d40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,7 @@ flake8 = "==4.0.1" flake8-bugbear = "==23.3.12" isort = "==5.10.1" moto = "==4.2.0" -pytest = "==7.4.0" +pytest = "==7.4.2" pytest-env = "==1.0.1" pytest-mock = "==3.11.1" pytest-cov = "==4.1.0" From 13090a675a3a59855ca880fe6650fddfe521da5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:47:23 +0000 Subject: [PATCH 2/4] Bump click-repl from 0.2.0 to 0.3.0 Bumps [click-repl](https://github.com/untitaker/click-repl) from 0.2.0 to 0.3.0. - [Changelog](https://github.com/click-contrib/click-repl/blob/master/Changelog.rst) - [Commits](https://github.com/untitaker/click-repl/compare/0.2.0...0.3.0) --- updated-dependencies: - dependency-name: click-repl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 18 ++++++++++-------- pyproject.toml | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 5f78769b1..d9654362a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -708,19 +708,21 @@ dev = ["coveralls", "pytest (>=3.6)", "pytest-cov", "wheel"] [[package]] name = "click-repl" -version = "0.2.0" +version = "0.3.0" description = "REPL plugin for Click" optional = false -python-versions = "*" +python-versions = ">=3.6" files = [ - {file = "click-repl-0.2.0.tar.gz", hash = "sha256:cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"}, - {file = "click_repl-0.2.0-py3-none-any.whl", hash = "sha256:94b3fbbc9406a236f176e0506524b2937e4b23b6f4c0c0b2a0a83f8a64e9194b"}, + {file = "click-repl-0.3.0.tar.gz", hash = "sha256:17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9"}, + {file = "click_repl-0.3.0-py3-none-any.whl", hash = "sha256:fb7e06deb8da8de86180a33a9da97ac316751c094c6899382da7feeeeb51b812"}, ] [package.dependencies] -click = "*" -prompt-toolkit = "*" -six = "*" +click = ">=7.0" +prompt-toolkit = ">=3.0.36" + +[package.extras] +testing = ["pytest (>=7.2.1)", "pytest-cov (>=4.0.0)", "tox (>=4.4.3)"] [[package]] name = "cloudfoundry-client" @@ -4265,4 +4267,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "65bfc1af0c12473f0cc7e5f0b99928b63d9f00e4eb5d35d02fb02ad54d69530b" +content-hash = "70c016733bad85611bc1c588a6cec6b6d8d9680a9d22aa60c2f0b192e3367d60" diff --git a/pyproject.toml b/pyproject.toml index bdb568d40..9d837e1aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ click = "==8.1.6" click-datetime = "==0.2" click-didyoumean = "==0.3.0" click-plugins = "==1.1.1" -click-repl = "==0.2.0" +click-repl = "==0.3.0" colorama = "==0.4.4" defusedxml = "==0.7.1" deprecated = "==1.2.14" From 5790f52388f8893691c9046a59c38d40e48250dd Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Mon, 18 Sep 2023 13:09:46 -0400 Subject: [PATCH 3/4] Add missing environment variables from cf push This changeset actually adds the missing E2E test environment variables to the cf push command. Signed-off-by: Carlo Costino --- .github/workflows/deploy-demo.yml | 2 ++ .github/workflows/deploy-prod.yml | 2 ++ .github/workflows/deploy.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 5543c0895..078f66ed7 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -68,6 +68,8 @@ jobs: --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" + --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL" + --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD" - name: Check for changes to egress config id: changed-egress-config diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index ab1e89d7c..4ef3ffcba 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -72,6 +72,8 @@ jobs: --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" + --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL" + --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD" - name: Check for changes to egress config id: changed-egress-config diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0f2faf051..e0df02a6b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -73,6 +73,8 @@ jobs: --var SECRET_KEY="$SECRET_KEY" --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" + --var NOTIFY_E2E_TEST_EMAIL="$NOTIFY_E2E_TEST_EMAIL" + --var NOTIFY_E2E_TEST_PASSWORD="$NOTIFY_E2E_TEST_PASSWORD" - name: Check for changes to egress config id: changed-egress-config From 53ec9e504172d62840f47ef661c847369ab9f935 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Mon, 18 Sep 2023 13:24:15 -0400 Subject: [PATCH 4/4] Update the manifest.yml file too Signed-off-by: Carlo Costino --- manifest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.yml b/manifest.yml index 44dd270c4..eb78a7dc1 100644 --- a/manifest.yml +++ b/manifest.yml @@ -43,6 +43,8 @@ applications: NOTIFY_ENVIRONMENT: ((env)) API_HOST_NAME: https://((public_api_route)) ADMIN_BASE_URL: ((admin_base_url)) + NOTIFY_E2E_TEST_EMAIL: ((NOTIFY_E2E_TEST_EMAIL)) + NOTIFY_E2E_TEST_PASSWORD: ((NOTIFY_E2E_TEST_PASSWORD)) # Credentials variables INTERNAL_CLIENT_API_KEYS: '{"notify-admin":["((ADMIN_CLIENT_SECRET))"]}'