dt-extensions-sdk 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

{dt_extensions_sdk-1.1.7.dist-info → dt_extensions_sdk-1.1.9.dist-info}/METADATA

@@ -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.dist-info → dt_extensions_sdk-1.1.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dynatrace_extension/__about__.py,sha256=VBKHua6arVUqC3Y_XtiYN45BWPreV_mbmmN1Bq42_VQ,112
+dynatrace_extension/__about__.py,sha256=jNoLyMOt8_aiMvw5Fehf8n1DwmvYr4lWDzAm0Uj9Zx0,112
 dynatrace_extension/__init__.py,sha256=XYHyWducrLWengm6jcCZMYAHzaQwQfoJKzKT4QvhTxE,779
 dynatrace_extension/cli/__init__.py,sha256=eg2YQkeboIfJ_hcUGp1WFEvT-moa2qGGN-L9RjTbxCM,128
-dynatrace_extension/cli/main.py,sha256=x0IUINQH8d-8YSEPyO9zdNgMDo-qJYt0MgO16Ibxzzg,16525
+dynatrace_extension/cli/main.py,sha256=NK9LaMvEFonb6FUb8FnDqY9Yziiz0eiQ-7d2HRwr5vU,17163
 dynatrace_extension/cli/schema.py,sha256=Fiks7vS69M52O3_pvdzkKk2X0zBhE8maforvRY9eUIU,3359
 dynatrace_extension/cli/create/__init__.py,sha256=_MjYuWPJo7_NbGRqjWZ9DNzkfevz_Br2Yc90__f22yY,73
 dynatrace_extension/cli/create/create.py,sha256=Wkkp4AuRID18k9EUJdVZ3GP2US35OF5h6jooKJY2CLM,2784
@@ -26,8 +26,8 @@ dynatrace_extension/sdk/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 dynatrace_extension/sdk/vendor/mureq/LICENSE,sha256=_rKBhB1pJYXjxjBCdOSIkv_slxWbhEXVBXXZs1MdpQQ,684
 dynatrace_extension/sdk/vendor/mureq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dynatrace_extension/sdk/vendor/mureq/mureq.py,sha256=gKzGiPmZ2g74Nb8K_6bu0f2coWZHZiZ2aXGzG2Pimlg,15102
-dt_extensions_sdk-1.1.7.dist-info/METADATA,sha256=sUYVLisO_ICY8VFe91nCSbsOcgIqAZBrTwn76xE4tRU,2793
-dt_extensions_sdk-1.1.7.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-dt_extensions_sdk-1.1.7.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.1.7.dist-info/licenses/LICENSE.txt,sha256=k7kok_OTpJ5sfb5ANni8wu-Q1lXw8OQjNZXdrTGhFKc,1087
-dt_extensions_sdk-1.1.7.dist-info/RECORD,,
+dt_extensions_sdk-1.1.9.dist-info/METADATA,sha256=wiz9rr3TzRlG7n9ybTdbf-6wp7s3DOgmQhyo12QGMDA,2793
+dt_extensions_sdk-1.1.9.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+dt_extensions_sdk-1.1.9.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.1.9.dist-info/licenses/LICENSE.txt,sha256=k7kok_OTpJ5sfb5ANni8wu-Q1lXw8OQjNZXdrTGhFKc,1087
+dt_extensions_sdk-1.1.9.dist-info/RECORD,,

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"

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")