Merge branch 'master' into feat/per-alias-versions

- Fix compile tests by falling back to old component path if no dependencies object is present - Fix git tree tests by allowing dependency repos with no Author information on components - Fix using the correct path for rendering aliased targets
projectsyn · Jan 7, 2025 · 0e6e4cd · 0e6e4cd
2 parents 591f081 + c838601
commit 0e6e4cd
Show file tree

Hide file tree

Showing 195 changed files with 15,003 additions and 6,861 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -7,6 +7,7 @@ inventory/
 tools/
 !tools/entrypoint.sh
 !tools/install-jb.sh
+!tools/install-kustomize.sh
 Dockerfile
 docker-compose.*
 _antora

diff --git a/.editorconfig b/.editorconfig
@@ -24,3 +24,9 @@ insert_final_newline = false
 
 [Makefile]
 indent_style = tab
+
+[tests/testdata/**]
+trim_trailing_whitespace = false
+
+[commodore/lib/kube-libsonnet/**]
+indent_size = unset
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,7 @@ Remove items that do not apply. For completed items, change [ ] to [x].
 - [ ] Update the documentation.
 - [ ] Update tests.
 - [ ] Categorize the PR by setting a good title and adding one of the labels:
-      `bug`, `enhancement`, `documentation`, `change`, `breaking`, `dependency`
+      `bug`, `enhancement`, `documentation`, `change`, `breaking`, `dependency`, `internal`
       as they show up in the changelog
 - [ ] Link this PR to related issues.
 

diff --git a/.github/changelog-configuration.json b/.github/changelog-configuration.json
@@ -1,6 +1,10 @@
 {
     "pr_template": "- ${{TITLE}} (#${{NUMBER}})",
     "categories": [
+        {
+            "title": "## 🔎 Breaking Changes",
+            "labels": ["breaking"]
+        },
         {
             "title": "## 🚀 Features",
             "labels": ["enhancement", "feature"]
@@ -10,8 +14,8 @@
             "labels": ["change"]
         },
         {
-            "title": "## 🔎 Breaking Changes",
-            "labels": ["breaking"]
+            "title": "## 🪛 Internal Changes",
+            "labels": ["internal"]
         },
         {
             "title": "## 🐛 Fixes",

diff --git a/.github/workflows/build-virtualenv-caches.yml b/.github/workflows/build-virtualenv-caches.yml
@@ -21,15 +21,15 @@ jobs:
           - mypy
           - black
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
-    - uses: Gr1N/setup-poetry@v7
+        python-version: '3.11'
+    - uses: Gr1N/setup-poetry@v9
     - name: Install tox
       run: |
         pip install tox
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           .tox
@@ -42,20 +42,19 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9.7'
-          - '3.9'
           - '3.10'
+          - '3.11'
+          - '3.12'
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: Gr1N/setup-poetry@v7
+    - uses: Gr1N/setup-poetry@v9
     - name: Install tox
       run: |
         pip install tox
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           .tox
@@ -71,19 +70,19 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
+          - '3.11'
+          - '3.12'
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: Gr1N/setup-poetry@v7
+    - uses: Gr1N/setup-poetry@v9
     - name: Install tox
       run: |
         pip install tox
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           .tox
@@ -97,16 +96,16 @@ jobs:
   build_poetry_virtualenv:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
-    - uses: Gr1N/setup-poetry@v7
-    - uses: actions/cache@v3
+        python-version: '3.11'
+    - uses: Gr1N/setup-poetry@v9
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pypoetry/virtualenvs
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - name: Install Poetry and setup Poetry virtualenv
       run: |
-        poetry env use python3.9
+        poetry env use python3.11
         poetry install
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -9,25 +9,27 @@ on:
 
 jobs:
   coverage:
+    # Only run coverage (which includes the integration test) for PRs which don't originate from a fork
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
-    - uses: Gr1N/setup-poetry@v7
-    - uses: actions/cache@v3
+        python-version: '3.11'
+    - uses: Gr1N/setup-poetry@v9
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pypoetry/virtualenvs
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - name: Install Poetry and setup Poetry virtualenv
       run: |
-        poetry env use python3.9
+        poetry env use python3.11
         poetry install
     - name: Install jsonnet-bundler
       run: |
         mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
-          https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
+          https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
           && chmod +x /opt/bin/jb
     - name: Update PATH
       run: echo "/opt/bin" >> $GITHUB_PATH
@@ -44,7 +46,7 @@ jobs:
       env:
         SSH_AUTH_SOCK: /tmp/ssh_agent.sock
     - name: Upload code coverage report to Code Climate
-      uses: paambaati/codeclimate-action@v3.0.0
+      uses: paambaati/codeclimate-action@v9.0.0
       env:
         CC_TEST_REPORTER_ID: f9c194f25b65bf9c9413d736386e70d32c128516218768333cd7205e79076506
       with:

diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -12,19 +12,21 @@ on:
 
 jobs:
   build-and-publish:
+    # Skip job on forks
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
     name: Build and publish to PyPI
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
-      - uses: Gr1N/setup-poetry@v7
-      - uses: actions/cache@v3
+          python-version: '3.11'
+      - uses: Gr1N/setup-poetry@v9
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-publish-pypi-${{ hashFiles('poetry.lock') }}
@@ -44,9 +46,16 @@ jobs:
         run: poetry build
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags/v')
+        env:
+          # increase connection timeout to PyPI to 60s
+          # NOTE(sg): This is probably not required
+          POETRY_REQUESTS_TIMEOUT: "60"
         run: poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}
       - name: Publish to TestPyPI
         if: "!startsWith(github.ref, 'refs/tags/v')"
+        env:
+          # increase connection timeout to TestPyPI to 60s
+          POETRY_REQUESTS_TIMEOUT: "60"
         run: |
           poetry config repositories.test-pypi https://test.pypi.org/legacy/
           poetry publish -r test-pypi -u __token__ -p ${{ secrets.TEST_PYPI_TOKEN }}
diff --git a/.github/workflows/push-kapitan.yml b/.github/workflows/push-kapitan.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       IMAGE: docker.io/projectsyn/kapitan
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set image version
       run: |
         echo "VERSION=$(grep "KAPITAN_VERSION=" tools/Dockerfile.kapitan | cut -d= -f2)" >> ${GITHUB_ENV}

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -12,7 +12,7 @@ jobs:
     env:
       IMAGE: docker.io/${{ github.repository }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: "0"
     - name: Set image version latest
@@ -35,7 +35,7 @@ jobs:
     - name: Build changelog from PRs with labels
       if: startsWith(github.ref, 'refs/tags/v')
       id: build_changelog
-      uses: mikepenz/release-changelog-builder-action@v3
+      uses: mikepenz/release-changelog-builder-action@v5
       with:
         configuration: ".github/changelog-configuration.json"
         # PreReleases still get a changelog, but the next full release gets a diff since the last full release,