Provide support for reading a single parameter value from file

README.rst

@@ -25,7 +25,7 @@ Then:
 
 Alternatively:
  + Run :code:`docker pull azuresdk/azure-cli-python:latest`
- + Run :code:`alias az='docker run --rm -v ~/.azure:/root/.azure azuresdk/azure-cli-python az'`
+ + Run :code:`alias az='docker run --rm -i -t -v ~/.azure:/root/.azure azuresdk/azure-cli-python az'`
  + Then run :code:`az` as normal. e.g. :code:`az account login`
 
 Usage

appveyor.yml

@@ -33,8 +33,8 @@ on_success:
   - git config --global user.email "%GIT_USER_EMAIL%"
   - git config --global user.name "%GIT_USER_NAME%"
   - git clone --depth 5 -q --branch=%TARGET_BRANCH% %GIT_CONTENT_REPO_URL% %TEMP%\azure-cli-content
+  - if exist %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER% ((cd %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER%) & (del %FILES_TO_DELETE% /f /q) & (for /d %%p IN (*) do rmdir "%%p" /s /q))
   - cd %TEMP%\azure-cli-content
-  - if exist %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER% rmdir /s /q %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER%
-  - SETLOCAL EnableDelayedExpansion & robocopy %TEMP%\azure-cli-xml2yml\yml-output %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER% /e & IF !ERRORLEVEL! EQU 1 (exit 0) ELSE (exit 1)
+  - SETLOCAL EnableDelayedExpansion & robocopy %TEMP%\azure-cli-xml2yml\yml-output %TEMP%\azure-cli-content\%YML_OUTPUT_FOLDER% /e & IF !ERRORLEVEL! EQU 1 (exit 0) ELSE (IF !ERRORLEVEL! EQU 3 (exit 0) ELSE (exit 1))
   - git add -A
   - git diff --quiet --exit-code --cached || git commit -m "Update Document Content" && git push origin %TARGET_BRANCH% && appveyor AddMessage "Document Updated"

azure-cli.pyproj

@@ -71,6 +71,73 @@
     <Compile Include="command_modules\azure-cli-feedback\azure\__init__.py" />
     <Compile Include="command_modules\azure-cli-feedback\setup.py" />
     <Compile Include="azure\cli\utils\vcr_test_base.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\custom.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\generated.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\iot_hub_client.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\cloud_to_device_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\error_details.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\event_hub_consumer_group_info.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\event_hub_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\export_devices_request.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\feedback_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\import_devices_request.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_capacity.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_description.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_description_paged.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_name_availability_info.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_quota_metric_info.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_quota_metric_info_paged.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_sku_description.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_sku_description_paged.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\iot_hub_sku_info.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\job_response.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\job_response_paged.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\messaging_endpoint_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\operations_monitoring_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\operation_inputs.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\registry_statistics.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\resource.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\shared_access_authorization_rule.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\shared_access_signature_authorization_rule.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\shared_access_signature_authorization_rule_list_result.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\storage_endpoint_properties.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\str_paged.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\operations\iot_hub_resource_operations.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\iot_hub_device_client.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\authentication.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\create_device_request.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\device_description.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\error_details.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\symmetric_key.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\iot_hub_devices_operations.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\sas_token_auth.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\test_iot_commands.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\test_sas_token_auth.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_factory.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_help.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_params.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\setup.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\custom.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\generated.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\test_keyvault_commands.py" />
@@ -635,6 +702,21 @@
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\" />
+    <Folder Include="command_modules\azure-cli-iot\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\models\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-keyvault\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\cli\" />
@@ -758,6 +840,7 @@
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\lib\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\lib\models\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\nested_templates\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vm\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vm\lib\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vm\lib\models\" />
@@ -779,6 +862,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="command_modules\azure-cli-component\requirements.txt" />
+    <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub\swagger_iot_hub_resource_provider.json" />
+    <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\swagger_iot_hub_device_identity.json" />
+    <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\recordings\test_iot_device_create.yaml" />
+    <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\recordings\test_iot_hub_create.yaml" />
+    <Content Include="command_modules\azure-cli-iot\README.rst" />
+    <Content Include="command_modules\azure-cli-iot\requirements.txt" />
     <Content Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\recordings\test_key_vault_mgmt.yaml" />
     <Content Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\__pycache__\test_keyvault_commands.cpython-35.pyc" />
     <Content Include="command_modules\azure-cli-keyvault\README.rst" />
@@ -846,6 +935,8 @@
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_avail_set\swagger_create_avail_set.json" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\azuredeploy.json" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\azuredeploy_test.md" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\nested_templates\nat_rules_new.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\nested_templates\nat_rules_none.json" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vm\azuredeploy_test.md" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vmss\swagger_create_vmss.json" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt_vm\azuredeploy.json" />

