fromJSON is required

Kong · Mar 27, 2024 · 5d378e9 · 5d378e9
1 parent 44fc6e6
commit 5d378e9
Show file tree

Hide file tree

Showing 30 changed files with 54 additions and 54 deletions.
diff --git a/.github/workflows/_conformance_tests.yaml b/.github/workflows/_conformance_tests.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   dependencies-versions:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       helm-kong: ${{ steps.set-versions.outputs.helm-kong }}
@@ -25,7 +25,7 @@ jobs:
           echo "helm-kong=$(yq -ojson -r '.integration.helm.kong' < .github/test_dependencies.yaml )" >> $GITHUB_OUTPUT
 
   conformance-tests:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     needs: dependencies-versions

diff --git a/.github/workflows/_docker_build.yaml b/.github/workflows/_docker_build.yaml
@@ -22,7 +22,7 @@ on:
 
 jobs:
   prepare-tags:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       tags: ${{ steps.merge-tags.outputs.tags }}
@@ -71,7 +71,7 @@ jobs:
           echo "tags: ${{ steps.merge-tags.outputs.tags }}"
 
   build:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     runs-on: ubuntu-latest
     needs: prepare-tags
     outputs:

diff --git a/.github/workflows/_e2e_tests.yaml b/.github/workflows/_e2e_tests.yaml
@@ -34,7 +34,7 @@ on:
 
 jobs:
   setup-e2e-tests:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       test_names: ${{ steps.set_test_names.outputs.test_names }}
@@ -70,7 +70,7 @@ jobs:
         run: echo "Test names ${{ steps.set_test_names.outputs.test_names }}"
 
   dependencies-versions:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       kind: ${{ steps.set-versions.outputs.kind }}
@@ -92,7 +92,7 @@ jobs:
           echo "istio=$(yq -r -ojson '.e2e.istio' < .github/test_dependencies.yaml | jq -c)" >> $GITHUB_OUTPUT
 
   kind:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }}
     needs:
@@ -189,7 +189,7 @@ jobs:
           path: "*-tests.xml"
 
   gke:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.run-gke }}
     environment: "gcloud"
     runs-on: ubuntu-latest
@@ -285,7 +285,7 @@ jobs:
           path: "*-tests.xml"
 
   istio:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.run-istio }}
     runs-on: ubuntu-latest
     needs: dependencies-versions

diff --git a/.github/workflows/_envtest_tests.yaml b/.github/workflows/_envtest_tests.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   envtest-tests:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository

diff --git a/.github/workflows/_integration_tests.yaml b/.github/workflows/_integration_tests.yaml
@@ -41,7 +41,7 @@ on:
 
 jobs:
   dependencies-versions:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       kind: ${{ steps.set-versions.outputs.kind }}
@@ -61,7 +61,7 @@ jobs:
           echo "helm-kong=$(yq -ojson -r '.integration.helm.kong' < .github/test_dependencies.yaml )" >> $GITHUB_OUTPUT
 
   integration-tests:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     needs: dependencies-versions

diff --git a/.github/workflows/_kongintegration_tests.yaml b/.github/workflows/_kongintegration_tests.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   kongintegration-tests:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository

diff --git a/.github/workflows/_linters.yaml b/.github/workflows/_linters.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   lint:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/_performance_tests.yaml b/.github/workflows/_performance_tests.yaml
@@ -25,7 +25,7 @@ on:
 
 jobs:
   performance-matrix:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.res-number-for-perf == '' }}
     runs-on: ubuntu-latest
     strategy:
@@ -116,7 +116,7 @@ jobs:
           if-no-files-found: ignore
 
   performance-target:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.res-number-for-perf != '' }}
     runs-on: ubuntu-latest
     strategy:

diff --git a/.github/workflows/_test_reports.yaml b/.github/workflows/_test_reports.yaml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   coverage:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.coverage && !cancelled() }}
     runs-on: ubuntu-latest
     steps:
