Merge branch 'adsandor/pubip' of https://github.com/Sandido/azure-cli…

…-extensions into adsandor/pubip
Azure · Oct 18, 2024 · 6f3ca22 · 6f3ca22
2 parents 3d9c690 + 6ef8542
commit 6f3ca22
Show file tree

Hide file tree

Showing 142 changed files with 14,536 additions and 13,020 deletions.
diff --git a/CodeQL.yml b/CodeQL.yml
@@ -0,0 +1,12 @@
+path_classifiers:
+  library:
+    - "src/**/vendored_sdks/"
+    - "src/k8s-extension/azext_k8s_extension/partner_extensions/*.py"
+    - src/virtual-wan/azext_vwan/custom.py
+    - src/k8s-configuration/azext_k8s_configuration/validators.py
+    - src/connectedk8s/azext_connectedk8s/custom.py
+    - src/alias/azext_alias/custom.py
+    - src/alias/azext_alias/alias.py
+    - src/dataprotection/azext_dataprotection/manual/helpers.py
+    - src/containerapp/azext_containerapp/_utils.py
+    - "src/**/tests/"
diff --git a/src/bastion/HISTORY.rst b/src/bastion/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.3.1
+++++++
+* Remove dependency on msazurerest.
+
 1.3.0
 ++++++
 * Bug fixes for connect rdp/ssh/tunnel.

diff --git a/src/bastion/azext_bastion/custom.py b/src/bastion/azext_bastion/custom.py
@@ -21,8 +21,8 @@
 from azure.cli.core.azclierror import ValidationError, InvalidArgumentValueError, RequiredArgumentMissingError, \
     UnrecognizedArgumentError, CLIInternalError, ClientRequestError
 from azure.cli.core.commands.client_factory import get_subscription_id
+from azure.mgmt.core.tools import is_valid_resource_id
 from knack.log import get_logger
-from msrestazure.tools import is_valid_resource_id
 from .BastionServiceConstants import BastionSku
 from .aaz.latest.network.bastion import Create as _BastionCreate
 

diff --git a/src/bastion/azext_bastion/tests/latest/recordings/test_bastion_host_crud.yaml b/src/bastion/azext_bastion/tests/latest/recordings/test_bastion_host_crud.yaml
diff --git a/src/bastion/azext_bastion/tunnel.py b/src/bastion/azext_bastion/tunnel.py
@@ -25,7 +25,7 @@
 import websocket
 from websocket import create_connection, WebSocket
 
-from msrestazure.azure_exceptions import CloudError
+from azure.core.exceptions import HttpResponseError
 from azure.cli.core._profile import Profile
 from azure.cli.core.util import should_disable_connection_verify
 
@@ -106,10 +106,8 @@ def _get_auth_token(self):
 
         if response.status_code not in [200]:
             if response_json is not None and response_json["message"] is not None:
-                exp = CloudError(response, error=response_json["message"])
-            else:
-                exp = CloudError(response)
-                raise exp
+                raise HttpResponseError(response=response, message=response_json["message"])
+            raise HttpResponseError(response=response)
 
         self.last_token = response_json["authToken"]
         self.node_id = response_json["nodeId"]
@@ -224,8 +222,7 @@ def cleanup(self):
             if response.status_code == 404:
                 logger.info('Session already deleted')
             elif response.status_code not in [200, 204]:
-                exp = CloudError(response)
-                raise exp
+                raise HttpResponseError(response=response)
 
             self.last_token = None
             self.node_id = None

diff --git a/src/bastion/setup.py b/src/bastion/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '1.3.0'
+VERSION = '1.3.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/src/index.json b/src/index.json
@@ -28069,6 +28069,49 @@
                     "version": "1.3.0"
                 },
                 "sha256Digest": "151ab25d4dcde10b46c4693cefdaf1d0d5841e15cfe3ec64c089aaaf55e6c8c0"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl",
+                "filename": "bastion-1.3.1-py3-none-any.whl",
+                "metadata": {
+                    "azext.isPreview": false,
+                    "azext.minCliCoreVersion": "2.62.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "Programming Language :: Python :: 3.9",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/bastion"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "bastion",
+                    "summary": "Microsoft Azure Command-Line Tools Bastion Extension.",
+                    "version": "1.3.1"
+                },
+                "sha256Digest": "0ccaa40674fc329fe9f9257f869c319c64d6c89c028664a6ff534ebaee1dc5e9"
             }
         ],
         "billing-benefits": [
@@ -58348,6 +58391,59 @@
                     "version": "1.1.0"
                 },
                 "sha256Digest": "db587f0b2c06a75309cc3c15ab3fca8c647ea16a2357f0d2d4504a974e36007f"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/load-1.1.1-py3-none-any.whl",
