Merge branch 'stable' into may-202501-repo-ref-commit-fix-1

Author: FragmentedPacket

.github/workflows/ci.yml

@@ -116,6 +116,9 @@ jobs:
 
 
   unit-tests:
+    env:
+      # workaround for Rich table column width
+      COLUMNS: 140
     strategy:
       matrix:
         python-version:
@@ -148,8 +151,6 @@ jobs:
         run: "poetry install --all-extras"
       - name: "Mypy Tests"
         run: "poetry run mypy --show-error-codes infrahub_sdk/"
-      # - name: "Pylint Tests"
-      #   run: "poetry run pylint infrahub_sdk/"
       - name: "Unit Tests"
         run: "poetry run pytest --cov infrahub_sdk tests/unit/"
       - name: "Upload coverage to Codecov"
@@ -173,7 +174,7 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   # ------------------------------------------ Integration Tests  ------------------------------------------
-  integration-tests:
+  integration-tests-latest-infrahub:
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
@@ -201,8 +202,87 @@ jobs:
           pip install invoke toml codecov
       - name: "Install Package"
         run: "poetry install --all-extras"
+      - name: "Set environment variables for python_testcontainers"
+        run: |
+          echo INFRAHUB_TESTING_IMAGE_VER=latest >> $GITHUB_ENV
       - name: "Integration Tests"
-        run: "poetry run pytest --cov infrahub_sdk tests/integration/"
+        run: |
+          poetry run pytest --cov infrahub_sdk tests/integration/
+      - name: "Upload coverage to Codecov"
+        run: |
+          codecov --flags integration-tests
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  integration-tests-local-infrahub:
+    if: |
+      always() && !cancelled() &&
+      !contains(needs.*.result, 'failure') &&
+      !contains(needs.*.result, 'cancelled') &&
+      needs.files-changed.outputs.python == 'true' &&
+      (github.base_ref == 'stable' || github.base_ref == 'develop')
+    needs: ["files-changed", "yaml-lint", "python-lint"]
+    runs-on:
+      group: "huge-runners"
+    timeout-minutes: 30
+    steps:
+      - name: "Check out repository code"
+        uses: "actions/checkout@v4"
+
+      - name: "Extract target branch name"
+        id: extract_branch
+        run: echo "TARGET_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
+
+      - name: "Checkout infrahub repository"
+        uses: "actions/checkout@v4"
+        with:
+          repository: "opsmill/infrahub"
+          path: "infrahub-server"
+          ref: ${{ github.base_ref }}
+          submodules: true
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: "Setup git credentials prior dev.build"
+        run: |
+          cd infrahub-server
+          git config --global user.name 'Infrahub'
+          git config --global user.email '[email protected]'
+          git config --global --add safe.directory '*'
+          git config --global credential.usehttppath true
+          git config --global credential.helper /usr/local/bin/infrahub-git-credential
+
+      - name: "Set environment variables prior dev.build"
+        run: |
+          echo "INFRAHUB_BUILD_NAME=infrahub-${{ runner.name }}" >> $GITHUB_ENV
+          RUNNER_NAME=$(echo "${{ runner.name }}" | grep -o 'ghrunner[0-9]\+' | sed 's/ghrunner\([0-9]\+\)/ghrunner_\1/')
+          echo "PYTEST_DEBUG_TEMPROOT=/var/lib/github/${RUNNER_NAME}/_temp" >> $GITHUB_ENV
+          echo "INFRAHUB_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }}" >> $GITHUB_ENV
+          echo "INFRAHUB_TESTING_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }}" >> $GITHUB_ENV
+          echo "INFRAHUB_TESTING_DOCKER_IMAGE=opsmill/infrahub" >> $GITHUB_ENV
+
+      - name: "Build container"
+        run: |
+          cd infrahub-server
+          inv dev.build
+
+      - name: "Setup environment"
+        run: |
+          pipx install poetry==1.8.5
+          poetry config virtualenvs.create true --local
+          pip install invoke toml codecov
+
+      - name: "Install Package"
+        run: "poetry install --all-extras"
+
+      - name: "Integration Tests"
+        run: |
+          echo "Running tests for version: $INFRAHUB_TESTING_IMAGE_VER"
+          poetry run pytest --cov infrahub_sdk tests/integration/
+
       - name: "Upload coverage to Codecov"
         run: |
           codecov --flags integration-tests

CHANGELOG.md

