dt-extensions-sdk 1.1.7__tar.gz → 1.1.9__tar.gz

dt_extensions_sdk-1.1.9/.github/workflows/publish.yml

@@ -0,0 +1,107 @@
+name: Publish to PyPI
+on:
+  workflow_dispatch:
+
+jobs:
+  build-package:
+    name: Build distribution 📦
+    runs-on: ubuntu-latest
+
+    steps:
+      - id: check_ref
+        run: echo "::set-output name=match::$(echo '${{ github.ref }}' | grep -Pq '^refs/tags/v\d+\.\d+\.\d+$' && echo true || echo false)"
+        shell: bash
+
+      - name: Check if tag is valid
+        if: steps.check_ref.outputs.match != 'true'
+        run: exit 1
+
+      - uses: actions/checkout@v4
+    
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install hatch
+        run: |
+          pip install hatch --user
+    
+      - name: Build a wheel and a source tarball
+        run: |
+          python3 -m hatch build
+    
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: package
+          path: |
+            dist/*
+  
+  github-release:
+    name: Create GitHub release
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    needs:
+      - build-package
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate changelog
+        run: |
+          cat > CHANGELOG.md <<EOT
+          # CHANGELOG
+
+          **Release**: dt-cli (${GITHUB_REF#refs/tags/})
+
+          # Changes
+
+          EOT
+          
+          git log --format=format:"%ad: %s" --date=short >> CHANGELOG.md
+
+      - name: Download cached built package
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: dist
+
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            dist/*
+            LICENSE
+          body_path: CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-to-pypi:
+    name: Publish to PyPI
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    needs:
+      - build-package
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install hatch
+        run: |
+          pip install hatch --user
+
+      - name: Download cached built package
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: dist
+
+      - name: Publish to PyPI
+        env:
+          PYPI_PUBLISH_TOKEN: ${{ secrets.PYPI_PUBLISH_TOKEN }}
+        run: |
+          hatch publish --user __token__ --auth $PYPI_PUBLISH_TOKEN --no-prompt

{dt_extensions_sdk-1.1.7 → dt_extensions_sdk-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dt-extensions-sdk
-Version: 1.1.7
+Version: 1.1.9
 Project-URL: Documentation, https://github.com/dynatrace-extensions/dt-extensions-python-sdk#readme
 Project-URL: Issues, https://github.com/dynatrace-extensions/dt-extensions-python-sdk/issues
 Project-URL: Source, https://github.com/dynatrace-extensions/dt-extensions-python-sdk

{dt_extensions_sdk-1.1.7 → dt_extensions_sdk-1.1.9}/dynatrace_extension/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present Dynatrace LLC
 #
 # SPDX-License-Identifier: MIT
-__version__ = "1.1.7"
+__version__ = "1.1.9"

{dt_extensions_sdk-1.1.7 → dt_extensions_sdk-1.1.9}/dynatrace_extension/cli/main.py

@@ -7,6 +7,8 @@ from pathlib import Path
 from typing import List, Optional
 
 import typer
+from dtcli.server_api import upload as dt_cli_upload
+from dtcli.server_api import validate as dt_cli_validate
 from rich.console import Console
 
 from ..__about__ import __version__
@@ -77,6 +79,7 @@ def build(
     extra_index_url: Optional[str] = typer.Option(
         None, "--extra-index-url", "-i", help="Extra index url to use when downloading dependencies"
     ),
+    find_links: Optional[str] = typer.Option( None, "--find-links", "-f", help="Extra index url to use when downloading dependencies" ),
 ):
     """
     Builds and signs an extension using the developer fused key-certificate
@@ -88,6 +91,7 @@ def build(
     folder
     :param extra_platforms: Attempt to also download wheels for an extra platform (e.g. manylinux1_x86_64 or win_amd64)
     :param extra_index_url: Extra index url to use when downloading dependencies
+    :param find_links: Extra index url to use when downloading dependencies
     """
     console.print(f"Building and signing extension from {extension_dir} to {target_directory}", style="cyan")
     if target_directory is None:
@@ -96,7 +100,7 @@ def build(
         target_directory.mkdir()
 
     console.print("Stage 1 - Download and build dependencies", style="bold blue")
-    wheel(extension_dir, extra_platforms, extra_index_url)
+    wheel(extension_dir, extra_platforms, extra_index_url, find_links)
 
     console.print("Stage 2 - Create the extension zip file", style="bold blue")
     built_zip = assemble(extension_dir, target_directory)
@@ -161,6 +165,7 @@ def wheel(
     extra_index_url: Optional[str] = typer.Option(
         None, "--extra-index-url", "-i", help="Extra index url to use when downloading dependencies"
     ),
+    find_links: Optional[str] = typer.Option( None, "--find-links", "-f", help="Extra index url to use when downloading dependencies" ),
 ):
     """
     Builds the extension and it's dependencies into wheel files
@@ -169,6 +174,7 @@ def wheel(
     :param extension_dir: The directory of the extension, by default this is the current directory
     :param extra_platforms: Attempt to also download wheels for an extra platform (e.g. manylinux1_x86_64 or win_amd64)
     :param extra_index_url: Extra index url to use when downloading dependencies
+    :param find_links: Extra index url to use when downloading dependencies
     """
     relative_lib_folder_dir = "extension/lib"
     lib_folder: Path = extension_dir / relative_lib_folder_dir
@@ -180,6 +186,8 @@ def wheel(
     command = [sys.executable, "-m", "pip", "wheel", "-w", relative_lib_folder_dir]
     if extra_index_url is not None:
         command.extend(["--extra-index-url", extra_index_url])
+    if find_links is not None:
+        command.extend(["--find-links", find_links])
     command.append(".")
     run_process(command, cwd=extension_dir)
 
@@ -199,6 +207,8 @@ def wheel(
             ]
             if extra_index_url:
                 command.extend(["--extra-index-url", extra_index_url])
+            if find_links:
+                command.extend(["--find-links", find_links])
             command.append(".")
 
             run_process(command, cwd=extension_dir)
@@ -277,7 +287,7 @@ def upload(
     :param api_token: The Dynatrace API token
     :param validate: If true, only validate the extension and exit
     """
-    action = "upload" if not validate else "validate"
+
     zip_file_path = extension_path
     if extension_path is None:
         extension_path = Path(".")
@@ -299,9 +309,11 @@ def upload(
         console.print("Set the --api-token parameter or the DT_API_TOKEN environment variable", style="bold red")
         sys.exit(1)
 
-    command = ["dt", "ext", action, "--tenant-url", api_url, "--api-token", api_token, f"{zip_file_path}"]
-    run_process(command, print_message=f"{action} extension {zip_file_path} to {api_url}")
-    console.print(f"Extension {zip_file_path} uploaded to {api_url}", style="bold green")
+    if validate:
+        dt_cli_validate(f"{zip_file_path}", api_url, api_token)
+    else:
+        dt_cli_upload(f"{zip_file_path}", api_url, api_token)
+        console.print(f"Extension {zip_file_path} uploaded to {api_url}", style="bold green")
 
 
 @app.command(help="Generate root and developer certificates and key")

dt_extensions_sdk-1.1.7/.github/workflows/publish.yml

@@ -1,49 +0,0 @@
-name: Publish to PyPI
-on: push
-
-jobs:
-  build:
-    name: Build distribution 📦
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-
-    - name: Install hatch and build
-      run: >-
-        python3 -m
-        pip install
-        hatch
-        --user
-    - name: Build a binary wheel and a source tarball
-      run: python3 -m hatch build
-    - name: Store the distribution packages
-      uses: actions/upload-artifact@v3
-      with:
-        name: python-package-distributions
-        path: dist/
-
-  publish-to-pypi:
-    name: >-
-      Publish to PyPI
-    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/dt-extensions-sdk
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
-    steps:
-    - name: Download dist from build
-      uses: actions/download-artifact@v3
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1