From 65167989ec91eb6269eca89e5f711b04559a90b8 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Fri, 3 Apr 2020 13:24:54 -0400 Subject: [PATCH 1/5] Fixes: #4890 to support new ssh key types --- CHANGELOG.rst | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 41177e391b..593f61c66f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -54,6 +54,7 @@ Changed before returning error to the end user. #4834 * Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement) * Remove `.scrutinizer.yml` config file. No longer used. +* Updated Parmiko to v2.7.1 to support new key formats Fixed ~~~~~ diff --git a/requirements.txt b/requirements.txt index a317861a68..a117ffc9cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ nose-parallel==0.3.1 nose-timer==0.7.5 oslo.config<1.13,>=1.12.1 oslo.utils<=3.37.0,>=3.36.2 -paramiko==2.6.0 +paramiko==2.7.1 passlib==1.7.1 prettytable prompt-toolkit==1.0.15 From cb81be4ef2d625479c10b26858843496bbc20a53 Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 3 Apr 2020 11:49:26 -0700 Subject: [PATCH 2/5] Betterize Travis Bash commands --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eac901c32e..dec79a4074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,20 +125,20 @@ script: # Clean up egg-info directories which get created when installing runners # NOTE: We enable code coverage and per test timing information on master so build can take twice # as long as PR builds - - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD} + - if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${IS_NIGHTLY_BUILD}" = "no" ]]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD} # Run any additional nightly checks only as part of a nightly (cron) build - - if [ "${IS_NIGHTLY_BUILD}" = "yes" ]; then ./scripts/travis/run-nightly-make-task-if-exists.sh "${TASK}"; fi + - if [[ "${IS_NIGHTLY_BUILD}" = "yes" ]]; then ./scripts/travis/run-nightly-make-task-if-exists.sh "${TASK}"; fi # NOTE: We only generate and submit coverage report for master and version branches # NOTE: We put this here and not after_success so build is marked as failed if this step fails # See https://docs.travis-ci.com/user/customizing-the-build/#breaking-the-build # https://github.com/travis-ci/travis-ci/issues/758#issuecomment-266756853 - - if [ ${TASK} = 'ci-unit' ] || [ ${TASK} = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then ./scripts/travis/submit-codecov-coverage.sh; fi + - if [[ ${TASK} = 'ci-unit' ]] || [[ ${TASK} = 'ci-integration' ]] && [[ "${ENABLE_COVERAGE}" = 'yes' ]]; then ./scripts/travis/submit-codecov-coverage.sh; fi # Don't store cache for target PR branch (typically `master`), because it will be re-used for opened PRs # See: https://docs.travis-ci.com/user/caching/#Pull-request-builds-and-caches # Alternative: use strict pip pinning, including git-based pip packages before_cache: - - if [ ${TRAVIS_PULL_REQUEST} = 'false' ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then rm -rf virtualenv/; fi + - if [[ "${TRAVIS_PULL_REQUEST}" = 'false' ]] && [[ "${IS_NIGHTLY_BUILD}" = "no" ]]; then rm -rf virtualenv/; fi # We want to be notified when a master or nightly build fails notifications: From 89cac6e5a55dfee679e21e880b71bd7fde38ddb8 Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 3 Apr 2020 13:28:53 -0700 Subject: [PATCH 3/5] Use fixed-requirements to update paramiko --- fixed-requirements.txt | 2 +- st2common/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 661910fc75..84eee50218 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -21,7 +21,7 @@ networkx==1.11 # See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details oslo.config>=1.12.1,<1.13 oslo.utils>=3.36.2,<=3.37.0 -paramiko==2.6.0 +paramiko==2.7.1 passlib==1.7.1 prance==0.9.0 prompt-toolkit==1.0.15 diff --git a/st2common/requirements.txt b/st2common/requirements.txt index aa89981a7f..166f90a0ab 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -22,7 +22,7 @@ lockfile==0.12.2 mongoengine==0.18.2 networkx==1.11 oslo.config<1.13,>=1.12.1 -paramiko==2.6.0 +paramiko==2.7.1 pymongo==3.10.0 python-dateutil==2.8.0 python-statsd==2.1.0 From 22383466d74204b4648cc5cc30b38e0e3a2dc417 Mon Sep 17 00:00:00 2001 From: Nick Maludy Date: Tue, 7 Apr 2020 21:17:40 -0400 Subject: [PATCH 4/5] Update CHANGELOG.rst Fixed typo in referenced issue. --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a8cd8e71fb..a418a6986f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -52,7 +52,7 @@ Changed connection related errors, our code would first wait for this timeout to be reached (30 seconds) before returning error to the end user. #4834 * Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement) -* Updated Parmiko to v2.7.1 to support new key formats #4891 (improvement) +* Updated Parmiko to v2.7.1 to support new key formats #4901 (improvement) * Remove ``.scrutinizer.yml`` config file. No longer used. * Convert escaped dict and dynamic fields in workflow db models to normal dict and dynamic fields. (performnce improvement) From 452c6ea550f4c8fa4a2c1cca6b00ca9a9397f921 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Wed, 8 Apr 2020 01:45:39 -0400 Subject: [PATCH 5/5] Update CHANGELOG.rst --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 102ecba05f..d2b215dfd6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -52,7 +52,7 @@ Changed connection related errors, our code would first wait for this timeout to be reached (30 seconds) before returning error to the end user. #4834 * Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement) -* Updated Parmiko to v2.7.1 to support new key formats #4901 (improvement) +* Updated Paramiko to v2.7.1 to support new PEM ECDSA key formats #4901 (improvement) * Remove ``.scrutinizer.yml`` config file. No longer used. * Convert escaped dict and dynamic fields in workflow db models to normal dict and dynamic fields. (performnce improvement)