Skip to content

[IoT Hub] Track 2 updates and managed identity implementation #18098

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

Merged
yonzhan merged 12 commits into from
May 21, 2021
Merged

[IoT Hub] Track 2 updates and managed identity implementation #18098

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c75e60e
IoT Hub track 2 updates and managed identity implementation (#2)
c-ryan-k May 14, 2021
ef05589
Test recording updates with 2.0.0 SDK
c-ryan-k May 17, 2021
d6005a9
Fixes for hyrid profile commands / tests and iot_security tests
c-ryan-k May 17, 2021
5c394ee
String fixes from code review
c-ryan-k May 19, 2021
6164e87
Updated CLIErrors for missing params to use RequiredArgumentMissingError
c-ryan-k May 19, 2021
b4affcf
Merge branch 'azure-dev' into dev
c-ryan-k May 19, 2021
a38a985
Fix CLIError -> ArgumentUsageError
c-ryan-k May 19, 2021
44e6e20
Merge branch 'dev' of https://github.com/c-ryan-k/azure-cli into dev
c-ryan-k May 19, 2021
e9633f4
PR feedback and test updates
c-ryan-k May 19, 2021
d60a1a7
New format for managed identity parameters
c-ryan-k May 19, 2021
6fc1bfc
Fix wrong parameter in error description
c-ryan-k May 20, 2021
f8ec73d
Removed identity update command
c-ryan-k May 20, 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
Prev Previous commit
Next Next commit
Fix CLIError -> ArgumentUsageError
  • Loading branch information
@c-ryan-k
c-ryan-k committed May 19, 2021
commit a38a985cf326aa0fbe0551785307aa1e0302be86
14 changes: 7 additions & 7 deletions src/azure-cli/azure/cli/command_modules/iot/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from knack.log import get_logger
from knack.util import CLIError
from msrestazure.azure_exceptions import CloudError
from azure.cli.core.azclierror import RequiredArgumentMissingError
from azure.cli.core.azclierror import RequiredArgumentMissingError, ArgumentUsageError
from azure.cli.core.commands import LongRunningOperation
from azure.cli.core.util import sdk_no_wait

Expand Down Expand Up @@ -698,7 +698,7 @@ def iot_hub_identity_remove(cmd, client, hub_name, identities, resource_group_na
IdentityType.system_assigned.value,
IdentityType.system_assigned_user_assigned.value
]:
raise CLIError('Hub {} is not currently using a system-assigned identity'.format(hub_name))
raise ArgumentUsageError('Hub {} is not currently using a system-assigned identity'.format(hub_name))
hub_identity.type = IdentityType.user_assigned if hub.identity.type in [IdentityType.user_assigned.value, IdentityType.system_assigned_user_assigned.value] else IdentityType.none.value

# separate user identities from system identity
Expand All @@ -707,7 +707,7 @@ def iot_hub_identity_remove(cmd, client, hub_name, identities, resource_group_na
# loop through user_identities to remove
for identity in user_identities:
if not hub_identity.user_assigned_identities[identity]:
raise CLIError('Hub {0} is not currently using a user-assigned identity with id: {1}'.format(hub_name, identity))
raise ArgumentUsageError('Hub {0} is not currently using a user-assigned identity with id: {1}'.format(hub_name, identity))
del hub_identity.user_assigned_identities[identity]

if hub_identity.type in [
Expand Down Expand Up @@ -830,7 +830,7 @@ def iot_hub_routing_endpoint_create(cmd, client, hub_name, endpoint_name, endpoi
resource_group_name = _ensure_resource_group_name(client, resource_group_name, hub_name)
hub = iot_hub_get(cmd, client, hub_name, resource_group_name)
if identity and authentication_type.lower() != AuthenticationType.IdentityBased.value:
raise CLIError("In order to use an identity for authentication, you must select --auth-type as 'identityBased'")
raise ArgumentUsageError("In order to use an identity for authentication, you must select --auth-type as 'identityBased'")

if EndpointType.EventHub.value == endpoint_type.lower():
hub.properties.routing.endpoints.event_hubs.append(
Expand Down Expand Up @@ -1291,9 +1291,9 @@ def _process_fileupload_args(
default_storage_endpoint.connection_string = fileupload_storage_connectionstring
default_storage_endpoint.container_name = fileupload_storage_container_name
elif fileupload_storage_connectionstring is not None:
raise CLIError('Please mention storage container name.')
raise RequiredArgumentMissingError('Please mention storage container name.')
elif fileupload_storage_container_name is not None:
raise CLIError('Please mention storage connection string.')
raise RequiredArgumentMissingError('Please mention storage connection string.')
if fileupload_sas_ttl is not None:
default_storage_endpoint.sas_ttl_as_iso8601 = timedelta(hours=fileupload_sas_ttl)

Expand All @@ -1305,7 +1305,7 @@ def _process_fileupload_args(
default_storage_endpoint.identity = ManagedIdentity(user_assigned_identity=fileupload_storage_identity) if fileupload_storage_identity not in [IdentityType.none.value, SYSTEM_IDENTITY] else None
# otherwise - let them know they need identity-based auth enabled
elif fileupload_storage_identity:
raise CLIError('In order to set a file upload storage identity, you must set the file upload storage authentication type (--fsa) to IdentityBased')
raise ArgumentUsageError('In order to set a file upload storage identity, you must set the file upload storage authentication type (--fsa) to IdentityBased')

return default_storage_endpoint

Expand Down