Expose sku and managed identity for GA

src/azure-cli/HISTORY.rst

@@ -12,6 +12,8 @@ Release History
 * Support import/export of keyvault references from/to appservice
 * Support import/export of all labels from appconfig to appconfig
 * Validate key and feature names before setting and importing
+* Expose sku modification for configuration store.
+* Add command group for managed identity.
 
 **AppService**
 

src/azure-cli/azure/cli/command_modules/appconfig/_azconfig/constants.py

@@ -77,7 +77,7 @@ class StatusCodes:
 class Versions:
     """Constants of versions.
     """
-    SDKVersion = '1.0.0'
+    SDKVersion = '2.0.0'
     ApiVersion = '1.0'
 
 

src/azure-cli/azure/cli/command_modules/appconfig/_format.py

@@ -14,6 +14,10 @@ def configstore_output_format(result):
     return _output_format(result, _configstore_format_group)
 
 
+def configstore_identity_format(result):
+    return _output_format(result, _configstore_identity_format_group)
+
+
 def configstore_credential_format(result):
     return _output_format(result, _configstore_credential_format_group)
 
@@ -47,16 +51,24 @@ def _configstore_format_group(item):
         sku = ""
 
     return OrderedDict([
-        ('CREATIONDATE', _format_datetime(_get_value(item, 'creationDate'))),
+        ('CREATION DATE', _format_datetime(_get_value(item, 'creationDate'))),
         ('ENDPOINT', _get_value(item, 'endpoint')),
         ('LOCATION', _get_value(item, 'location')),
         ('NAME', _get_value(item, 'name')),
-        ('PROVISIONINGSTATE', _get_value(item, 'provisioningState')),
-        ('RESOURCEGROUP', _get_value(item, 'resourceGroup')),
+        ('PROVISIONING STATE', _get_value(item, 'provisioningState')),
+        ('RESOURCE GROUP', _get_value(item, 'resourceGroup')),
         ('SKU', sku)
     ])
 
 
+def _configstore_identity_format_group(item):
+    return OrderedDict([
+        ('PRINCIPAL ID', _format_datetime(_get_value(item, 'principalId'))),
+        ('TENANT ID', _get_value(item, 'tenantId')),
+        ('TYPE', _get_value(item, 'type'))
+    ])
+
+
 def _configstore_credential_format_group(item):
     return OrderedDict([
         ('CONNECTION STRING', _get_value(item, 'connectionString')),

src/azure-cli/azure/cli/command_modules/appconfig/_help.py

@@ -16,13 +16,54 @@
 type: command
 short-summary: Create an App Configuration.
 examples:
-  - name: Create an App Configuration with name, location and resource group.
-    text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus
+  - name: Create an App Configuration with name, location, sku and resource group.
+    text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
+  - name: Create an App Configuration with name, location, sku and resource group with system assigned identity.
+    text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
+  - name: Create an App Configuration with name, location, sku and resource group with user assigned identity.
+    text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
+"""
+
+helps['appconfig identity'] = """
+type: group
+short-summary: Managed identities for App Configurations.
+"""
+
+helps['appconfig identity assign'] = """
+type: command
+short-summary: Update managed identities for an App Configuration.
+examples:
+  - name: Enable the system-assigned identity for an existing App Configuration
+    text: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
+  - name: Assign a user-assigned managed identity for an existing App Configuration
+    text: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+  - name: Assign both system-assigned and user assigned identities for an existing App Configuration
+    text: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+"""
+
+helps['appconfig identity remove'] = """
+type: command
+short-summary: Remove managed identities for an App Configuration.
+examples:
+  - name: Remove the system-assigned identity from a App Configuration.
+    text: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
+  - name: Remove a user assigned identity from a App Configuration.
+    text: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+  - name: Remove all identities from an App Configuration.
+    text: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
+"""
+
+helps['appconfig identity show'] = """
+type: command
+short-summary: Display managed identities for an App Configuration.
+examples:
+  - name: Display managed identities for a task.
+    text: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
 """
 
 helps['appconfig credential'] = """
 type: group
-short-summary: Manage credentials for App Configurations
+short-summary: Manage credentials for App Configurations.
 """
 
 helps['appconfig credential list'] = """
@@ -211,6 +252,8 @@
 examples:
   - name: Update tags of an App Configuration
     text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
+  - name: Upgrade sku of an App Configuration to standard
+    text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
 """
 
 helps['appconfig feature'] = """

src/azure-cli/azure/cli/command_modules/appconfig/_params.py

@@ -21,7 +21,8 @@
                           validate_import_depth, validate_query_fields,
                           validate_feature_query_fields, validate_filter_parameters,
                           validate_separator, validate_secret_identifier,
-                          validate_key, validate_content_type, validate_feature)
+                          validate_key, validate_content_type, validate_feature,
+                          validate_identity)
 
 
 def load_arguments(self, _):
