fix cli deploy and release workflow

Author: colbylwilliams

client/tc/azext_tc/_deploy_utils.py

@@ -166,6 +166,7 @@ def zip_deploy_app(cli_ctx, resource_group_name, name, zip_url, slot=None, app_i
 
 def deploy_arm_template_at_resource_group(cmd, resource_group_name=None, template_file=None,
                                           template_uri=None, parameters=None, no_wait=False):
+
     from azure.cli.command_modules.resource.custom import _prepare_deployment_properties_unmodified
 
     properties = _prepare_deployment_properties_unmodified(cmd, 'resourceGroup', template_file=template_file,
@@ -178,16 +179,11 @@ def deploy_arm_template_at_resource_group(cmd, resource_group_name=None, templat
         try:
             deployment_name = random_string(length=14, force_lower=True) + str(try_number)
 
-            if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES):
-                Deployment = cmd.get_models(
-                    'Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
+            Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
+            deployment = Deployment(properties=properties)
 
-                deployment = Deployment(properties=properties)
-                deploy_poll = sdk_no_wait(no_wait, client.create_or_update, resource_group_name,
-                                          deployment_name, deployment)
-            else:
-                deploy_poll = sdk_no_wait(no_wait, client.create_or_update, resource_group_name,
-                                          deployment_name, properties)
+            deploy_poll = sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name,
+                                      deployment_name, deployment)
 
             result = LongRunningOperation(cmd.cli_ctx, start_msg='Deploying ARM template',
                                           finish_msg='Finished deploying ARM template')(deploy_poll)

client/tc/azext_tc/custom.py

@@ -29,45 +29,63 @@ def teamcloud_update(cmd, version=None, prerelease=False):
     from azure.cli.core import CommandIndex
     from azure.cli.core.extension import get_extension
     from azure.cli.core.extension.operations import _add_whl_ext, _augment_telemetry_with_ext_info
+    from azure.cli.core.extension.operations import update_extension
     from ._deploy_utils import get_github_release
 
     release = get_github_release(cmd.cli_ctx, 'TeamCloud', version=version, prerelease=prerelease)
-    asset = next((a for a in release['assets']
-                  if 'py3-none-any.whl' in a['browser_download_url']), None)
 
-    download_url = asset['browser_download_url'] if asset else None
+    index = next((a for a in release['assets']
+                  if 'index.json' in a['browser_download_url']), None)
 
-    if not download_url:
+    index_url = index['browser_download_url'] if index else None
+
+    if not index_url:
         raise CLIError(
-            'Could not find extension .whl asset on release {}. '
+            'Could not find index.json asset on release {}. '
             'Specify a specific prerelease version with --version '
             'or use latest prerelease with --pre'.format(release['tag_name']))
 
-    extension_name = 'tc'
-    ext = get_extension(extension_name)
-    cur_version = ext.get_version()
-    # Copy current version of extension to tmp directory in case we need to restore it after a failed install.
-    backup_dir = os.path.join(tempfile.mkdtemp(), extension_name)
-    extension_path = ext.path
-    logger.debug('Backing up the current extension: %s to %s', extension_path, backup_dir)
-    shutil.copytree(extension_path, backup_dir)
-    # Remove current version of the extension
-    shutil.rmtree(extension_path)
-    # Install newer version
-    try:
-        _add_whl_ext(cli_ctx=cmd.cli_ctx, source=download_url)
-        logger.debug('Deleting backup of old extension at %s', backup_dir)
-        shutil.rmtree(backup_dir)
-        # This gets the metadata for the extension *after* the update
-        _augment_telemetry_with_ext_info(extension_name)
-    except Exception as err:
-        logger.error('An error occurred whilst updating.')
-        logger.error(err)
-        logger.debug('Copying %s to %s', backup_dir, extension_path)
-        shutil.copytree(backup_dir, extension_path)
-        raise CLIError('Failed to update. Rolled {} back to {}.'.format(
-            extension_name, cur_version)) from err
-    CommandIndex().invalidate()
+    update_extension(cmd, extension_name='tc', index_url=index_url)
+
+    # asset = next((a for a in release['assets']
+    #               if 'py3-none-any.whl' in a['browser_download_url']), None)
+
+    # download_url = asset['browser_download_url'] if asset else None
+
+    # logger.warning(index_url)
+    # return index_url
+
+    # if not download_url:
+    #     raise CLIError(
+    #         'Could not find extension .whl asset on release {}. '
+    #         'Specify a specific prerelease version with --version '
+    #         'or use latest prerelease with --pre'.format(release['tag_name']))
+
+    # extension_name = 'tc'
+    # ext = get_extension(extension_name)
+    # cur_version = ext.get_version()
+    # # Copy current version of extension to tmp directory in case we need to restore it after a failed install.
+    # backup_dir = os.path.join(tempfile.mkdtemp(), extension_name)
+    # extension_path = ext.path
+    # logger.debug('Backing up the current extension: %s to %s', extension_path, backup_dir)
+    # shutil.copytree(extension_path, backup_dir)
+    # # Remove current version of the extension
+    # shutil.rmtree(extension_path)
+    # # Install newer version
+    # try:
+    #     _add_whl_ext(cli_ctx=cmd.cli_ctx, source=download_url)
+    #     logger.debug('Deleting backup of old extension at %s', backup_dir)
+    #     shutil.rmtree(backup_dir)
+    #     # This gets the metadata for the extension *after* the update
+    #     _augment_telemetry_with_ext_info(extension_name)
+    # except Exception as err:
+    #     logger.error('An error occurred whilst updating.')
+    #     logger.error(err)
+    #     logger.debug('Copying %s to %s', backup_dir, extension_path)
+    #     shutil.copytree(backup_dir, extension_path)
+    #     raise CLIError('Failed to update. Rolled {} back to {}.'.format(
+    #         extension_name, cur_version)) from err
+    # CommandIndex().invalidate()
 
 
 def teamcloud_deploy(cmd, client, name, location=None, resource_group_name='TeamCloud',