+                "filename": "load-1.1.1-py3-none-any.whl",
+                "metadata": {
+                    "azext.minCliCoreVersion": "2.41.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "Programming Language :: Python :: 3.9",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/load"
+                            }
+                        }
+                    },
+                    "extras": [],
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "load",
+                    "run_requires": [
+                        {
+                            "requires": [
+                                "azure-core",
+                                "azure-core",
+                                "pyyaml",
+                                "pyyaml"
+                            ]
+                        }
+                    ],
+                    "summary": "Microsoft Azure Command-Line Tools Load Testing Extension.",
+                    "version": "1.1.1"
+                },
+                "sha256Digest": "0b41277c663a5f8e3710bf71d275d3043ab5f37c6ceda3a8cf0afaf32180f8bb"
             }
         ],
         "log-analytics": [
@@ -72657,6 +72753,48 @@
                     "version": "1.1.1"
                 },
                 "sha256Digest": "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.2-py2.py3-none-any.whl",
+                "filename": "scvmm-1.1.2-py2.py3-none-any.whl",
+                "metadata": {
+                    "azext.minCliCoreVersion": "2.15.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.6",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/scvmm"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "scvmm",
+                    "summary": "Microsoft Azure Command-Line Tools SCVMM Extension",
+                    "version": "1.1.2"
+                },
+                "sha256Digest": "b1b2e66c0ff057976d48f18a43960f4ff5802b5502e9e6d2d5a5d8f1b4e8b6f2"
             }
         ],
         "self-help": [
@@ -85757,6 +85895,49 @@
                     "version": "0.1.5"
                 },
                 "sha256Digest": "ff7896aebc46862a6d30ac5f4cf64bdd40cb50e5437cea299590896d75f1013e"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl",
+                "filename": "subscription-1.0.0b1-py2.py3-none-any.whl",
+                "metadata": {
+                    "azext.isPreview": true,
+                    "azext.minCliCoreVersion": "2.61.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "Programming Language :: Python :: 3.9",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/subscription"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "subscription",
+                    "summary": "Microsoft Azure Command-Line Tools Subscription  Extension.",
+                    "version": "1.0.0b1"
+                },
+                "sha256Digest": "3f3bb4fbb761174d13a0f863362b74f388bc648f7f296f9b6e2191b35507ae4f"
             }
         ],
         "support": [
@@ -91420,6 +91601,57 @@
                     "version": "1.6.0"
                 },
                 "sha256Digest": "7c30049ded256664b8e5434230407331f6349def48e8aa57a759dc1cd9ab75e9"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/webpubsub-1.7.0-py3-none-any.whl",
+                "filename": "webpubsub-1.7.0-py3-none-any.whl",
+                "metadata": {
+                    "azext.isPreview": false,
+                    "azext.minCliCoreVersion": "2.56.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/webpubsub"
+                            }
+                        }
+                    },
+                    "extras": [],
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "webpubsub",
+                    "run_requires": [
+                        {
+                            "requires": [
+                                "websockets (~=10.4)",
+                                "websockets~=10.4"
+                            ]
+                        }
+                    ],
+                    "summary": "Microsoft Azure Command-Line Tools Webpubsub Extension",
+                    "version": "1.7.0"
+                },
+                "sha256Digest": "d4a1df1b81531516cbb8460303e30ab7e465ff10da9bb91f5c90e5c223610643"
             }
         ],
         "workloads": [

diff --git a/src/load/HISTORY.rst b/src/load/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+1.1.1
+++++++
+* Fix empty response object on CLI when using 'az load test file upload'
+* Add 'NOT_VALIDATED' as a terminal status for File Validation
+
 1.1.0
 ++++++
 * Add support for ZIP artifacts upload to a test. Artifacts can be uploaded through YAML config when using --load-test-config-file and through cmd `az load test file upload`, the associate --file-type is `ZIPPED_ARTIFACTS`

diff --git a/src/load/azext_load/data_plane/load_test/custom.py b/src/load/azext_load/data_plane/load_test/custom.py
@@ -386,7 +386,7 @@ def upload_test_file(
     )
     logger.debug("Upload test file response: %s", response)
     logger.info("Upload test file completed")
-    return response
+    return response.as_dict()
 
 
 def list_test_file(