@@ -11,6 +11,18 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [1.7.1](https://github.com/opsmill/infrahub-sdk-python/tree/v1.7.1) - 2025-01-30
+
+### Removed
+
+- All mention of pylint have been removed from the project. ([#206](https://github.com/opsmill/infrahub-sdk-python/issues/206))
+
+## [1.7.0](https://github.com/opsmill/infrahub-sdk-python/tree/v1.7.0) - 2025-01-23
+
+### Added
+
+- adds `infrahubctl repository list` command
+
 ## [1.6.1](https://github.com/opsmill/infrahub-sdk-python/tree/v1.6.1) - 2025-01-16
 
 Fixes release of v1.6.0

changelog/+align-infrahubctl-env-vars.md

@@ -0,0 +1 @@
+Aligned the environment variables used by the `infrahubctl` with the environment variables used by the SDK

changelog/+artifact_methods.changed.md

@@ -0,0 +1 @@
+Changes InfrahubNode `artifact_fetch` and `artifact_generate` methods to use the name of the artifact instead of the name of the artifact definition

changelog/104.fixed.md

@@ -0,0 +1 @@
+- `protocols` CTL command properly gets default branch setting from environment variable

changelog/towncrier.md.template

@@ -0,0 +1,53 @@
+{% if render_title %}
+{% if versiondata.name %}
+# {{ versiondata.name }} {{ versiondata.version }} ({{ versiondata.date }})
+{% else %}
+# {{ versiondata.version }} ({{ versiondata.date }})
+{% endif %}
+{% endif %}
+{% for section, _ in sections.items() %}
+{% if section %}
+
+## {{section}}
+{% endif %}
+{% if sections[section] %}
+{% for category, val in definitions.items() if category in sections[section] %}
+### {{ definitions[category]['name'] }}
+
+{% for text, values in sections[section][category].items() %}
+- {{ text }}
+{%- if values %}
+{% if "\n  - " in text or '\n  * ' in text %}
+
+
+  (
+{%- else %}
+{% if text %} ({% endif %}
+{%- endif -%}
+{%- for issue in values %}
+{{ issue.split(": ", 1)[0] }}{% if not loop.last %}, {% endif %}
+{%- endfor %}
+{% if text %}){% endif %}
+
+{% else %}
+
+{% endif %}
+{% endfor %}
+
+{% if issues_by_category[section][category] and "]: " in issues_by_category[section][category][0] %}
+{% for issue in issues_by_category[section][category] %}
+{{ issue }}
+{% endfor %}
+
+{% endif %}
+{% if sections[section][category]|length == 0 %}
+No significant changes.
+
+{% else %}
+{% endif %}
+{% endfor %}
+{% else %}
+No significant changes.
+
+{% endif %}
+{% endfor +%}

infrahub_sdk/batch.py

@@ -30,7 +30,7 @@ def execute(self, return_exceptions: bool = False) -> tuple[InfrahubNodeSync | N
         result = None
         try:
             result = self.task(*self.args, **self.kwargs)
-        except Exception as exc:  # pylint: disable=broad-exception-caught
+        except Exception as exc:
             if return_exceptions:
                 return self.node, exc
             raise exc
@@ -44,7 +44,7 @@ async def execute_batch_task_in_pool(
     async with semaphore:
         try:
             result = await task.task(*task.args, **task.kwargs)
-        except Exception as exc:  # pylint: disable=broad-exception-caught
+        except Exception as exc:
             if return_exceptions:
                 return (task.node, exc)
             raise exc

infrahub_sdk/config.py

@@ -113,7 +113,7 @@ def validate_address(cls, value: str) -> str:
 
     @model_validator(mode="after")
     def validate_proxy_config(self) -> Self:
-        if self.proxy and self.proxy_mounts.is_set:  # pylint: disable=no-member
+        if self.proxy and self.proxy_mounts.is_set:
             raise ValueError("'proxy' and 'proxy_mounts' are mutually exclusive")
         return self
 

infrahub_sdk/ctl/check.py

@@ -121,7 +121,7 @@ async def run_check(
     except QueryNotFoundError as exc:
         log.warning(f"{module_name}::{check}: unable to find query ({exc!s})")
         passed = False
-    except Exception as exc:  # pylint: disable=broad-exception-caught
+    except Exception as exc:
         log.warning(f"{module_name}::{check}: An error occurred during execution ({exc})")
         passed = False
 

infrahub_sdk/ctl/cli_commands.py

@@ -129,13 +129,13 @@ async def run(
     method: str = "run",
     debug: bool = False,
     _: str = CONFIG_PARAM,
-    branch: str = typer.Option("main", help="Branch on which to run the script."),
-    concurrent: int = typer.Option(
-        4,
+    branch: str = typer.Option("main", help="Branch on which to run the script."),  # TODO: Replace main by None
+    concurrent: int | None = typer.Option(
+        None,
         help="Maximum number of requests to execute at the same time.",
-        envvar="INFRAHUBCTL_CONCURRENT_EXECUTION",
+        envvar="INFRAHUB_MAX_CONCURRENT_EXECUTION",
     ),
-    timeout: int = typer.Option(60, help="Timeout in sec", envvar="INFRAHUBCTL_TIMEOUT"),
+    timeout: int = typer.Option(60, help="Timeout in sec", envvar="INFRAHUB_TIMEOUT"),
     variables: list[str] | None = typer.Argument(
         None, help="Variables to pass along with the query. Format key=value key=value."
     ),
@@ -383,6 +383,7 @@ def protocols(
 
     else:
         client = initialize_client_sync()
+        branch = branch or client.default_branch
         schema.update(client.schema.fetch(branch=branch))
 
     code_generator = CodeGenerator(schema=schema)