Align files (#6)

Co-authored-by: github-actions <[email protected]>
giantswarm · Mar 31, 2022 · 4da32db · 4da32db
1 parent 29b7559
commit 4da32db
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 50 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@4.14.2
+  architect: giantswarm/architect@4.15.0
 
 commands:
   run-ats:

diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml
@@ -0,0 +1,49 @@
+# DO NOT EDIT. Generated with:
+#
+#    [email protected]
+#
+name: 'Check if values schema file has been updated'
+on: pull_request
+
+jobs:
+  check:
+    name: 'Check values.yaml and its schema in PR'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v3
+      - name: 'Check if values.schema.json was updated'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          VALUES_FILE_CHANGED="false"
+          SCHEMA_FILE_CHANGED="false"
+
+          base_ref=${GITHUB_BASE_REF##*/}
+          head_ref=${GITHUB_HEAD_REF##*/}
+
+          echo "Comparing ${base_ref}...${head_ref}"
+
+          changed_files=$(gh api repos/{owner}/{repo}/compare/${base_ref}...${head_ref} --jq ".files[] | .filename")
+
+          if grep -q "values.schema.json" <<< $(git ls-tree -r --name-only ${GITHUB_SHA}); then
+
+            if grep -q "values.yaml" <<< "${changed_files}" ; then
+              VALUES_FILE_CHANGED="true"
+            fi
+
+            if grep -q "values.schema.json" <<< "${changed_files}" ; then
+              SCHEMA_FILE_CHANGED="true"
+            fi
+
+            if [ $VALUES_FILE_CHANGED != $SCHEMA_FILE_CHANGED ]; then
+              echo "FAILED: values.yaml was updated but values.schema.json hasn't been regenerated"
+              echo "Please refer to this document: https://intranet.giantswarm.io/docs/organizational-structure/teams/cabbage/app-updates/helm-values-schema/"
+              exit 1
+            fi
+
+            echo "PASSED: values.yaml and values.schema.json both appear to have been updated"
+            exit 0
+          fi
+
+          echo "INFO: values.schema.json not present in this repo - nothing to do"
diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@4.21.0
+#    devctl@4.23.0
 #
 name: Create Release
 on:

diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@4.21.0
+#    devctl@4.23.0
 #
 name: Create Release PR
 on:

diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@4.21.0
+#    devctl@4.23.0
 #
 name: gitleaks
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,15 @@
 minimum_pre_commit_version: 1.21.0
 repos:
-    -   repo: meta
-        hooks:
-            -   id: check-useless-excludes
+    - repo: meta
+      hooks:
+          - id: check-useless-excludes
 
     # format Python code with black
-    -   repo: https://github.com/psf/black
-        rev: 22.1.0
-        hooks:
-            -   id: black
-                language_version: python3
+    - repo: https://github.com/psf/black
+      rev: 22.3.0
+      hooks:
+          - id: black
+            language_version: python3
 
         ## check docstrings
         #- repo: https://github.com/PyCQA/pydocstyle
@@ -20,50 +20,50 @@ repos:
         #
 
     # accept proper type annotations only
-    -   repo: https://github.com/pre-commit/pygrep-hooks
-        rev: v1.9.0  # Use the ref you want to point at
-        hooks:
-            -   id: python-use-type-annotations
-            -   id: python-check-blanket-noqa
+    - repo: https://github.com/pre-commit/pygrep-hooks
+      rev: v1.9.0  # Use the ref you want to point at
+      hooks:
+          - id: python-use-type-annotations
+          - id: python-check-blanket-noqa
     # bandit
-    -   repo: https://github.com/PyCQA/bandit
-        rev: '1.7.3'
-        hooks:
-            -   id: bandit
-                args: [ "-c", ".bandit" ]
+    - repo: https://github.com/PyCQA/bandit
+      rev: '1.7.4'
+      hooks:
+          - id: bandit
+            args: [ "-c", ".bandit" ]
 
     # static type checking with mypy
-    -   repo: https://github.com/pre-commit/mirrors-mypy
-        rev: v0.931
-        hooks:
-            -   id: mypy
+    - repo: https://github.com/pre-commit/mirrors-mypy
+      rev: v0.942
+      hooks:
+          - id: mypy
 
-    -   repo: https://github.com/pycqa/flake8
-        rev: '4.0.1'  # pick a git hash / tag to point to
-        hooks:
-            -   id: flake8
+    - repo: https://github.com/pycqa/flake8
+      rev: '4.0.1'  # pick a git hash / tag to point to
+      hooks:
+          - id: flake8
 
     # shell scripts
-    -   repo: git://github.com/detailyang/pre-commit-shell
-        rev: 1.0.5
-        hooks:
-            -   id: shell-lint
-                args: [ --format=json ]
+    - repo: https://github.com/detailyang/pre-commit-shell
+      rev: 1.0.5
+      hooks:
+          - id: shell-lint
+            args: [ --format=json ]
 
     - repo: https://github.com/igorshubovych/markdownlint-cli
       rev: v0.31.1
       hooks:
-          -     id: markdownlint
+          - id: markdownlint
 
-    -   repo: https://github.com/pre-commit/pre-commit-hooks
-        rev: v4.1.0
-        hooks:
-            -   id: check-added-large-files
-            -   id: check-docstring-first
-            -   id: debug-statements
-            -   id: end-of-file-fixer
-            -   id: trailing-whitespace
-            -   id: check-ast
-            -   id: check-builtin-literals
-            -   id: detect-private-key
-            -   id: mixed-line-ending
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v4.1.0
+      hooks:
+          - id: check-added-large-files
+          - id: check-docstring-first
+          - id: debug-statements
+          - id: end-of-file-fixer
+          - id: trailing-whitespace
+          - id: check-ast
+          - id: check-builtin-literals
+          - id: detect-private-key
+          - id: mixed-line-ending
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@4.21.0
+#    devctl@4.23.0
 #
 
 include Makefile.*.mk

diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@4.21.0
+#    devctl@4.23.0
 #
 
 ##@ App