Merge branch 'master' into set_fix

skulltraill · May 22, 2021 · 33a3af5 · 33a3af5
2 parents 62f7e35 + fb2d1b3
commit 33a3af5
Show file tree

Hide file tree

Showing 37 changed files with 1,935 additions and 102 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,26 +41,32 @@ jobs:
     # NOTE: We always want to run job on master since we run some additional checks there (code
     # coverage, etc)
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
-    name: '${{ matrix.name }} - Python ${{ matrix.python-version }}'
+    name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         # NOTE: To speed the CI run, we split unit and integration tests into multiple jobs where
         # each job runs subset of tests.
+        # NOTE: We need to use full Python version as part of Python deps cache key otherwise
+        # setup virtualenv step will fail.
         include:
           - name: 'Lint Checks (black, flake8, etc.)'
             task: 'ci-checks'
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Compile (pip deps, pylint, etc.)'
             task: 'ci-compile'
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Lint Checks (black, flake8, etc.)'
             task: 'ci-checks'
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
           - name: 'Compile (pip deps, pylint, etc.)'
             task: 'ci-compile'
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
 
     env:
       TASK: '${{ matrix.task }}'
@@ -95,9 +101,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-apt-v7-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -130,7 +136,7 @@ jobs:
     # NOTE: We always want to run job on master since we run some additional checks there (code
     # coverage, etc)
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
-    name: '${{ matrix.name }} - Python ${{ matrix.python-version }}'
+    name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -142,26 +148,30 @@ jobs:
             task: 'ci-unit'
             nosetests_node_total: 2
             nosetests_node_index: 0
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Unit Tests (chunk 2)'
             task: 'ci-unit'
             nosetests_node_total: 2
             nosetests_node_index: 1
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Unit Tests (chunk 1)'
             task: 'ci-unit'
             nosetests_node_total: 2
             nosetests_node_index: 0
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
           - name: 'Unit Tests (chunk 2)'
             task: 'ci-unit'
             nosetests_node_total: 2
             nosetests_node_index: 1
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
           # This job is slow so we only run in on a daily basis
           # - name: 'Micro Benchmarks'
           #   task: 'micro-benchmarks'
-          #   python-version: '3.6'
+          #   python-version: '3.6.13'
           #   nosetests_node_total: 1
           #  nosetests_node_ index: 0
     services:
@@ -295,7 +305,7 @@ jobs:
     # NOTE: We always want to run job on master since we run some additional checks there (code
     # coverage, etc)
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
-    name: '${{ matrix.name }} - Python ${{ matrix.python-version }}'
+    name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -309,32 +319,38 @@ jobs:
             task: 'ci-packs-tests'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Integration Tests (chunk 1)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 0
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Integration Tests (chunk 2)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 1
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Pack Tests'
             task: 'ci-packs-tests'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
           - name: 'Integration Tests (chunk 1)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 0
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
           - name: 'Integration Tests (chunk 2)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 1
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
     services:
       mongo:
         image: mongo:4.4

diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
@@ -26,22 +26,26 @@ jobs:
     # NOTE: We always want to run job on master since we run some additional checks there (code
     # coverage, etc)
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
-    name: '${{ matrix.name }} - Python ${{ matrix.python-version }}'
+    name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        # NOTE: We need to use full Python version as part of Python deps cache key otherwise
+        # setup virtualenv step will fail.
         include:
           - name: 'Microbenchmarks'
             task: 'micro-benchmarks'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.6'
+            python-version-short: '3.6'
+            python-version: '3.6.13'
           - name: 'Microbenchmarks'
             task: 'micro-benchmarks'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
     services:
       mongo:
         image: mongo:4.4
@@ -91,9 +95,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-apt-v7-
       - name: Install APT Dependencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}

diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
@@ -44,22 +44,26 @@ jobs:
     # NOTE: We always want to run job on master since we run some additional checks there (code
     # coverage, etc)
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
-    name: '${{ matrix.name }} - Python ${{ matrix.python-version }}'
+    name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        # NOTE: We need to use full Python version as part of Python deps cache key otherwise
+        # setup virtualenv step will fail.
         include:
           - name: 'Integration Tests (Orquesta)'
             task: 'ci-orquesta'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.6'
+            python-version: '3.6.13'
+            python-version-short: '3.6'
           - name: 'Integration Tests (Orquesta)'
             task: 'ci-orquesta'
             nosetests_node_total: 1
             nosetests_node_index: 0
-            python-version: '3.8'
+            python-version-short: '3.8'
+            python-version: '3.8.10'
     services:
       mongo:
         image: mongo:4.4
@@ -144,9 +148,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-apt-v7-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -78,6 +78,11 @@ Added
 
   Contributed by @Kami.
 
+* Mask secrets in output of an action execution in the API if the action has an output schema
+  defined and one or more output parameters are marked as secret. #5250
+
+  Contributed by @mahesh-orch.
+
 Changed
 ~~~~~~~
 
@@ -167,7 +172,11 @@ Changed
   triggers with larger payloads.
 
   This should address a long standing issue where StackStorm was reported to be slow and CPU
-  inefficient with handling large executions. (improvement) #4846
+  inefficient with handling large executions.
+
+  If you want to migrate existing database objects to utilize the new type, you can use
+  ``st2common/bin/migrations/v3.5/st2-migrate-db-dict-field-values`` migration
+  script. (improvement) #4846
 
   Contributed by @Kami.
 
@@ -238,6 +247,10 @@ Changed
 
   Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions)
 
+* Remove duplicate host header in the nginx config for the auth endpoint.
+
+* Update orquesta to v1.4.0.
+
 Improvements
 ~~~~~~~~~~~~
 
@@ -359,6 +372,8 @@ Fixed
 
   Contributed by @khushboobhatia01.
 
+* Clean up to remove unused methods in the action execution concurrency policies. #5268
+
 3.4.1 - March 14, 2021
 ----------------------
 

diff --git a/conf/nginx/st2.conf b/conf/nginx/st2.conf
@@ -137,7 +137,6 @@ server {
     chunked_transfer_encoding off;
     proxy_buffering off;
     proxy_cache off;
-    proxy_set_header Host $host;
     max_ranges 0;
   }
 

diff --git a/conf/st2.package.conf b/conf/st2.package.conf
@@ -84,3 +84,5 @@ logging = /etc/st2/logging.workflowengine.conf
 [scheduler]
 logging = /etc/st2/logging.scheduler.conf
 
+[coordination]
+url = redis://127.0.0.1:6379
diff --git a/contrib/runners/orquesta_runner/in-requirements.txt b/contrib/runners/orquesta_runner/in-requirements.txt
@@ -1 +1 @@
-git+https://github.com/StackStorm/orquesta.git@v1.3.0#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@v1.4.0#egg=orquesta
diff --git a/contrib/runners/orquesta_runner/requirements.txt b/contrib/runners/orquesta_runner/requirements.txt
@@ -5,4 +5,4 @@
 # If you want to update depdencies for a single component, modify the
 # in-requirements.txt for that component and then run 'make requirements' to
 # update the component requirements.txt
-git+https://github.com/StackStorm/orquesta.git@v1.3.0#egg=orquesta
+git+https://github.com/StackStorm/orquesta.git@v1.4.0#egg=orquesta