@@ -42,7 +42,7 @@ jobs:
           verbose: true
 
   buildpulse-report:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     if: ${{ inputs.buildpulse && !cancelled() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/_unit_tests.yaml b/.github/workflows/_unit_tests.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   unit-tests:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository

diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   backport:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     name: Backport
     runs-on: ubuntu-latest
     # Only react to merged PRs for security reasons.

diff --git a/.github/workflows/benchmarks.yaml b/.github/workflows/benchmarks.yaml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   benchmark:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     name: Run Go benchmarks
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/check_fixed_issues_references.yaml b/.github/workflows/check_fixed_issues_references.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
     check_issues_state:
-      timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+      timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
       runs-on: ubuntu-latest
       permissions:
         issues: read
@@ -20,7 +20,7 @@ jobs:
           run: ./hack/check_fixed_issues_references.sh
 
     notify-on-slack:
-      timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+      timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
       runs-on: ubuntu-latest
       needs:
         - check_issues_state

diff --git a/.github/workflows/check_pr_labels.yaml b/.github/workflows/check_pr_labels.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   label:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - uses: pmalek/verify-pr-label-action@v1.4.5

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -21,7 +21,7 @@ on:
 
 jobs:
   up-to-date:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       status: ${{ steps.up-to-date.outputs.status }}
@@ -39,7 +39,7 @@ jobs:
 
   # This job is used to check if the secrets are available. If they are not, we'll skip jobs that require them.
   should-run-with-secrets:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     needs:
     - up-to-date
@@ -57,7 +57,7 @@ jobs:
           fi
 
   tools:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     needs:
     - up-to-date
@@ -129,7 +129,7 @@ jobs:
   # It allows to use this particular job as a required check for PRs.
   # Ref: https://github.com/orgs/community/discussions/26822#discussioncomment-3305794
   passed:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     needs:
       - up-to-date

diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   gcloud:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     environment: gcloud
     runs-on: ubuntu-latest
     steps:
@@ -25,7 +25,7 @@ jobs:
           GOOGLE_LOCATION: ${{ secrets.GOOGLE_LOCATION }}
 
   konnect:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   analyze:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     name: analyze
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/conformance_tests_report.yaml b/.github/workflows/conformance_tests_report.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   dependencies-versions:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     outputs:
       helm-kong: ${{ steps.set-versions.outputs.helm-kong }}
@@ -29,7 +29,7 @@ jobs:
           echo "helm-kong=$(yq -ojson -r '.integration.helm.kong' < .github/test_dependencies.yaml )" >> $GITHUB_OUTPUT
 
   generate-report:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     needs: dependencies-versions
     steps:

diff --git a/.github/workflows/e2e_nightly.yaml b/.github/workflows/e2e_nightly.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   ensure-nightly-image-was-built:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     runs-on: ubuntu-latest
     steps:
       - name: Check if image built this night exists
@@ -65,7 +65,7 @@ jobs:
 
   notify-on-slack:
     runs-on: ubuntu-latest
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     needs:
       - ensure-nightly-image-was-built
       - e2e-tests

diff --git a/.github/workflows/e2e_targeted.yaml b/.github/workflows/e2e_targeted.yaml
@@ -33,7 +33,7 @@ on:
 
 jobs:
   post-comment-in-pr:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     if: ${{ github.event.inputs.pr-number != '' }}
     runs-on: ubuntu-latest
     env:
@@ -64,7 +64,7 @@ jobs:
   # We need to pick an image to use for the tests. If the input specified one, we use that. Otherwise, we use the one
   # built by the previous job.
   choose-image:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }}
     needs: build-image

diff --git a/.github/workflows/e2e_trigger_via_label.yaml b/.github/workflows/e2e_trigger_via_label.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   trigger-e2e-tests-targeted:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     if: contains(github.event.*.labels.*.name, 'ci/run-e2e')
     runs-on: ubuntu-latest
     env:

diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   fossa-scan:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     environment: "FOSSA"
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-push-images:
-    timeout-minutes: ${{ vars.GHA_EXTENDED_TIMEOUT_MINUTES }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES) }}
     environment: 'Docker Push'
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/performance_nightly.yaml b/.github/workflows/performance_nightly.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   ensure-nightly-image-was-built:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     steps:
       - name: Check if image built this night exists
@@ -45,7 +45,7 @@ jobs:
       coverage: false
 
   notify-on-slack:
-    timeout-minutes: ${{ vars.GHA_DEFAULT_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     runs-on: ubuntu-latest
     needs:
       - ensure-nightly-image-was-built