@@ -53,6 +54,11 @@ def load_arguments(self, _):
         type=int,
         help='Maximum number of items to return. Must be a positive integer. Default to 100.'
     )
+    identities_arg_type = CLIArgumentType(
+        nargs='*',
+        validator=validate_identity,
+        help="Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified."
+    )
 
     with self.argument_context('appconfig') as c:
         c.argument('resource_group_name', arg_type=resource_group_name_type)
@@ -64,14 +70,21 @@ def load_arguments(self, _):
         c.argument('top', arg_type=top_arg_type)
         c.argument('all_', options_list=['--all'], action='store_true', help="List all items.")
         c.argument('fields', arg_type=fields_arg_type)
+        c.argument('sku', help='The sku of App Configuration', arg_type=get_enum_type(['free', 'standard']))
 
     with self.argument_context('appconfig create') as c:
         c.argument('location', options_list=['--location', '-l'], arg_type=get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group)
-        c.ignore('sku')
+        c.argument('assign_identity', arg_type=identities_arg_type)
 
     with self.argument_context('appconfig update') as c:
         c.argument('tags', arg_type=tags_type)
 
+    with self.argument_context('appconfig identity assign') as c:
+        c.argument('identities', arg_type=identities_arg_type)
+
+    with self.argument_context('appconfig identity remove') as c:
+        c.argument('identities', arg_type=identities_arg_type, help="Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, '[all]' for all identities or a resource id to refer user assigned identity. Remove system assigned identity if not specified.")
+
     with self.argument_context('appconfig credential regenerate') as c:
         c.argument('id_', options_list=['--id'], help='Id of the key to be regenerated. Can be found using az appconfig credential list command.')
 

src/azure-cli/azure/cli/command_modules/appconfig/_validators.py

@@ -155,6 +155,26 @@ def validate_filter_parameter(string):
     return result
 
 
+def validate_identity(namespace):
+    subcommand = namespace.command.split(' ')[-1]
+    identities = set()
+
+    if subcommand == 'create' and namespace.assign_identity:
+        identities = set(namespace.assign_identity)
+    elif subcommand in ('assign', 'remove') and namespace.identities:
+        identities = set(namespace.identities)
+    else:
+        return
+
+    for identity in identities:
+        from msrestazure.tools import is_valid_resource_id
+        if identity == '[all]' and subcommand == 'remove':
+            continue
+
+        if identity != '[system]' and not is_valid_resource_id(identity):
+            raise CLIError("Invalid identity '{}'. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity.".format(identity))
+
+
 def validate_secret_identifier(namespace):
     """ Validate the format of keyvault reference secret identifier """
     from azure.keyvault.key_vault_id import KeyVaultIdentifier

src/azure-cli/azure/cli/command_modules/appconfig/commands.py

@@ -7,6 +7,7 @@
 
 from ._client_factory import cf_configstore, cf_configstore_operations
 from ._format import (configstore_credential_format,
+                      configstore_identity_format,
                       configstore_output_format,
                       keyvalue_entry_format,
                       featureflag_entry_format,
@@ -21,6 +22,12 @@ def load_command_table(self, _):
         client_factory=cf_configstore
     )
 
+    configstore_identity_util = CliCommandType(
+        operations_tmpl='azure.cli.command_modules.appconfig.custom#{}',
+        table_transformer=configstore_identity_format,
+        client_factory=cf_configstore
+    )
+
     configstore_credential_util = CliCommandType(
         operations_tmpl='azure.cli.command_modules.appconfig.custom#{}',
         table_transformer=configstore_credential_format,
@@ -50,15 +57,16 @@ def get_custom_sdk(custom_module, client_factory, table_transformer):
         g.command('update', 'update_configstore')
         g.command('list', 'list_configstore')
         g.command('show', 'show_configstore')
-        g.generic_update_command('update',
-                                 getter_name='configstore_update_get',
-                                 setter_name='configstore_update_set',
-                                 custom_func_name='configstore_update_custom')
 
     with self.command_group('appconfig credential', configstore_credential_util) as g:
         g.command('list', 'list_credential')
         g.command('regenerate', 'regenerate_credential')
 
+    with self.command_group('appconfig identity', configstore_identity_util) as g:
+        g.command('assign', 'assign_managed_identity')
+        g.command('remove', 'remove_managed_identity')
+        g.command('show', 'show_managed_identity')
+
     with self.command_group('appconfig revision', configstore_keyvalue_util) as g:
         g.command('list', 'list_revision')