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

Jump to bottom

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

Merged
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
Updated CLIErrors for missing params to use RequiredArgumentMissingError
  • Loading branch information
@c-ryan-k
c-ryan-k committed May 19, 2021
commit 6164e87ac970728b802ce42f2f085f9a828afc58
17 changes: 9 additions & 8 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,6 +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.commands import LongRunningOperation
from azure.cli.core.util import sdk_no_wait

Expand Down Expand Up @@ -418,18 +419,18 @@ def iot_hub_create(cmd, client, hub_name, resource_group_name, location=None,
cli_ctx = cmd.cli_ctx
if enable_fileupload_notifications:
if not fileupload_storage_connectionstring or not fileupload_storage_container_name:
raise CLIError('Please specify storage endpoint (storage connection string and storage container name).')
raise RequiredArgumentMissingError('Please specify storage endpoint (storage connection string and storage container name).')
if fileupload_storage_connectionstring and not fileupload_storage_container_name:
raise CLIError('Please mention storage container name.')
raise RequiredArgumentMissingError('Please mention storage container name.')
if fileupload_storage_container_name and not fileupload_storage_connectionstring:
raise CLIError('Please mention storage connection string.')
raise RequiredArgumentMissingError('Please mention storage connection string.')
identity_based_file_upload = fileupload_storage_authentication_type and fileupload_storage_authentication_type.lower() == AuthenticationType.IdentityBased.value
if not identity_based_file_upload and not fileupload_storage_connectionstring and fileupload_storage_container_name:
raise CLIError('Key-based authentication requires a connection string.')
raise RequiredArgumentMissingError('Key-based authentication requires a connection string.')
if identity_based_file_upload and not fileupload_storage_container_uri:
raise CLIError('Identity-based authentication requires a storage container uri (--fileupload-storage-container-uri, --fcu).')
raise RequiredArgumentMissingError('Identity-based authentication requires a storage container uri (--fileupload-storage-container-uri, --fcu).')
if not identity_based_file_upload and fileupload_storage_identity:
raise CLIError('In order to set a fileupload storage identity, please set file upload storage authentication (--fsa) to IdentityBased')
raise RequiredArgumentMissingError('In order to set a fileupload storage identity, please set file upload storage authentication (--fsa) to IdentityBased')

location = _ensure_location(cli_ctx, resource_group_name, location)
sku = IotHubSkuInfo(name=sku, capacity=unit)
Expand Down Expand Up @@ -468,7 +469,7 @@ def iot_hub_create(cmd, client, hub_name, resource_group_name, location=None,
tags=tags)
hub_description.identity = _build_identity(identities) if identities else None
if bool(identity_role) ^ bool(identity_scopes):
raise CLIError('At least one scope (--scopes) and one role (--role) required for system-assigned managed identity role assignment')
raise RequiredArgumentMissingError('At least one scope (--scopes) and one role (--role) required for system-assigned managed identity role assignment')

def identity_assignment(lro):
try:
Expand Down Expand Up @@ -669,7 +670,7 @@ def setter(hub):
return LongRunningOperation(cmd.cli_ctx)(poller)

if bool(identity_role) ^ bool(identity_scopes):
raise CLIError('At least one scope (--scopes) and one role (--role) required for system-managed identity role assignment')
raise RequiredArgumentMissingError('At least one scope (--scopes) and one role (--role) required for system-managed identity role assignment')

if identity_role and identity_scopes:
from azure.cli.core.commands.arm import assign_identity
Expand Down