[ReleasePR account] subscription quick fix

src/account/HISTORY.rst

@@ -1,8 +1,8 @@
-.. :changelog:
-
-Release History
-===============
-
-0.1.0
-++++++
-* Initial release.
+.. :changelog:
+
+Release History
+===============
+
+0.1.0
+++++++
+* Initial release.

src/account/README.rst → src/account/README.md

@@ -1,5 +1,5 @@
-Microsoft Azure CLI 'account' Extension
-==========================================
-
-This package is for the 'account' extension.
-i.e. 'az account'
+Microsoft Azure CLI 'account' Extension
+==========================================
+
+This package is for the 'account' extension.
+i.e. 'az account'

src/account/azext_account/__init__.py

@@ -1,41 +1,46 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-from azure.cli.core import AzCommandsLoader
-from azext_account.generated._help import helps  # pylint: disable=unused-import
-
-
-class SubscriptionClientCommandsLoader(AzCommandsLoader):
-
-    def __init__(self, cli_ctx=None):
-        from azure.cli.core.commands import CliCommandType
-        from azext_account.generated._client_factory import cf_account
-        account_custom = CliCommandType(
-            operations_tmpl='azext_account.custom#{}',
-            client_factory=cf_account)
-        super(SubscriptionClientCommandsLoader, self).__init__(cli_ctx=cli_ctx,
-                                                               custom_command_type=account_custom)
-
-    def load_command_table(self, args):
-        from azext_account.generated.commands import load_command_table
-        load_command_table(self, args)
-        try:
-            from azext_account.manual.commands import load_command_table as load_command_table_manual
-            load_command_table_manual(self, args)
-        except ImportError:
-            pass
-        return self.command_table
-
-    def load_arguments(self, command):
-        from azext_account.generated._params import load_arguments
-        load_arguments(self, command)
-        try:
-            from azext_account.manual._params import load_arguments as load_arguments_manual
-            load_arguments_manual(self, command)
-        except ImportError:
-            pass
-
-
-COMMAND_LOADER_CLS = SubscriptionClientCommandsLoader
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from azure.cli.core import AzCommandsLoader
+from azext_account.generated._help import helps  # pylint: disable=unused-import
+
+
+class SubscriptionClientCommandsLoader(AzCommandsLoader):
+
+    def __init__(self, cli_ctx=None):
+        from azure.cli.core.commands import CliCommandType
+        from azext_account.generated._client_factory import cf_account
+        account_custom = CliCommandType(
+            operations_tmpl='azext_account.custom#{}',
+            client_factory=cf_account)
+        parent = super(SubscriptionClientCommandsLoader, self)
+        parent.__init__(cli_ctx=cli_ctx, custom_command_type=account_custom)
+
+    def load_command_table(self, args):
+        from azext_account.generated.commands import load_command_table
+        load_command_table(self, args)
+        try:
+            from azext_account.manual.commands import load_command_table as load_command_table_manual
+            load_command_table_manual(self, args)
+        except ImportError:
+            pass
+        return self.command_table
+
+    def load_arguments(self, command):
+        from azext_account.generated._params import load_arguments
+        load_arguments(self, command)
+        try:
+            from azext_account.manual._params import load_arguments as load_arguments_manual
+            load_arguments_manual(self, command)
+        except ImportError:
+            pass
+
+
+COMMAND_LOADER_CLS = SubscriptionClientCommandsLoader

src/account/azext_account/action.py

@@ -1,13 +1,17 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-# pylint: disable=wildcard-import
-# pylint: disable=unused-wildcard-import
-
-from azext_account.generated.action import *  # noqa: F403
-try:
-    from azext_account.manual.action import *  # noqa: F403
-except ImportError:
-    pass
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wildcard-import
+# pylint: disable=unused-wildcard-import
+
+from .generated.action import *  # noqa: F403
+try:
+    from .manual.action import *  # noqa: F403
+except ImportError:
+    pass

src/account/azext_account/azext_metadata.json

@@ -1,4 +1,4 @@
-{
-    "azext.isExperimental": true,
-    "azext.minCliCoreVersion": "2.3.1"
+{
+    "azext.isExperimental": true,
+    "azext.minCliCoreVersion": "2.3.1"
 }

src/account/azext_account/custom.py

@@ -1,13 +1,17 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-# pylint: disable=wildcard-import
-# pylint: disable=unused-wildcard-import
-
-from azext_account.generated.custom import *  # noqa: F403
-try:
-    from azext_account.manual.custom import *  # noqa: F403
-except ImportError:
-    pass
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wildcard-import
+# pylint: disable=unused-wildcard-import
+
+from .generated.custom import *  # noqa: F403
+try:
+    from .manual.custom import *  # noqa: F403
+except ImportError:
+    pass

src/account/azext_account/generated/__init__.py

@@ -1,4 +1,12 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

src/account/azext_account/generated/_client_factory.py

@@ -1,24 +1,31 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-
-def cf_account(cli_ctx, *_):
-    from azure.cli.core.commands.client_factory import _get_mgmt_service_client
-    from ..vendored_sdks.subscription import SubscriptionClient
-    return _get_mgmt_service_client(cli_ctx, SubscriptionClient,
-                                    subscription_bound=False,
-                                    base_url_bound=False)[0]
-
-
-def cf_subscription(cli_ctx, *_):
-    return cf_account(cli_ctx).subscription
-
-
-def cf_subscription_operation(cli_ctx, *_):
-    return cf_account(cli_ctx).subscription_operation
-
-
-def cf_operation(cli_ctx, *_):
-    return cf_account(cli_ctx).operation
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+
+def cf_account(cli_ctx, *_):
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    from ..vendored_sdks.subscription import SubscriptionClient
+    return get_mgmt_service_client(cli_ctx, SubscriptionClient)
+
+
+def cf_subscription(cli_ctx, *_):
+    return cf_account(cli_ctx).subscription
+
+
+def cf_tenant(cli_ctx, *_):
+    return cf_account(cli_ctx).tenant
+
+
+def cf_subscription(cli_ctx, *_):
+    return cf_account(cli_ctx).subscription
+
+
+def cf_alias(cli_ctx, *_):
+    return cf_account(cli_ctx).alias