Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for upcoming changes in Track 2 SDKs #383

Merged
merged 7 commits into from
Jul 1, 2021
Merged

Support for upcoming changes in Track 2 SDKs #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cc4183
Initial DPS track 2 breaking change fixes
c-ryan-k Jun 25, 2021
85802a5
Test update to patch azure cli core Profile.get_subscription_id
c-ryan-k Jun 29, 2021
121abf9
Merge branch 'dev' into track2
c-ryan-k Jun 29, 2021
9b78eef
Merge branch 'dev' into track2
c-ryan-k Jun 29, 2021
9f729b7
Merge branch 'dev' into track2
c-ryan-k Jun 30, 2021
d6d2f8c
Merge branch 'dev' into track2
c-ryan-k Jul 1, 2021
84befc2
revert change of unit test subscription id
c-ryan-k Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions azext_iot/_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ def iot_service_provisioning_factory(cli_ctx, *_):
service_client (IotDpsClient): operational resource for
working with IoT Hub Device Provisioning Service.
"""
from azure.cli.core.commands.client_factory import get_mgmt_service_client
from azure.mgmt.iothubprovisioningservices.iot_dps_client import IotDpsClient

return get_mgmt_service_client(cli_ctx, IotDpsClient)
from azure.cli.command_modules.iot._client_factory import iot_service_provisioning_factory
return iot_service_provisioning_factory(cli_ctx=cli_ctx)


class SdkResolver(object):
Expand Down
4 changes: 3 additions & 1 deletion azext_iot/common/_azure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from knack.util import CLIError
from azext_iot.common.utility import validate_key_value_pairs
from azext_iot.common.auth import get_aad_token
from azure.cli.core.commands.client_factory import get_subscription_id


def _parse_connection_string(cs, validate=None, cstring_type="entity"):
Expand Down Expand Up @@ -42,6 +43,7 @@ def parse_iot_device_module_connection_string(cs):


def get_iot_dps_connection_string(
cmd,
client,
dps_name,
resource_group_name,
Expand Down Expand Up @@ -109,7 +111,7 @@ def _find_iot_dps_from_list(all_dps, dps_name):
result["policy"] = policy_name
result["primarykey"] = policy.primary_key
result["secondarykey"] = policy.secondary_key
result["subscription"] = client.config.subscription_id
result["subscription"] = get_subscription_id(cmd.cli_ctx)

return result

Expand Down
48 changes: 26 additions & 22 deletions azext_iot/operations/dps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
# DPS Enrollments


def iot_dps_device_enrollment_list(client, dps_name, resource_group_name, top=None):
def iot_dps_device_enrollment_list(cmd, client, dps_name, resource_group_name, top=None):
from azext_iot.sdk.dps.service.models.query_specification import QuerySpecification

target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)

try:
resolver = SdkResolver(target=target)
Expand All @@ -60,9 +60,9 @@ def iot_dps_device_enrollment_list(client, dps_name, resource_group_name, top=No


def iot_dps_device_enrollment_get(
client, enrollment_id, dps_name, resource_group_name, show_keys=None
cmd, client, enrollment_id, dps_name, resource_group_name, show_keys=None
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -90,6 +90,7 @@ def iot_dps_device_enrollment_get(


def iot_dps_device_enrollment_create(
cmd,
client,
enrollment_id,
attestation_type,
Expand All @@ -112,7 +113,7 @@ def iot_dps_device_enrollment_create(
webhook_url=None,
api_version=None
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -169,6 +170,7 @@ def iot_dps_device_enrollment_create(


def iot_dps_device_enrollment_update(
cmd,
client,
enrollment_id,
dps_name,
Expand All @@ -193,7 +195,7 @@ def iot_dps_device_enrollment_update(
webhook_url=None,
api_version=None,
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -272,9 +274,9 @@ def iot_dps_device_enrollment_update(


def iot_dps_device_enrollment_delete(
client, enrollment_id, dps_name, resource_group_name, etag=None
cmd, client, enrollment_id, dps_name, resource_group_name, etag=None
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand All @@ -288,11 +290,11 @@ def iot_dps_device_enrollment_delete(


def iot_dps_device_enrollment_group_list(
client, dps_name, resource_group_name, top=None
cmd, client, dps_name, resource_group_name, top=None
):
from azext_iot.sdk.dps.service.models.query_specification import QuerySpecification

target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand All @@ -305,9 +307,9 @@ def iot_dps_device_enrollment_group_list(


def iot_dps_device_enrollment_group_get(
client, enrollment_id, dps_name, resource_group_name, show_keys=None
cmd, client, enrollment_id, dps_name, resource_group_name, show_keys=None
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -335,6 +337,7 @@ def iot_dps_device_enrollment_group_get(


def iot_dps_device_enrollment_group_create(
cmd,
client,
enrollment_id,
dps_name,
Expand All @@ -356,7 +359,7 @@ def iot_dps_device_enrollment_group_create(
webhook_url=None,
api_version=None,
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -419,6 +422,7 @@ def iot_dps_device_enrollment_group_create(


def iot_dps_device_enrollment_group_update(
cmd,
client,
enrollment_id,
dps_name,
Expand All @@ -443,7 +447,7 @@ def iot_dps_device_enrollment_group_update(
webhook_url=None,
api_version=None,
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down Expand Up @@ -541,9 +545,9 @@ def iot_dps_device_enrollment_group_update(


def iot_dps_device_enrollment_group_delete(
client, enrollment_id, dps_name, resource_group_name, etag=None
cmd, client, enrollment_id, dps_name, resource_group_name, etag=None
):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand All @@ -564,8 +568,8 @@ def iot_dps_compute_device_key(
# DPS Registration


def iot_dps_registration_list(client, dps_name, resource_group_name, enrollment_id):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
def iot_dps_registration_list(cmd, client, dps_name, resource_group_name, enrollment_id):
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand All @@ -577,8 +581,8 @@ def iot_dps_registration_list(client, dps_name, resource_group_name, enrollment_
raise CLIError(e)


def iot_dps_registration_get(client, dps_name, resource_group_name, registration_id):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
def iot_dps_registration_get(cmd, client, dps_name, resource_group_name, registration_id):
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand All @@ -590,8 +594,8 @@ def iot_dps_registration_get(client, dps_name, resource_group_name, registration
raise CLIError(e)


def iot_dps_registration_delete(client, dps_name, resource_group_name, registration_id, etag=None):
target = get_iot_dps_connection_string(client, dps_name, resource_group_name)
def iot_dps_registration_delete(cmd, client, dps_name, resource_group_name, registration_id, etag=None):
target = get_iot_dps_connection_string(cmd, client, dps_name, resource_group_name)
try:
resolver = SdkResolver(target=target)
sdk = resolver.get_sdk(SdkType.dps_sdk)
Expand Down
Loading