From b9e21a0db170f30586458cbd83f13eea4bb3d94f Mon Sep 17 00:00:00 2001 From: Paymaun Heidari Date: Thu, 19 Sep 2024 14:43:23 -0700 Subject: [PATCH 1/2] WIP --- azext_edge/constants.py | 2 +- azext_edge/edge/providers/orchestration/rp_namespace.py | 1 - azext_edge/edge/providers/orchestration/targets.py | 2 +- setup.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azext_edge/constants.py b/azext_edge/constants.py index dbccd3f63..00a2866bf 100644 --- a/azext_edge/constants.py +++ b/azext_edge/constants.py @@ -7,7 +7,7 @@ import os -VERSION = "0.7.0a9" +VERSION = "0.7.0a10" EXTENSION_NAME = "azure-iot-ops" EXTENSION_ROOT = os.path.dirname(os.path.abspath(__file__)) USER_AGENT = "IotOperationsCliExtension/{}".format(VERSION) diff --git a/azext_edge/edge/providers/orchestration/rp_namespace.py b/azext_edge/edge/providers/orchestration/rp_namespace.py index 0ae7ddc92..20818bfb4 100644 --- a/azext_edge/edge/providers/orchestration/rp_namespace.py +++ b/azext_edge/edge/providers/orchestration/rp_namespace.py @@ -13,7 +13,6 @@ RP_NAMESPACE_SET = frozenset( [ - "Microsoft.IoTOperationsOrchestrator", "Microsoft.IoTOperations", "Microsoft.DeviceRegistry", "Microsoft.SecretSyncController", diff --git a/azext_edge/edge/providers/orchestration/targets.py b/azext_edge/edge/providers/orchestration/targets.py index 3be8d4d39..86535324c 100644 --- a/azext_edge/edge/providers/orchestration/targets.py +++ b/azext_edge/edge/providers/orchestration/targets.py @@ -125,7 +125,7 @@ def _handle_apply_targets( deploy_params = {} for param in param_to_target: - if param in built_in_template_params and param_to_target[param]: + if param in built_in_template_params and param_to_target[param] is not None: deploy_params[param] = {"value": param_to_target[param]} return template_copy, deploy_params diff --git a/setup.py b/setup.py index 844b89d1e..eda9f4875 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ DEPENDENCIES = [ "rich>=13.6,<14.0", "kubernetes>=27.2,<29.0", - "azure-identity>=1.14.1,<2.0", + "azure-identity>=1.14.1,<1.18.0", "protobuf~=4.25.0", "opentelemetry-proto~=1.20.0", "packaging>=23.2", From 63365af9623004f22c2c26fbe2ae066e211fa8cf Mon Sep 17 00:00:00 2001 From: Paymaun Heidari Date: Thu, 19 Sep 2024 14:57:00 -0700 Subject: [PATCH 2/2] WIP --- azext_edge/tests/edge/init/test_base_unit.py | 1 - 1 file changed, 1 deletion(-) diff --git a/azext_edge/tests/edge/init/test_base_unit.py b/azext_edge/tests/edge/init/test_base_unit.py index f016b8980..b0c71cda5 100644 --- a/azext_edge/tests/edge/init/test_base_unit.py +++ b/azext_edge/tests/edge/init/test_base_unit.py @@ -334,7 +334,6 @@ def test_register_providers(mocker, registration_state): ) iot_ops_rps = [ - "Microsoft.IoTOperationsOrchestrator", "Microsoft.IoTOperations", "Microsoft.DeviceRegistry", "Microsoft.SecretSyncController",