doc/authoring_command_modules/authoring_commands.md

@@ -34,12 +34,12 @@ from azure.cli.commands import cli_command
 
 The signature of this method is 
 ```Python
-def cli_command(name, operation, client_factory=None, transform=None, simple_output_query=None):
+def cli_command(name, operation, client_factory=None, transform=None, table_transformer=None):
 ```
-You will generally only specify `name`, `operation` and possibly `simple_output_query`.
+You will generally only specify `name`, `operation` and possibly `table_transformer`.
   - `name` - String uniquely naming your command and placing it within the command hierachy. It will be the string that you would type at the command line, omitting `az` (ex: access your command at `az mypackage mycommand` using a name of `mypackage mycommand`).
   - `operation` - Your function's name.
-  - `simple_output_query` (optional) - Supply a JMESPath projection string to enable the table output type for your command. This is most applicable to list-type commands. See www.jmespath.org for guidance on creating JMESPath queries. Alternatively, you can supply a callable that takes, transforms and returns a result. This is appropriate when the structure of the server response makes JMESPath querying difficult.
+  - `table_transformer` (optional) - Supply a callable that takes, transforms and returns a result for table output.
 
 At this point, you should be able to access your command using `az [name]` and access the built-in help with `az [name] -h/--help`. Your command will automatically be 'wired up' with the global parameters.
 

doc/preview_instructions.md

@@ -6,14 +6,16 @@ The Project AZ team is excited to offer a preview build for members of the GitHu
 Installation via CURL
 -----------------
 
-To install via cURL on Linux, Unix and OS X, type:
+To install via cURL on Linux and OS X, type:
 
     curl -L https://aka.ms/ProjectAzInstall | bash
 
 If you chose to enable tab completion, type `exec -l $SHELL` to restart your shell.
 
 Note: This will install the latest verified nightly builds.  You may re-run this script later to safely update to the latest version.
 
+For more detailed information on installing the preview, please visit the [Preview Install Guide](https://github.com/Azure/azure-cli/blob/master/doc/preview_install_guide.md) page.
+
 Example Demo Script
 -------------------
 

requirements.txt

@@ -13,4 +13,5 @@ pylint==1.5.4
 pyyaml==3.11
 requests==2.9.1
 six==1.10.0
+tabulate==0.7.5
 vcrpy==1.7.4

setup.py

@@ -68,6 +68,7 @@
     'pyyaml',
     'requests',
     'six',
+    'tabulate',
 ]
 
 if sys.version_info < (3, 4):

src/azure/cli/_config.py

@@ -0,0 +1,55 @@
+#---------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#---------------------------------------------------------------------------------------------
+import os
+from six.moves import configparser
+
+GLOBAL_CONFIG_PATH = os.path.expanduser(os.path.join('~', '.azure', 'config'))
+ACTIVE_ENV_CONFIG_PATH = os.path.expanduser(os.path.join('~', '.azure', 'env_config', 'default'))
+ENV_VAR_PREFIX = 'AZURE_'
+
+_UNSET = object()
+_ENV_VAR_FORMAT = ENV_VAR_PREFIX+'{section}_{option}'
+
+class AzConfig(object):
+    _BOOLEAN_STATES = {'1': True, 'yes': True, 'true': True, 'on': True,
+                       '0': False, 'no': False, 'false': False, 'off': False}
+
+    def __init__(self):
+        self.config_parser = configparser.SafeConfigParser()
+
+    @staticmethod
+    def env_var_name(section, option):
+        return _ENV_VAR_FORMAT.format(section=section.upper(),
+                                      option=option.upper())
+
+    def has_option(self, section, option):
+        if AzConfig.env_var_name(section, option) in os.environ:
+            return True
+        return self.config_parser.has_option(section, option)
+
+    def get(self, section, option, fallback=_UNSET):
+        try:
+            env = AzConfig.env_var_name(section, option)
+            return os.environ[env] if env in os.environ else self.config_parser.get(section, option)
+        except (configparser.NoSectionError, configparser.NoOptionError):
+            if fallback is _UNSET:
+                raise
+            else:
+                return fallback
+
+    def getint(self, section, option, fallback=_UNSET):
+        return int(self.get(section, option, fallback))
+
+    def getfloat(self, section, option, fallback=_UNSET):
+        return float(self.get(section, option, fallback))
+
+    def getboolean(self, section, option, fallback=_UNSET):
+        val = self.get(section, option, fallback)
+        if val.lower() not in AzConfig._BOOLEAN_STATES: #pylint: disable=E1101
+            raise ValueError('Not a boolean: {}'.format(val))
+        return AzConfig._BOOLEAN_STATES[val.lower()] #pylint: disable=E1101
+
+az_config = AzConfig()
+az_config.config_parser.read([GLOBAL_CONFIG_PATH, ACTIVE_ENV_CONFIG_PATH])