diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a3c2b5012af..a9425319cb4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,9 +2,9 @@ *help.py @sptramer -/tools/ @troydai -/scripts/ @troydai -/src/azure-cli-testsdk/ @troydai +/tools/ @tjprescott +/scripts/ @tjprescott +/src/azure-cli-testsdk/ @tjprescott /src/command_modules/azure-cli-acr/ @djyou /src/command_modules/azure-cli-acs/ @rjtsdl /src/command_modules/azure-cli-advisor/ @Prasanna-Padmanabhan @@ -15,17 +15,17 @@ /src/command_modules/azure-cli-cdn/ @tjprescott /src/command_modules/azure-cli-cosmosdb/ @dmakwana /src/command_modules/azure-cli-cloud/ @yugangw-msft -/src/command_modules/azure-cli-container/ @yolo3301 +/src/command_modules/azure-cli-container/ @samkreter /src/command_modules/azure-cli-consumption/ @sandeepnl /src/command_modules/azure-cli-dls/ @lewu-msft /src/command_modules/azure-cli-eventgrid/ @kalyanaj /src/command_modules/azure-cli-extension/ @williexu /src/command_modules/azure-cli-keyvault/ @tjprescott -/src/command_modules/azure-cli-monitor/ @troydai +/src/command_modules/azure-cli-monitor/ @tjprescott /src/command_modules/azure-cli-network/ @tjprescott /src/command_modules/azure-cli-policyinsights/ @bulentelmaci /src/command_modules/azure-cli-profile/ @yugangw-msft -/src/command_modules/azure-cli-storage/ @troydai @williexu +/src/command_modules/azure-cli-storage/ @williexu /src/command_modules/azure-cli-servicefabric/ @QingChenmsft /src/command_modules/azure-cli-sql/ @jaredmoo /src/command_modules/azure-cli-vm/ @yugangw-msft diff --git a/Pipfile.lock b/Pipfile.lock index 8b7703cbe62..32b8e21aeba 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1009,12 +1009,6 @@ ], "version": "==1.6.5" }, - "autopep8": { - "hashes": [ - "sha256:2284d4ae2052fedb9f466c09728e30d2e231cfded5ffd7b1a20c34123fdc4ba4" - ], - "version": "==1.3.5" - }, "azure-batch": { "hashes": [ "sha256:017be21a9e6db92473d2e33170d5dd445596fc70d706f73552ac9c6b57a6ef1c", diff --git a/README.md b/README.md index 224cb4d00a9..91452f21a03 100644 --- a/README.md +++ b/README.md @@ -103,10 +103,13 @@ jasonsha@MyVM:~$ #### Exit Codes For scripting purposes, we output certain exit codes for differing scenarios. -`0`: Command ran successfully. -`1`: Generic error; server returned bad status code, CLI validation failed, etc. -`2`: Parser error; check input to command line. -`3`: Missing ARM resource; used for existence check from `show` commands. + +|Exit Code |Scenario | +|---|---| +|0 |Command ran successfully. | +|1 |Generic error; server returned bad status code, CLI validation failed, etc. | +|2 |Parser error; check input to command line. | +|3 |Missing ARM resource; used for existence check from `show` commands. | #### More Samples and Snippets For more usage examples, take a look at our [GitHub samples repo](https://github.com/Azure/azure-cli-samples) or [https://docs.microsoft.com/en-us/cli/azure/overview](https://docs.microsoft.com/en-us/cli/azure/overview). diff --git a/azure-cli2017.pyproj b/azure-cli2017.pyproj index 0c47a614cda..2d32cbfd73f 100644 --- a/azure-cli2017.pyproj +++ b/azure-cli2017.pyproj @@ -83,6 +83,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -406,6 +438,17 @@ + + + + + + + + + + + @@ -515,19 +558,18 @@ + - - @@ -607,6 +649,19 @@ + + + + + + + + + + + + + @@ -668,6 +723,17 @@ + + + + + + + + + + + @@ -794,6 +860,24 @@ + + + + + + + + + + + + + + + + + + @@ -974,6 +1058,13 @@ + + + + + + + @@ -1069,6 +1160,13 @@ + + + + + + + @@ -1097,6 +1195,15 @@ + + + + + + + + + @@ -1156,6 +1263,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1289,6 +1488,8 @@ + + @@ -1343,6 +1544,8 @@ + + @@ -1378,6 +1581,11 @@ + + + + + diff --git a/build_scripts/debian/README.md b/build_scripts/debian/README.md new file mode 100644 index 00000000000..f1c92138bdb --- /dev/null +++ b/build_scripts/debian/README.md @@ -0,0 +1,30 @@ +Debian Packaging +================ + +Updating the Debian package +--------------------------- + +On a build machine (e.g. new Ubuntu 14.04 VM), run the build script. + +For example: +``` +git clone https://github.com/azure/azure-cli +cd azure-cli +export CLI_VERSION=2.0.9 \ + && export BUILD_ARTIFACT_DIR=$(mktemp -d)\ + && build_scripts/debian/build.sh $(pwd) +``` + +Note: The paths above have to be full paths, not relative otherwise the build will fail. + +Now you have built the package, upload the package to the apt repository. + + +Verification +------------ + +``` +sudo dpkg -i azure-cli_${CLI_VERSION}-1_all.deb +az +az --version +``` diff --git a/build_scripts/debian/build.sh b/build_scripts/debian/build.sh new file mode 100644 index 00000000000..9e7ea6200e2 --- /dev/null +++ b/build_scripts/debian/build.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env bash +#--------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +#--------------------------------------------------------------------------------------------- + +set -ex + +: "${CLI_VERSION:?CLI_VERSION environment variable not set.}" +: "${BUILD_ARTIFACT_DIR:?BUILD_ARTIFACT_DIR environment variable not set.}" + +if [ -z "$1" ] + then + echo "Argument should be path to local repo." + exit 1 +fi + +local_repo=$1 + +sudo apt-get update + +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +debian_directory_creator=$script_dir/dir_creator.sh + +# Install dependencies for the build +sudo apt-get install -y libssl-dev libffi-dev python3-dev debhelper +# Download, Extract, Patch, Build CLI +tmp_pkg_dir=$(mktemp -d) +working_dir=$(mktemp -d) +cd $working_dir +source_dir=$local_repo +deb_file=$local_repo/../azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_all.deb +az_completion_file=$source_dir/az.completion +# clean up old build output +if [ -d "$source_dir/debian" ] + then + rm -rf $source_dir/debian +fi +[ -d $local_repo/privates ] && cp $local_repo/privates/*.whl $tmp_pkg_dir + +# Build Python from source and include +python_dir=$(mktemp -d) +python_archive=$(mktemp) +wget https://www.python.org/ftp/python/3.6.1/Python-3.6.1.tgz -qO $python_archive +tar -xvzf $python_archive -C $python_dir +echo "Python dir is $python_dir" +# clean any previous make files +make clean || echo "Nothing to clean" +$python_dir/*/configure --srcdir $python_dir/* --prefix $source_dir/python_env +make +# required to run the 'make install' +sudo apt-get install -y zlib1g-dev +make install + +# note: This installation step could happen in debian/rules but was unable to escape $ char. +# It does not affect the built .deb file though. +$source_dir/python_env/bin/pip3 install wheel +for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg \ + $source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/; + do cd $d; + $source_dir/python_env/bin/python3 setup.py bdist_wheel -d $tmp_pkg_dir; + cd -; +done; +all_modules=`find $tmp_pkg_dir -name "*.whl"` +$source_dir/python_env/bin/pip3 install $all_modules +$source_dir/python_env/bin/pip3 install --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg +# Add the debian files +mkdir $source_dir/debian +# Create temp dir for the debian/ directory used for CLI build. +cli_debian_dir_tmp=$(mktemp -d) + +$debian_directory_creator $cli_debian_dir_tmp $az_completion_file $source_dir +cp -r $cli_debian_dir_tmp/* $source_dir/debian +cd $source_dir +dpkg-buildpackage -us -uc +echo "The archive is available at $working_dir/azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_all.deb" +cp $deb_file ${BUILD_ARTIFACT_DIR} +echo "The archive has also been copied to ${BUILD_ARTIFACT_DIR}" +echo "Done." diff --git a/build_scripts/debian/dir_creator.sh b/build_scripts/debian/dir_creator.sh new file mode 100644 index 00000000000..f14331b6cb7 --- /dev/null +++ b/build_scripts/debian/dir_creator.sh @@ -0,0 +1,124 @@ +#!/usr/bin/env bash +#--------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +#--------------------------------------------------------------------------------------------- + +set -ex + +# Create the debian/ directory for building the azure-cli Debian package + +# This script takes an argument of the empty directory where the files will be placed. + +if [ -z "$1" ] + then + echo "No argument supplied for debian directory." + exit 1 +fi + +if [ -z "$2" ] + then + echo "No argument supplied for completion script." + exit 1 +fi + +if [ -z "$3" ] + then + echo "No argument supplied for source directory." + exit 1 +fi + +TAB=$'\t' + +debian_dir=$1 +completion_script=$2 +source_dir=$3 +mkdir $debian_dir/source + +echo '1.0' > $debian_dir/source/format +echo '9' > $debian_dir/compat + +cat > $debian_dir/changelog <<- EOM +azure-cli (${CLI_VERSION}-${CLI_VERSION_REVISION:=1}) unstable; urgency=low + + * Debian package release. + + -- Azure Python CLI Team $(date -R) + +EOM + +cat > $debian_dir/control <<- EOM +Source: azure-cli +Section: python +Priority: extra +Maintainer: Azure Python CLI Team +Build-Depends: debhelper (>= 9), libssl-dev, libffi-dev, python3-dev +Standards-Version: 3.9.5 +Homepage: https://github.com/azure/azure-cli + +Package: azure-cli +Architecture: all +Depends: \${shlibs:Depends}, \${misc:Depends} +Description: Azure CLI + A great cloud needs great tools; we're excited to introduce Azure CLI, + our next generation multi-platform command line experience for Azure. + +EOM + +cat > $debian_dir/copyright <<- EOM +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: azure-cli +Upstream-Contact: Azure Python CLI Team +Source: https://github.com/azure/azure-cli + +Files: * +Copyright: Copyright (c) Microsoft Corporation +License: MIT +Azure CLI + +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +EOM + +# TODO: Instead of "_ssl.cpython-36m-x86_64-linux-gnu.so" only, find all .so files with "find debian/azure-cli/opt/az -type f -name '*.so'" + +cat > $debian_dir/rules << EOM +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +export DH_OPTIONS=-v + +%: +${TAB}dh \$@ --sourcedirectory $source_dir + +override_dh_install: +${TAB}mkdir -p debian/azure-cli/opt/az +${TAB}cp -a python_env/* debian/azure-cli/opt/az +${TAB}mkdir -p debian/azure-cli/usr/bin/ +${TAB}echo "\043!/usr/bin/env bash\n/opt/az/bin/python3 -Im azure.cli \"\044\100\"" > debian/azure-cli/usr/bin/az +${TAB}chmod 0755 debian/azure-cli/usr/bin/az +${TAB}mkdir -p debian/azure-cli/etc/bash_completion.d/ +${TAB}cat ${completion_script} > debian/azure-cli/etc/bash_completion.d/azure-cli +${TAB}dpkg-shlibdeps -v --warnings=7 -Tdebian/azure-cli.substvars -dDepends -edebian/azure-cli/opt/az/bin/python3 debian/azure-cli/opt/az/lib/python3.6/lib-dynload/_ssl.cpython-36m-x86_64-linux-gnu.so + + +override_dh_strip: +${TAB}dh_strip --exclude=_cffi_backend + +EOM + +cat $debian_dir/rules + +# debian/rules should be executable +chmod 0755 $debian_dir/rules diff --git a/build_scripts/docker/README.md b/build_scripts/docker/README.md new file mode 100644 index 00000000000..b1740a090fc --- /dev/null +++ b/build_scripts/docker/README.md @@ -0,0 +1,35 @@ +Docker Packaging +================ + +The Docker image is available at https://hub.docker.com/r/microsoft/azure-cli/tags/. + +Updating the Docker image +------------------------- +1. Run `docker build` with the Dockerfile. + When tagging this Docker image, choose an appropriate version number. + e.g.: ``sudo docker build --no-cache --build-arg BUILD_DATE="`date -u +"%Y-%m-%dT%H:%M:%SZ"`" --build-arg CLI_VERSION=${CLI_VERSION} -f Dockerfile -t microsoft/azure-cli:${CLI_VERSION} .`` +2. Push the image to the registry, + e.g.: `sudo docker push microsoft/azure-cli:${CLI_VERSION}` +3. Create a PR to commit the Dockerfile changes back to the repository. + + +Verification +------------ + +Run the image. + +``` +$ docker run -it microsoft/azure-cli:${CLI_VERSION} +$ az +$ az --version +``` + +Save the image +``` +docker save -o docker-microsoft-azure-cli-VERSION.tar microsoft/azure-cli:${CLI_VERSION} +``` + +Load the saved image +``` +docker load -i docker-microsoft-azure-cli-VERSION.tar +``` diff --git a/build_scripts/homebrew/README.md b/build_scripts/homebrew/README.md new file mode 100644 index 00000000000..a14e5a373d0 --- /dev/null +++ b/build_scripts/homebrew/README.md @@ -0,0 +1,35 @@ +Homebrew Packaging +================== + + +Updating the formula +-------------------- +1. Change the `url` in the formula to point to the new release and change the `sha256` value also. +2. Update the resources list in the formula (see below). +3. Run the formula verification commands (see below). +4. Submit a PR to https://github.com/Homebrew/homebrew-core. + + +Updating the resources list +--------------------------- +``` +# Create a new virtual environment first +pip install azure-cli homebrew-pypi-poet; poet -r azure-cli +``` + +Verification +------------ + +``` +brew install --build-from-source azure-cli.rb +brew test azure-cli.rb +brew audit --strict --online azure-cli.rb +``` + +More Information +---------------- +https://github.com/Homebrew/homebrew-core/blob/master/CONTRIBUTING.md + +https://github.com/Homebrew/brew/blob/master/docs/Formula-Cookbook.md + +https://github.com/Homebrew/brew/blob/master/docs/Acceptable-Formulae.md diff --git a/build_scripts/homebrew/formula-generate.py b/build_scripts/homebrew/formula-generate.py new file mode 100644 index 00000000000..5080943b83d --- /dev/null +++ b/build_scripts/homebrew/formula-generate.py @@ -0,0 +1,107 @@ +#!/usr/bin/env python +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- +import os +import sys +import tempfile +import hashlib +import shutil +from collections import OrderedDict +from sh import pip, git + +try: + # Attempt to load python 3 module + from urllib.request import urlopen +except ImportError: + # Import python 2 version + from urllib2 import urlopen + +HOMEBREW_REPO_URL = 'https://github.com/Homebrew/homebrew-core' +AZURE_CLI_FORMULA_PATH = os.path.join('Formula', 'azure-cli.rb') + +CLI_VERSION = os.environ['CLI_VERSION'] +UPSTREAM_URL = os.environ['UPSTREAM_URL'] +BUILD_ARTIFACTS_DIR = os.environ.get('BUILD_ARTIFACT_DIR') + +def get_homebrew_formula(): + tmp_dir = tempfile.mkdtemp() + git(['clone', '--depth', '1', HOMEBREW_REPO_URL, tmp_dir], _out=sys.stdout, _err=sys.stdout) + formula_path = os.path.join(tmp_dir, AZURE_CLI_FORMULA_PATH) + formula_content = [] + with open(formula_path) as f: + formula_content = f.readlines() + formula_content = [x.rstrip() for x in formula_content] + return formula_path, formula_content + +def modify_url(formula_content): + for line_no, line_contents in enumerate(formula_content): + # Find/replace first url + if 'url' in line_contents: + formula_content[line_no] = ' url "' + UPSTREAM_URL + '"' + break + +def modify_sha256(formula_content): + tmp_file = tempfile.mkstemp()[1] + response = urlopen(UPSTREAM_URL) + with open(tmp_file, 'wb') as f: + f.write(response.read()) + sha256 = hashlib.sha256() + with open(tmp_file, 'rb') as f: + sha256.update(f.read()) + computed_hash = sha256.hexdigest() + for line_no, line_contents in enumerate(formula_content): + # Find/replace first sha256 + if 'sha256' in line_contents: + formula_content[line_no] = ' sha256 "' + computed_hash + '"' + break + +def _should_include_resource(r): + return not r.startswith('azure-cli') and r not in ['futures'] + +def modify_resources(formula_content): + start_resources_line_no = None + end_resources_line_no = None + for line_no, line_contents in enumerate(formula_content): + if 'resource' in line_contents and start_resources_line_no is None: + start_resources_line_no = line_no + if 'def install' in line_contents and end_resources_line_no is None: + end_resources_line_no = line_no - 1 + break + # Delete resources block + del formula_content[start_resources_line_no : end_resources_line_no] + # The script will have installed homebrew-pypi-poet by this point so we can import + from poet.poet import make_graph, RESOURCE_TEMPLATE + nodes = make_graph('azure-cli') + filtered_nodes = OrderedDict([(n, nodes[n]) for n in nodes if _should_include_resource(n)]) + resources_stanza = '\n\n'.join([RESOURCE_TEMPLATE.render(resource=node) for node in filtered_nodes.values()]) + formula_content[start_resources_line_no:start_resources_line_no] = resources_stanza.split('\n') + + +def write_file(formula_path, formula_content): + with open(formula_path, 'w') as f: + for line in formula_content: + f.write("%s\n" % line) + +def setup_pip_deps(): + pip(['install', '--ignore-installed', 'azure-cli', 'homebrew-pypi-poet'], _out=sys.stdout, _err=sys.stdout) + +def main(): + formula_path, formula_content = get_homebrew_formula() + setup_pip_deps() + modify_url(formula_content) + modify_sha256(formula_content) + modify_resources(formula_content) + write_file(formula_path, formula_content) + print('Done') + new_formula_path = formula_path + if BUILD_ARTIFACTS_DIR: + new_formula_path = os.path.join(BUILD_ARTIFACTS_DIR, 'azure-cli.rb') + shutil.copyfile(formula_path, new_formula_path) + print('The new Homebrew formula is available at {}'.format(new_formula_path)) + print('Create a PR to {} for {}'.format(HOMEBREW_REPO_URL, AZURE_CLI_FORMULA_PATH)) + + +if __name__ == '__main__': + main() diff --git a/build_scripts/pypi/README.md b/build_scripts/pypi/README.md new file mode 100644 index 00000000000..e41a2fbe69b --- /dev/null +++ b/build_scripts/pypi/README.md @@ -0,0 +1,9 @@ +Python Package Builds (.whl & .tar.gz) +====================================== + +For example: +``` +artifacts_dir=$(mktemp -d) +python build_scripts/pypi/build.py $artifacts_dir . +ls -la $artifacts_dir +``` diff --git a/build_scripts/pypi/build.py b/build_scripts/pypi/build.py new file mode 100644 index 00000000000..39800b2172b --- /dev/null +++ b/build_scripts/pypi/build.py @@ -0,0 +1,67 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- + +""" +Script to build all command modules that can be used to install a fully self-contained instance of the CLI. +""" + +from __future__ import print_function + +import glob +import os +import sys +import tempfile +import subprocess + +def _error_exit(msg): + print('ERROR: '+msg, file=sys.stderr) + sys.exit(1) + +def _print_status(msg=''): + print('-- '+msg) + +def _get_tmp_dir(): + return tempfile.mkdtemp() + +def _get_tmp_file(): + return tempfile.mkstemp()[1] + +def _exec_command(command_list, cwd=None, stdout=None): + """Returns True in the command was executed successfully""" + try: + _print_status('Executing {}'.format(command_list)) + subprocess.check_call(command_list, stdout=stdout, cwd=cwd) + return True + except subprocess.CalledProcessError as err: + print(err, file=sys.stderr) + return False + +def _build_package(path_to_package, dist_dir): + cmd_success = _exec_command(['python', 'setup.py', 'bdist_wheel', '-d', dist_dir], cwd=path_to_package) + cmd_success = _exec_command(['python', 'setup.py', 'sdist', '-d', dist_dir], cwd=path_to_package) + if not cmd_success: + _error_exit('Error building {}.'.format(path_to_package)) + +def build_packages(clone_root, dist_dir): + packages_to_build = [ + os.path.join(clone_root, 'src', 'azure-cli'), + os.path.join(clone_root, 'src', 'azure-cli-core'), + os.path.join(clone_root, 'src', 'azure-cli-nspkg'), + os.path.join(clone_root, 'src', 'azure-cli-command_modules-nspkg'), + ] + + packages_to_build.extend(glob.glob(os.path.join(clone_root, 'src', 'command_modules', 'azure-cli-*'))) + for p in packages_to_build: + if os.path.isfile(os.path.join(p, 'setup.py')): + _build_package(p, dist_dir) + +if __name__ == '__main__': + if len(sys.argv) == 1: + raise ValueError('Please provide temporary path for local built packages') + dist_dir = sys.argv[1] + clone_root = sys.argv[2] + build_packages(clone_root, dist_dir) + print("package were built to {}".format(dist_dir)) + print("Done.") diff --git a/build_scripts/rpm/README.md b/build_scripts/rpm/README.md new file mode 100644 index 00000000000..a64dfe7c681 --- /dev/null +++ b/build_scripts/rpm/README.md @@ -0,0 +1,53 @@ +RPM Packaging +================ + +Building the RPM package +------------------------ + +On a build machine (e.g. new CentOS 7 VM) run the following. + +Install dependencies required to build: +Required for rpm build tools & required to build the CLI. +``` +sudo yum install -y gcc git rpm-build rpm-devel rpmlint make bash coreutils diffutils patch rpmdevtools python libffi-devel python-devel openssl-devel +``` + +Build example: +Note: use the full path to the repo path, not a relative path. +``` +git clone https://github.com/azure/azure-cli +cd azure-cli +export CLI_VERSION=2.0.16 +export REPO_PATH=$(pwd) +rpmbuild -v -bb --clean build_scripts/rpm/azure-cli.spec +``` + +Verification +------------ + +``` +sudo rpm -i RPMS/*/azure-cli-2.0.16-1.noarch.rpm +az --version +``` + +Check the file permissions of the package: +``` +rpmlint RPMS/*/azure-cli-2.0.16-1.x86_64.rpm +``` + +Check the file permissions of the package: +``` +rpm -qlvp RPMS/*/azure-cli-2.0.16-1.x86_64.rpm +``` + +To remove: +``` +sudo rpm -e azure-cli +``` + +Links +----- + +https://fedoraproject.org/wiki/How_to_create_an_RPM_package + +https://fedoraproject.org/wiki/Packaging:RPMMacros?rd=Packaging/RPMMacros diff --git a/build_scripts/rpm/azure-cli.spec b/build_scripts/rpm/azure-cli.spec new file mode 100644 index 00000000000..4f034e11fa6 --- /dev/null +++ b/build_scripts/rpm/azure-cli.spec @@ -0,0 +1,78 @@ +# RPM spec file for Azure CLI +# Definition of macros used - https://fedoraproject.org/wiki/Packaging:RPMMacros?rd=Packaging/RPMMacros + +# .el7.centos -> .el7 +%if 0%{?rhel} == 7 + %define dist .el7 +%endif + +%define name azure-cli +%define release 1%{?dist} +%define version %{getenv:CLI_VERSION} +%define repo_path %{getenv:REPO_PATH} +%define venv_url https://pypi.python.org/packages/source/v/virtualenv/virtualenv-15.0.0.tar.gz +%define venv_sha256 70d63fb7e949d07aeb37f6ecc94e8b60671edb15b890aa86dba5dfaf2225dc19 +%define cli_lib_dir %{_libdir}/az + +Summary: Azure CLI +License: MIT +Name: %{name} +Version: %{version} +Release: %{release} +Url: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli +BuildArch: x86_64 +Requires: python + +BuildRequires: gcc +BuildRequires: python +BuildRequires: libffi-devel +BuildRequires: python-devel +BuildRequires: openssl-devel + +%global _python_bytecompile_errors_terminate_build 0 + +%description +A great cloud needs great tools; we're excited to introduce Azure CLI, + our next generation multi-platform command line experience for Azure. + +%prep +# Create some tmp files +tmp_venv_archive=$(mktemp) + +# Download, Extract Virtualenv +wget %{venv_url} -qO $tmp_venv_archive +echo "%{venv_sha256} $tmp_venv_archive" | sha256sum -c - +tar -xvzf $tmp_venv_archive -C %{_builddir} + +%install +# Create the venv +python %{_builddir}/virtualenv-15.0.0/virtualenv.py --python python %{buildroot}%{cli_lib_dir} + +# Build the wheels from the source +source_dir=%{repo_path} +dist_dir=$(mktemp -d) +for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg $source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/; \ +do cd $d; %{buildroot}%{cli_lib_dir}/bin/python setup.py bdist_wheel -d $dist_dir; cd -; done; + +[ -d $source_dir/privates ] && cp $source_dir/privates/*.whl $dist_dir + +# Install the CLI +all_modules=`find $dist_dir -name "*.whl"` +%{buildroot}%{cli_lib_dir}/bin/pip install --no-compile $all_modules +%{buildroot}%{cli_lib_dir}/bin/pip install --no-compile --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg + +# Fix up %{buildroot} appearing in some files... +for d in %{buildroot}%{cli_lib_dir}/bin/*; do perl -p -i -e "s#%{buildroot}##g" $d; done; + +# Create executable +mkdir -p %{buildroot}%{_bindir} +printf '#!/usr/bin/env bash\n%{cli_lib_dir}/bin/python -Esm azure.cli "$@"' > %{buildroot}%{_bindir}/az + +# Set up tab completion +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/ +cat $source_dir/az.completion > %{buildroot}%{_sysconfdir}/bash_completion.d/azure-cli + +%files +%attr(-,root,root) %{cli_lib_dir} +%config(noreplace) %{_sysconfdir}/bash_completion.d/azure-cli +%attr(0755,root,root) %{_bindir}/az diff --git a/build_scripts/windows/scripts/build.cmd b/build_scripts/windows/scripts/build.cmd index 26d69af37ca..422e39108bf 100644 --- a/build_scripts/windows/scripts/build.cmd +++ b/build_scripts/windows/scripts/build.cmd @@ -3,37 +3,34 @@ SetLocal EnableDelayedExpansion echo build a msi installer using local cli sources and python executables. You need to have curl.exe, unzip.exe and msbuild.exe available under PATH echo. -set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin" - -set PYTHON_DOWNLOAD_URL="https://www.python.org/ftp/python/3.6.5/python-3.6.5-embed-win32.zip" -set GET_PIP_DOWNLOAD_URL="https://bootstrap.pypa.io/get-pip.py" -set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip" +set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;" if "%CLI_VERSION%"=="" ( echo Please set the CLI_VERSION environment variable, e.g. 2.0.13 goto ERROR ) +set PYTHON_VERSION=3.6.6 +set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip" +set PYTHON_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/util/Python366-32.zip" :: Set up the output directory and temp. directories echo Cleaning previous build artifacts... - set OUTPUT_DIR=%~dp0..\out if exist %OUTPUT_DIR% rmdir /s /q %OUTPUT_DIR% mkdir %OUTPUT_DIR% set ARTIFACTS_DIR=%~dp0..\artifacts mkdir %ARTIFACTS_DIR% - set TEMP_SCRATCH_FOLDER=%ARTIFACTS_DIR%\cli_scratch set BUILDING_DIR=%ARTIFACTS_DIR%\cli -set PYTHON_DIR=%ARTIFACTS_DIR%\Python set WIX_DIR=%ARTIFACTS_DIR%\wix +set PYTHON_DIR=%ARTIFACTS_DIR%\Python366-32 + set REPO_ROOT=%~dp0..\..\.. ::reset working folders if exist %BUILDING_DIR% rmdir /s /q %BUILDING_DIR% - ::rmdir always returns 0, so check folder's existence if exist %BUILDING_DIR% ( echo Failed to delete %BUILDING_DIR%. @@ -41,36 +38,6 @@ if exist %BUILDING_DIR% ( ) mkdir %BUILDING_DIR% -:: get Python -if exist %PYTHON_DIR% rmdir /s /q %PYTHON_DIR% - -:: rmdir always returns 0, so check folder's existence -if exist %PYTHON_DIR% ( - echo Failed to delete %PYTHON_DIR%. - goto ERROR -) - -mkdir %PYTHON_DIR% -pushd %PYTHON_DIR% - -echo Downloading Python. -curl -o python-archive.zip %PYTHON_DOWNLOAD_URL% -k -unzip -q python-archive.zip -unzip -q python36.zip -if %errorlevel% neq 0 goto ERROR - -del python-archive.zip -del python36.zip - -echo Python downloaded and extracted successfully. -echo Setting up pip -curl -o get-pip.py %GET_PIP_DOWNLOAD_URL% -k -%PYTHON_DIR%\python.exe get-pip.py -del get-pip.py -echo Pip set up successful. - -popd - if exist %TEMP_SCRATCH_FOLDER% rmdir /s /q %TEMP_SCRATCH_FOLDER% if exist %TEMP_SCRATCH_FOLDER% ( echo Failed to delete %TEMP_SCRATCH_FOLDER%. @@ -82,11 +49,10 @@ if exist %REPO_ROOT%\privates ( copy %REPO_ROOT%\privates\*.whl %TEMP_SCRATCH_FOLDER% ) -:: ensure wix is available +::ensure wix is available if exist %WIX_DIR% ( echo Using existing Wix at %WIX_DIR% ) - if not exist %WIX_DIR% ( mkdir %WIX_DIR% pushd %WIX_DIR% @@ -99,23 +65,34 @@ if not exist %WIX_DIR% ( popd ) -:: Use the Python version on the machine that creates the MSI +::ensure Python is available +if exist %PYTHON_DIR% ( + echo Using existing Python at %PYTHON_DIR% +) +if not exist %PYTHON_DIR% ( + mkdir %PYTHON_DIR% + pushd %PYTHON_DIR% + echo Downloading Python. + curl -o Python366-32.zip %PYTHON_DOWNLOAD_URL% -k + unzip -q Python366-32.zip + if %errorlevel% neq 0 goto ERROR + del Python366-32.zip + echo Python downloaded and extracted successfully. + popd +) +set PYTHON_EXE=%PYTHON_DIR%\python.exe + robocopy %PYTHON_DIR% %BUILDING_DIR% /s /NFL /NDL :: Build & install all the packages with bdist_wheel +%BUILDING_DIR%\python.exe -m pip install wheel echo Building CLI packages... - -:: Workaround for get bdist_wheel to complete otherwise it fails to import azure_bdist_wheel -set PYTHONPATH=%BUILDING_DIR%\Lib\site-packages -del %BUILDING_DIR%\python36._pth - set CLI_SRC=%REPO_ROOT%\src for %%a in (%CLI_SRC%\azure-cli %CLI_SRC%\azure-cli-core %CLI_SRC%\azure-cli-nspkg %CLI_SRC%\azure-cli-telemetry) do ( pushd %%a %BUILDING_DIR%\python.exe setup.py bdist_wheel -d %TEMP_SCRATCH_FOLDER% popd ) - pushd %CLI_SRC%\command_modules for /D %%a in (*) do ( pushd %CLI_SRC%\command_modules\%%a @@ -123,16 +100,6 @@ for /D %%a in (*) do ( popd ) popd - -:: Undo the rest of the workaround and add site-packages to ._pth. -:: See https://docs.python.org/3/using/windows.html#finding-modules -set PYTHONPATH= -( - echo python36.zip - echo . - echo Lib\site-packages -) > %BUILDING_DIR%\python36._pth - echo Built CLI packages successfully. if %errorlevel% neq 0 goto ERROR @@ -146,6 +113,10 @@ echo All modules: %ALL_MODULES% %BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --no-cache-dir %ALL_MODULES% %BUILDING_DIR%\python.exe -m pip install --no-warn-script-location --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg +pushd %BUILDING_DIR% +%BUILDING_DIR%\python.exe %~dp0\patch_models_v2.py +popd + echo Creating the wbin (Windows binaries) folder that will be added to the path... mkdir %BUILDING_DIR%\wbin copy %REPO_ROOT%\build_scripts\windows\scripts\az.cmd %BUILDING_DIR%\wbin\ @@ -153,12 +124,6 @@ if %errorlevel% neq 0 goto ERROR copy %REPO_ROOT%\build_scripts\windows\resources\CLI_LICENSE.rtf %BUILDING_DIR% copy %REPO_ROOT%\build_scripts\windows\resources\ThirdPartyNotices.txt %BUILDING_DIR% -: Delete some files we don't need -rmdir /s /q %BUILDING_DIR%\Scripts -for /f %%a in ('dir %BUILDING_DIR%\Lib\site-packages\*.egg-info /b /s /a:d') do ( - rmdir /s /q %%a -) - :: Use universal files and remove Py3 only files pushd %BUILDING_DIR%\Lib\site-packages\azure\mgmt for /f %%a in ('dir /b /s *_py3.py') do ( @@ -172,11 +137,11 @@ for /f %%a in ('dir /b /s *_py3.*.pyc') do ( popd :: Remove .py and only deploy .pyc files -pushd %BUILDING_DIR%\Lib\site-packages\azure +pushd %BUILDING_DIR%\Lib\site-packages for /f %%f in ('dir /b /s *.pyc') do ( set PARENT_DIR=%%~df%%~pf.. - echo !PARENT_DIR! | findstr /C:"!BUILDING_DIR!\Lib\site-packages\pip" 1>nul - if errorlevel 1 ( + echo !PARENT_DIR! | findstr /C:\Lib\site-packages\pip\ 1>nul + if !errorlevel! neq 0 ( set FILENAME=%%~nf set BASE_FILENAME=!FILENAME:~0,-11! set pyc=!BASE_FILENAME!.pyc @@ -196,7 +161,7 @@ for /d /r %BUILDING_DIR%\Lib\site-packages\pip %%d in (__pycache__) do ( if %errorlevel% neq 0 goto ERROR echo Building MSI... -MSBuild.exe /t:rebuild /p:Configuration=Release %REPO_ROOT%\build_scripts\windows\azure-cli.wixproj +msbuild /t:rebuild /p:Configuration=Release %REPO_ROOT%\build_scripts\windows\azure-cli.wixproj start %OUTPUT_DIR% @@ -208,4 +173,4 @@ exit /b 1 :END exit /b 0 -popd +popd \ No newline at end of file diff --git a/build_scripts/windows/scripts/patch_models_v2.py b/build_scripts/windows/scripts/patch_models_v2.py new file mode 100644 index 00000000000..ce09f604385 --- /dev/null +++ b/build_scripts/windows/scripts/patch_models_v2.py @@ -0,0 +1,282 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- + +from enum import Enum +import importlib +import inspect +import logging +from pathlib import Path +import pkgutil +import shutil +import sys +import tempfile + +from msrest.serialization import Model +from msrest.exceptions import HttpOperationError +from msrest.paging import Paged + +_LOGGER = logging.getLogger(__name__) + + +copyright_header = b"""# 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. +# -------------------------------------------------------------------------- + +""" + +header = copyright_header+b"""from msrest.serialization import Model +from msrest.exceptions import HttpOperationError +""" + +paging_header = copyright_header+b"""from msrest.paging import Paged +""" + +init_file = """ +try: + from .{} import * +except (SyntaxError, ImportError): + from .{} import * +from .{} import * +""" + +MODEL_PY2_NAME = "_models" +MODEL_PY3_NAME = "_models_py3" +PAGED_NAME = "_paged_models" + +def as_file_name(name): + return name + ".py" + +def parse_input(input_parameter): + """From a syntax like package_name#submodule, build a package name + and complete module name. + """ + split_package_name = input_parameter.split('#') + package_name = split_package_name[0] + module_name = package_name.replace("-", ".") + if len(split_package_name) >= 2: + module_name = ".".join([module_name, split_package_name[1]]) + return package_name, module_name + +def solve_mro(models): + for models_module in models: + models_path = models_module.__path__[0] + _LOGGER.info(f"Working on {models_path}") + if Path(models_path, as_file_name(MODEL_PY3_NAME)).exists(): + _LOGGER.info("Skipping since already patched") + return + + # Build the new files in a temp folder + with tempfile.TemporaryDirectory() as temp_folder: + final_models_path = Path(temp_folder, "models") + final_models_path.mkdir() + solve_one_model(models_module, final_models_path) + + # Swith the files + shutil.rmtree(models_path) + shutil.move(final_models_path, models_path) + +def solve_one_model(models_module, output_folder): + """Will build the compacted models in the output_folder""" + + models_classes = [ + (len(model_class.__mro__), model_name, inspect.getfile(model_class), model_class) for model_name, model_class in vars(models_module).items() + if model_name[0].isupper() and Model in model_class.__mro__ + ] + # Sort on MRO size first, and then alphabetically + models_classes.sort(key=lambda x: (x[0], x[1])) + + # Just need the name of exceptions + exceptions_classes = [ + model_name for model_name, model_class in vars(models_module).items() + if model_name[0].isupper() and HttpOperationError in model_class.__mro__ + ] + + py2_models_classes = [ + (len_mro, model_name, path.replace("_py3.py", ".py"), None) + for len_mro, model_name, path, _ in models_classes + ] + + paged_models_classes = [ + (model_name, inspect.getfile(model_class), model_class) for model_name, model_class in vars(models_module).items() + if model_name[0].isupper() and Paged in model_class.__mro__ + ] + + enum_models_classes = [ + (model_name, inspect.getfile(model_class), model_class) for model_name, model_class in vars(models_module).items() + if model_name[0].isupper() and Enum in model_class.__mro__ + ] + if enum_models_classes: + # Can't be more than one enum file + enum_file = Path(enum_models_classes[0][1]) + enum_file_module_name = "_"+enum_file.with_suffix('').name + shutil.copyfile(enum_file, Path(output_folder, as_file_name(enum_file_module_name))) + else: + enum_file_module_name = None + + write_model_file(Path(output_folder, as_file_name(MODEL_PY3_NAME)), models_classes) + write_model_file(Path(output_folder, as_file_name(MODEL_PY2_NAME)), py2_models_classes) + write_paging_file(Path(output_folder, as_file_name(PAGED_NAME)), paged_models_classes) + write_complete_init( + Path(output_folder, "__init__.py"), + models_classes, + exceptions_classes, + paged_models_classes, + enum_models_classes, + enum_file_module_name + ) + +def write_model_file(output_file_path, classes_to_write): + with open(output_file_path, "bw") as write_fd: + write_fd.write(header) + + for model in classes_to_write: + _, _, model_file_path, _ = model + + with open(model_file_path, "rb") as read_fd: + lines = read_fd.readlines() + # Skip until it's "class XXXX" + while lines: + if lines[0].startswith(b"class "): + break + lines.pop(0) + else: + raise ValueError("Never found any class definition!") + # Now I keep everything + write_fd.write(b'\n') + write_fd.write(b'\n') + write_fd.writelines(lines) + +def write_paging_file(output_file_path, classes_to_write): + with open(output_file_path, "bw") as write_fd: + write_fd.write(paging_header) + + for model in classes_to_write: + _, model_file_path, _ = model + + with open(model_file_path, "rb") as read_fd: + # Skip the first 15 lines (based on Autorest deterministic behavior) + # If we want this less random, look for the first line starts with "class" + lines = read_fd.readlines()[14:] + write_fd.write(b'\n') + write_fd.write(b'\n') + write_fd.writelines(lines) + +def write_init(output_file_path, model_file_name, model_file_name_py2, paging_file_name, enum_file_name): + with open(output_file_path, "bw") as write_fd: + write_fd.write(copyright_header) + + write_fd.write(init_file.format( + model_file_name, + model_file_name_py2, + paging_file_name, + ).encode('utf8')) + if enum_file_name: + write_fd.write( + "from .{} import *".format(enum_file_name).encode('utf8') + ) + +def write_complete_init(output_file_path, models, exceptions_classes, paging_models, enum_models, enum_file_module_name): + with open(output_file_path, "bw") as write_fd: + write_fd.write(copyright_header) + + write_fd.write(b"\ntry:\n") + # Write py3 import + for _, model_name, _, _ in models: + write_fd.write(f" from .{MODEL_PY3_NAME} import {model_name}\n".encode("utf-8")) + # Py 3 exceptions + for model_name in exceptions_classes: + write_fd.write(f" from .{MODEL_PY3_NAME} import {model_name}\n".encode("utf-8")) + + write_fd.write(b"except (SyntaxError, ImportError):\n") + + # Write py2 import + for _, model_name, _, _ in models: + write_fd.write(f" from .{MODEL_PY2_NAME} import {model_name}\n".encode("utf-8")) + # Py 2 exceptions + for model_name in exceptions_classes: + write_fd.write(f" from .{MODEL_PY2_NAME} import {model_name}\n".encode("utf-8")) + + # Write paged import + for model_name, _, _ in paging_models: + write_fd.write(f"from .{PAGED_NAME} import {model_name}\n".encode("utf-8")) + + if enum_models: + # Write enum model import + for model_name, _, _ in enum_models: + write_fd.write(f"from .{enum_file_module_name} import {model_name}\n".encode("utf-8")) + + write_fd.write(b"\n\n__all__=[\n") + # Write all classes name + for _, model_name, _, _ in models: + write_fd.write(f" '{model_name}',\n".encode("utf-8")) + for model_name in exceptions_classes: + write_fd.write(f" '{model_name}',\n".encode("utf-8")) + for model_name, _, _ in paging_models: + write_fd.write(f" '{model_name}',\n".encode("utf-8")) + if enum_models: + for model_name, _, _ in enum_models: + write_fd.write(f" '{model_name}',\n".encode("utf-8")) + + write_fd.write(b"]\n") + + +def find_models_to_change(module_name): + """Will figure out if the package is a multi-api one, + and understand what to generate. + """ + main_module = importlib.import_module(module_name) + try: + models_module = main_module.models + models_module.__path__ + # It didn't fail, that's a single API package + return [models_module] + except AttributeError: + # This means I loaded the fake module "models" + # and it's multi-api, load all models + return [ + importlib.import_module('.'+label+'.models', main_module.__name__) + for (_, label, ispkg) in pkgutil.iter_modules(main_module.__path__) + if ispkg + ] + + +def find_autorest_generated_folder(module_prefix="azure.mgmt"): + """Find all Autorest generated code in that module prefix. + + This actually looks for a "models" package only. We could be smarter if necessary. + """ + _LOGGER.info(f"Looking for Autorest generated package in {module_prefix}") + result = [] + try: + _LOGGER.debug(f"Try {module_prefix}") + importlib.import_module(".models", module_prefix) + # If not exception, we found it + _LOGGER.info(f"Found {module_prefix}") + result.append(module_prefix) + except ModuleNotFoundError: + # No model, might dig deeper + prefix_module = importlib.import_module(module_prefix) + for _, sub_package, ispkg in pkgutil.iter_modules(prefix_module.__path__, module_prefix+"."): + if ispkg: + result += find_autorest_generated_folder(sub_package) + return result + + +def main(prefix="azure.mgmt"): + packages = find_autorest_generated_folder(prefix) + for autorest_package in packages: + models_module = find_models_to_change(autorest_package) + solve_mro(models_module) + +if __name__ == "__main__": + logging.basicConfig(level=logging.INFO) + main(sys.argv[1] if len(sys.argv) >= 2 else "azure.mgmt") \ No newline at end of file diff --git a/scripts/ci/precheck_pep8.sh b/scripts/ci/precheck_pep8.sh index fafa8a2de24..8026ec42b51 100755 --- a/scripts/ci/precheck_pep8.sh +++ b/scripts/ci/precheck_pep8.sh @@ -3,7 +3,7 @@ set -e # install flake 8 -pip install -qqq flake8 +pip install -qqq flake8==3.5.0 echo "Run flake8." flake8 --statistics --config=./.flake8 diff --git a/scripts/dependency/requirements.Darwin.external.txt b/scripts/dependency/requirements.Darwin.external.txt index 6ca575252f3..1b86f8cfbcd 100644 --- a/scripts/dependency/requirements.Darwin.external.txt +++ b/scripts/dependency/requirements.Darwin.external.txt @@ -74,7 +74,7 @@ idna==2.7 isodate==0.6.0 jmespath==0.9.3 keyring==15.1.0 -knack==0.4.3 +knack==0.4.4 mock==2.0.0 msrest==0.5.5 msrestazure==0.4.34 diff --git a/scripts/dependency/requirements.Linux.external.txt b/scripts/dependency/requirements.Linux.external.txt index c4e6d54d672..a2b54bb934a 100644 --- a/scripts/dependency/requirements.Linux.external.txt +++ b/scripts/dependency/requirements.Linux.external.txt @@ -75,7 +75,7 @@ isodate==0.6.0 jeepney==0.3.1 jmespath==0.9.3 keyring==15.1.0 -knack==0.4.3 +knack==0.4.4 mock==2.0.0 msrest==0.5.5 msrestazure==0.4.34 diff --git a/scripts/smart_create_gen/_common.py b/scripts/smart_create_gen/_common.py deleted file mode 100644 index 6afcfe11b36..00000000000 --- a/scripts/smart_create_gen/_common.py +++ /dev/null @@ -1,47 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -import configparser -import os -import re - -def get_name_from_path(path): - """ Parses a directory in 'mgmt_ ' format into the camel case name used by ARM. The - directory name should be in snake case. """ - while path: - path, item = os.path.split(path) - if 'mgmt_' in item: - return snake_to_camel(item.replace('mgmt_', '', 1)) - raise RuntimeError('You must specify a path with --src that includes a directory in the format \'mgmt_\'') - -def get_config(): - config = configparser.ConfigParser() - CONFIG_PATH = os.path.join(os.getcwd(), 'config.ini') - if os.path.isfile('config.ini'): - config.read('config.ini') - return config - else: - print("'config.ini' file not found. Creating an empty one. Please update it and re-run the script.") - with open(CONFIG_PATH, 'w') as f: - f.write("""[autorest] -path = AutoRest.exe - -[storage] -account = FILL_IN -key = FILL_IN -container = FILL_IN -subscription = FILL_IN -""") - return None - -def to_snake_case(s): - s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', s) - return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower() - -def to_dash_case(s): - return _to_snake_case(s).replace('_', '-') - -def snake_to_camel(s): - return ''.join([x.capitalize() for x in s.split('_')]) diff --git a/scripts/smart_create_gen/generate_smart_create.py b/scripts/smart_create_gen/generate_smart_create.py deleted file mode 100644 index 33a121d789d..00000000000 --- a/scripts/smart_create_gen/generate_smart_create.py +++ /dev/null @@ -1,123 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -from __future__ import print_function - -from distutils import dir_util -import os -import re -import shutil -import sys - -import argparse - -from template_to_swagger import convert_template_to_swagger -from upload_arm_templates import upload_template_files -from _common import get_name_from_path, get_config, to_snake_case - -def _autorest_client_name(name): - return '{}creationclient'.format(str.lower(name)) - -HEADER = """# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- -# pylint: skip-file -""" - -INIT_FILE_CONTENTS = HEADER + """import pkg_resources -pkg_resources.declare_namespace(__name__) - -""" - -def _args_to_list(**kwargs): - arg_list = [] - for k, v in kwargs.items(): - k = k.replace('_','-') - arg_list.append('--{}'.format(k)) - arg_list.append(v) - return arg_list - -def generate_smart_create(*args): - - print('\n== GENERATE SMART CREATE ==') - - parser = argparse.ArgumentParser(description='Smart Create Generation') - parser.add_argument('--src', metavar='PATH', required=True, help='Path to the directory containing the main ARM template. Must contain a directory in the format \'mgmt_\'. Default name of main template is \'azuredeploy.json\' but a different name can be specified.') - parser.add_argument('--api-version', metavar='VERSION', required=True, help='API version for the template being generated in yyyy-MM-dd format. (ex: 2016-07-01)') - parser.add_argument('--no-upload', action='store_true', help='Turn off upload to only regenerate the client-side code.') - args = parser.parse_args(args) - - api_version = args.api_version - src = args.src or os.path.join(os.getcwd()) - if not os.path.isfile(src): - root = src - src = os.path.join(root, 'azuredeploy.json') - else: - root = os.path.split(src)[0] - name = get_name_from_path(root) # name in CamelCase - dest = root - if not os.path.isfile(src): - raise RuntimeError('Main template not found at path: {}'.format(src)) - if not name: - raise RuntimeError('Unable to parse name from path: {}. Path must contain a directory in the format \'mgmt_\'.'.format(src)) - - # Convert the supplied template into Swagger - swagger_path = convert_template_to_swagger(*_args_to_list(api_version=api_version, src=src, name=to_snake_case(name))) - - # Use AutoRest to generate the Python files from the Swagger - config = get_config() - if not config: - sys.exit(-1) - - AUTO_REST_PATH = config['autorest']['path'] or 'AutoRest.exe' - cmd = '{} -Namespace Default -CodeGenerator Azure.Python -addcredentials -input {} -OutputDirectory {}'.format(AUTO_REST_PATH, swagger_path, root) - os.system(cmd) - - # Insert Pylint ignore statements into the generated files - autorest_generated_path = os.path.join(root, _autorest_client_name(name)) - for root, dirs, files in os.walk(autorest_generated_path): - path = root.split('/') - for file in files: - if file.endswith('.py'): - with open(os.path.join(root, file), 'r') as original: data = original.read() - with open(os.path.join(root, file), 'w') as modified: modified.write(HEADER + '\n' + data) - - # Rename the generated file directory to lib - dir_util.copy_tree(autorest_generated_path, os.path.join(dest, 'lib')) - - # Create the cheesy __init__.py file in - with open(os.path.join(dest, '__init__.py'), 'w') as f: - f.write(INIT_FILE_CONTENTS) - - if not args.no_upload: - # Publish template files into blob storage - upload_template_files(*_args_to_list(src=dest, api_version=api_version, name=name)) - - # Delete the Generated folder - shutil.rmtree(autorest_generated_path) - os.remove(os.path.join(dest, 'setup.py')) - - print("""SMART GENERATION COMPLETE! - -Your template is almost ready to be integrated into the CLI. You need to do the following: - -(1) If you did not generate your files in-place, move the directory into the project structure. - Import the newly added directory in Visual Studio so it appears in the Solution Explorer. - -(2) Add your folders to the 'packages' list in the parent module's 'setup.py' file with the - following pattern: - 'azure.cli.command_modules..mgmt__create' - 'azure.cli.command_modules..mgmt__create.lib' - 'azure.cli.command_modules..mgmt__create.lib.models' - 'azure.cli.command_modules..mgmt__create.lib.operations' - -(3) Expose your SmartCreate command in the module's 'generated.py' file and tweak any necessary - parameter aliasing in '_params.py'. -""" - ) - -if __name__ == '__main__': - generate_smart_create(*sys.argv[1:]) diff --git a/scripts/smart_create_gen/template_to_swagger.py b/scripts/smart_create_gen/template_to_swagger.py deleted file mode 100644 index 412f19cc438..00000000000 --- a/scripts/smart_create_gen/template_to_swagger.py +++ /dev/null @@ -1,569 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -from __future__ import print_function - -from collections import OrderedDict -import json -import os -import re -import sys - -import argparse - -from _common import snake_to_camel - -# HELPER FUNCTIONS - -def get_required(value): - default_value = value.get('defaultValue') - if not default_value and default_value != '' \ - and not isinstance(default_value, list) and not isinstance(default_value, dict): - return swagger_template_required - return '' - -def get_enum(value, name): - if value.get('allowedValues'): - enum_text = ',\n'.join(['"{0}"'.format(v) for v in value['allowedValues']]) - return swagger_template_enum.format(enum_text, name) - return '' - -def get_default(value): - default_value = value.get('defaultValue') - swagger = '' - if default_value and (isinstance(default_value, int) or '[' not in default_value) \ - and not isinstance(default_value, list) and not isinstance(default_value, dict): - swagger = swagger_template_default.format(default_value) - elif (isinstance(default_value, bool)): - swagger = swagger_template_default.format(default_value) - return swagger - -def get_type_string(value): - type = value.get('type') - type_conversion = { - 'bool': 'boolean', - 'int': 'integer', - 'securestring': 'string' - } - type = type_conversion.get(type, type) - - type_string = '"type": "{}"'.format(type) - if type == 'array': - type_string = ''' - "type": "{0}", - "items": {{ - "type": "{1}" - }} - '''.format(type, 'object') # Currently only support arrays of objects - - return type_string - - -def get_required_list(items): - list = ',\n '.join(['"{0}"'.format(name) for name, value in items if get_required(value)]) - return swagger_template_required_list.format(list) - -# SWAGGER TEMPLATE SNIPPETS - -swagger_template_master = '''{{ - "swagger": "2.0", - "info": {{ - "title": "{3}CreationClient", - "version": "2015-11-01" - }}, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - {{ - "azure_auth": [ - "user_impersonation" - ] - }} - ], - "securityDefinitions": {{ - "azure_auth": {{ - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": {{ - "user_impersonation": "impersonate your user account" - }} - }} - }}, - "paths": {{ - "/subscriptions/{{subscriptionId}}/resourcegroups/{{resourceGroupName}}/providers/Microsoft.Resources/deployments/{{deploymentName}}": {{ - "put": {{ - "tags": [ - "{3}" - ], - "operationId": "{3}_CreateOrUpdate", - "description": "Create a new {3}.", - "parameters": [ - {{ - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group. The name is case insensitive.", - "pattern": "^[-\\\\w\\\\._]+$", - "minLength": 1, - "maxLength": 64 - }}, - {{ - "name": "deploymentName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the deployment.", - "pattern": "^[-\\\\w\\\\._]+$", - "minLength": 1, - "maxLength": 64 - }}, - {{ - "name": "parameters", - "x-ms-client-flatten": true, - "in": "body", - "required": true, - "schema": {{ - "$ref": "#/definitions/Deployment_{3}" - }}, - "description": "Additional parameters supplied to the operation." - }}, - {{ - "$ref": "#/parameters/ApiVersionParameter" - }}, - {{ - "$ref": "#/parameters/SubscriptionIdParameter" - }} - ], - "responses": {{ - "200": {{ - "description": "", - "schema": {{ - "$ref": "#/definitions/DeploymentExtended" - }} - }}, - "201": {{ - "description": "", - "schema": {{ - "$ref": "#/definitions/DeploymentExtended" - }} - }} - }}, - "x-ms-long-running-operation": true - }} - }} - }}, - "definitions": {{ - "Deployment_{3}": {{ - "properties": {{ - "properties": {{ - "$ref": "#/definitions/DeploymentProperties_{3}", - "description": "Gets or sets the deployment properties.", - "x-ms-client-flatten": true - }} - }}, - "description": "Deployment operation parameters." - }}, - "DeploymentProperties_{3}": {{ - "properties": {{ - "templateLink": {{ - "$ref": "#/definitions/TemplateLink", - "description": "Gets or sets the URI referencing the template. Use only one of Template or TemplateLink.", - "x-ms-client-flatten": true - }}, - "parameters": {{ - "$ref": "#/definitions/{3}Parameters", - "type": "object", - "description": "Deployment parameters. Use only one of Parameters or ParametersLink.", - "x-ms-client-flatten": true - }}, - "mode": {{ - "type": "string", - "description": "Gets or sets the deployment mode.", - "enum": [ - "Incremental" - ], - "x-ms-enum": {{ - "name": "DeploymentMode", - "modelAsString": false - }} - }} - }}, - "required": [ - "templateLink", - "parameters", - "mode" - ], - "description": "Deployment properties." - }}, - "TemplateLink": {{ - "properties": {{ - "uri": {{ - "type": "string", - "description": "URI referencing the template.", - "enum": [ - "https://azuresdkci.blob.core.windows.net/templatehost/Create{3}_{4}/azuredeploy.json" - ] - }}, - "contentVersion": {{ - "type": "string", - "description": "If included it must match the ContentVersion in the template." - }} - }}, - "required": [ - "uri" - ], - "description": "Entity representing the reference to the template." - }}, - "{3}Parameters": {{ - {0}{1} - }}, - {2}, - "ParametersLink": {{ - "properties": {{ - "uri": {{ - "type": "string", - "description": "URI referencing the template." - }}, - "contentVersion": {{ - "type": "string", - "description": "If included it must match the ContentVersion in the template." - }} - }}, - "required": [ - "uri" - ], - "description": "Entity representing the reference to the deployment parameters." - }}, - "ProviderResourceType": {{ - "properties": {{ - "resourceType": {{ - "type": "string", - "description": "Gets or sets the resource type." - }}, - "locations": {{ - "type": "array", - "items": {{ - "type": "string" - }}, - "description": "Gets or sets the collection of locations where this resource type can be created in." - }}, - "apiVersions": {{ - "type": "array", - "items": {{ - "type": "string" - }}, - "description": "Gets or sets the api version." - }}, - "properties": {{ - "type": "object", - "additionalProperties": {{ - "type": "string" - }}, - "description": "Gets or sets the properties." - }} - }}, - "description": "Resource type managed by the resource provider." - }}, - "Provider": {{ - "properties": {{ - "id": {{ - "type": "string", - "description": "Gets or sets the provider id." - }}, - "namespace": {{ - "type": "string", - "description": "Gets or sets the namespace of the provider." - }}, - "registrationState": {{ - "type": "string", - "description": "Gets or sets the registration state of the provider." - }}, - "resourceTypes": {{ - "type": "array", - "items": {{ - "$ref": "#/definitions/ProviderResourceType" - }}, - "description": "Gets or sets the collection of provider resource types." - }} - }}, - "description": "Resource provider information." - }}, - "BasicDependency": {{ - "properties": {{ - "id": {{ - "type": "string", - "description": "Gets or sets the ID of the dependency." - }}, - "resourceType": {{ - "type": "string", - "description": "Gets or sets the dependency resource type." - }}, - "resourceName": {{ - "type": "string", - "description": "Gets or sets the dependency resource name." - }} - }}, - "description": "Deployment dependency information." - }}, - "Dependency": {{ - "properties": {{ - "dependsOn": {{ - "type": "array", - "items": {{ - "$ref": "#/definitions/BasicDependency" - }}, - "description": "Gets the list of dependencies." - }}, - "id": {{ - "type": "string", - "description": "Gets or sets the ID of the dependency." - }}, - "resourceType": {{ - "type": "string", - "description": "Gets or sets the dependency resource type." - }}, - "resourceName": {{ - "type": "string", - "description": "Gets or sets the dependency resource name." - }} - }}, - "description": "Deployment dependency information." - }}, - "DeploymentPropertiesExtended": {{ - "properties": {{ - "provisioningState": {{ - "type": "string", - "description": "Gets or sets the state of the provisioning." - }}, - "correlationId": {{ - "type": "string", - "description": "Gets or sets the correlation ID of the deployment." - }}, - "timestamp": {{ - "type": "string", - "format": "date-time", - "description": "Gets or sets the timestamp of the template deployment." - }}, - "outputs": {{ - "type": "object", - "description": "Gets or sets key/value pairs that represent deploymentoutput." - }}, - "providers": {{ - "type": "array", - "items": {{ - "$ref": "#/definitions/Provider" - }}, - "description": "Gets the list of resource providers needed for the deployment." - }}, - "dependencies": {{ - "type": "array", - "items": {{ - "$ref": "#/definitions/Dependency" - }}, - "description": "Gets the list of deployment dependencies." - }}, - "template": {{ - "type": "object", - "description": "Gets or sets the template content. Use only one of Template or TemplateLink." - }}, - "TemplateLink": {{ - "$ref": "#/definitions/TemplateLink", - "description": "Gets or sets the URI referencing the template. Use only one of Template or TemplateLink." - }}, - "parameters": {{ - "type": "object", - "description": "Deployment parameters. Use only one of Parameters or ParametersLink." - }}, - "parametersLink": {{ - "$ref": "#/definitions/ParametersLink", - "description": "Gets or sets the URI referencing the parameters. Use only one of Parameters or ParametersLink." - }}, - "mode": {{ - "type": "string", - "description": "Gets or sets the deployment mode.", - "enum": [ - "Incremental", - "Complete" - ], - "x-ms-enum": {{ - "name": "DeploymentMode", - "modelAsString": false - }} - }} - }}, - "description": "Deployment properties with additional details." - }}, - "DeploymentExtended": {{ - "properties": {{ - "id": {{ - "type": "string", - "description": "Gets or sets the ID of the deployment." - }}, - "name": {{ - "type": "string", - "description": "Gets or sets the name of the deployment." - }}, - "properties": {{ - "$ref": "#/definitions/DeploymentPropertiesExtended", - "description": "Gets or sets deployment properties." - }} - }}, - "required": [ - "name" - ], - "description": "Deployment information." - }} - }}, - "parameters": {{ - "SubscriptionIdParameter": {{ - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." - }}, - "ApiVersionParameter": {{ - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - }} - }} -}} -''' - -swagger_props_template = ''' -"properties": {{ -{0} -}} -''' - -swagger_template_prop = ''' "{0}": {{ - "type": "object", - "$ref": "#/definitions/DeploymentParameter_{0}", - "x-ms-client-flatten": true - }}''' - -swagger_template_param = '''"DeploymentParameter_{0}": {{ - "properties": {{ - "value": {{ - {5}, - "description": "{1}", - "x-ms-client-name": "{0}"{3}{4} - }} - }}{2} -}}''' - -swagger_template_artifacts_location = ''' -"DeploymentParameter__artifactsLocation": {{ - "properties": {{ - "value": {{ - "type": "string", - "description": "Container URI of of the template.", - "x-ms-client-name": "_artifactsLocation", - "enum": [ - "https://azuresdkci.blob.core.windows.net/templatehost/Create{0}_{1}" - ] - }} - }}, - "required": [ - "value" - ] - }}''' - -swagger_template_required = ''', - "required": [ - "value" - ] -''' - -swagger_template_enum = ''', - "enum": [ - {0} - ], - "x-ms-enum": {{ - "name": "{1}", - "modelAsString": false - }}''' - -swagger_template_default = ''', - "default": "{0}"''' - -swagger_template_required_list = ''', - "required": [ - {0} - ] -''' - -def convert_template_to_swagger(*args): - - # Create script parser - - print('\n== CONVERT TEMPLATE TO SWAGGER ==') - - parser = argparse.ArgumentParser(description='ARM Template to Swagger') - parser.add_argument('--name', metavar='NAME', required=True, help='Name of the thing being created (in snake_case)') - parser.add_argument('--src', metavar='PATH', required=True, help='Path to the ARM template file to convert.') - parser.add_argument('--api-version', metavar='VERSION', required=True, help='API version for the template being generated in yyyy-MM-dd format. (ex: 2016-07-01)') - args = parser.parse_args(args) - - api_version = args.api_version - src = args.src - name = args.name - - if not os.path.isfile(src): - raise RuntimeError('File {} not found.'.format(src)) - - root, src_file = os.path.split(src) - dest = os.path.join(root, 'swagger_create_{}.json'.format(name)) - - # Convert template to swagger - with open(src) as f: - j = json.load(f) - - print('Converting ARM template {} to swagger.'.format(src_file)) - params = j['parameters'] - prop_strings = [swagger_template_prop.format(key) - for key, value in sorted(params.items(), key=lambda item: item[0])] - props_section = swagger_props_template.format(',\n '.join(prop_strings)) - - param_strs = [] - for key, value in sorted(params.items(), key=lambda item: item[0]): - comment = value['metadata'].get('description') if value['metadata'] else None - if not comment: - print('FAILURE: Description metadata is required for all parameters. Not found for {}'.format(value)) - sys.exit(-1) - param_strs.append(swagger_template_param.format( - key, comment or '', get_required(value), get_enum(value, key), get_default(value), get_type_string(value))) - - # artifacts special case - artifacts_paramstr = next((p for p in param_strs if '_artifacts' in p), None) - if artifacts_paramstr: - param_strs.remove(artifacts_paramstr) - param_strs.append(swagger_template_artifacts_location.format(snake_to_camel(name), api_version)) - - params_section = ',\n'.join(param_strs) - - with open(dest, 'w') as output_file: - raw_swagger = swagger_template_master.format(props_section, get_required_list(params.items()), params_section, snake_to_camel(name), api_version) - output_file.write(json.dumps(json.loads(raw_swagger, object_pairs_hook=OrderedDict), indent=2)) - print('{} generated successfully.'.format(dest)) - - return dest - -if __name__ == '__main__': - convert_template_to_swagger(*sys.argv[1:]) diff --git a/scripts/smart_create_gen/upload_arm_templates.py b/scripts/smart_create_gen/upload_arm_templates.py deleted file mode 100644 index 5897c893aa0..00000000000 --- a/scripts/smart_create_gen/upload_arm_templates.py +++ /dev/null @@ -1,70 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -from __future__ import print_function - -import json -import os -import re -import sys - -import argparse - -from _common import get_config - -config = get_config() -if not config: - sys.exit(-1) - -STORAGE_ACCOUNT_NAME = config['storage']['account'] -TEMPLATE_CONTAINER_NAME = config['storage']['container'] -STORAGE_ACCOUNT_KEY = config['storage']['key'] -SUBSCRIPTION_ID = config['storage']['subscription'] - -uploads = [] - -def _upload_templates(name, api_version, path, dir=None): - for item in os.listdir(path): - item_path = os.path.join(path, item) - if os.path.isdir(item_path): - temp_dir = '{}/{}'.format(dir, item) if dir else item - _upload_templates(name, api_version, item_path, temp_dir) - elif item.endswith('.json') and 'swagger' not in item: - blob_src = os.path.join(path, item) - if dir: - blob_dest = 'Create{}_{}/{}/{}'.format(name, api_version, dir, item) - else: - blob_dest = 'Create{}_{}/{}'.format(name, api_version, item) - cmd = 'az storage blob upload -n {0} --account-name {1} --type block --account-key {2} --container-name {3} --file {4} --subscription {5}'.format( - blob_dest, STORAGE_ACCOUNT_NAME, STORAGE_ACCOUNT_KEY, TEMPLATE_CONTAINER_NAME, blob_src, SUBSCRIPTION_ID - ) - print('\nUPLOADING {}...'.format(blob_dest)) - uploads.append(cmd) - -def upload_template_files(*args): - - print('\n== UPLOAD ARM TEMPLATES ==') - - parser = argparse.ArgumentParser(description='Upload ARM Templates') - parser.add_argument('--name', metavar='NAME', required=True, help='Name of the thing being uploaded (in CamelCase)') - parser.add_argument('--src', metavar='PATH', required=True, help='Path to the directory containing ARM templates to upload. Subdirectories will automatically be crawled.') - parser.add_argument('--api-version', metavar='VERSION', required=True, help='API version for the templates being uploaded in yyyy-MM-dd format. (ex: 2016-07-01)') - args = parser.parse_args(args) - - name = args.name - api_version = args.api_version - src = args.src - - _upload_templates(name, api_version, src) - - from concurrent.futures import ThreadPoolExecutor, as_completed - with ThreadPoolExecutor(max_workers=40) as executor: - tasks = [executor.submit(lambda cmd: os.system(cmd), u) for u in uploads] - for t in as_completed(tasks): - t.result() # don't use the result but expose exceptions from the threads - - -if __name__ == '__main__': - upload_template_files(*sys.argv[1:]) diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst index 03eed0072df..da1a7f3821d 100644 --- a/src/azure-cli-core/HISTORY.rst +++ b/src/azure-cli-core/HISTORY.rst @@ -2,9 +2,19 @@ Release History =============== + +2.0.50 +++++++ +* Fix issue where update commands using `--remove` and `--ids` fail after first update is applied to first resource in ids list. + +2.0.49 +++++++ +* Fix issue with `--ids` where `--subscription` would take precedence over the subscription in `--ids`. + Adding explicit warnings when name parameters would be ignored by use of `--ids`. + 2.0.48 ++++++ -* Minor fixes +* Fix Homebrew. 2.0.47 ++++++ diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index 6123e7d10d3..44f6b52d934 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------- from __future__ import print_function -__version__ = "2.0.48" +__version__ = "2.0.50" import os import sys @@ -33,12 +33,12 @@ class AzCli(CLI): def __init__(self, **kwargs): super(AzCli, self).__init__(**kwargs) - from azure.cli.core.commands.arm import add_id_parameters, register_global_subscription_parameter + from azure.cli.core.commands.arm import ( + register_ids_argument, register_global_subscription_argument) from azure.cli.core.cloud import get_active_cloud - from azure.cli.core.extensions import register_extensions + from azure.cli.core.commands.transform import register_global_transforms from azure.cli.core._session import ACCOUNT, CONFIG, SESSION - import knack.events as events from knack.util import ensure_dir self.data['headers'] = {} @@ -55,9 +55,9 @@ def __init__(self, **kwargs): self.cloud = get_active_cloud(self) logger.debug('Current cloud config:\n%s', str(self.cloud.name)) - register_extensions(self) - self.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_id_parameters) - register_global_subscription_parameter(self) + register_global_transforms(self) + register_global_subscription_argument(self) + register_ids_argument(self) # global subscription must be registered first! self.progress_controller = None @@ -110,7 +110,7 @@ def load_command_table(self, args): import traceback from azure.cli.core.commands import ( _load_module_command_loader, _load_extension_command_loader, BLACKLISTED_MODS, ExtensionCommandSource) - from azure.cli.core.extension import ( + from azure.cli.core.extensions import ( get_extensions, get_extension_path, get_extension_modname) def _update_command_table_from_modules(args): diff --git a/src/azure-cli-core/azure/cli/core/_help.py b/src/azure-cli-core/azure/cli/core/_help.py index 8046198764a..5977508c66d 100644 --- a/src/azure-cli-core/azure/cli/core/_help.py +++ b/src/azure-cli-core/azure/cli/core/_help.py @@ -80,9 +80,9 @@ def _print_extensions_msg(help_file): if help_file.command_source.preview: logger.warning(help_file.command_source.get_preview_warn_msg()) - def print_detailed_help(self, cli_name, help_file): + def _print_detailed_help(self, cli_name, help_file): AzCliHelp._print_extensions_msg(help_file) - self._print_detailed_help(cli_name, help_file) + super(AzCliHelp, self)._print_detailed_help(cli_name, help_file) class CliHelpFile(KnackHelpFile): diff --git a/src/azure-cli-core/azure/cli/core/commands/__init__.py b/src/azure-cli-core/azure/cli/core/commands/__init__.py index 4c788d5db04..2eff60bec5e 100644 --- a/src/azure-cli-core/azure/cli/core/commands/__init__.py +++ b/src/azure-cli-core/azure/cli/core/commands/__init__.py @@ -27,7 +27,7 @@ CLI_POSITIONAL_PARAM_KWARGS, CONFIRM_PARAM_NAME) from azure.cli.core.commands.parameters import ( AzArgumentContext, patch_arg_make_required, patch_arg_make_optional) -from azure.cli.core.extension import get_extension +from azure.cli.core.extensions import get_extension from azure.cli.core.util import get_command_type_kwarg, read_file_content, get_arg_list, poller_classes import azure.cli.core.telemetry as telemetry @@ -120,6 +120,7 @@ def __init__(self, loader, name, handler, description=None, table_transformer=No def _resolve_default_value_from_cfg_file(self, arg, overrides): from azure.cli.core._config import DEFAULTS_SECTION + from azure.cli.core.commands.validators import DefaultStr if not hasattr(arg.type, 'required_tooling'): required = arg.type.settings.get('required', False) @@ -130,11 +131,10 @@ def _resolve_default_value_from_cfg_file(self, arg, overrides): # same blunt mechanism like we handled id-parts, for create command, no name default if self.name.split()[-1] == 'create' and overrides.settings.get('metavar', None) == 'NAME': return - setattr(arg.type, 'configured_default_applied', True) config_value = self.cli_ctx.config.get(DEFAULTS_SECTION, def_config, None) if config_value: logger.info("Configured default '%s' for arg %s", config_value, arg.name) - overrides.settings['default'] = config_value + overrides.settings['default'] = DefaultStr(config_value) overrides.settings['required'] = False def load_arguments(self): @@ -296,6 +296,9 @@ def execute(self, args): self.cli_ctx.data['command'] = expanded_arg.command + if hasattr(expanded_arg, '_subscription'): + self.cli_ctx.data['subscription_id'] = expanded_arg._subscription # pylint: disable=protected-access + self._validation(expanded_arg) params = self._filter_params(expanded_arg) diff --git a/src/azure-cli-core/azure/cli/core/commands/arm.py b/src/azure-cli-core/azure/cli/core/commands/arm.py index 297e41959cf..8ae445e8a89 100644 --- a/src/azure-cli-core/azure/cli/core/commands/arm.py +++ b/src/azure-cli-core/azure/cli/core/commands/arm.py @@ -172,128 +172,128 @@ def resource_exists(cli_ctx, resource_group, name, namespace, type, **_): # pyl return existing -def add_id_parameters(_, **kwargs): # pylint: disable=unused-argument +def register_ids_argument(cli_ctx): - command_table = kwargs.get('commands_loader').command_table + from knack import events + from msrestazure.tools import parse_resource_id, is_valid_resource_id + import os - if not command_table: - return + ids_metadata = {} - def split_action(arguments, deprecate_info): - class SplitAction(argparse.Action): # pylint: disable=too-few-public-methods - def __call__(self, parser, namespace, values, option_string=None): - ''' The SplitAction will take the given ID parameter and spread the parsed - parts of the id into the individual backing fields. - - Since the id value is expected to be of type `IterateValue`, all the backing - (dest) fields will also be of type `IterateValue` - ''' - from msrestazure.tools import parse_resource_id - import os - - if isinstance(values, str): - values = [values] - expanded_values = [] - for val in values: - try: - # support piping values from JSON. Does not require use of --query - json_vals = json.loads(val) - if not isinstance(json_vals, list): - json_vals = [json_vals] - for json_val in json_vals: - if 'id' in json_val: - expanded_values += [json_val['id']] - except ValueError: - # supports piping of --ids to the command when using TSV. Requires use of --query - expanded_values = expanded_values + val.split(os.linesep) - try: - for value in expanded_values: - parts = parse_resource_id(value) - for arg in [arg for arg in arguments.values() if arg.type.settings.get('id_part')]: - self.set_argument_value(namespace, arg, parts) - except Exception as ex: - raise ValueError(ex) - - if deprecate_info: - if not hasattr(namespace, '_argument_deprecations'): - setattr(namespace, '_argument_deprecations', [deprecate_info]) - else: - namespace._argument_deprecations.append(deprecate_info) # pylint: disable=protected-access - - @staticmethod - def set_argument_value(namespace, arg, parts): - - existing_values = getattr(namespace, arg.name, None) - if existing_values is None: - existing_values = IterateValue() - existing_values.append(parts.get(arg.type.settings['id_part'], None)) - else: - if isinstance(existing_values, str): - if not getattr(arg.type, 'configured_default_applied', None): - logger.warning( - "Property '%s=%s' being overriden by value '%s' from IDs parameter.", - arg.name, existing_values, parts[arg.type.settings['id_part']] - ) - existing_values = IterateValue() - existing_values.append(parts.get(arg.type.settings['id_part'])) - setattr(namespace, arg.name, existing_values) - - return SplitAction - - def command_loaded_handler(command): - id_parts = [arg.type.settings['id_part'] for arg in command.arguments.values() - if arg.type.settings.get('id_part')] - if 'name' not in id_parts and 'resource_name' not in id_parts: - # Only commands with a resource name are candidates for an id parameter - return - if command.name.split()[-1] == 'create': - # Somewhat blunt hammer, but any create commands will not have an automatic id - # parameter + def add_ids_arguments(_, **kwargs): # pylint: disable=unused-argument + + command_table = kwargs.get('commands_loader').command_table + + if not command_table: return - required_arguments = [] - optional_arguments = [] - for arg in [argument for argument in command.arguments.values() if argument.type.settings.get('id_part')]: - if arg.options.get('required', False): - required_arguments.append(arg) - else: - optional_arguments.append(arg) - arg.required = False + for command in command_table.values(): + + # Somewhat blunt hammer, but any create commands will not have an automatic id parameter + if command.name.split()[-1] == 'create': + continue - def required_values_validator(namespace): + # Only commands with a resource name are candidates for an id parameter + id_parts = [a.type.settings.get('id_part') for a in command.arguments.values()] + if 'name' not in id_parts and 'resource_name' not in id_parts: + continue - errors = [arg for arg in required_arguments - if getattr(namespace, arg.name, None) is None] + group_name = 'Resource Id' + # determine which arguments are required and optional and store in ids_metadata + ids_metadata[command.name] = {'required': [], 'optional': []} + for arg in [a for a in command.arguments.values() if a.type.settings.get('id_part')]: + if arg.options.get('required', False): + ids_metadata[command.name]['required'].append(arg.name) + else: + ids_metadata[command.name]['optional'].append(arg.name) + arg.required = False + arg.arg_group = group_name + + # retrieve existing `ids` arg if it exists + id_arg = command.loader.argument_registry.arguments[command.name].get('ids', None) + deprecate_info = id_arg.settings.get('deprecate_info', None) if id_arg else None + id_kwargs = { + 'metavar': 'ID', + 'help': "One or more resource IDs (space-delimited). If provided, " + "no other 'Resource Id' arguments should be specified.", + 'dest': 'ids' if id_arg else '_ids', + 'deprecate_info': deprecate_info, + 'nargs': '+', + 'arg_group': group_name + } + command.add_argument('ids', '--ids', **id_kwargs) + + def parse_ids_arguments(_, command, args): + + namespace = args + cmd = namespace._cmd # pylint: disable=protected-access + + # some commands have custom IDs and parsing. This will not work for that. + if not ids_metadata.get(command, None): + return + + ids = getattr(namespace, 'ids', getattr(namespace, '_ids', None)) + required_args = [cmd.arguments[x] for x in ids_metadata[command]['required']] + optional_args = [cmd.arguments[x] for x in ids_metadata[command]['optional']] + combined_args = required_args + optional_args + + if not ids: + # ensure the required parameters are provided if --ids is not + errors = [arg for arg in required_args if getattr(namespace, arg.name, None) is None] if errors: missing_required = ' '.join((arg.options_list[0] for arg in errors)) raise ValueError('({} | {}) are required'.format(missing_required, '--ids')) + return - group_name = 'Resource Id' - for key, arg in command.arguments.items(): - if command.arguments[key].type.settings.get('id_part'): - command.arguments[key].arg_group = group_name - - id_arg = command.loader.argument_registry.arguments[command.name].get('ids', None) - deprecate_info = id_arg.settings.get('deprecate_info', None) if id_arg else None - id_kwargs = { - 'metavar': 'RESOURCE_ID', - 'help': "One or more resource IDs (space-delimited). If provided, " - "no other 'Resource Id' arguments should be specified.", - 'dest': argparse.SUPPRESS, - 'action': split_action(command.arguments, deprecate_info), - 'deprecate_info': deprecate_info, - 'nargs': '+', - 'validator': required_values_validator, - 'arg_group': group_name - } - command.add_argument('ids', '--ids', **id_kwargs) + # show warning if names are used in conjunction with --ids + other_values = {arg.name: {'arg': arg, 'value': getattr(namespace, arg.name, None)} + for arg in combined_args} + for _, data in other_values.items(): + if data['value'] and not getattr(data['value'], 'is_default', None): + logger.warning("option '%s' will be ignored due to use of '--ids'.", + data['arg'].type.settings['options_list'][0]) + + # create the empty lists, overwriting any values that may already be there + for arg in combined_args: + setattr(namespace, arg.name, IterateValue()) + + # expand the IDs into the relevant fields + full_id_list = [] + for val in ids: + try: + # support piping values from JSON. Does not require use of --query + json_vals = json.loads(val) + if not isinstance(json_vals, list): + json_vals = [json_vals] + for json_val in json_vals: + if 'id' in json_val: + full_id_list += [json_val['id']] + except ValueError: + # supports piping of --ids to the command when using TSV. Requires use of --query + full_id_list = full_id_list + val.split(os.linesep) + + for val in full_id_list: + if not is_valid_resource_id(val): + raise CLIError('invalid resource ID: {}'.format(val)) + # place the ID parts into the correct property lists + parts = parse_resource_id(val) + for arg in combined_args: + getattr(namespace, arg.name).append(parts[arg.type.settings['id_part']]) + + # support deprecating --ids + deprecate_info = cmd.arguments['ids'].type.settings.get('deprecate_info') + if deprecate_info: + if not hasattr(namespace, '_argument_deprecations'): + setattr(namespace, '_argument_deprecations', [deprecate_info]) + else: + namespace._argument_deprecations.append(deprecate_info) # pylint: disable=protected-access - for command in command_table.values(): - command_loaded_handler(command) + cli_ctx.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_ids_arguments) + cli_ctx.register_event(events.EVENT_INVOKER_POST_PARSE_ARGS, parse_ids_arguments) -def register_global_subscription_parameter(cli_ctx): +def register_global_subscription_argument(cli_ctx): import knack.events as events @@ -307,21 +307,14 @@ def add_subscription_parameter(_, **kwargs): 'using `az account set -s NAME_OR_ID`', 'completer': get_subscription_id_list, 'arg_group': 'Global', - 'configured_default': 'subscription' + 'configured_default': 'subscription', + 'id_part': 'subscription' } for _, cmd in cmd_tbl.items(): if 'subscription' not in cmd.arguments: cmd.add_argument('_subscription', '--subscription', **subscription_kwargs) - def parse_subscription_parameter(cli_ctx, args, **kwargs): # pylint: disable=unused-argument - subscription = getattr(args, '_subscription', None) - if subscription: - from azure.cli.core._profile import Profile - subscription_id = Profile(cli_ctx=cli_ctx).get_subscription_id(subscription) - cli_ctx.data['subscription_id'] = subscription_id - cli_ctx.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_subscription_parameter) - cli_ctx.register_event(events.EVENT_INVOKER_POST_PARSE_ARGS, parse_subscription_parameter) add_usage = '--add property.listProperty ' @@ -801,6 +794,7 @@ def set_properties(instance, expression, force_string): def add_properties(instance, argument_values, force_string): # The first argument indicates the path to the collection to add to. + argument_values = list(argument_values) list_attribute_path = _get_internal_path(argument_values.pop(0)) list_to_add_to = _find_property(instance, list_attribute_path) @@ -840,8 +834,8 @@ def add_properties(instance, argument_values, force_string): def remove_properties(instance, argument_values): - # The first argument indicates the path to the collection to add to. - argument_values = argument_values if isinstance(argument_values, list) else [argument_values] + # The first argument indicates the path to the collection to remove from. + argument_values = list(argument_values) if isinstance(argument_values, list) else [argument_values] list_attribute_path = _get_internal_path(argument_values.pop(0)) list_index = None diff --git a/src/azure-cli-core/azure/cli/core/commands/client_factory.py b/src/azure-cli-core/azure/cli/core/commands/client_factory.py index 7b08dadb20a..a3442494104 100644 --- a/src/azure-cli-core/azure/cli/core/commands/client_factory.py +++ b/src/azure-cli-core/azure/cli/core/commands/client_factory.py @@ -10,7 +10,7 @@ from azure.cli.core import __version__ as core_version import azure.cli.core._debug as _debug -from azure.cli.core.extension import EXTENSIONS_MOD_PREFIX +from azure.cli.core.extensions import EXTENSIONS_MOD_PREFIX from azure.cli.core.profiles._shared import get_client_class, SDKProfile from azure.cli.core.profiles import ResourceType, CustomResourceType, get_api_version, get_sdk @@ -171,11 +171,9 @@ def get_data_service_client(cli_ctx, service_type, account_name, account_key, co def get_subscription_id(cli_ctx): from azure.cli.core._profile import Profile - if 'subscription_id' in cli_ctx.data: - subscription_id = cli_ctx.data['subscription_id'] - else: - subscription_id = Profile(cli_ctx=cli_ctx).get_subscription_id() - return subscription_id + if not cli_ctx.data.get('subscription_id'): + cli_ctx.data['subscription_id'] = Profile(cli_ctx=cli_ctx).get_subscription_id() + return cli_ctx.data['subscription_id'] def _get_add_headers_callback(cli_ctx): diff --git a/src/azure-cli-core/azure/cli/core/commands/events.py b/src/azure-cli-core/azure/cli/core/commands/events.py index bfb1a760e02..454d564843b 100644 --- a/src/azure-cli-core/azure/cli/core/commands/events.py +++ b/src/azure-cli-core/azure/cli/core/commands/events.py @@ -5,3 +5,7 @@ EVENT_INVOKER_PRE_CMD_TBL_TRUNCATE = 'CommandInvoker.OnPreCommandTableTruncate' EVENT_INVOKER_ON_TAB_COMPLETION = 'CommandInvoker.OnTabCompletion' + +# special events used for Interactive and Alias extension communication +EVENT_INTERACTIVE_PRE_COMPLETER_TEXT_PARSING = 'Interactive.PreCompleterTextParsing' +EVENT_INTERACTIVE_POST_SUB_TREE_CREATE = 'Interactive.PostSubTreeCreate' diff --git a/src/azure-cli-core/azure/cli/core/commands/parameters.py b/src/azure-cli-core/azure/cli/core/commands/parameters.py index d49ade54bd1..a136b89d848 100644 --- a/src/azure-cli-core/azure/cli/core/commands/parameters.py +++ b/src/azure-cli-core/azure/cli/core/commands/parameters.py @@ -36,7 +36,7 @@ def get_location_completion_list(cmd, prefix, namespace, **kwargs): # pylint: d # pylint: disable=redefined-builtin def get_datetime_type(help=None, date=True, time=True, timezone=True): - help_string = help + ' ' or '' + help_string = help + ' ' if help else '' accepted_formats = [] if date: accepted_formats.append('date (yyyy-mm-dd)') @@ -44,7 +44,7 @@ def get_datetime_type(help=None, date=True, time=True, timezone=True): accepted_formats.append('time (hh:mm:ss.xxxxx)') if timezone: accepted_formats.append('timezone (+/-hh:mm)') - help_string = help_string + 'Format: ' + ', '.join(accepted_formats) + help_string = help_string + 'Format: ' + ' '.join(accepted_formats) # pylint: disable=too-few-public-methods class DatetimeAction(argparse.Action): @@ -52,6 +52,7 @@ class DatetimeAction(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): """ Parse a date value and return the ISO8601 string. """ import dateutil.parser + import dateutil.tz value_string = ' '.join(values) dt_val = None @@ -62,10 +63,12 @@ def __call__(self, parser, namespace, values, option_string=None): pass # TODO: custom parsing attempts here - if not dt_val: raise CLIError("Unable to parse: '{}'. Expected format: {}".format(value_string, help_string)) + if not dt_val.tzinfo and timezone: + dt_val = dt_val.replace(tzinfo=dateutil.tz.tzlocal()) + # Issue warning if any supplied data will be ignored if not date and any([dt_val.day, dt_val.month, dt_val.year]): logger.warning('Date info will be ignored in %s.', value_string) diff --git a/src/azure-cli-core/azure/cli/core/extensions/transform.py b/src/azure-cli-core/azure/cli/core/commands/transform.py similarity index 98% rename from src/azure-cli-core/azure/cli/core/extensions/transform.py rename to src/azure-cli-core/azure/cli/core/commands/transform.py index 27b18a8c3cc..fc3f0e248b8 100644 --- a/src/azure-cli-core/azure/cli/core/extensions/transform.py +++ b/src/azure-cli-core/azure/cli/core/commands/transform.py @@ -10,7 +10,7 @@ from azure.cli.core.util import b64_to_hex -def register(cli_ctx): +def register_global_transforms(cli_ctx): cli_ctx.register_event(events.EVENT_INVOKER_TRANSFORM_RESULT, _resource_group_transform) cli_ctx.register_event(events.EVENT_INVOKER_TRANSFORM_RESULT, _x509_from_base64_to_hex_transform) diff --git a/src/azure-cli-core/azure/cli/core/extension.py b/src/azure-cli-core/azure/cli/core/extension.py deleted file mode 100644 index 1aeebf271f6..00000000000 --- a/src/azure-cli-core/azure/cli/core/extension.py +++ /dev/null @@ -1,205 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -import os -import traceback -import json - -from knack.log import get_logger - -from azure.cli.core._config import GLOBAL_CONFIG_DIR - - -_CUSTOM_EXT_DIR = os.environ.get('AZURE_EXTENSION_DIR') -EXTENSIONS_DIR = os.path.expanduser(_CUSTOM_EXT_DIR) if _CUSTOM_EXT_DIR else os.path.join(GLOBAL_CONFIG_DIR, - 'cliextensions') -EXTENSIONS_MOD_PREFIX = 'azext_' - -WHL_METADATA_FILENAME = 'metadata.json' -AZEXT_METADATA_FILENAME = 'azext_metadata.json' - -EXT_METADATA_MINCLICOREVERSION = 'azext.minCliCoreVersion' -EXT_METADATA_MAXCLICOREVERSION = 'azext.maxCliCoreVersion' -EXT_METADATA_ISPREVIEW = 'azext.isPreview' - -logger = get_logger(__name__) - - -class ExtensionNotInstalledException(Exception): - def __init__(self, extension_name): - super(ExtensionNotInstalledException, self).__init__(extension_name) - self.extension_name = extension_name - - def __str__(self): - return "The extension {} is not installed.".format(self.extension_name) - - -class Extension(object): - - def __init__(self, name, ext_type): - self.name = name - self.ext_type = ext_type - self._version = None - self._metadata = None - self._preview = None - - @property - def version(self): - """ - Lazy load version. - Returns the version as a string or None if not available. - """ - try: - self._version = self._version or self.get_version() - except Exception: # pylint: disable=broad-except - logger.debug("Unable to get extension version: %s", traceback.format_exc()) - return self._version - - @property - def metadata(self): - """ - Lazy load metadata. - Returns the metadata as a dictionary or None if not available. - """ - try: - self._metadata = self._metadata or self.get_metadata() - except Exception: # pylint: disable=broad-except - logger.debug("Unable to get extension metadata: %s", traceback.format_exc()) - return self._metadata - - @property - def preview(self): - """ - Lazy load preview status. - Returns the preview status of the extension. - """ - try: - if not isinstance(self._preview, bool): - self._preview = bool(self.metadata.get(EXT_METADATA_ISPREVIEW)) - except Exception: # pylint: disable=broad-except - logger.debug("Unable to get extension preview status: %s", traceback.format_exc()) - return self._preview - - def get_version(self): - raise NotImplementedError() - - def get_metadata(self): - raise NotImplementedError() - - @staticmethod - def get_all(): - raise NotImplementedError() - - -class WheelExtension(Extension): - - def __init__(self, name): - super(WheelExtension, self).__init__(name, 'whl') - - def get_version(self): - return self.metadata.get('version') - - def get_metadata(self): - from wheel.install import WHEEL_INFO_RE - if not extension_exists(self.name): - return None - metadata = {} - ext_dir = get_extension_path(self.name) - dist_info_dirs = [f for f in os.listdir(ext_dir) if f.endswith('.dist-info')] - azext_metadata = WheelExtension.get_azext_metadata(ext_dir) - if azext_metadata: - metadata.update(azext_metadata) - for dist_info_dirname in dist_info_dirs: - parsed_dist_info_dir = WHEEL_INFO_RE(dist_info_dirname) - if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == self.name.replace('-', '_'): - whl_metadata_filepath = os.path.join(ext_dir, dist_info_dirname, WHL_METADATA_FILENAME) - if os.path.isfile(whl_metadata_filepath): - with open(whl_metadata_filepath) as f: - metadata.update(json.load(f)) - return metadata - - @staticmethod - def get_azext_metadata(ext_dir): - azext_metadata = None - ext_modname = get_extension_modname(ext_dir=ext_dir) - azext_metadata_filepath = os.path.join(ext_dir, ext_modname, AZEXT_METADATA_FILENAME) - if os.path.isfile(azext_metadata_filepath): - with open(azext_metadata_filepath) as f: - azext_metadata = json.load(f) - return azext_metadata - - @staticmethod - def get_all(): - """ - Returns all wheel-based extensions. - """ - exts = [] - if os.path.isdir(EXTENSIONS_DIR): - for ext_name in os.listdir(EXTENSIONS_DIR): - ext_path = get_extension_path(ext_name) - if os.path.isdir(ext_path) and \ - next((f for f in os.listdir(ext_path) if f.endswith(('.dist-info', '.egg-info'))), None): - exts.append(WheelExtension(ext_name)) - return exts - - -EXTENSION_TYPES = [WheelExtension] - - -def ext_compat_with_cli(azext_metadata): - from azure.cli.core import __version__ as core_version - from pkg_resources import parse_version - is_compatible, min_required, max_required = (True, None, None) - if azext_metadata: - min_required = azext_metadata.get(EXT_METADATA_MINCLICOREVERSION) - max_required = azext_metadata.get(EXT_METADATA_MAXCLICOREVERSION) - parsed_cli_version = parse_version(core_version) - if min_required and parsed_cli_version < parse_version(min_required): - is_compatible = False - elif max_required and parsed_cli_version > parse_version(max_required): - is_compatible = False - return is_compatible, core_version, min_required, max_required - - -def get_extension_modname(ext_name=None, ext_dir=None): - ext_dir = ext_dir or get_extension_path(ext_name) - pos_mods = [n for n in os.listdir(ext_dir) - if n.startswith(EXTENSIONS_MOD_PREFIX) and os.path.isdir(os.path.join(ext_dir, n))] - if len(pos_mods) != 1: - raise AssertionError("Expected 1 module to load starting with " - "'{}': got {}".format(EXTENSIONS_MOD_PREFIX, pos_mods)) - return pos_mods[0] - - -def get_extension_path(ext_name): - return os.path.join(EXTENSIONS_DIR, ext_name) - - -def get_extensions(): - logger.debug("Extensions directory: '%s'", EXTENSIONS_DIR) - extensions = [] - for ext_type in EXTENSION_TYPES: - extensions.extend([ext for ext in ext_type.get_all()]) - return extensions - - -def get_extension(ext_name): - ext = next((ext for ext in get_extensions() if ext.name == ext_name), None) - if ext is None: - raise ExtensionNotInstalledException(ext_name) - return ext - - -def extension_exists(ext_name): - ext = next((ext for ext in get_extensions() if ext.name == ext_name), None) - return ext is not None - - -def get_extension_names(): - """ - Helper method to only get extension names. - Returns the extension names of extensions installed in the extensions directory. - """ - return [ext.name for ext in get_extensions()] diff --git a/src/azure-cli-core/azure/cli/core/extensions/__init__.py b/src/azure-cli-core/azure/cli/core/extensions/__init__.py index d7c33a11221..1aeebf271f6 100644 --- a/src/azure-cli-core/azure/cli/core/extensions/__init__.py +++ b/src/azure-cli-core/azure/cli/core/extensions/__init__.py @@ -3,8 +3,203 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.cli.core.extensions.transform import register as register_transform +import os +import traceback +import json +from knack.log import get_logger -def register_extensions(cli_ctx): - register_transform(cli_ctx) +from azure.cli.core._config import GLOBAL_CONFIG_DIR + + +_CUSTOM_EXT_DIR = os.environ.get('AZURE_EXTENSION_DIR') +EXTENSIONS_DIR = os.path.expanduser(_CUSTOM_EXT_DIR) if _CUSTOM_EXT_DIR else os.path.join(GLOBAL_CONFIG_DIR, + 'cliextensions') +EXTENSIONS_MOD_PREFIX = 'azext_' + +WHL_METADATA_FILENAME = 'metadata.json' +AZEXT_METADATA_FILENAME = 'azext_metadata.json' + +EXT_METADATA_MINCLICOREVERSION = 'azext.minCliCoreVersion' +EXT_METADATA_MAXCLICOREVERSION = 'azext.maxCliCoreVersion' +EXT_METADATA_ISPREVIEW = 'azext.isPreview' + +logger = get_logger(__name__) + + +class ExtensionNotInstalledException(Exception): + def __init__(self, extension_name): + super(ExtensionNotInstalledException, self).__init__(extension_name) + self.extension_name = extension_name + + def __str__(self): + return "The extension {} is not installed.".format(self.extension_name) + + +class Extension(object): + + def __init__(self, name, ext_type): + self.name = name + self.ext_type = ext_type + self._version = None + self._metadata = None + self._preview = None + + @property + def version(self): + """ + Lazy load version. + Returns the version as a string or None if not available. + """ + try: + self._version = self._version or self.get_version() + except Exception: # pylint: disable=broad-except + logger.debug("Unable to get extension version: %s", traceback.format_exc()) + return self._version + + @property + def metadata(self): + """ + Lazy load metadata. + Returns the metadata as a dictionary or None if not available. + """ + try: + self._metadata = self._metadata or self.get_metadata() + except Exception: # pylint: disable=broad-except + logger.debug("Unable to get extension metadata: %s", traceback.format_exc()) + return self._metadata + + @property + def preview(self): + """ + Lazy load preview status. + Returns the preview status of the extension. + """ + try: + if not isinstance(self._preview, bool): + self._preview = bool(self.metadata.get(EXT_METADATA_ISPREVIEW)) + except Exception: # pylint: disable=broad-except + logger.debug("Unable to get extension preview status: %s", traceback.format_exc()) + return self._preview + + def get_version(self): + raise NotImplementedError() + + def get_metadata(self): + raise NotImplementedError() + + @staticmethod + def get_all(): + raise NotImplementedError() + + +class WheelExtension(Extension): + + def __init__(self, name): + super(WheelExtension, self).__init__(name, 'whl') + + def get_version(self): + return self.metadata.get('version') + + def get_metadata(self): + from wheel.install import WHEEL_INFO_RE + if not extension_exists(self.name): + return None + metadata = {} + ext_dir = get_extension_path(self.name) + dist_info_dirs = [f for f in os.listdir(ext_dir) if f.endswith('.dist-info')] + azext_metadata = WheelExtension.get_azext_metadata(ext_dir) + if azext_metadata: + metadata.update(azext_metadata) + for dist_info_dirname in dist_info_dirs: + parsed_dist_info_dir = WHEEL_INFO_RE(dist_info_dirname) + if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == self.name.replace('-', '_'): + whl_metadata_filepath = os.path.join(ext_dir, dist_info_dirname, WHL_METADATA_FILENAME) + if os.path.isfile(whl_metadata_filepath): + with open(whl_metadata_filepath) as f: + metadata.update(json.load(f)) + return metadata + + @staticmethod + def get_azext_metadata(ext_dir): + azext_metadata = None + ext_modname = get_extension_modname(ext_dir=ext_dir) + azext_metadata_filepath = os.path.join(ext_dir, ext_modname, AZEXT_METADATA_FILENAME) + if os.path.isfile(azext_metadata_filepath): + with open(azext_metadata_filepath) as f: + azext_metadata = json.load(f) + return azext_metadata + + @staticmethod + def get_all(): + """ + Returns all wheel-based extensions. + """ + exts = [] + if os.path.isdir(EXTENSIONS_DIR): + for ext_name in os.listdir(EXTENSIONS_DIR): + ext_path = get_extension_path(ext_name) + if os.path.isdir(ext_path) and \ + next((f for f in os.listdir(ext_path) if f.endswith(('.dist-info', '.egg-info'))), None): + exts.append(WheelExtension(ext_name)) + return exts + + +EXTENSION_TYPES = [WheelExtension] + + +def ext_compat_with_cli(azext_metadata): + from azure.cli.core import __version__ as core_version + from pkg_resources import parse_version + is_compatible, min_required, max_required = (True, None, None) + if azext_metadata: + min_required = azext_metadata.get(EXT_METADATA_MINCLICOREVERSION) + max_required = azext_metadata.get(EXT_METADATA_MAXCLICOREVERSION) + parsed_cli_version = parse_version(core_version) + if min_required and parsed_cli_version < parse_version(min_required): + is_compatible = False + elif max_required and parsed_cli_version > parse_version(max_required): + is_compatible = False + return is_compatible, core_version, min_required, max_required + + +def get_extension_modname(ext_name=None, ext_dir=None): + ext_dir = ext_dir or get_extension_path(ext_name) + pos_mods = [n for n in os.listdir(ext_dir) + if n.startswith(EXTENSIONS_MOD_PREFIX) and os.path.isdir(os.path.join(ext_dir, n))] + if len(pos_mods) != 1: + raise AssertionError("Expected 1 module to load starting with " + "'{}': got {}".format(EXTENSIONS_MOD_PREFIX, pos_mods)) + return pos_mods[0] + + +def get_extension_path(ext_name): + return os.path.join(EXTENSIONS_DIR, ext_name) + + +def get_extensions(): + logger.debug("Extensions directory: '%s'", EXTENSIONS_DIR) + extensions = [] + for ext_type in EXTENSION_TYPES: + extensions.extend([ext for ext in ext_type.get_all()]) + return extensions + + +def get_extension(ext_name): + ext = next((ext for ext in get_extensions() if ext.name == ext_name), None) + if ext is None: + raise ExtensionNotInstalledException(ext_name) + return ext + + +def extension_exists(ext_name): + ext = next((ext for ext in get_extensions() if ext.name == ext_name), None) + return ext is not None + + +def get_extension_names(): + """ + Helper method to only get extension names. + Returns the extension names of extensions installed in the extensions directory. + """ + return [ext.name for ext in get_extensions()] diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_homebrew_patch.py b/src/azure-cli-core/azure/cli/core/extensions/_homebrew_patch.py similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_homebrew_patch.py rename to src/azure-cli-core/azure/cli/core/extensions/_homebrew_patch.py diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_index.py b/src/azure-cli-core/azure/cli/core/extensions/_index.py similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_index.py rename to src/azure-cli-core/azure/cli/core/extensions/_index.py diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_resolve.py b/src/azure-cli-core/azure/cli/core/extensions/_resolve.py similarity index 96% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_resolve.py rename to src/azure-cli-core/azure/cli/core/extensions/_resolve.py index 383d481f406..6cbac714a41 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_resolve.py +++ b/src/azure-cli-core/azure/cli/core/extensions/_resolve.py @@ -7,9 +7,8 @@ from knack.log import get_logger -from azure.cli.core.extension import ext_compat_with_cli - -from azure.cli.command_modules.extension._index import get_index_extensions +from azure.cli.core.extensions import ext_compat_with_cli +from azure.cli.core.extensions._index import get_index_extensions logger = get_logger(__name__) diff --git a/src/azure-cli-core/azure/cli/core/extensions/experimental.py b/src/azure-cli-core/azure/cli/core/extensions/experimental.py deleted file mode 100644 index 21938b8fea5..00000000000 --- a/src/azure-cli-core/azure/cli/core/extensions/experimental.py +++ /dev/null @@ -1,37 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - - -def register(event_dispatcher): - def _enable_experimental_handlers(_, event_data): - """The user can opt in to experimental event handlers by - passing an --experimental flag on the command line - """ - try: - event_data['args'].remove('--experimental') - event_dispatcher.register(event_dispatcher.PARSING_PARAMETERS, - file_argument_value) - except ValueError: - pass - - def file_argument_value(_, event_data): - """Replace provided parameter value with value from file - if the parameter value starts with a '@' - """ - def load_file(path): - with open(path, 'r') as f: - return f.read() - - args = event_data['args'] - for name in args.keys(): - value = args[name] - try: - if str.startswith(value, '@'): - args[name] = load_file(value[1:]) - except TypeError: - pass - - event_dispatcher.register(event_dispatcher.REGISTER_GLOBAL_PARAMETERS, - _enable_experimental_handlers) diff --git a/src/azure-cli-core/azure/cli/core/extensions/operations.py b/src/azure-cli-core/azure/cli/core/extensions/operations.py new file mode 100644 index 00000000000..c2bdeae7ff7 --- /dev/null +++ b/src/azure-cli-core/azure/cli/core/extensions/operations.py @@ -0,0 +1,348 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- +import sys +import os +import tempfile +import shutil +import zipfile +import traceback +import hashlib +from subprocess import check_output, STDOUT, CalledProcessError +from six.moves.urllib.parse import urlparse # pylint: disable=import-error +from collections import OrderedDict + +import requests +from wheel.install import WHEEL_INFO_RE +from pkg_resources import parse_version + +from knack.log import get_logger + +from azure.cli.core.util import CLIError +from azure.cli.core.extensions import (extension_exists, get_extension_path, get_extensions, + get_extension, ext_compat_with_cli, EXT_METADATA_ISPREVIEW, + WheelExtension, ExtensionNotInstalledException) +from azure.cli.core.telemetry import set_extension_management_detail + +from ._homebrew_patch import HomebrewPipPatch +from ._index import get_index_extensions +from ._resolve import resolve_from_index, NoExtensionCandidatesError + +logger = get_logger(__name__) + +OUT_KEY_NAME = 'name' +OUT_KEY_VERSION = 'version' +OUT_KEY_TYPE = 'extensionType' +OUT_KEY_METADATA = 'metadata' + +IS_WINDOWS = sys.platform.lower() in ['windows', 'win32'] +LIST_FILE_PATH = os.path.join(os.sep, 'etc', 'apt', 'sources.list.d', 'azure-cli.list') +LSB_RELEASE_FILE = os.path.join(os.sep, 'etc', 'lsb-release') + + +def _run_pip(pip_exec_args): + cmd = [sys.executable, '-m', 'pip'] + pip_exec_args + ['-vv', '--disable-pip-version-check', '--no-cache-dir'] + logger.debug('Running: %s', cmd) + try: + log_output = check_output(cmd, stderr=STDOUT, universal_newlines=True) + logger.debug(log_output) + returncode = 0 + except CalledProcessError as e: + logger.debug(e.output) + logger.debug(e) + returncode = e.returncode + return returncode + + +def _whl_download_from_url(url_parse_result, ext_file): + from azure.cli.core.util import should_disable_connection_verify + url = url_parse_result.geturl() + r = requests.get(url, stream=True, verify=(not should_disable_connection_verify())) + if r.status_code != 200: + raise CLIError("Request to {} failed with {}".format(url, r.status_code)) + with open(ext_file, 'wb') as f: + for chunk in r.iter_content(chunk_size=1024): + if chunk: # ignore keep-alive new chunks + f.write(chunk) + + +def _validate_whl_cli_compat(azext_metadata): + is_compatible, cli_core_version, min_required, max_required = ext_compat_with_cli(azext_metadata) + logger.debug("Extension compatibility result: is_compatible=%s cli_core_version=%s min_required=%s " + "max_required=%s", is_compatible, cli_core_version, min_required, max_required) + if not is_compatible: + min_max_msg_fmt = "The extension is not compatible with this version of the CLI.\n" \ + "You have CLI core version {} and this extension " \ + "requires ".format(cli_core_version) + if min_required and max_required: + min_max_msg_fmt += 'a min of {} and max of {}.'.format(min_required, max_required) + elif min_required: + min_max_msg_fmt += 'a min of {}.'.format(min_required) + elif max_required: + min_max_msg_fmt += 'a max of {}.'.format(max_required) + raise CLIError(min_max_msg_fmt) + + +def _validate_whl_extension(ext_file): + tmp_dir = tempfile.mkdtemp() + zip_ref = zipfile.ZipFile(ext_file, 'r') + zip_ref.extractall(tmp_dir) + zip_ref.close() + azext_metadata = WheelExtension.get_azext_metadata(tmp_dir) + shutil.rmtree(tmp_dir) + _validate_whl_cli_compat(azext_metadata) + + +def _add_whl_ext(source, ext_sha256=None, pip_extra_index_urls=None, pip_proxy=None): # pylint: disable=too-many-statements + if not source.endswith('.whl'): + raise ValueError('Unknown extension type. Only Python wheels are supported.') + url_parse_result = urlparse(source) + is_url = (url_parse_result.scheme == 'http' or url_parse_result.scheme == 'https') + logger.debug('Extension source is url? %s', is_url) + whl_filename = os.path.basename(url_parse_result.path) if is_url else os.path.basename(source) + parsed_filename = WHEEL_INFO_RE(whl_filename) + # Extension names can have - but .whl format changes it to _ (PEP 0427). Undo this. + extension_name = parsed_filename.groupdict().get('name').replace('_', '-') if parsed_filename else None + if not extension_name: + raise CLIError('Unable to determine extension name from {}. Is the file name correct?'.format(source)) + if extension_exists(extension_name): + raise CLIError('The extension {} already exists.'.format(extension_name)) + ext_file = None + if is_url: + # Download from URL + tmp_dir = tempfile.mkdtemp() + ext_file = os.path.join(tmp_dir, whl_filename) + logger.debug('Downloading %s to %s', source, ext_file) + try: + _whl_download_from_url(url_parse_result, ext_file) + except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError) as err: + raise CLIError('Please ensure you have network connection. Error detail: {}'.format(str(err))) + logger.debug('Downloaded to %s', ext_file) + else: + # Get file path + ext_file = os.path.realpath(os.path.expanduser(source)) + if not os.path.isfile(ext_file): + raise CLIError("File {} not found.".format(source)) + # Validate the extension + logger.debug('Validating the extension %s', ext_file) + if ext_sha256: + valid_checksum, computed_checksum = is_valid_sha256sum(ext_file, ext_sha256) + if valid_checksum: + logger.debug("Checksum of %s is OK", ext_file) + else: + logger.debug("Invalid checksum for %s. Expected '%s', computed '%s'.", + ext_file, ext_sha256, computed_checksum) + raise CLIError("The checksum of the extension does not match the expected value. " + "Use --debug for more information.") + try: + _validate_whl_extension(ext_file) + except AssertionError: + logger.debug(traceback.format_exc()) + raise CLIError('The extension is invalid. Use --debug for more information.') + except CLIError as e: + raise e + logger.debug('Validation successful on %s', ext_file) + # Check for distro consistency + check_distro_consistency() + # Install with pip + extension_path = get_extension_path(extension_name) + pip_args = ['install', '--target', extension_path, ext_file] + + if pip_proxy: + pip_args = pip_args + ['--proxy', pip_proxy] + if pip_extra_index_urls: + for extra_index_url in pip_extra_index_urls: + pip_args = pip_args + ['--extra-index-url', extra_index_url] + + logger.debug('Executing pip with args: %s', pip_args) + with HomebrewPipPatch(): + pip_status_code = _run_pip(pip_args) + if pip_status_code > 0: + logger.debug('Pip failed so deleting anything we might have installed at %s', extension_path) + shutil.rmtree(extension_path, ignore_errors=True) + raise CLIError('An error occurred. Pip failed with status code {}. ' + 'Use --debug for more information.'.format(pip_status_code)) + # Save the whl we used to install the extension in the extension dir. + dst = os.path.join(extension_path, whl_filename) + shutil.copyfile(ext_file, dst) + logger.debug('Saved the whl to %s', dst) + + +def is_valid_sha256sum(a_file, expected_sum): + sha256 = hashlib.sha256() + with open(a_file, 'rb') as f: + sha256.update(f.read()) + computed_hash = sha256.hexdigest() + return expected_sum == computed_hash, computed_hash + + +def _augment_telemetry_with_ext_info(extension_name): + # The extension must be available before calling this otherwise we can't get the version from metadata + if not extension_name: + return + try: + ext = get_extension(extension_name) + ext_version = ext.version + set_extension_management_detail(extension_name, ext_version) + except Exception: # nopa pylint: disable=broad-except + # Don't error on telemetry + pass + + +def add_extension(source=None, extension_name=None, index_url=None, yes=None, # pylint: disable=unused-argument + pip_extra_index_urls=None, pip_proxy=None): + ext_sha256 = None + if extension_name: + if extension_exists(extension_name): + logger.warning("The extension '%s' already exists.", extension_name) + return + try: + source, ext_sha256 = resolve_from_index(extension_name, index_url=index_url) + except NoExtensionCandidatesError as err: + logger.debug(err) + raise CLIError("No matching extensions for '{}'. Use --debug for more information.".format(extension_name)) + _add_whl_ext(source, ext_sha256=ext_sha256, pip_extra_index_urls=pip_extra_index_urls, pip_proxy=pip_proxy) + _augment_telemetry_with_ext_info(extension_name) + try: + if extension_name and get_extension(extension_name).preview: + logger.warning("The installed extension '%s' is in preview.", extension_name) + except ExtensionNotInstalledException: + pass + + +def remove_extension(extension_name): + def log_err(func, path, exc_info): + logger.debug("Error occurred attempting to delete item from the extension '%s'.", extension_name) + logger.debug("%s: %s - %s", func, path, exc_info) + + try: + # Get the extension and it will raise an error if it doesn't exist + get_extension(extension_name) + # We call this just before we remove the extension so we can get the metadata before it is gone + _augment_telemetry_with_ext_info(extension_name) + shutil.rmtree(get_extension_path(extension_name), onerror=log_err) + except ExtensionNotInstalledException as e: + raise CLIError(e) + + +def list_extensions(): + return [{OUT_KEY_NAME: ext.name, OUT_KEY_VERSION: ext.version, OUT_KEY_TYPE: ext.ext_type} + for ext in get_extensions()] + + +def show_extension(extension_name): + try: + extension = get_extension(extension_name) + return {OUT_KEY_NAME: extension.name, + OUT_KEY_VERSION: extension.version, + OUT_KEY_TYPE: extension.ext_type, + OUT_KEY_METADATA: extension.metadata} + except ExtensionNotInstalledException as e: + raise CLIError(e) + + +def update_extension(extension_name, index_url=None, pip_extra_index_urls=None, pip_proxy=None): + try: + ext = get_extension(extension_name) + cur_version = ext.get_version() + try: + download_url, ext_sha256 = resolve_from_index(extension_name, cur_version=cur_version, index_url=index_url) + except NoExtensionCandidatesError as err: + logger.debug(err) + raise CLIError("No updates available for '{}'. Use --debug for more information.".format(extension_name)) + # 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 = get_extension_path(extension_name) + 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(download_url, ext_sha256=ext_sha256, + pip_extra_index_urls=pip_extra_index_urls, pip_proxy=pip_proxy) + 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)) + except ExtensionNotInstalledException as e: + raise CLIError(e) + + +def list_available_extensions(index_url=None, show_details=False): + index_data = get_index_extensions(index_url=index_url) + if show_details: + return index_data + installed_extensions = get_extensions() + installed_extension_names = [e.name for e in installed_extensions] + results = [] + for name, items in OrderedDict(sorted(index_data.items())).items(): + # exclude extensions/versions incompatible with current CLI version + items = [item for item in items if ext_compat_with_cli(item['metadata'])[0]] + if not items: + continue + + latest = max(items, key=lambda c: parse_version(c['metadata']['version'])) + installed = False + if name in installed_extension_names: + installed = True + ext_version = get_extension(name).version + if ext_version and parse_version(latest['metadata']['version']) > parse_version(ext_version): + installed = str(True) + ' (upgrade available)' + results.append({ + 'name': name, + 'version': latest['metadata']['version'], + 'summary': latest['metadata']['summary'], + 'preview': latest['metadata'].get(EXT_METADATA_ISPREVIEW, False), + 'installed': installed + }) + return results + + +def get_lsb_release(): + try: + with open(LSB_RELEASE_FILE, 'r') as lr: + lsb = lr.readlines() + desc = lsb[2] + desc_split = desc.split('=') + rel = desc_split[1] + return rel.strip() + except Exception: # pylint: disable=broad-except + return None + + +def check_distro_consistency(): + if IS_WINDOWS: + return + + try: + logger.debug('Linux distro check: Reading from: %s', LIST_FILE_PATH) + + with open(LIST_FILE_PATH, 'r') as list_file: + package_source = list_file.read() + stored_linux_dist_name = package_source.split(" ")[3] + logger.debug('Linux distro check: Found in list file: %s', stored_linux_dist_name) + current_linux_dist_name = get_lsb_release() + logger.debug('Linux distro check: Reported by API: %s', current_linux_dist_name) + + except Exception as err: # pylint: disable=broad-except + current_linux_dist_name = None + stored_linux_dist_name = None + logger.debug('Linux distro check: An error occurred while checking ' + 'linux distribution version source list consistency.') + logger.debug(err) + + if current_linux_dist_name != stored_linux_dist_name: + logger.debug("Linux distro check: Mismatch distribution " + "name in %s file", LIST_FILE_PATH) + logger.debug("Linux distro check: If command fails, install the appropriate package " + "for your distribution or change the above file accordingly.") + logger.debug("Linux distro check: %s has '%s', current distro is '%s'", + LIST_FILE_PATH, stored_linux_dist_name, current_linux_dist_name) diff --git a/src/azure-cli-core/azure/cli/core/extensions/tests/__init__.py b/src/azure-cli-core/azure/cli/core/extensions/tests/__init__.py new file mode 100644 index 00000000000..34913fb394d --- /dev/null +++ b/src/azure-cli-core/azure/cli/core/extensions/tests/__init__.py @@ -0,0 +1,4 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- diff --git a/src/azure-cli-core/azure/cli/core/extensions/tests/latest/__init__.py b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/__init__.py new file mode 100644 index 00000000000..34913fb394d --- /dev/null +++ b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/__init__.py @@ -0,0 +1,4 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/notanextension.txt b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/notanextension.txt similarity index 100% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/data/notanextension.txt rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/data/notanextension.txt diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_extension_commands.py b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_extension_commands.py similarity index 75% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_extension_commands.py rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_extension_commands.py index 5fed2931f71..b7ad2a3c848 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_extension_commands.py +++ b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_extension_commands.py @@ -10,10 +10,10 @@ import mock from azure.cli.core.util import CLIError -from azure.cli.command_modules.extension.custom import (list_extensions, add_extension, show_extension, - remove_extension, update_extension, - list_available_extensions, OUT_KEY_NAME, OUT_KEY_VERSION, OUT_KEY_METADATA) -from azure.cli.command_modules.extension._resolve import NoExtensionCandidatesError +from azure.cli.core.extensions.operations import (list_extensions, add_extension, show_extension, + remove_extension, update_extension, + list_available_extensions, OUT_KEY_NAME, OUT_KEY_VERSION, OUT_KEY_METADATA) +from azure.cli.core.extensions._resolve import NoExtensionCandidatesError def _get_test_data_file(filename): @@ -38,7 +38,7 @@ class TestExtensionCommands(unittest.TestCase): def setUp(self): self.ext_dir = tempfile.mkdtemp() - self.patcher = mock.patch('azure.cli.core.extension.EXTENSIONS_DIR', self.ext_dir) + self.patcher = mock.patch('azure.cli.core.extensions.EXTENSIONS_DIR', self.ext_dir) self.patcher.start() def tearDown(self): @@ -106,9 +106,9 @@ def test_add_extension_with_pip_proxy(self): proxy_param = '--proxy' proxy_endpoint = "https://user:pass@proxy.microsoft.com" computed_extension_sha256 = _compute_file_hash(MY_EXT_SOURCE) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.shutil'), \ - mock.patch('azure.cli.command_modules.extension.custom.check_output') as check_output: + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.shutil'), \ + mock.patch('azure.cli.core.extensions.operations.check_output') as check_output: add_extension(extension_name=extension_name, pip_proxy=proxy_endpoint) args = check_output.call_args pip_cmd = args[0][0] @@ -118,9 +118,9 @@ def test_add_extension_with_pip_proxy(self): def test_add_extension_verify_no_pip_proxy(self): extension_name = MY_EXT_NAME computed_extension_sha256 = _compute_file_hash(MY_EXT_SOURCE) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.shutil'), \ - mock.patch('azure.cli.command_modules.extension.custom.check_output') as check_output: + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.shutil'), \ + mock.patch('azure.cli.core.extensions.operations.check_output') as check_output: add_extension(extension_name=extension_name) args = check_output.call_args pip_cmd = args[0][0] @@ -130,7 +130,7 @@ def test_add_extension_verify_no_pip_proxy(self): def test_add_extension_with_name_valid_checksum(self): extension_name = MY_EXT_NAME computed_extension_sha256 = _compute_file_hash(MY_EXT_SOURCE) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)): add_extension(extension_name=extension_name) ext = show_extension(MY_EXT_NAME) self.assertEqual(ext[OUT_KEY_NAME], MY_EXT_NAME) @@ -138,14 +138,14 @@ def test_add_extension_with_name_valid_checksum(self): def test_add_extension_with_name_invalid_checksum(self): extension_name = MY_EXT_NAME bad_sha256 = 'thishashisclearlywrong' - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, bad_sha256)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, bad_sha256)): with self.assertRaises(CLIError) as err: add_extension(extension_name=extension_name) self.assertTrue('The checksum of the extension does not match the expected value.' in str(err.exception)) def test_add_extension_with_name_source_not_whl(self): extension_name = 'myextension' - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=('{}.notwhl'.format(extension_name), None)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=('{}.notwhl'.format(extension_name), None)): with self.assertRaises(ValueError) as err: add_extension(extension_name=extension_name) self.assertTrue('Unknown extension type. Only Python wheels are supported.' in str(err.exception)) @@ -157,8 +157,8 @@ def test_add_extension_with_name_but_it_already_exists(self): self.assertEqual(ext[OUT_KEY_NAME], MY_EXT_NAME) # Now add using name computed_extension_sha256 = _compute_file_hash(MY_EXT_SOURCE) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)): - with mock.patch('azure.cli.command_modules.extension.custom.logger') as mock_logger: + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)): + with mock.patch('azure.cli.core.extensions.operations.logger') as mock_logger: add_extension(extension_name=MY_EXT_NAME) call_args = mock_logger.warning.call_args self.assertEqual("The extension '%s' already exists.", call_args[0][0]) @@ -171,7 +171,7 @@ def test_update_extension(self): self.assertEqual(ext[OUT_KEY_VERSION], '0.0.3+dev') newer_extension = _get_test_data_file('myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl') computed_extension_sha256 = _compute_file_hash(newer_extension) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(newer_extension, computed_extension_sha256)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(newer_extension, computed_extension_sha256)): update_extension(MY_EXT_NAME) ext = show_extension(MY_EXT_NAME) self.assertEqual(ext[OUT_KEY_VERSION], '0.0.4+dev') @@ -185,11 +185,11 @@ def test_update_extension_with_pip_proxy(self): proxy_param = '--proxy' proxy_endpoint = "https://user:pass@proxy.microsoft.com" - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.shutil'), \ - mock.patch('azure.cli.command_modules.extension.custom.is_valid_sha256sum', return_value=(True, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.extension_exists', return_value=None), \ - mock.patch('azure.cli.command_modules.extension.custom.check_output') as check_output: + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.shutil'), \ + mock.patch('azure.cli.core.extensions.operations.is_valid_sha256sum', return_value=(True, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.extension_exists', return_value=None), \ + mock.patch('azure.cli.core.extensions.operations.check_output') as check_output: update_extension(MY_EXT_NAME, pip_proxy=proxy_endpoint) args = check_output.call_args @@ -204,11 +204,11 @@ def test_update_extension_verify_no_pip_proxy(self): newer_extension = _get_test_data_file('myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl') computed_extension_sha256 = _compute_file_hash(newer_extension) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.shutil'), \ - mock.patch('azure.cli.command_modules.extension.custom.is_valid_sha256sum', return_value=(True, computed_extension_sha256)), \ - mock.patch('azure.cli.command_modules.extension.custom.extension_exists', return_value=None), \ - mock.patch('azure.cli.command_modules.extension.custom.check_output') as check_output: + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(MY_EXT_SOURCE, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.shutil'), \ + mock.patch('azure.cli.core.extensions.operations.is_valid_sha256sum', return_value=(True, computed_extension_sha256)), \ + mock.patch('azure.cli.core.extensions.operations.extension_exists', return_value=None), \ + mock.patch('azure.cli.core.extensions.operations.check_output') as check_output: update_extension(MY_EXT_NAME) args = check_output.call_args @@ -225,7 +225,7 @@ def test_update_extension_no_updates(self): add_extension(source=MY_EXT_SOURCE) ext = show_extension(MY_EXT_NAME) self.assertEqual(ext[OUT_KEY_VERSION], '0.0.3+dev') - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', side_effect=NoExtensionCandidatesError()): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', side_effect=NoExtensionCandidatesError()): with self.assertRaises(CLIError) as err: update_extension(MY_EXT_NAME) self.assertTrue("No updates available for '{}'.".format(MY_EXT_NAME) in str(err.exception)) @@ -236,7 +236,7 @@ def test_update_extension_exception_in_update_and_rolled_back(self): self.assertEqual(ext[OUT_KEY_VERSION], '0.0.3+dev') newer_extension = _get_test_data_file('myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl') bad_sha256 = 'thishashisclearlywrong' - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(newer_extension, bad_sha256)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(newer_extension, bad_sha256)): with self.assertRaises(CLIError) as err: update_extension(MY_EXT_NAME) self.assertTrue('Failed to update. Rolled {} back to {}.'.format(ext['name'], ext[OUT_KEY_VERSION]) in str(err.exception)) @@ -244,18 +244,18 @@ def test_update_extension_exception_in_update_and_rolled_back(self): self.assertEqual(ext[OUT_KEY_VERSION], '0.0.3+dev') def test_list_available_extensions_default(self): - with mock.patch('azure.cli.command_modules.extension.custom.get_index_extensions', autospec=True) as c: + with mock.patch('azure.cli.core.extensions.operations.get_index_extensions', autospec=True) as c: list_available_extensions() c.assert_called_once_with(None) - def test_list_available_extensions_custom_index_url(self): - with mock.patch('azure.cli.command_modules.extension.custom.get_index_extensions', autospec=True) as c: + def test_list_available_extensions_operations_index_url(self): + with mock.patch('azure.cli.core.extensions.operations.get_index_extensions', autospec=True) as c: index_url = 'http://contoso.com' list_available_extensions(index_url=index_url) c.assert_called_once_with(index_url) def test_list_available_extensions_show_details(self): - with mock.patch('azure.cli.command_modules.extension.custom.get_index_extensions', autospec=True) as c: + with mock.patch('azure.cli.core.extensions.operations.get_index_extensions', autospec=True) as c: list_available_extensions(show_details=True) c.assert_called_once_with(None) @@ -268,7 +268,7 @@ def test_list_available_extensions_no_show_details(self): 'version': '0.1.0' }}] } - with mock.patch('azure.cli.command_modules.extension.custom.get_index_extensions', return_value=sample_index_extensions): + with mock.patch('azure.cli.core.extensions.operations.get_index_extensions', return_value=sample_index_extensions): res = list_available_extensions() self.assertIsInstance(res, list) self.assertEqual(len(res), len(sample_index_extensions)) @@ -287,7 +287,7 @@ def test_list_available_extensions_incompatible_cli_version(self): 'version': '0.1.0' }}] } - with mock.patch('azure.cli.command_modules.extension.custom.get_index_extensions', return_value=sample_index_extensions): + with mock.patch('azure.cli.core.extensions.operations.get_index_extensions', return_value=sample_index_extensions): res = list_available_extensions() self.assertIsInstance(res, list) self.assertEqual(len(res), 0) @@ -320,7 +320,7 @@ def test_update_extension_extra_index_url(self): self.assertEqual(ext[OUT_KEY_VERSION], '0.0.3+dev') newer_extension = _get_test_data_file('myfirstcliextension-0.0.4+dev-py2.py3-none-any.whl') computed_extension_sha256 = _compute_file_hash(newer_extension) - with mock.patch('azure.cli.command_modules.extension.custom.resolve_from_index', return_value=(newer_extension, computed_extension_sha256)): + with mock.patch('azure.cli.core.extensions.operations.resolve_from_index', return_value=(newer_extension, computed_extension_sha256)): update_extension(MY_EXT_NAME, pip_extra_index_urls=extra_index_urls) ext = show_extension(MY_EXT_NAME) self.assertEqual(ext[OUT_KEY_VERSION], '0.0.4+dev') diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_index_get.py b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_index_get.py similarity index 87% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_index_get.py rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_index_get.py index 645d1691ede..50e864ab10f 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_index_get.py +++ b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_index_get.py @@ -7,9 +7,9 @@ import unittest from requests.exceptions import ConnectionError, HTTPError from azure.cli.core.util import CLIError -from azure.cli.command_modules.extension._index import (get_index, get_index_extensions, DEFAULT_INDEX_URL, - ERR_TMPL_NON_200, ERR_TMPL_NO_NETWORK, ERR_TMPL_BAD_JSON, - ERR_UNABLE_TO_GET_EXTENSIONS) +from azure.cli.core.extensions._index import (get_index, get_index_extensions, DEFAULT_INDEX_URL, + ERR_TMPL_NON_200, ERR_TMPL_NO_NETWORK, ERR_TMPL_BAD_JSON, + ERR_UNABLE_TO_GET_EXTENSIONS) class MockResponse(object): @@ -75,12 +75,12 @@ def test_get_index_extensions(self): with mock.patch('requests.get', side_effect=mock_index_get_generator(DEFAULT_INDEX_URL, data)): self.assertEqual(get_index_extensions().get('myext'), obj) - with mock.patch('azure.cli.command_modules.extension._index.logger.warning', autospec=True) as logger_mock: + with mock.patch('azure.cli.core.extensions._index.logger.warning', autospec=True) as logger_mock: with mock.patch('requests.get', side_effect=mock_index_get_generator(DEFAULT_INDEX_URL, {})): self.assertEqual(get_index_extensions(), None) logger_mock.assert_called_once_with(ERR_UNABLE_TO_GET_EXTENSIONS) - with mock.patch('azure.cli.command_modules.extension._index.logger.warning', autospec=True) as logger_mock: + with mock.patch('azure.cli.core.extensions._index.logger.warning', autospec=True) as logger_mock: with mock.patch('requests.get', side_effect=mock_index_get_generator(DEFAULT_INDEX_URL, {'v2extensions': []})): self.assertEqual(get_index_extensions(), None) logger_mock.assert_called_once_with(ERR_UNABLE_TO_GET_EXTENSIONS) diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_resolve.py b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_resolve.py similarity index 93% rename from src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_resolve.py rename to src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_resolve.py index 38cb83b929e..1ffc35e50ee 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/latest/test_resolve.py +++ b/src/azure-cli-core/azure/cli/core/extensions/tests/latest/test_resolve.py @@ -5,13 +5,13 @@ import unittest import mock -from azure.cli.command_modules.extension._resolve import (resolve_from_index, NoExtensionCandidatesError, - _is_not_platform_specific, _is_greater_than_cur_version) +from azure.cli.core.extensions._resolve import (resolve_from_index, NoExtensionCandidatesError, + _is_not_platform_specific, _is_greater_than_cur_version) class IndexPatch(object): def __init__(self, data=None): - self.patcher = mock.patch('azure.cli.command_modules.extension._resolve.get_index_extensions', return_value=data) + self.patcher = mock.patch('azure.cli.core.extensions._resolve.get_index_extensions', return_value=data) def __enter__(self): self.patcher.start() diff --git a/src/azure-cli-core/azure/cli/core/file_util.py b/src/azure-cli-core/azure/cli/core/file_util.py index eaacae9cdaf..a90667dc62e 100644 --- a/src/azure-cli-core/azure/cli/core/file_util.py +++ b/src/azure-cli-core/azure/cli/core/file_util.py @@ -8,7 +8,6 @@ from knack.help import GroupHelpFile from azure.cli.core._help import CliCommandHelpFile -from azure.cli.core.commands.arm import add_id_parameters def get_all_help(cli_ctx): @@ -40,6 +39,9 @@ def get_all_help(cli_ctx): def create_invoker_and_load_cmds_and_args(cli_ctx): + from knack import events + from azure.cli.core.commands.arm import register_global_subscription_argument, register_ids_argument + invoker = cli_ctx.invocation_cls(cli_ctx=cli_ctx, commands_loader_cls=cli_ctx.commands_loader_cls, parser_cls=cli_ctx.parser_cls, help_cls=cli_ctx.help_cls) cli_ctx.invocation = invoker @@ -47,7 +49,10 @@ def create_invoker_and_load_cmds_and_args(cli_ctx): for command in invoker.commands_loader.command_table: invoker.commands_loader.load_arguments(command) invoker.parser.load_command_table(invoker.commands_loader) - add_id_parameters(None, commands_loader=invoker.commands_loader) + + register_global_subscription_argument(cli_ctx) + register_ids_argument(cli_ctx) # global subscription must be registered first! + cli_ctx.raise_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, commands_loader=invoker.commands_loader) def _store_parsers(parser, parser_keys, parser_values, sub_parser_keys, sub_parser_values): diff --git a/src/azure-cli-core/azure/cli/core/parser.py b/src/azure-cli-core/azure/cli/core/parser.py index 8f606c7998c..61858d4ccf3 100644 --- a/src/azure-cli-core/azure/cli/core/parser.py +++ b/src/azure-cli-core/azure/cli/core/parser.py @@ -17,7 +17,7 @@ from knack.util import CLIError import azure.cli.core.telemetry as telemetry -from azure.cli.core.extension import get_extension +from azure.cli.core.extensions import get_extension from azure.cli.core.commands import ExtensionCommandSource from azure.cli.core.commands.events import EVENT_INVOKER_ON_TAB_COMPLETION diff --git a/src/azure-cli-core/azure/cli/core/tests/test_add_resourcegroup_transform.py b/src/azure-cli-core/azure/cli/core/tests/test_add_resourcegroup_transform.py index 6b8cd34c250..453bb49df6e 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_add_resourcegroup_transform.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_add_resourcegroup_transform.py @@ -5,7 +5,7 @@ import unittest from six import StringIO -from azure.cli.core.extensions.transform import _parse_id, _add_resource_group +from azure.cli.core.commands.transform import _parse_id, _add_resource_group class TestResourceGroupTransform(unittest.TestCase): diff --git a/src/azure-cli-core/azure/cli/core/tests/test_command_registration.py b/src/azure-cli-core/azure/cli/core/tests/test_command_registration.py index e7395d205cd..d261c0305b5 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_command_registration.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_command_registration.py @@ -11,7 +11,7 @@ from azure.cli.core import AzCommandsLoader, MainCommandsLoader from azure.cli.core.commands import ExtensionCommandSource -from azure.cli.core.extension import EXTENSIONS_MOD_PREFIX +from azure.cli.core.extensions import EXTENSIONS_MOD_PREFIX from azure.cli.core.mock import DummyCli from knack.arguments import CLICommandArgument, CLIArgumentType @@ -201,8 +201,8 @@ def load_command_table(self, args): @mock.patch('importlib.import_module', _mock_import_lib) @mock.patch('pkgutil.iter_modules', _mock_iter_modules) @mock.patch('azure.cli.core.commands._load_command_loader', _mock_load_command_loader) - @mock.patch('azure.cli.core.extension.get_extension_modname', _mock_extension_modname) - @mock.patch('azure.cli.core.extension.get_extensions', _mock_get_extensions) + @mock.patch('azure.cli.core.extensions.get_extension_modname', _mock_extension_modname) + @mock.patch('azure.cli.core.extensions.get_extensions', _mock_get_extensions) def test_register_command_from_extension(self): from azure.cli.core.commands import _load_command_loader diff --git a/src/azure-cli-core/azure/cli/core/tests/test_extension.py b/src/azure-cli-core/azure/cli/core/tests/test_extension.py index aa7e730e574..49caf1d2a1c 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_extension.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_extension.py @@ -10,10 +10,10 @@ import mock -from azure.cli.core.extension import (get_extensions, get_extension_path, extension_exists, - get_extension, get_extension_names, get_extension_modname, ext_compat_with_cli, - ExtensionNotInstalledException, WheelExtension, - EXTENSIONS_MOD_PREFIX, EXT_METADATA_MINCLICOREVERSION, EXT_METADATA_MAXCLICOREVERSION) +from azure.cli.core.extensions import (get_extensions, get_extension_path, extension_exists, + get_extension, get_extension_names, get_extension_modname, ext_compat_with_cli, + ExtensionNotInstalledException, WheelExtension, + EXTENSIONS_MOD_PREFIX, EXT_METADATA_MINCLICOREVERSION, EXT_METADATA_MAXCLICOREVERSION) # The test extension name @@ -45,7 +45,7 @@ class TestExtensionsBase(unittest.TestCase): def setUp(self): self.ext_dir = tempfile.mkdtemp() - self.patcher = mock.patch('azure.cli.core.extension.EXTENSIONS_DIR', self.ext_dir) + self.patcher = mock.patch('azure.cli.core.extensions.EXTENSIONS_DIR', self.ext_dir) self.patcher.start() def tearDown(self): diff --git a/src/azure-cli-core/azure/cli/core/tests/test_help.py b/src/azure-cli-core/azure/cli/core/tests/test_help.py index 0acaa6ddef7..0c780e8243d 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_help.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_help.py @@ -25,7 +25,7 @@ def tearDownClass(cls): logging.shutdown() def test_help_loads(self): - from azure.cli.core.commands.arm import add_id_parameters + from azure.cli.core.commands.arm import register_global_subscription_argument, register_ids_argument import knack.events as events cli = DummyCli() @@ -44,7 +44,8 @@ def test_help_loads(self): cmd_tbl[cmd].loader.load_arguments(cmd) except KeyError: pass - cli.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_id_parameters) + cli.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, register_global_subscription_argument) + cli.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, register_ids_argument) cli.raise_event(events.EVENT_INVOKER_CMD_TBL_LOADED, command_table=cmd_tbl) cli.invocation.parser.load_command_table(cli.invocation.commands_loader) _store_parsers(cli.invocation.parser, parser_dict) diff --git a/src/azure-cli-core/azure/cli/core/tests/test_parser.py b/src/azure-cli-core/azure/cli/core/tests/test_parser.py index 7b95890fbba..7a2ede53fd5 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_parser.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_parser.py @@ -193,8 +193,8 @@ def load_command_table(self, args): @mock.patch('importlib.import_module', _mock_import_lib) @mock.patch('pkgutil.iter_modules', _mock_iter_modules) @mock.patch('azure.cli.core.commands._load_command_loader', _mock_load_command_loader) - @mock.patch('azure.cli.core.extension.get_extension_modname', _mock_extension_modname) - @mock.patch('azure.cli.core.extension.get_extensions', _mock_get_extensions) + @mock.patch('azure.cli.core.extensions.get_extension_modname', _mock_extension_modname) + @mock.patch('azure.cli.core.extensions.get_extensions', _mock_get_extensions) def test_parser_error_spellchecker(self): cli = DummyCli() main_loader = MainCommandsLoader(cli) diff --git a/src/azure-cli-core/azure/cli/core/util.py b/src/azure-cli-core/azure/cli/core/util.py index b3317d6528e..05c1ffa3fb0 100644 --- a/src/azure-cli-core/azure/cli/core/util.py +++ b/src/azure-cli-core/azure/cli/core/util.py @@ -72,7 +72,7 @@ def get_installed_cli_distributions(): def get_az_version_string(): import platform - from azure.cli.core.extension import get_extensions, EXTENSIONS_DIR + from azure.cli.core.extensions import get_extensions, EXTENSIONS_DIR output = six.StringIO() installed_dists = get_installed_cli_distributions() @@ -288,7 +288,10 @@ def open_page_in_browser(url): # understand the "open location" message" # b. Python 2.x can't sniff out the default browser return subprocess.Popen(['open', url]) - return webbrowser.open(url, new=2) # 2 means: open in a new tab, if possible + try: + return webbrowser.open(url, new=2) # 2 means: open in a new tab, if possible + except TypeError: # See https://bugs.python.org/msg322439 + return webbrowser.open(url, new=2) def _get_platform_info(): diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index fbc03fc74db..ee1934e0c7b 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -17,7 +17,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.0.48" +VERSION = "2.0.50" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. try: @@ -59,7 +59,7 @@ 'colorama>=0.3.9', 'humanfriendly>=4.7', 'jmespath', - 'knack==0.4.3', + 'knack==0.4.4', 'msrest>=0.4.4', 'msrestazure>=0.4.25', 'paramiko>=2.0.8', diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py b/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py index fa6db78d5cf..9a4cdc01e5c 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py @@ -7,17 +7,19 @@ from .base import ScenarioTest, LiveScenarioTest from .preparers import (StorageAccountPreparer, ResourceGroupPreparer, RoleBasedServicePrincipalPreparer, - KeyVaultPreparer) + KeyVaultPreparer, AADGraphUserReplacer) from .exceptions import CliTestError from .checkers import (JMESPathCheck, JMESPathCheckExists, JMESPathCheckGreaterThan, NoneCheck, StringCheck, StringContainCheck) from .decorators import api_version_constraint from .utilities import create_random_name +from .patches import MOCKED_USER_NAME __all__ = ['ScenarioTest', 'LiveScenarioTest', 'ResourceGroupPreparer', 'StorageAccountPreparer', 'RoleBasedServicePrincipalPreparer', 'CliTestError', 'JMESPathCheck', 'JMESPathCheckExists', 'NoneCheck', 'live_only', 'record_only', 'StringCheck', 'StringContainCheck', 'get_sha1_hash', 'KeyVaultPreparer', - 'JMESPathCheckGreaterThan', 'api_version_constraint', 'create_random_name'] + 'JMESPathCheckGreaterThan', 'api_version_constraint', 'create_random_name', 'MOCKED_USER_NAME', + 'AADGraphUserReplacer'] __version__ = '0.1.0' diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/patches.py b/src/azure-cli-testsdk/azure/cli/testsdk/patches.py index a2a5612580d..f18e31b1ec0 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/patches.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/patches.py @@ -8,6 +8,8 @@ from .exceptions import CliExecutionError +MOCKED_USER_NAME = 'example@example.com' + def patch_progress_controller(unit_test): def _mock_pass(*args, **kwargs): # pylint: disable=unused-argument @@ -41,7 +43,7 @@ def _handle_load_cached_subscription(*args, **kwargs): # pylint: disable=unused return [{ "id": MOCKED_SUBSCRIPTION_ID, "user": { - "name": "example@example.com", + "name": MOCKED_USER_NAME, "type": "user" }, "state": "Enabled", diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/preparers.py b/src/azure-cli-testsdk/azure/cli/testsdk/preparers.py index 88357d81265..f9b4957545c 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/preparers.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/preparers.py @@ -174,6 +174,29 @@ def remove_resource(self, name, **kwargs): execute(self.cli_ctx, 'az ad sp delete --id {}'.format(self.result['appId'])) +class AADGraphUserReplacer: + def __init__(self, test_user, mock_user): + self.test_user = test_user + self.mock_user = mock_user + + def process_request(self, request): + test_user_encoded = self.test_user.replace('@', '%40') + if test_user_encoded in request.uri: + request.uri = request.uri.replace(test_user_encoded, self.mock_user.replace('@', '%40')) + + if request.body: + body = str(request.body) + if self.test_user in body: + request.body = body.replace(self.test_user, self.mock_user) + + return request + + def process_response(self, response): + if response['body']['string']: + response['body']['string'] = response['body']['string'].replace(self.test_user, + self.mock_user) + + return response # Utility diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/utilities.py b/src/azure-cli-testsdk/azure/cli/testsdk/utilities.py index bca98b32a71..2d96c7b576e 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/utilities.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/utilities.py @@ -50,7 +50,7 @@ def force_progress_logging(): class StorageAccountKeyReplacer(RecordingProcessor): """Replace the access token for service principal authentication in a response body.""" - def __init__(self, replacement='veryFakedStorageAccountKey'): + def __init__(self, replacement='veryFakedStorageAccountKey=='): self._replacement = replacement self._activated = False diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 147aadf05ab..998dfc1abc6 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -2,10 +2,19 @@ Release History =============== -2.0.48 + +2.0.50 +++++++ +* Minor fixes + +2.0.49 ++++++ * Minor fixes +2.0.48 +++++++ +* Fix Homebrew + 2.0.47 ++++++ * Minor fixes diff --git a/src/azure-cli/azure/cli/__init__.py b/src/azure-cli/azure/cli/__init__.py index 5d17eec4dda..949b83c7312 100644 --- a/src/azure-cli/azure/cli/__init__.py +++ b/src/azure-cli/azure/cli/__init__.py @@ -11,4 +11,4 @@ pkg_resources.declare_namespace(__name__) __author__ = "Microsoft Corporation " -__version__ = "2.0.48" +__version__ = "2.0.50" diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index aa9f739030f..96addec4396 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -15,7 +15,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.0.48" +VERSION = "2.0.50" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. try: @@ -54,26 +54,28 @@ 'azure-cli-advisor', 'azure-cli-ams', 'azure-cli-appservice', + 'azure-cli-backup', 'azure-cli-batch', 'azure-cli-batchai', - 'azure-cli-backup', 'azure-cli-billing', 'azure-cli-botservice', 'azure-cli-cdn', 'azure-cli-cloud', 'azure-cli-cognitiveservices', - 'azure-cli-container', 'azure-cli-configure', 'azure-cli-consumption', + 'azure-cli-container', 'azure-cli-core', 'azure-cli-cosmosdb', 'azure-cli-dla', 'azure-cli-dls', 'azure-cli-dms', 'azure-cli-eventgrid', + 'azure-cli-eventhubs', 'azure-cli-extension', 'azure-cli-feedback', 'azure-cli-find', + 'azure-cli-hdinsight', 'azure-cli-interactive', 'azure-cli-iot', 'azure-cli-iotcentral', @@ -83,20 +85,21 @@ 'azure-cli-monitor', 'azure-cli-network', 'azure-cli-nspkg', + 'azure-cli-policyinsights', 'azure-cli-profile', 'azure-cli-rdbms', 'azure-cli-redis', + 'azure-cli-relay', 'azure-cli-reservations', 'azure-cli-resource', 'azure-cli-role', + 'azure-cli-search', + 'azure-cli-servicebus', + 'azure-cli-servicefabric', + 'azure-cli-signalr', 'azure-cli-sql', 'azure-cli-storage', - 'azure-cli-vm', - 'azure-cli-servicefabric', - 'azure-cli-servicebus', - 'azure-cli-eventhubs', - 'azure-cli-search', - 'azure-cli-signalr' + 'azure-cli-vm' ] with open('README.rst', 'r', encoding='utf-8') as f: diff --git a/src/command_modules/azure-cli-acr/HISTORY.rst b/src/command_modules/azure-cli-acr/HISTORY.rst index 0384a765f23..cde785f703d 100644 --- a/src/command_modules/azure-cli-acr/HISTORY.rst +++ b/src/command_modules/azure-cli-acr/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +2.1.8 ++++++ +* Support commit and pull request git events for Task source trigger. + 2.1.7 +++++ * Fix an ACR Build encoding issue in Python2. diff --git a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_format.py b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_format.py index a8e700bbf2c..e8ceddc1abf 100644 --- a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_format.py +++ b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_format.py @@ -199,7 +199,7 @@ def _task_format_group(item): ('Name', _get_value(item, 'name')), ('PLATFORM', _get_value(item, 'platform', 'os')), ('STATUS', _get_value(item, 'status')), - ('COMMIT TRIGGER', _get_value(item, 'trigger', 'sourceTriggers', 0, 'status')), + ('SOURCE TRIGGER', _get_value(item, 'trigger', 'sourceTriggers', 0, 'status')), ('SOURCE REPOSITORY', _get_value(item, 'step', 'contextPath')), ('BRANCH', _get_value(item, 'trigger', 'sourceTriggers', 0, 'sourceRepository', 'branch')), ('BASE IMAGE TRIGGER', _get_value(item, 'trigger', 'baseImageTrigger', 'baseImageTriggerType')), @@ -214,7 +214,8 @@ def _build_format_group(item): ('TASK', _get_value(item, 'buildTask')), ('PLATFORM', _get_value(item, 'platform', 'osType')), ('STATUS', _get_value(item, 'status')), - ("TRIGGER", _get_build_trigger(_get_value(item, 'imageUpdateTrigger'), _get_value(item, 'gitCommitTrigger'))), + ("TRIGGER", _get_build_trigger(_get_value(item, 'imageUpdateTrigger'), + _get_value(item, 'sourceTrigger', 'eventType'))), ('STARTED', _format_datetime(_get_value(item, 'startTime'))), ('DURATION', _get_duration(_get_value(item, 'startTime'), _get_value(item, 'finishTime'))) ]) @@ -226,7 +227,8 @@ def _run_format_group(item): ('TASK', _get_value(item, 'task')), ('PLATFORM', _get_value(item, 'platform', 'os')), ('STATUS', _get_value(item, 'status')), - ("TRIGGER", _get_build_trigger(_get_value(item, 'imageUpdateTrigger'), _get_value(item, 'sourceTrigger'))), + ("TRIGGER", _get_build_trigger(_get_value(item, 'imageUpdateTrigger'), + _get_value(item, 'sourceTrigger', 'eventType'))), ('STARTED', _format_datetime(_get_value(item, 'startTime'))), ('DURATION', _get_duration(_get_value(item, 'startTime'), _get_value(item, 'finishTime'))) ]) @@ -257,9 +259,9 @@ def _get_value(item, *args): return ' ' -def _get_build_trigger(image_update_trigger, git_commit_trigger): - if git_commit_trigger.strip(): - return 'Git Commit' +def _get_build_trigger(image_update_trigger, git_source_trigger): + if git_source_trigger.strip(): + return git_source_trigger if image_update_trigger.strip(): return 'Image Update' return 'Manual' diff --git a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_params.py b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_params.py index 79071923a80..6bc305913d9 100644 --- a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_params.py +++ b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_params.py @@ -207,6 +207,7 @@ def load_arguments(self, _): # pylint: disable=too-many-statements # Source Trigger parameters c.argument('source_trigger_name', help="The name of the source trigger.") c.argument('commit_trigger_enabled', help="Indicates whether the source control commit trigger is enabled.", arg_type=get_three_state_flag()) + c.argument('pull_request_trigger_enabled', help="Indicates whether the source control pull request trigger is enabled.", arg_type=get_three_state_flag()) c.argument('git_access_token', help="The access token used to access the source control provider.") c.argument('branch', help="The source control branch name.") c.argument('base_image_trigger_name', help="The name of the base image trigger.") diff --git a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/task.py b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/task.py index 08886673f68..d84606eb982 100644 --- a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/task.py +++ b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/task.py @@ -66,6 +66,7 @@ def acr_task_create(cmd, # pylint: disable=too-many-locals values=None, source_trigger_name='defaultSourceTriggerName', commit_trigger_enabled=True, + pull_request_trigger_enabled=True, branch='master', no_push=False, no_cache=False, @@ -77,9 +78,9 @@ def acr_task_create(cmd, # pylint: disable=too-many-locals base_image_trigger_enabled=True, base_image_trigger_type='Runtime', resource_group_name=None): - if commit_trigger_enabled and not git_access_token: - raise CLIError("Commit trigger needs to be disabled [--commit-trigger-enabled False] " - "if no --git-access-token is provided.") + if (commit_trigger_enabled or pull_request_trigger_enabled) and not git_access_token: + raise CLIError("If source control trigger is enabled [--commit-trigger-enabled] or " + "[--pull-request-trigger-enabled] --git-access-token must be provided.") if file.endswith(ALLOWED_TASK_FILE_TYPES): step = FileTaskStep( @@ -106,7 +107,13 @@ def acr_task_create(cmd, # pylint: disable=too-many-locals source_control_type = SourceControlType.github.value source_triggers = None + source_trigger_events = [] if commit_trigger_enabled: + source_trigger_events.append(SourceTriggerEvent.commit.value) + if pull_request_trigger_enabled: + source_trigger_events.append(SourceTriggerEvent.pullrequest.value) + # if source_trigger_events contains any event types we assume they are enabled + if source_trigger_events: source_triggers = [ SourceTrigger( source_repository=SourceProperties( @@ -119,8 +126,8 @@ def acr_task_create(cmd, # pylint: disable=too-many-locals scope='repo' ) ), - source_trigger_events=[SourceTriggerEvent.commit.value], - status=TriggerStatus.enabled.value if commit_trigger_enabled else TriggerStatus.disabled.value, + source_trigger_events=source_trigger_events, + status=TriggerStatus.enabled.value, name=source_trigger_name ) ] @@ -205,6 +212,7 @@ def acr_task_update(cmd, # pylint: disable=too-many-locals timeout=None, context_path=None, commit_trigger_enabled=None, + pull_request_trigger_enabled=None, git_access_token=None, branch=None, image_names=None, @@ -282,10 +290,10 @@ def acr_task_update(cmd, # pylint: disable=too-many-locals if task.trigger: source_triggers = task.trigger.source_triggers base_image_trigger = task.trigger.base_image_trigger - if commit_trigger_enabled or source_triggers is not None: - status = None - if commit_trigger_enabled is not None: - status = TriggerStatus.enabled.value if commit_trigger_enabled else TriggerStatus.disabled.value + if (commit_trigger_enabled or pull_request_trigger_enabled) or source_triggers: + source_trigger_events = _get_trigger_event_list(source_triggers, + commit_trigger_enabled, + pull_request_trigger_enabled) source_trigger_update_params = [ SourceTriggerUpdateParameters( source_repository=SourceUpdateParameters( @@ -297,11 +305,12 @@ def acr_task_update(cmd, # pylint: disable=too-many-locals token_type=DEFAULT_TOKEN_TYPE ) ), - source_trigger_events=[SourceTriggerEvent.commit], - status=status, - name=source_triggers[0].name if source_triggers else "defaultBaseimageTriggerName" + source_trigger_events=source_trigger_events, + status=TriggerStatus.enabled.value if source_trigger_events else TriggerStatus.disabled.value, + name=source_triggers[0].name if source_triggers else "defaultSourceTriggerName" ) ] + if base_image_trigger_enabled or base_image_trigger is not None: status = None if base_image_trigger_enabled is not None: @@ -488,3 +497,27 @@ def _get_list_runs_message(base_message, task_name=None, image=None): if image: base_message = "{} for image '{}'".format(base_message, image) return "{}.".format(base_message) + + +def _get_trigger_event_list(source_triggers, + commit_trigger_enabled=None, + pull_request_trigger_enabled=None): + source_trigger_events = set() + # perform merge with server-side event list + if source_triggers: + source_trigger_events = set(source_triggers[0].source_trigger_events) + if source_triggers[0].status == TriggerStatus.disabled.value: + source_trigger_events.clear() + if commit_trigger_enabled is not None: + if commit_trigger_enabled: + source_trigger_events.add(SourceTriggerEvent.commit.value) + else: + if SourceTriggerEvent.commit.value in source_trigger_events: + source_trigger_events.remove(SourceTriggerEvent.commit.value) + if pull_request_trigger_enabled is not None: + if pull_request_trigger_enabled: + source_trigger_events.add(SourceTriggerEvent.pullrequest.value) + else: + if SourceTriggerEvent.pullrequest.value in source_trigger_events: + source_trigger_events.remove(SourceTriggerEvent.pullrequest.value) + return source_trigger_events diff --git a/src/command_modules/azure-cli-acr/setup.py b/src/command_modules/azure-cli-acr/setup.py index 01582c74e1b..0a321dfce23 100644 --- a/src/command_modules/azure-cli-acr/setup.py +++ b/src/command_modules/azure-cli-acr/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.1.7" +VERSION = "2.1.8" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', @@ -33,7 +33,7 @@ 'azure-cli-core', 'azure-mgmt-storage==2.0.0rc4', 'azure-storage-blob==1.3.1', - 'azure-mgmt-containerregistry==2.2.0', + 'azure-mgmt-containerregistry==2.3.0', ] with open('README.rst', 'r', encoding='utf-8') as f: diff --git a/src/command_modules/azure-cli-acs/HISTORY.rst b/src/command_modules/azure-cli-acs/HISTORY.rst index 73635ba3a2e..1202c145ac2 100644 --- a/src/command_modules/azure-cli-acs/HISTORY.rst +++ b/src/command_modules/azure-cli-acs/HISTORY.rst @@ -2,6 +2,21 @@ Release History =============== +2.3.10 +++++++ +* Minor fixes + +2.3.9 ++++++ +* Minor fixes + +2.3.8 ++++++ +* Minor fixes. + +2.3.7 ++++++ +* Minor fixes. 2.3.6 +++++ diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py index b75dc0aa7ad..f7e177f8016 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py @@ -31,7 +31,6 @@ from dateutil.relativedelta import relativedelta from knack.log import get_logger from knack.util import CLIError -from knack.prompting import prompt_y_n from msrestazure.azure_exceptions import CloudError import requests @@ -1165,9 +1164,9 @@ def create_application(client, display_name, homepage, identifier_uris, password_creds, key_creds = _build_application_creds(password, key_value, key_type, key_usage, start_date, end_date) - app_create_param = ApplicationCreateParameters(available_to_other_tenants, - display_name, - identifier_uris, + app_create_param = ApplicationCreateParameters(available_to_other_tenants=available_to_other_tenants, + display_name=display_name, + identifier_uris=identifier_uris, homepage=homepage, reply_urls=reply_urls, key_credentials=key_creds, @@ -1230,7 +1229,7 @@ def create_service_principal(cli_ctx, identifier, resolve_app=True, rbac_client= else: app_id = identifier - return rbac_client.service_principals.create(ServicePrincipalCreateParameters(app_id, True)) + return rbac_client.service_principals.create(ServicePrincipalCreateParameters(app_id=app_id, account_enabled=True)) def create_role_assignment(cli_ctx, role, assignee, resource_group_name=None, scope=None): @@ -1357,16 +1356,14 @@ def aks_browse(cmd, client, resource_group_name, name, disable_browser=False, li raise CLIError("Couldn't find the Kubernetes dashboard pod.") # launch kubectl port-forward locally to access the remote dashboard if in_cloud_console() and enable_cloud_console_aks_browse: - logger.warning('***WARNING***') - logger.warning('Browsing the kubernetes dashboard in Cloud Shell is an alpha feature.') - logger.warning('The browse URL is currently obfuscated but not authenticated.') - logger.warning('Do not share this URL.') - if not prompt_y_n('Proceed?'): - raise CLIError("Browse aborted.") # TODO: better error handling here. response = requests.post('http://localhost:8888/openport/8001') result = json.loads(response.text) - logger.warning('To view the console, please open % in a new tab', result['url']) + term_id = os.environ.get('ACC_TERM_ID') + if term_id: + response = requests.post('http://localhost:8888/openLink/{}'.format(term_id), + json={"url": result['url']}) + logger.warning('To view the console, please open %s in a new tab', result['url']) else: logger.warning('Proxy running on %s', proxy_url) @@ -1742,7 +1739,7 @@ def _update_addons(cmd, instance, subscription_id, resource_group_name, addons, def _get_azext_module(extension_name, module_name): try: # Adding the installed extension in the path - from azure.cli.core.extension import get_extension_path + from azure.cli.core.extensions import get_extension_path ext_dir = get_extension_path(extension_name) sys.path.append(ext_dir) # Import the extension module @@ -1788,18 +1785,18 @@ def _handle_addons_args(cmd, addons_str, subscription_id, resource_group_name, a def _install_dev_spaces_extension(extension_name): try: - from azure.cli.command_modules.extension import custom - custom.add_extension(extension_name=extension_name) + from azure.cli.core.extensions import operations + operations.add_extension(extension_name=extension_name) except Exception: # nopa pylint: disable=broad-except return False return True def _update_dev_spaces_extension(extension_name, extension_module): - from azure.cli.core.extension import ExtensionNotInstalledException + from azure.cli.core.extensions import ExtensionNotInstalledException try: - from azure.cli.command_modules.extension import custom - custom.update_extension(extension_name=extension_name) + from azure.cli.core.extensions import operations + operations.update_extension(extension_name=extension_name) # reloading the imported module to update try: @@ -1820,7 +1817,7 @@ def _update_dev_spaces_extension(extension_name, extension_module): def _get_or_add_extension(extension_name, extension_module, update=False): - from azure.cli.core.extension import (ExtensionNotInstalledException, get_extension) + from azure.cli.core.extensions import (ExtensionNotInstalledException, get_extension) try: get_extension(extension_name) if update: diff --git a/src/command_modules/azure-cli-acs/setup.py b/src/command_modules/azure-cli-acs/setup.py index 2804ff2eafe..3aaa6ed8eaa 100644 --- a/src/command_modules/azure-cli-acs/setup.py +++ b/src/command_modules/azure-cli-acs/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.3.6" +VERSION = "2.3.10" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -31,9 +31,9 @@ DEPENDENCIES = [ 'azure-mgmt-authorization==0.50.0', - 'azure-mgmt-compute==4.3.0', + 'azure-mgmt-compute==4.3.1', 'azure-mgmt-containerservice==4.2.2', - 'azure-graphrbac==0.40.0', + 'azure-graphrbac==0.51.1', 'azure-cli-core', 'paramiko>=2.0.8', 'pyyaml>=3.13', diff --git a/src/command_modules/azure-cli-advisor/HISTORY.rst b/src/command_modules/azure-cli-advisor/HISTORY.rst index a0da7a4d05d..889e74614de 100644 --- a/src/command_modules/azure-cli-advisor/HISTORY.rst +++ b/src/command_modules/azure-cli-advisor/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +2.0.0 +++++++ +* GA release. + 0.6.0 +++++ * BREAKING CHANGE: 'show' commands log error message and fail with exit code of 3 upon a missing resource. diff --git a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml index 70cdb9ec6bb..93df0e0a39f 100644 --- a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml +++ b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml @@ -1,26 +1,27 @@ interactions: - request: - body: '{"location": "westus", "tags": {"use": "az-test"}}' + body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", + "date": "2018-10-16T16:36:01Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] CommandName: [group create] Connection: [keep-alive] - Content-Length: ['50'] + Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_advisor000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001","name":"cli_test_advisor000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001","name":"cli_test_advisor000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-16T16:36:01Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] - content-length: ['328'] + content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:25:54 GMT'] + date: ['Tue, 16 Oct 2018 16:36:02 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -34,9 +35,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -46,7 +46,7 @@ interactions: cache-control: [no-cache] content-length: ['514'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:25:56 GMT'] + date: ['Tue, 16 Oct 2018 16:36:03 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -54,7 +54,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests: ['599'] + x-ms-ratelimit-remaining-subscription-resource-requests: ['598'] status: {code: 200, message: OK} - request: body: null @@ -63,9 +63,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration update] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -75,7 +74,7 @@ interactions: cache-control: [no-cache] content-length: ['514'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:25:57 GMT'] + date: ['Tue, 16 Oct 2018 16:36:04 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -96,8 +95,8 @@ interactions: Connection: [keep-alive] Content-Length: ['509'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -105,7 +104,7 @@ interactions: body: {string: ''} headers: cache-control: [no-cache] - date: ['Mon, 26 Feb 2018 21:25:58 GMT'] + date: ['Tue, 16 Oct 2018 16:36:05 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -120,9 +119,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -132,7 +130,7 @@ interactions: cache-control: [no-cache] content-length: ['513'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:25:59 GMT'] + date: ['Tue, 16 Oct 2018 16:36:05 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -149,9 +147,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration update] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -161,7 +158,7 @@ interactions: cache-control: [no-cache] content-length: ['513'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:00 GMT'] + date: ['Tue, 16 Oct 2018 16:36:05 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -182,8 +179,8 @@ interactions: Connection: [keep-alive] Content-Length: ['510'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -191,7 +188,7 @@ interactions: body: {string: ''} headers: cache-control: [no-cache] - date: ['Mon, 26 Feb 2018 21:26:01 GMT'] + date: ['Tue, 16 Oct 2018 16:36:07 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -206,9 +203,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -218,7 +214,7 @@ interactions: cache-control: [no-cache] content-length: ['514'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:03 GMT'] + date: ['Tue, 16 Oct 2018 16:36:07 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -237,9 +233,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_advisor000001?api-version=2018-05-01 @@ -248,12 +244,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Mon, 26 Feb 2018 21:26:04 GMT'] + date: ['Tue, 16 Oct 2018 16:36:08 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURWSVNPUjZXNlJCTUJUQklYQTZYTDZETkw1RzRXR0dKNnxFMURERDhBMUE3Q0I1N0M1LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURWSVNPUkUyMkg0NU5WSVJXU05KVFJXVzRWREFHR1pQQXw3RjExMzQxMkZBNTM4MzQwLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml index 7a4022fcb05..12a23c37ece 100644 --- a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml +++ b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml @@ -6,19 +6,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 response: - body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","properties":{"exclude":false}}]}'} + body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","properties":{"exclude":false}}]}'} headers: cache-control: [no-cache] content-length: ['798'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:06 GMT'] + date: ['Tue, 16 Oct 2018 16:36:09 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -35,19 +34,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration update] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 response: - body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","properties":{"exclude":false}}]}'} + body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","properties":{"exclude":false}}]}'} headers: cache-control: [no-cache] content-length: ['798'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:07 GMT'] + date: ['Tue, 16 Oct 2018 16:36:10 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -68,8 +66,8 @@ interactions: Connection: [keep-alive] Content-Length: ['293'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -77,7 +75,7 @@ interactions: body: {string: ''} headers: cache-control: [no-cache] - date: ['Mon, 26 Feb 2018 21:26:08 GMT'] + date: ['Tue, 16 Oct 2018 16:36:11 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -92,9 +90,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -104,7 +101,7 @@ interactions: cache-control: [no-cache] content-length: ['295'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:09 GMT'] + date: ['Tue, 16 Oct 2018 16:36:12 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -112,7 +109,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests: ['599'] + x-ms-ratelimit-remaining-subscription-resource-requests: ['598'] status: {code: 200, message: OK} - request: body: null @@ -121,9 +118,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration update] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -133,7 +129,7 @@ interactions: cache-control: [no-cache] content-length: ['295'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:10 GMT'] + date: ['Tue, 16 Oct 2018 16:36:13 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -154,8 +150,8 @@ interactions: Connection: [keep-alive] Content-Length: ['293'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -163,7 +159,7 @@ interactions: body: {string: ''} headers: cache-control: [no-cache] - date: ['Mon, 26 Feb 2018 21:26:10 GMT'] + date: ['Tue, 16 Oct 2018 16:36:13 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -178,9 +174,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration show] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -190,7 +185,7 @@ interactions: cache-control: [no-cache] content-length: ['295'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:12 GMT'] + date: ['Tue, 16 Oct 2018 16:36:15 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -198,7 +193,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests: ['598'] + x-ms-ratelimit-remaining-subscription-resource-requests: ['599'] status: {code: 200, message: OK} - request: body: null @@ -207,9 +202,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [advisor configuration list] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18 - msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29] + User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1 + msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19 @@ -219,7 +213,7 @@ interactions: cache-control: [no-cache] content-length: ['295'] content-type: [application/json; charset=utf-8] - date: ['Mon, 26 Feb 2018 21:26:11 GMT'] + date: ['Tue, 16 Oct 2018 16:36:15 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -227,6 +221,6 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests: ['599'] + x-ms-ratelimit-remaining-subscription-resource-requests: ['598'] status: {code: 200, message: OK} version: 1 diff --git a/src/command_modules/azure-cli-advisor/setup.py b/src/command_modules/azure-cli-advisor/setup.py index 47d353a70d0..a6f8fd45a7b 100644 --- a/src/command_modules/azure-cli-advisor/setup.py +++ b/src/command_modules/azure-cli-advisor/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.6.0" +VERSION = "2.0.0" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -33,7 +33,7 @@ DEPENDENCIES = [ 'azure-cli-core', - 'azure-mgmt-advisor==1.0.1' + 'azure-mgmt-advisor==2.0.1' ] with open('README.rst', 'r', encoding='utf-8') as f: diff --git a/src/command_modules/azure-cli-ams/HISTORY.rst b/src/command_modules/azure-cli-ams/HISTORY.rst index 891e698ec7f..7149646e544 100644 --- a/src/command_modules/azure-cli-ams/HISTORY.rst +++ b/src/command_modules/azure-cli-ams/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.2.4 ++++++ +* Minor changes 0.2.3 +++++ diff --git a/src/command_modules/azure-cli-ams/azure/cli/command_modules/ams/operations/sp.py b/src/command_modules/azure-cli-ams/azure/cli/command_modules/ams/operations/sp.py index 4357fab5fef..b80e6320164 100644 --- a/src/command_modules/azure-cli-ams/azure/cli/command_modules/ams/operations/sp.py +++ b/src/command_modules/azure-cli-ams/azure/cli/command_modules/ams/operations/sp.py @@ -98,9 +98,9 @@ def _update_password_credentials(client, app_object_id, sp_password, years): def _get_displayable_name(graph_object): - if graph_object.user_principal_name: + if getattr(graph_object, 'user_principal_name', None): return graph_object.user_principal_name - elif graph_object.service_principal_names: + elif getattr(graph_object, 'service_principal_names', None): return graph_object.service_principal_names[0] return graph_object.display_name or '' @@ -217,7 +217,8 @@ def _create_service_principal( # retry till server replication is done for l in range(0, _RETRY_TIMES): try: - aad_sp = graph_client.service_principals.create(ServicePrincipalCreateParameters(app_id, True)) + aad_sp = graph_client.service_principals.create(ServicePrincipalCreateParameters(app_id=app_id, + account_enabled=True)) break except Exception as ex: # pylint: disable=broad-except if l < _RETRY_TIMES and ( @@ -237,9 +238,9 @@ def create_application(client, display_name, homepage, years, password, identifi available_to_other_tenants=False, reply_urls=None): password_credential = _build_password_credential(password, years) - app_create_param = ApplicationCreateParameters(available_to_other_tenants, - display_name, - identifier_uris, + app_create_param = ApplicationCreateParameters(available_to_other_tenants=available_to_other_tenants, + display_name=display_name, + identifier_uris=identifier_uris, homepage=homepage, reply_urls=reply_urls, password_credentials=[password_credential]) diff --git a/src/command_modules/azure-cli-ams/setup.py b/src/command_modules/azure-cli-ams/setup.py index 233f025d689..8de2355a4cd 100644 --- a/src/command_modules/azure-cli-ams/setup.py +++ b/src/command_modules/azure-cli-ams/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.2.3" +VERSION = "0.2.4" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -34,7 +34,7 @@ DEPENDENCIES = [ 'azure-cli-core', 'azure-mgmt-media==1.0.0rc1', - 'azure-graphrbac==0.40.0' + 'azure-graphrbac==0.51.1' ] with open('README.rst', 'r', encoding='utf-8') as f: diff --git a/src/command_modules/azure-cli-appservice/HISTORY.rst b/src/command_modules/azure-cli-appservice/HISTORY.rst index e08af786b2b..567dcbcfe03 100644 --- a/src/command_modules/azure-cli-appservice/HISTORY.rst +++ b/src/command_modules/azure-cli-appservice/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +0.2.6 ++++++ +* update ACR SDK + 0.2.5 +++++ * az functionapp create supports creating a linux consumption plan type with a specific runtime diff --git a/src/command_modules/azure-cli-appservice/setup.py b/src/command_modules/azure-cli-appservice/setup.py index cd3b717c305..ddcc8c083f6 100644 --- a/src/command_modules/azure-cli-appservice/setup.py +++ b/src/command_modules/azure-cli-appservice/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.2.5" +VERSION = "0.2.6" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', @@ -33,7 +33,7 @@ 'azure-cli-core', 'azure-mgmt-web==0.40.0', 'azure-mgmt-storage==2.0.0rc4', - 'azure-mgmt-containerregistry==2.2.0', + 'azure-mgmt-containerregistry==2.3.0', # v1.17 breaks on wildcard cert https://github.com/shazow/urllib3/issues/981 'urllib3[secure]>=1.18', 'xmltodict', diff --git a/src/command_modules/azure-cli-container/HISTORY.rst b/src/command_modules/azure-cli-container/HISTORY.rst index ca2b0155288..9fcccf9a096 100644 --- a/src/command_modules/azure-cli-container/HISTORY.rst +++ b/src/command_modules/azure-cli-container/HISTORY.rst @@ -3,9 +3,16 @@ Release History =============== +0.3.7 ++++++ +* Make 'Private' a valid type to pass to '--ip-address' +* Allow using only subnet ID to setup a virtual network for the container group +* Allow using vnet name or resource id to enable using vnets from different resource groups + 0.3.6 +++++ * Add '--assign-identity' for adding a MSI identity to a container group +* Add '--scope' to create a role assignment for the system assigned MSI identity * Show warning when creating a container group with an image without a long running process * Fix table output issues for 'list' and 'show' commands diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_client_factory.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_client_factory.py index c5a7b617cc4..fe0a2d28d16 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_client_factory.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_client_factory.py @@ -34,6 +34,19 @@ def cf_resource(cli_ctx): return get_mgmt_service_client(cli_ctx, ResourceManagementClient) +def get_auth_management_client(cli_ctx, scope=None, **_): + import re + from azure.cli.core.profiles import ResourceType + from azure.cli.core.commands.client_factory import get_mgmt_service_client + + subscription_id = None + if scope: + matched = re.match('/subscriptions/(?P[^/]*)/', scope) + if matched: + subscription_id = matched.groupdict()['subscription'] + return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_AUTHORIZATION, subscription_id=subscription_id) + + def cf_network(cli_ctx): from azure.mgmt.network import NetworkManagementClient from azure.cli.core.commands.client_factory import get_mgmt_service_client diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_help.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_help.py index c2996981eac..39adb6b26dd 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_help.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_help.py @@ -41,6 +41,8 @@ text: az container create -g MyResourceGroup --name myapp --log-analytics-workspace myworkspace - name: Create a container group with a system assigned identity. text: az container create -g MyResourceGroup --name myapp --image myimage:latest --assign-identity + - name: Create a container group with a system assigned identity. The group will have a 'Contributor' role with access to a storage account. + text: az container create -g MyResourceGroup --name myapp --image myimage:latest --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1 - name: Create a container group with a user assigned identity. text: az container create -g MyResourceGroup --name myapp --image myimage:latest --assign-identity /subscriptions/mySubscrpitionId/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID - name: Create a container group with both system and user assigned identity. diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_params.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_params.py index a881f2c1b30..2f7db97557a 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_params.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_params.py @@ -11,12 +11,12 @@ from azure.cli.core.commands.validators import get_default_location_from_resource_group from azure.mgmt.containerinstance.models import ( ContainerGroupRestartPolicy, OperatingSystemTypes, ContainerNetworkProtocol) -from ._validators import (validate_volume_mount_path, validate_secrets, validate_subnet, +from ._validators import (validate_volume_mount_path, validate_secrets, validate_subnet, validate_msi, validate_gitrepo_directory, validate_network_profile, validate_image) # pylint: disable=line-too-long -IP_ADDRESS_TYPES = ['Public'] +IP_ADDRESS_TYPES = ['Public', 'Private'] def _environment_variables_type(value): @@ -78,11 +78,18 @@ def load_arguments(self, _): c.argument('secrets', secrets_type) c.argument('secrets_mount_path', validator=validate_volume_mount_path, help="The path within the container where the secrets volume should be mounted. Must not contain colon ':'.") c.argument('file', options_list=['--file', '-f'], help="The path to the input file.") - c.argument('assign_identity', nargs='*', arg_group='Managed Service Identity', help="Space-separated list of assigned identities. Assigned identities are either user assigned identities (resource IDs) and / or the system assigned identity ('[system]'). See examples for more info.") + + with self.argument_context('container create', arg_group='Managed Service Identity') as c: + c.argument('assign_identity', nargs='*', validator=validate_msi, help="Space-separated list of assigned identities. Assigned identities are either user assigned identities (resource IDs) and / or the system assigned identity ('[system]'). See examples for more info.") + c.argument('identity_scope', options_list=['--scope'], help="Scope that the system assigned identity can access") + c.argument('identity_role', options_list=['--role'], help="Role name or id the system assigned identity will have") + c.ignore('identity_role_id') with self.argument_context('container create', arg_group='Network') as c: c.argument('network_profile', network_profile_type) - c.argument('vnet_name', help='The name of the VNET when creating a new one or referencing an existing one.') + c.argument('vnet', help='The name of the VNET when creating a new one or referencing an existing one. Can also reference an existing vnet by ID. This allows using vnets from other resource groups.') + c.argument('vnet_name', help='The name of the VNET when creating a new one or referencing an existing one.', + deprecate_info=c.deprecate(redirect="--vnet", hide="0.3.5")) c.argument('vnet_address_prefix', help='The IP address prefix to use when creating a new VNET in CIDR format.') c.argument('subnet', options_list=['--subnet'], validator=validate_subnet, help='The name of the subnet when creating a new VNET or referencing an existing one. Can also reference an existing subnet by ID.') c.argument('subnet_address_prefix', help='The subnet IP address prefix to use when creating a new VNET in CIDR format.') diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_validators.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_validators.py index 1849a4a325e..17fd63d586a 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_validators.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/_validators.py @@ -43,18 +43,71 @@ def validate_gitrepo_directory(ns): def validate_image(ns): - if ns.image.split(':')[0] in short_running_images and not ns.command_line: + if ns.image and ns.image.split(':')[0] in short_running_images and not ns.command_line: logger.warning('Image "%s" has no long running process. The "--command-line" argument must be used to start a ' 'long running process inside the container for the container group to stay running. ' - 'Ex: /bin/bash', + 'Ex: "tail -f /dev/null" ' + 'For more imformation visit https://aka.ms/aci/troubleshoot', ns.image) +def validate_msi(cmd, namespace): + MSI_LOCAL_ID = '[system]' + if namespace.assign_identity is not None: + identities = namespace.assign_identity or [] + if not namespace.identity_scope and getattr(namespace.identity_role, 'is_default', None) is None: + raise CLIError("usage error: '--role {}' is not applicable as the '--scope' is not provided".format( + namespace.identity_role)) + + if namespace.identity_scope: + if identities and MSI_LOCAL_ID not in identities: + raise CLIError("usage error: '--scope'/'--role' is only applicable when assign system identity") + # keep 'identity_role' for output as logical name is more readable + setattr(namespace, 'identity_role_id', _resolve_role_id(cmd.cli_ctx, namespace.identity_role, + namespace.identity_scope)) + elif namespace.identity_scope or getattr(namespace.identity_role, 'is_default', None) is None: + raise CLIError('usage error: --assign-identity [--scope SCOPE] [--role ROLE]') + + +def _resolve_role_id(cli_ctx, role, scope): + import re + import uuid + from azure.cli.core.commands.client_factory import get_mgmt_service_client + from azure.cli.core.profiles import ResourceType + + client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_AUTHORIZATION).role_definitions + role_id = None + if re.match(r'/subscriptions/.+/providers/Microsoft.Authorization/roleDefinitions/', + role, re.I): + role_id = role + else: + try: + uuid.UUID(role) + role_id = '/subscriptions/{}/providers/Microsoft.Authorization/roleDefinitions/{}'.format( + client.config.subscription_id, role) + except ValueError: + pass + if not role_id: # retrieve role id + role_defs = list(client.list(scope, "roleName eq '{}'".format(role))) + if not role_defs: + raise CLIError("Role '{}' doesn't exist.".format(role)) + elif len(role_defs) > 1: + ids = [r.id for r in role_defs] + err = "More than one role matches the given name '{}'. Please pick an id from '{}'" + raise CLIError(err.format(role, ids)) + role_id = role_defs[0].id + return role_id + + def validate_subnet(ns): from msrestazure.tools import is_valid_resource_id - if not is_valid_resource_id(ns.subnet) and ((ns.vnet_name and not ns.subnet) or (ns.subnet and not ns.vnet_name)): - raise CLIError('usage error: --vnet-name NAME --subnet NAME | --subnet ID') + # vnet_name is depricated, using for backwards compatability + if ns.vnet_name and not ns.vnet: + ns.vnet = ns.vnet_name + + if not is_valid_resource_id(ns.subnet) and ((ns.vnet and not ns.subnet) or (ns.subnet and not ns.vnet)): + raise CLIError('usage error: --vnet NAME --subnet NAME | --vnet ID --subnet NAME | --subnet ID') def validate_network_profile(cmd, ns): diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/custom.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/custom.py index 1ca3cf857fd..7f98d99955e 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/custom.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/custom.py @@ -35,8 +35,8 @@ GitRepoVolume, LogAnalytics, ContainerGroupDiagnostics, ContainerGroupNetworkProfile, ContainerGroupIpAddressType, ResourceIdentityType, ContainerGroupIdentity) from azure.cli.core.util import sdk_no_wait -from ._client_factory import cf_container_groups, cf_container, cf_log_analytics, cf_resource, cf_network - +from ._client_factory import (cf_container_groups, cf_container, cf_log_analytics, cf_resource, + cf_network, get_auth_management_client) logger = get_logger(__name__) WINDOWS_NAME = 'Windows' @@ -91,6 +91,7 @@ def create_container(cmd, azure_file_volume_mount_path=None, log_analytics_workspace=None, log_analytics_workspace_key=None, + vnet=None, vnet_name=None, vnet_address_prefix='10.0.0.0/16', subnet=None, @@ -104,6 +105,9 @@ def create_container(cmd, secrets_mount_path=None, file=None, assign_identity=None, + identity_scope=None, + identity_role='Contributor', + identity_role_id=None, no_wait=False): """Create a container group. """ if file: @@ -183,8 +187,8 @@ def create_container(cmd, identity = _build_identities_info(assign_identity) # Set up VNET, subnet and network profile if needed - if subnet and vnet_name and not network_profile: - network_profile = _get_vnet_network_profile(cmd, location, resource_group_name, vnet_name, vnet_address_prefix, subnet, subnet_address_prefix) + if subnet and not network_profile: + network_profile = _get_vnet_network_profile(cmd, location, resource_group_name, vnet, vnet_address_prefix, subnet, subnet_address_prefix) cg_network_profile = None if network_profile: @@ -214,7 +218,15 @@ def create_container(cmd, tags=tags) container_group_client = cf_container_groups(cmd.cli_ctx) - return sdk_no_wait(no_wait, container_group_client.create_or_update, resource_group_name, name, cgroup) + + lro = sdk_no_wait(no_wait, container_group_client.create_or_update, resource_group_name, + name, cgroup) + + if assign_identity is not None and identity_scope: + cg = container_group_client.get(resource_group_name, name) + _create_update_msi_role_assignment(cmd, resource_group_name, name, cg.identity.principal_id, + identity_role_id, identity_scope) + return lro def _build_identities_info(identities): @@ -233,6 +245,25 @@ def _build_identities_info(identities): return identity +def _create_update_msi_role_assignment(cmd, resource_group_name, cg_name, identity_principle_id, + role_definition_id, identity_scope): + from azure.cli.core.profiles import ResourceType, get_sdk + + RoleAssignmentCreateParameters = get_sdk(cmd.cli_ctx, ResourceType.MGMT_AUTHORIZATION, + 'RoleAssignmentCreateParameters', + mod='models', operation_group='role_assignments') + + assignment_client = get_auth_management_client(cmd.cli_ctx, identity_scope).role_assignments + + role_assignment_guid = str(_gen_guid()) + + create_params = RoleAssignmentCreateParameters( + role_definition_id=role_definition_id, + principal_id=identity_principle_id + ) + return assignment_client.create(identity_scope, role_assignment_guid, create_params, custom_headers=None) + + def _get_resource(client, resource_group_name, *subresources): from msrestazure.azure_exceptions import CloudError try: @@ -245,51 +276,63 @@ def _get_resource(client, resource_group_name, *subresources): raise -def _get_vnet_network_profile(cmd, location, resource_group_name, vnet_name, vnet_address_prefix, subnet, subnet_address_prefix): +def _get_vnet_network_profile(cmd, location, resource_group_name, vnet, vnet_address_prefix, subnet, subnet_address_prefix): from azure.cli.core.profiles import ResourceType from msrestazure.tools import parse_resource_id, is_valid_resource_id - containerInstanceDelegationServiceName = "Microsoft.ContainerInstance/containerGroups" + aci_delegation_service_name = "Microsoft.ContainerInstance/containerGroups" Delegation = cmd.get_models('Delegation', resource_type=ResourceType.MGMT_NETWORK) aci_delegation = Delegation( - name="Microsoft.ContainerInstance.containerGroups", - service_name="Microsoft.ContainerInstance/containerGroups" + name=aci_delegation_service_name, + service_name=aci_delegation_service_name ) ncf = cf_network(cmd.cli_ctx) + vnet_name = vnet subnet_name = subnet if is_valid_resource_id(subnet): parsed_subnet_id = parse_resource_id(subnet) subnet_name = parsed_subnet_id['resource_name'] vnet_name = parsed_subnet_id['name'] + resource_group_name = parsed_subnet_id['resource_group'] + elif is_valid_resource_id(vnet): + parsed_vnet_id = parse_resource_id(vnet) + vnet_name = parsed_vnet_id['resource_name'] + resource_group_name = parsed_vnet_id['resource_group'] default_network_profile_name = "aci-network-profile-{}-{}".format(vnet_name, subnet_name) subnet = _get_resource(ncf.subnets, resource_group_name, vnet_name, subnet_name) # For an existing subnet, validate and add delegation if needed if subnet: - for endpoint in (subnet.service_endpoints or []): - if endpoint.service != "Microsoft.ContainerInstance": - raise CLIError("Can not use subnet with existing service links other than 'Microsoft.ContainerInstance'.") + logger.info('Using existing subnet "%s" in resource group "%s"', subnet.name, resource_group_name) + for sal in (subnet.service_association_links or []): + if sal.linked_resource_type != aci_delegation_service_name: + raise CLIError("Can not use subnet with existing service association links other than {}.".format(aci_delegation_service_name)) if not subnet.delegations: + logger.info('Adding ACI delegation to the existing subnet.') subnet.delegations = [aci_delegation] + subnet = ncf.subnets.create_or_update(resource_group_name, vnet_name, subnet_name, subnet).result() else: for delegation in subnet.delegations: - if delegation.service_name != containerInstanceDelegationServiceName: - raise CLIError("Can not use subnet with existing delegations other than {}".format(containerInstanceDelegationServiceName)) + if delegation.service_name != aci_delegation_service_name: + raise CLIError("Can not use subnet with existing delegations other than {}".format(aci_delegation_service_name)) network_profile = _get_resource(ncf.network_profiles, resource_group_name, default_network_profile_name) if network_profile: + logger.info('Using existing network profile "%s"', default_network_profile_name) return network_profile.id # Create new subnet and Vnet if not exists else: Subnet, VirtualNetwork, AddressSpace = cmd.get_models('Subnet', 'VirtualNetwork', 'AddressSpace', resource_type=ResourceType.MGMT_NETWORK) + vnet = _get_resource(ncf.virtual_networks, resource_group_name, vnet_name) if not vnet: + logger.info('Creating new vnet "%s" in resource group "%s"', vnet_name, resource_group_name) ncf.virtual_networks.create_or_update(resource_group_name, vnet_name, VirtualNetwork(name=vnet_name, @@ -301,13 +344,13 @@ def _get_vnet_network_profile(cmd, location, resource_group_name, vnet_name, vne address_prefix=subnet_address_prefix, delegations=[aci_delegation]) + logger.info('Creating new subnet "%s" in resource group "%s"', subnet_name, resource_group_name) subnet = ncf.subnets.create_or_update(resource_group_name, vnet_name, subnet_name, subnet).result() NetworkProfile, ContainerNetworkInterfaceConfiguration, IPConfigurationProfile = cmd.get_models('NetworkProfile', 'ContainerNetworkInterfaceConfiguration', 'IPConfigurationProfile', resource_type=ResourceType.MGMT_NETWORK) - # In all cases, create the network profile with aci NIC network_profile = NetworkProfile( name=default_network_profile_name, @@ -321,6 +364,7 @@ def _get_vnet_network_profile(cmd, location, resource_group_name, vnet_name, vne )] ) + logger.info('Creating network profile "%s" in resource group "%s"', default_network_profile_name, resource_group_name) network_profile = ncf.network_profiles.create_or_update(resource_group_name, default_network_profile_name, network_profile).result() return network_profile.id @@ -787,3 +831,8 @@ def _move_console_cursor_up(lines): if lines > 0: # Use stdout.write to support Python 2 sys.stdout.write('\033[{}A\033[K\033[J'.format(lines)) + + +def _gen_guid(): + import uuid + return uuid.uuid4() diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create.yaml index 14be2df516c..b33a932ece0 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create.yaml +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-10-09T22:14:20Z"}}' + "date": "2018-10-18T00:14:09Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -11,22 +11,22 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:14:20Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:14:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:14:22 GMT'] + date: ['Thu, 18 Oct 2018 00:14:13 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1197'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 201, message: Created} - request: body: null @@ -38,17 +38,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:14:20Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:14:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:14:23 GMT'] + date: ['Thu, 18 Oct 2018 00:14:13 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -75,26 +75,26 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","command":["/bin/sh","-c","while - true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.1.58","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"state":"Pending"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"instanceView":{"restartCount":0,"currentState":{"state":"Waiting","detailStatus":"ContainerCreating"}},"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.53.223","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"state":"Pending"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/be7b8039-7e65-41b3-9a12-727389c9114b?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/b3ab9b00-2f70-4988-a18b-fbe8e4737277?api-version=2018-06-01'] cache-control: [no-cache] - content-length: ['1152'] + content-length: ['1258'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:14:29 GMT'] + date: ['Thu, 18 Oct 2018 00:14:18 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['84'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['97'] - x-ms-ratelimit-remaining-subscription-writes: ['1196'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['86'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['99'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 201, message: Created} - request: body: null @@ -105,20 +105,20 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/be7b8039-7e65-41b3-9a12-727389c9114b?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/b3ab9b00-2f70-4988-a18b-fbe8e4737277?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-09T22:14:28.8640828Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-09T22:14:33Z","lastTimestamp":"2018-10-09T22:14:33Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Created","message":"Created - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:36Z","lastTimestamp":"2018-10-09T22:14:36Z","name":"Started","message":"Started - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"}]}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-18T00:14:18.048917Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-18T00:14:20Z","lastTimestamp":"2018-10-18T00:14:20Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Created","message":"Created + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Started","message":"Started + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"}]}}'} headers: cache-control: [no-cache] - content-length: ['1113'] + content-length: ['1112'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:14:59 GMT'] + date: ['Thu, 18 Oct 2018 00:14:48 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -135,21 +135,21 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","command":["/bin/sh","-c","while - true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:14:36Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:14:33Z","lastTimestamp":"2018-10-09T22:14:33Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Created","message":"Created - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:36Z","lastTimestamp":"2018-10-09T22:14:36Z","name":"Started","message":"Started - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.1.58","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:14:22Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:14:20Z","lastTimestamp":"2018-10-18T00:14:20Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Created","message":"Created + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Started","message":"Started + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.53.223","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] - content-length: ['2100'] + content-length: ['2102'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:14:59 GMT'] + date: ['Thu, 18 Oct 2018 00:14:49 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -166,22 +166,22 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","command":["/bin/sh","-c","while - true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:14:36Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:14:33Z","lastTimestamp":"2018-10-09T22:14:33Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:35Z","lastTimestamp":"2018-10-09T22:14:35Z","name":"Created","message":"Created - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:14:36Z","lastTimestamp":"2018-10-09T22:14:36Z","name":"Started","message":"Started - container with id f9a108b6f245ea37f8e39d526062d43b5ae618ec2733af4e1f3f9ffc4fdc0c45","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.1.58","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:14:22Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:14:20Z","lastTimestamp":"2018-10-18T00:14:20Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Created","message":"Created + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:14:22Z","lastTimestamp":"2018-10-18T00:14:22Z","name":"Started","message":"Started + container with id 4803e8035713583eca044ffef3e90d7fb3fe54b48d59151186d3cd3934c9987c","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.53.223","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] - content-length: ['2100'] + content-length: ['2102'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:01 GMT'] + date: ['Thu, 18 Oct 2018 00:14:50 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -198,18 +198,18 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups?api-version=2018-10-01 response: body: {string: '{"value":[{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","command":["/bin/sh","-c","while - true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.1.58","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}]},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}]}'} + true; do echo hello; sleep 20; done"],"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"environmentVariables":[{"name":"KEY1","value":"VALUE1"},{"name":"KEY2","value":"FOO=BAR="}],"resources":{"requests":{"memoryInGB":1.0,"cpu":1.0}},"volumeMounts":[{"name":"secrets","mountPath":"/s"}]}}],"restartPolicy":"Never","ipAddress":{"ports":[{"protocol":"TCP","port":8000},{"protocol":"TCP","port":8001}],"ip":"40.78.53.223","type":"Public","dnsNameLabel":"clicontainer000002","fqdn":"clicontainer000002.westus.azurecontainer.io"},"osType":"Linux","volumes":[{"name":"secrets","secret":{}}]},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}]}'} headers: cache-control: [no-cache] - content-length: ['1131'] + content-length: ['1133'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:01 GMT'] + date: ['Thu, 18 Oct 2018 00:14:50 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -228,7 +228,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -237,9 +237,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 09 Oct 2018 22:15:02 GMT'] + date: ['Thu, 18 Oct 2018 00:14:52 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdXVlBMUkpFUDI1RDJXQ1pRSkxaSFlFS05URUVLTlU1TUpRR3xGNzY0NDU1OEZEOTY3NTk0LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdUQ1E3QkZNRklJSTRFQkNFWUFQUDZHWlVLS0w0R1ZXNFc2N3xBQjdDNEYzRDA4RUUzNDY3LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_acr.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_acr.yaml index 7382beb0ded..08092c3f5dd 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_acr.yaml +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_acr.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-10-09T22:15:02Z"}}' + "date": "2018-10-18T00:14:52Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -11,17 +11,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:02Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:14:52Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:04 GMT'] + date: ['Thu, 18 Oct 2018 00:14:53 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -38,17 +38,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:02Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:14:52Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:03 GMT'] + date: ['Thu, 18 Oct 2018 00:14:53 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -70,24 +70,24 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"clitestregistry1.azurecr.io/nginx:latest","ports":[],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"imageRegistryCredentials":[{"server":"clitestregistry1.azurecr.io","username":"clitestregistry1"}],"restartPolicy":"Always","osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/d3e43779-bbaa-4586-aa1c-030aff0692f5?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/70b208c3-7bca-4591-b9a3-855fa2b4d2e8?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['780'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:06 GMT'] + date: ['Thu, 18 Oct 2018 00:15:00 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['81'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['97'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['85'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['98'] x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: @@ -99,20 +99,46 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/d3e43779-bbaa-4586-aa1c-030aff0692f5?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/70b208c3-7bca-4591-b9a3-855fa2b4d2e8?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-09T22:15:06.7773437Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-09T22:15:11Z","lastTimestamp":"2018-10-09T22:15:11Z","name":"Pulling","message":"pulling - image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Pulled","message":"Successfully - pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Created","message":"Created - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Started","message":"Started - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"}]}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Pending","startTime":"2018-10-18T00:15:01.0060422Z","properties":{"events":[]}}'} + headers: + cache-control: [no-cache] + content-length: ['311'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:15:31 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/70b208c3-7bca-4591-b9a3-855fa2b4d2e8?api-version=2018-06-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-18T00:15:01.0060422Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-18T00:15:18Z","lastTimestamp":"2018-10-18T00:15:18Z","name":"Pulling","message":"pulling + image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:27Z","lastTimestamp":"2018-10-18T00:15:27Z","name":"Pulled","message":"Successfully + pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:28Z","lastTimestamp":"2018-10-18T00:15:28Z","name":"Created","message":"Created + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:29Z","lastTimestamp":"2018-10-18T00:15:29Z","name":"Started","message":"Started + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"}]}}'} headers: cache-control: [no-cache] content-length: ['1167'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:36 GMT'] + date: ['Thu, 18 Oct 2018 00:16:01 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -129,20 +155,20 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"clitestregistry1.azurecr.io/nginx:latest","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:15:21Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:15:11Z","lastTimestamp":"2018-10-09T22:15:11Z","name":"Pulling","message":"pulling - image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Pulled","message":"Successfully - pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Created","message":"Created - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Started","message":"Started - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"imageRegistryCredentials":[{"server":"clitestregistry1.azurecr.io","username":"clitestregistry1"}],"restartPolicy":"Always","osType":"Linux","instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"clitestregistry1.azurecr.io/nginx:latest","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:15:28Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:15:18Z","lastTimestamp":"2018-10-18T00:15:18Z","name":"Pulling","message":"pulling + image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:27Z","lastTimestamp":"2018-10-18T00:15:27Z","name":"Pulled","message":"Successfully + pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:28Z","lastTimestamp":"2018-10-18T00:15:28Z","name":"Created","message":"Created + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:29Z","lastTimestamp":"2018-10-18T00:15:29Z","name":"Started","message":"Started + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"imageRegistryCredentials":[{"server":"clitestregistry1.azurecr.io","username":"clitestregistry1"}],"restartPolicy":"Always","osType":"Linux","instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] content-length: ['1782'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:37 GMT'] + date: ['Thu, 18 Oct 2018 00:16:02 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -159,21 +185,21 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"clitestregistry1.azurecr.io/nginx:latest","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:15:21Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:15:11Z","lastTimestamp":"2018-10-09T22:15:11Z","name":"Pulling","message":"pulling - image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Pulled","message":"Successfully - pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Created","message":"Created - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:15:21Z","lastTimestamp":"2018-10-09T22:15:21Z","name":"Started","message":"Started - container with id 5035b086ab7fed023c88ca6874045642e2049475bf33c97d9d36d0214d9b220d","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"imageRegistryCredentials":[{"server":"clitestregistry1.azurecr.io","username":"clitestregistry1"}],"restartPolicy":"Always","osType":"Linux","instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"clitestregistry1.azurecr.io/nginx:latest","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:15:28Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:15:18Z","lastTimestamp":"2018-10-18T00:15:18Z","name":"Pulling","message":"pulling + image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:27Z","lastTimestamp":"2018-10-18T00:15:27Z","name":"Pulled","message":"Successfully + pulled image \"clitestregistry1.azurecr.io/nginx:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:28Z","lastTimestamp":"2018-10-18T00:15:28Z","name":"Created","message":"Created + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:15:29Z","lastTimestamp":"2018-10-18T00:15:29Z","name":"Started","message":"Started + container with id c2d3aad29390141604536df07486ef3e2991623a11734b45d7300da71a266631","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"imageRegistryCredentials":[{"server":"clitestregistry1.azurecr.io","username":"clitestregistry1"}],"restartPolicy":"Always","osType":"Linux","instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] content-length: ['1782'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:37 GMT'] + date: ['Thu, 18 Oct 2018 00:16:08 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -192,7 +218,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -201,12 +227,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 09 Oct 2018 22:15:39 GMT'] + date: ['Thu, 18 Oct 2018 00:16:09 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdVNkxWTFhITEpCQkVKR0hPNVNSSVdWT1BCSEpLUEIyWlBPWHwxMDdFODIwRTE0NDREMzVELVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdNR1VOSkdVR0ZQRFdLNDdLUEtVNTVDSU4zNFlXVkREREdYMnxFOENGMTI3NTZFMzBFM0ZCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi.yaml index c596d3ddcb9..c40fb9cfd94 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi.yaml +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-10-09T22:15:39Z"}}' + "date": "2018-10-18T00:16:09Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -11,22 +11,22 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:39Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:16:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:40 GMT'] + date: ['Thu, 18 Oct 2018 00:16:10 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 201, message: Created} - request: body: null @@ -38,17 +38,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:39Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:16:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:41 GMT'] + date: ['Thu, 18 Oct 2018 00:16:10 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -65,24 +65,24 @@ interactions: Content-Length: ['22'] Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 - msrest_azure/0.4.34 azure-mgmt-msi/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + msrest_azure/0.4.34 azure-mgmt-msi/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005?api-version=2015-08-31-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005","name":"cliaciidentity000005","type":"Microsoft.ManagedIdentity/userAssignedIdentities","location":"westus","tags":{},"properties":{"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","principalId":"4bcbb5c3-4c15-48de-9442-adbd32ad93ed","clientId":"2aa393be-8bfb-430b-a4b9-a0bb403649a6","clientSecretUrl":"https://control-westus.identity.azure.net/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005/credentials?tid=72f988bf-86f1-41af-91ab-2d7cd011db47&oid=4bcbb5c3-4c15-48de-9442-adbd32ad93ed&aid=2aa393be-8bfb-430b-a4b9-a0bb403649a6"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005","name":"cliaciidentity000005","type":"Microsoft.ManagedIdentity/userAssignedIdentities","location":"westus","tags":{},"properties":{"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","principalId":"b84711d3-5a43-42ec-9595-04e831b7552a","clientId":"cc2aec49-4d0c-4d60-a860-ef6f85623455","clientSecretUrl":"https://control-westus.identity.azure.net/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005/credentials?tid=72f988bf-86f1-41af-91ab-2d7cd011db47&oid=b84711d3-5a43-42ec-9595-04e831b7552a&aid=cc2aec49-4d0c-4d60-a860-ef6f85623455"}}'} headers: cache-control: [no-cache] content-length: ['936'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:43 GMT'] + date: ['Thu, 18 Oct 2018 00:16:14 GMT'] expires: ['-1'] location: [/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: body: null @@ -94,17 +94,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:39Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:16:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:44 GMT'] + date: ['Thu, 18 Oct 2018 00:16:14 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -126,25 +126,25 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.61.17.91","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"principalId":"f414fa19-31b8-46f8-843e-f73bc7b11fa9","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Waiting","detailStatus":"ContainerCreating"}},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.42.215.201","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"principalId":"1e2a2ff9-fe3f-4a88-9637-89c8f712a188","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/a72f504f-a8fc-42b4-b11b-c78daa4ae314?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/3aacea1c-0f55-47f8-bc7e-2dfaefc9c719?api-version=2018-06-01'] cache-control: [no-cache] - content-length: ['883'] + content-length: ['989'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:15:52 GMT'] + date: ['Thu, 18 Oct 2018 00:16:21 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['83'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['97'] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['84'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['99'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 201, message: Created} - request: body: null @@ -155,23 +155,23 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/a72f504f-a8fc-42b4-b11b-c78daa4ae314?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/3aacea1c-0f55-47f8-bc7e-2dfaefc9c719?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-09T22:15:52.5521865Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-09T22:16:01Z","lastTimestamp":"2018-10-09T22:16:04Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-09T22:16:03Z","lastTimestamp":"2018-10-09T22:16:06Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:03Z","lastTimestamp":"2018-10-09T22:16:03Z","name":"Created","message":"Created - container with id 2315021daba9de086e853ad04497bb2da32ef27d47678746495960c7f0e00061","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:04Z","lastTimestamp":"2018-10-09T22:16:04Z","name":"Started","message":"Started - container with id 2315021daba9de086e853ad04497bb2da32ef27d47678746495960c7f0e00061","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:06Z","lastTimestamp":"2018-10-09T22:16:06Z","name":"Created","message":"Created - container with id 7b10e0a6cf311667580ab8436520ac555501a0d1c186ec5e4a9f1e2ef1a36076","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:06Z","lastTimestamp":"2018-10-09T22:16:06Z","name":"Started","message":"Started - container with id 7b10e0a6cf311667580ab8436520ac555501a0d1c186ec5e4a9f1e2ef1a36076","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:07Z","lastTimestamp":"2018-10-09T22:16:07Z","name":"BackOff","message":"Back-off + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-18T00:16:21.7464181Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-18T00:16:24Z","lastTimestamp":"2018-10-18T00:16:27Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:16:26Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:26Z","lastTimestamp":"2018-10-18T00:16:26Z","name":"Created","message":"Created + container with id 3bb22d56eb4bc772419befdbb65d795fd98397b986a58e7e152d6898ef80e26f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:27Z","lastTimestamp":"2018-10-18T00:16:27Z","name":"Started","message":"Started + container with id 3bb22d56eb4bc772419befdbb65d795fd98397b986a58e7e152d6898ef80e26f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"Created","message":"Created + container with id e7ea80d8d611c23323b2c912eef11436004d7278a993412e7af7393377378d7f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"Started","message":"Started + container with id e7ea80d8d611c23323b2c912eef11436004d7278a993412e7af7393377378d7f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"BackOff","message":"Back-off restarting failed container","type":"Warning"}]}}'} headers: cache-control: [no-cache] content-length: ['1741'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:16:22 GMT'] + date: ['Thu, 18 Oct 2018 00:16:52 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -188,25 +188,25 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-09T22:16:21Z","exitCode":0,"finishTime":"2018-10-09T22:16:21Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-09T22:16:06Z","exitCode":0,"finishTime":"2018-10-09T22:16:06Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-09T22:16:01Z","lastTimestamp":"2018-10-09T22:16:20Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:03Z","lastTimestamp":"2018-10-09T22:16:21Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:03Z","lastTimestamp":"2018-10-09T22:16:03Z","name":"Created","message":"Created - container with id 2315021daba9de086e853ad04497bb2da32ef27d47678746495960c7f0e00061","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:04Z","lastTimestamp":"2018-10-09T22:16:04Z","name":"Started","message":"Started - container with id 2315021daba9de086e853ad04497bb2da32ef27d47678746495960c7f0e00061","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:06Z","lastTimestamp":"2018-10-09T22:16:06Z","name":"Created","message":"Created - container with id 7b10e0a6cf311667580ab8436520ac555501a0d1c186ec5e4a9f1e2ef1a36076","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:06Z","lastTimestamp":"2018-10-09T22:16:06Z","name":"Started","message":"Started - container with id 7b10e0a6cf311667580ab8436520ac555501a0d1c186ec5e4a9f1e2ef1a36076","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:07Z","lastTimestamp":"2018-10-09T22:16:22Z","name":"BackOff","message":"Back-off - restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-09T22:16:21Z","lastTimestamp":"2018-10-09T22:16:21Z","name":"Created","message":"Created - container with id a2cd1ce17a021c308314929b85fbbd1026de165f3e484d66477504a1625bc063","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:21Z","lastTimestamp":"2018-10-09T22:16:21Z","name":"Started","message":"Started - container with id a2cd1ce17a021c308314929b85fbbd1026de165f3e484d66477504a1625bc063","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.61.17.91","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"principalId":"f414fa19-31b8-46f8-843e-f73bc7b11fa9","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-18T00:16:46Z","exitCode":0,"finishTime":"2018-10-18T00:16:46Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-18T00:16:29Z","exitCode":0,"finishTime":"2018-10-18T00:16:29Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-18T00:16:24Z","lastTimestamp":"2018-10-18T00:16:44Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:16:26Z","lastTimestamp":"2018-10-18T00:16:45Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:26Z","lastTimestamp":"2018-10-18T00:16:26Z","name":"Created","message":"Created + container with id 3bb22d56eb4bc772419befdbb65d795fd98397b986a58e7e152d6898ef80e26f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:27Z","lastTimestamp":"2018-10-18T00:16:27Z","name":"Started","message":"Started + container with id 3bb22d56eb4bc772419befdbb65d795fd98397b986a58e7e152d6898ef80e26f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"Created","message":"Created + container with id e7ea80d8d611c23323b2c912eef11436004d7278a993412e7af7393377378d7f","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:29Z","name":"Started","message":"Started + container with id e7ea80d8d611c23323b2c912eef11436004d7278a993412e7af7393377378d7f","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:16:29Z","lastTimestamp":"2018-10-18T00:16:47Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-18T00:16:46Z","lastTimestamp":"2018-10-18T00:16:46Z","name":"Created","message":"Created + container with id e463678ad51b661eb8d1a52200be6a69dd2b725f254c7175a7b901f2724b420b","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:16:46Z","lastTimestamp":"2018-10-18T00:16:46Z","name":"Started","message":"Started + container with id e463678ad51b661eb8d1a52200be6a69dd2b725f254c7175a7b901f2724b420b","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.42.215.201","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"principalId":"1e2a2ff9-fe3f-4a88-9637-89c8f712a188","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] - content-length: ['3126'] + content-length: ['3128'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:16:23 GMT'] + date: ['Thu, 18 Oct 2018 00:16:52 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -224,17 +224,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:39Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:16:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:16:25 GMT'] + date: ['Thu, 18 Oct 2018 00:16:54 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -258,25 +258,25 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000003","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.42.158.129","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"4bcbb5c3-4c15-48de-9442-adbd32ad93ed","clientId":"2aa393be-8bfb-430b-a4b9-a0bb403649a6"}},"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","name":"clicontainer000003","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000003","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.10.231","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"b84711d3-5a43-42ec-9595-04e831b7552a","clientId":"cc2aec49-4d0c-4d60-a860-ef6f85623455"}},"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","name":"clicontainer000003","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/65687022-7cd1-47e0-be42-199356b4194d?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/37e024d0-0abf-43b2-9b23-c92aa324f3c5?api-version=2018-06-01'] cache-control: [no-cache] - content-length: ['1187'] + content-length: ['1186'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:16:31 GMT'] + date: ['Thu, 18 Oct 2018 00:17:01 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['82'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['96'] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['83'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['98'] + x-ms-ratelimit-remaining-subscription-writes: ['1196'] status: {code: 201, message: Created} - request: body: null @@ -287,20 +287,23 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/65687022-7cd1-47e0-be42-199356b4194d?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/37e024d0-0abf-43b2-9b23-c92aa324f3c5?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","status":"Succeeded","startTime":"2018-10-09T22:16:31.0498322Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-09T22:16:36Z","lastTimestamp":"2018-10-09T22:16:41Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-09T22:16:39Z","lastTimestamp":"2018-10-09T22:16:42Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:40Z","lastTimestamp":"2018-10-09T22:16:40Z","name":"Created","message":"Created - container","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:16:40Z","lastTimestamp":"2018-10-09T22:16:40Z","name":"Started","message":"Started - container","type":"Normal"}]}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","status":"Succeeded","startTime":"2018-10-18T00:17:02.210261Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-18T00:17:07Z","lastTimestamp":"2018-10-18T00:17:11Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:17:10Z","lastTimestamp":"2018-10-18T00:17:13Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:10Z","lastTimestamp":"2018-10-18T00:17:10Z","name":"Created","message":"Created + container with id 669cd041bc577e46993ac2736b88187a8e4828f667efb350d130ad297440580d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:11Z","lastTimestamp":"2018-10-18T00:17:11Z","name":"Started","message":"Started + container with id 669cd041bc577e46993ac2736b88187a8e4828f667efb350d130ad297440580d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:13Z","lastTimestamp":"2018-10-18T00:17:13Z","name":"Created","message":"Created + container with id a95b6e50b319884e79e8126821d7dc55b34e45cb09dba952e2bf0a5bf4b7df64","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:13Z","lastTimestamp":"2018-10-18T00:17:13Z","name":"Started","message":"Started + container with id a95b6e50b319884e79e8126821d7dc55b34e45cb09dba952e2bf0a5bf4b7df64","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:14Z","lastTimestamp":"2018-10-18T00:17:14Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"}]}}'} headers: cache-control: [no-cache] - content-length: ['967'] + content-length: ['1740'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:00 GMT'] + date: ['Thu, 18 Oct 2018 00:17:32 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -317,21 +320,25 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000003","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-09T22:16:59Z","exitCode":0,"finishTime":"2018-10-09T22:16:59Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-09T22:16:43Z","exitCode":0,"finishTime":"2018-10-09T22:16:43Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-09T22:16:36Z","lastTimestamp":"2018-10-09T22:16:57Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:39Z","lastTimestamp":"2018-10-09T22:16:59Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:40Z","lastTimestamp":"2018-10-09T22:16:59Z","name":"Created","message":"Created - container","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:40Z","lastTimestamp":"2018-10-09T22:16:59Z","name":"Started","message":"Started - container","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:16:44Z","lastTimestamp":"2018-10-09T22:17:00Z","name":"BackOff","message":"Back-off - restarting failed container","type":"Warning"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.42.158.129","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"4bcbb5c3-4c15-48de-9442-adbd32ad93ed","clientId":"2aa393be-8bfb-430b-a4b9-a0bb403649a6"}},"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","name":"clicontainer000003","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000003","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-18T00:17:29Z","exitCode":0,"finishTime":"2018-10-18T00:17:29Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-18T00:17:13Z","exitCode":0,"finishTime":"2018-10-18T00:17:13Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-18T00:17:07Z","lastTimestamp":"2018-10-18T00:17:27Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:17:10Z","lastTimestamp":"2018-10-18T00:17:28Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:10Z","lastTimestamp":"2018-10-18T00:17:10Z","name":"Created","message":"Created + container with id 669cd041bc577e46993ac2736b88187a8e4828f667efb350d130ad297440580d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:11Z","lastTimestamp":"2018-10-18T00:17:11Z","name":"Started","message":"Started + container with id 669cd041bc577e46993ac2736b88187a8e4828f667efb350d130ad297440580d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:13Z","lastTimestamp":"2018-10-18T00:17:13Z","name":"Created","message":"Created + container with id a95b6e50b319884e79e8126821d7dc55b34e45cb09dba952e2bf0a5bf4b7df64","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:13Z","lastTimestamp":"2018-10-18T00:17:13Z","name":"Started","message":"Started + container with id a95b6e50b319884e79e8126821d7dc55b34e45cb09dba952e2bf0a5bf4b7df64","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:17:14Z","lastTimestamp":"2018-10-18T00:17:30Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-18T00:17:29Z","lastTimestamp":"2018-10-18T00:17:29Z","name":"Created","message":"Created + container with id 6ce9b8db835710669c2996054b416f5def923a1de906a06db114a849ad8d4d08","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:17:29Z","lastTimestamp":"2018-10-18T00:17:29Z","name":"Started","message":"Started + container with id 6ce9b8db835710669c2996054b416f5def923a1de906a06db114a849ad8d4d08","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.10.231","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"b84711d3-5a43-42ec-9595-04e831b7552a","clientId":"cc2aec49-4d0c-4d60-a860-ef6f85623455"}},"tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000003","name":"clicontainer000003","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] - content-length: ['2376'] + content-length: ['3429'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:01 GMT'] + date: ['Thu, 18 Oct 2018 00:17:33 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -349,17 +356,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:15:39Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:16:09Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:02 GMT'] + date: ['Thu, 18 Oct 2018 00:17:35 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -383,26 +390,26 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000004","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.30.231","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"4bcbb5c3-4c15-48de-9442-adbd32ad93ed","clientId":"2aa393be-8bfb-430b-a4b9-a0bb403649a6"}},"principalId":"4c5d4ae7-5df6-4e4c-ae36-156b86ffe299","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned, + body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000004","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.40.13.70","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"b84711d3-5a43-42ec-9595-04e831b7552a","clientId":"cc2aec49-4d0c-4d60-a860-ef6f85623455"}},"principalId":"fff35e2a-8751-4e64-8fc8-21d04f4580a0","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned, UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004","name":"clicontainer000004","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/729a82bd-3ab7-46e0-81ee-653b788f956e?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/c0af7683-80a7-4de4-be2b-1eb9699df057?api-version=2018-06-01'] cache-control: [no-cache] - content-length: ['1255'] + content-length: ['1254'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:07 GMT'] + date: ['Thu, 18 Oct 2018 00:17:42 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['81'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['96'] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['82'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['97'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 201, message: Created} - request: body: null @@ -413,23 +420,21 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/729a82bd-3ab7-46e0-81ee-653b788f956e?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/c0af7683-80a7-4de4-be2b-1eb9699df057?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004","status":"Succeeded","startTime":"2018-10-09T22:17:08.1276975Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-09T22:17:10Z","lastTimestamp":"2018-10-09T22:17:13Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:12Z","name":"Created","message":"Created - container with id f829375aa405870520f30df8c9a67020b6058f47c4b9e3291089ff6068a65c01","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:12Z","name":"Started","message":"Started - container with id f829375aa405870520f30df8c9a67020b6058f47c4b9e3291089ff6068a65c01","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"Created","message":"Created - container with id 069d13b8cd2ec948e04332cc64a7cc66afdb8e13994eb471afc1cbac9d09c37b","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"Started","message":"Started - container with id 069d13b8cd2ec948e04332cc64a7cc66afdb8e13994eb471afc1cbac9d09c37b","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"BackOff","message":"Back-off + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004","status":"Succeeded","startTime":"2018-10-18T00:17:43.0744749Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-18T00:18:00Z","lastTimestamp":"2018-10-18T00:18:04Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:03Z","lastTimestamp":"2018-10-18T00:18:06Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:03Z","lastTimestamp":"2018-10-18T00:18:06Z","name":"Created","message":"Created + container","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:04Z","lastTimestamp":"2018-10-18T00:18:07Z","name":"Started","message":"Started + container","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:08Z","lastTimestamp":"2018-10-18T00:18:08Z","name":"BackOff","message":"Back-off restarting failed container","type":"Warning"}]}}'} headers: cache-control: [no-cache] - content-length: ['1741'] + content-length: ['1141'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:38 GMT'] + date: ['Thu, 18 Oct 2018 00:18:12 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -446,26 +451,23 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000004","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-09T22:17:33Z","exitCode":0,"finishTime":"2018-10-09T22:17:33Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-09T22:17:15Z","exitCode":0,"finishTime":"2018-10-09T22:17:15Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-09T22:17:10Z","lastTimestamp":"2018-10-09T22:17:32Z","name":"Pulling","message":"pulling - image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:33Z","name":"Pulled","message":"Successfully - pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:12Z","name":"Created","message":"Created - container with id f829375aa405870520f30df8c9a67020b6058f47c4b9e3291089ff6068a65c01","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:12Z","lastTimestamp":"2018-10-09T22:17:12Z","name":"Started","message":"Started - container with id f829375aa405870520f30df8c9a67020b6058f47c4b9e3291089ff6068a65c01","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"Created","message":"Created - container with id 069d13b8cd2ec948e04332cc64a7cc66afdb8e13994eb471afc1cbac9d09c37b","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:15Z","name":"Started","message":"Started - container with id 069d13b8cd2ec948e04332cc64a7cc66afdb8e13994eb471afc1cbac9d09c37b","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-09T22:17:15Z","lastTimestamp":"2018-10-09T22:17:34Z","name":"BackOff","message":"Back-off - restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-09T22:17:33Z","lastTimestamp":"2018-10-09T22:17:33Z","name":"Created","message":"Created - container with id e8bdc0ec5dc10115c214ae1b204c4c6280333b656ed0c802a9f15c3810728e1d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:17:33Z","lastTimestamp":"2018-10-09T22:17:33Z","name":"Started","message":"Started - container with id e8bdc0ec5dc10115c214ae1b204c4c6280333b656ed0c802a9f15c3810728e1d","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.30.231","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"4bcbb5c3-4c15-48de-9442-adbd32ad93ed","clientId":"2aa393be-8bfb-430b-a4b9-a0bb403649a6"}},"principalId":"4c5d4ae7-5df6-4e4c-ae36-156b86ffe299","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned, + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000004","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":1,"currentState":{"state":"Waiting","detailStatus":"CrashLoopBackOff: + Back-off 10s restarting failed"},"previousState":{"state":"Terminated","startTime":"2018-10-18T00:18:06Z","exitCode":0,"finishTime":"2018-10-18T00:18:07Z","detailStatus":"Completed"},"events":[{"count":2,"firstTimestamp":"2018-10-18T00:18:00Z","lastTimestamp":"2018-10-18T00:18:04Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:03Z","lastTimestamp":"2018-10-18T00:18:06Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:03Z","lastTimestamp":"2018-10-18T00:18:06Z","name":"Created","message":"Created + container","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:04Z","lastTimestamp":"2018-10-18T00:18:07Z","name":"Started","message":"Started + container","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:18:08Z","lastTimestamp":"2018-10-18T00:18:10Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"104.40.13.70","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Running"}},"identity":{"userAssignedIdentities":{"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliaciidentity000005":{"principalId":"b84711d3-5a43-42ec-9595-04e831b7552a","clientId":"cc2aec49-4d0c-4d60-a860-ef6f85623455"}},"principalId":"fff35e2a-8751-4e64-8fc8-21d04f4580a0","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned, UserAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000004","name":"clicontainer000004","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] - content-length: ['3498'] + content-length: ['2393'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:38 GMT'] + date: ['Thu, 18 Oct 2018 00:18:13 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -484,7 +486,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -493,9 +495,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 09 Oct 2018 22:17:39 GMT'] + date: ['Thu, 18 Oct 2018 00:18:14 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkcyRUZWREtUT0ZGU05OU0xWUlBSQU9CSURPTUJOUENDQ0JTQXxDRDU2M0U5QjU1RTdEQzAzLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdFM0ZPS1JBM0FCWFlLT1JTRU1SR1NFU0pQU0RVNEJCS0NHWnwyNjNFN0E5MjJFMEJCNTBBLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi_scope.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi_scope.yaml new file mode 100644 index 00000000000..e6f53b9f7c6 --- /dev/null +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_msi_scope.yaml @@ -0,0 +1,373 @@ +interactions: +- request: + body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", + "date": "2018-10-18T00:18:15Z"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group create] + Connection: [keep-alive] + Content-Length: ['110'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:18:15Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:16 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:18:15Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:15 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: '{"sku": {"name": "Standard_RAGRS"}, "kind": "Storage", "location": "westus", + "properties": {"supportsHttpsTrafficOnly": false}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + Content-Length: ['127'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003?api-version=2018-03-01-preview + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + content-type: [text/plain; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:17 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/b87c81da-9cc7-43bd-9b5a-9937153d8732?monitor=true&api-version=2018-03-01-preview'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + status: {code: 202, message: Accepted} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/b87c81da-9cc7-43bd-9b5a-9937153d8732?monitor=true&api-version=2018-03-01-preview + response: + body: {string: '{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003","name":"clistorage000003","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-18T00:18:17.9588946Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-18T00:18:17.9588946Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-18T00:18:17.8650992Z","primaryEndpoints":{"blob":"https://clistorage000003.blob.core.windows.net/","queue":"https://clistorage000003.queue.core.windows.net/","table":"https://clistorage000003.table.core.windows.net/","file":"https://clistorage000003.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://clistorage000003-secondary.blob.core.windows.net/","queue":"https://clistorage000003-secondary.queue.core.windows.net/","table":"https://clistorage000003-secondary.table.core.windows.net/"}}}'} + headers: + cache-control: [no-cache] + content-length: ['1412'] + content-type: [application/json] + date: ['Thu, 18 Oct 2018 00:18:35 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:18:15Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:35 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-authorization/0.50.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Contributor%27&api-version=2018-01-01-preview + response: + body: {string: '{"value":[{"properties":{"roleName":"Contributor","type":"BuiltInRole","description":"Lets + you manage everything except access to resources.","assignableScopes":["/"],"permissions":[{"actions":["*"],"notActions":["Microsoft.Authorization/*/Delete","Microsoft.Authorization/*/Write","Microsoft.Authorization/elevateAccess/Action","Microsoft.Blueprint/blueprintAssignments/write","Microsoft.Blueprint/blueprintAssignments/delete"],"dataActions":[],"notDataActions":[]}],"createdOn":"0001-01-01T08:00:00.0000000Z","updatedOn":"2018-05-30T19:22:32.4538167Z","createdBy":null,"updatedBy":null},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","type":"Microsoft.Authorization/roleDefinitions","name":"b24988ac-6180-42a0-ab88-20f7382dd24c"}]}'} + headers: + cache-control: [no-cache] + content-length: ['832'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:36 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-IIS/10.0] + set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-request-charge: ['1'] + status: {code: 200, message: OK} +- request: + body: 'b''{"location": "westus", "tags": {}, "identity": {"type": "SystemAssigned"}, + "properties": {"containers": [{"name": "clicontainer000002", "properties": {"image": + "alpine:latest", "ports": [{"protocol": "TCP", "port": 80}], "resources": {"requests": + {"memoryInGB": 1.5, "cpu": 1.0}}}}], "restartPolicy": "Always", "ipAddress": + {"ports": [{"protocol": "TCP", "port": 80}], "type": "Public"}, "osType": "Linux"}}''' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + Content-Length: ['405'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 + response: + body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.28.155","type":"Public"},"osType":"Linux","instanceView":{"state":"Pending"}},"identity":{"principalId":"b07c5b68-8717-498b-ace5-27f9343a9738","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + headers: + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/e5494aa4-efa1-4c7e-8e91-eba1dd221ad2?api-version=2018-06-01'] + cache-control: [no-cache] + content-length: ['884'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:18:49 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['81'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['96'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/e5494aa4-efa1-4c7e-8e91-eba1dd221ad2?api-version=2018-06-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-18T00:18:48.871447Z","properties":{"events":[{"count":2,"firstTimestamp":"2018-10-18T00:18:53Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":2,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:58Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Created","message":"Created + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Started","message":"Started + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Created","message":"Created + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Started","message":"Started + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"}]}}'} + headers: + cache-control: [no-cache] + content-length: ['1566'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:19:19 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 + response: + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-18T00:19:18Z","exitCode":0,"finishTime":"2018-10-18T00:19:18Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-18T00:18:59Z","exitCode":0,"finishTime":"2018-10-18T00:18:59Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-18T00:18:53Z","lastTimestamp":"2018-10-18T00:19:16Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Created","message":"Created + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Started","message":"Started + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Created","message":"Created + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Started","message":"Started + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:19:00Z","lastTimestamp":"2018-10-18T00:19:19Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-18T00:19:18Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Created","message":"Created + container with id 72968856c829c31596ff9edcddf33910e347ee0f8742113475b23b9c8dc42427","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:18Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Started","message":"Started + container with id 72968856c829c31596ff9edcddf33910e347ee0f8742113475b23b9c8dc42427","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.28.155","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"principalId":"b07c5b68-8717-498b-ace5-27f9343a9738","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + headers: + cache-control: [no-cache] + content-length: ['3127'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:19:19 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 + response: + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"alpine:latest","ports":[{"protocol":"TCP","port":80}],"environmentVariables":[],"instanceView":{"restartCount":2,"currentState":{"state":"Terminated","startTime":"2018-10-18T00:19:18Z","exitCode":0,"finishTime":"2018-10-18T00:19:18Z","detailStatus":"Completed"},"previousState":{"state":"Terminated","startTime":"2018-10-18T00:18:59Z","exitCode":0,"finishTime":"2018-10-18T00:18:59Z","detailStatus":"Completed"},"events":[{"count":3,"firstTimestamp":"2018-10-18T00:18:53Z","lastTimestamp":"2018-10-18T00:19:16Z","name":"Pulling","message":"pulling + image \"alpine:latest\"","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Pulled","message":"Successfully + pulled image \"alpine:latest\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Created","message":"Created + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:56Z","lastTimestamp":"2018-10-18T00:18:56Z","name":"Started","message":"Started + container with id 3b1c97d9e1792152870a18236afb2335d668c835cd70d16968baf0d0b6c3703d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Created","message":"Created + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:18:59Z","lastTimestamp":"2018-10-18T00:18:59Z","name":"Started","message":"Started + container with id 30ea725d370fb82f8f12e3ceebe1996421999869739fb239c9971f9c395e0c5d","type":"Normal"},{"count":3,"firstTimestamp":"2018-10-18T00:19:00Z","lastTimestamp":"2018-10-18T00:19:19Z","name":"BackOff","message":"Back-off + restarting failed container","type":"Warning"},{"count":1,"firstTimestamp":"2018-10-18T00:19:18Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Created","message":"Created + container with id 72968856c829c31596ff9edcddf33910e347ee0f8742113475b23b9c8dc42427","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:18Z","lastTimestamp":"2018-10-18T00:19:18Z","name":"Started","message":"Started + container with id 72968856c829c31596ff9edcddf33910e347ee0f8742113475b23b9c8dc42427","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}}}}],"restartPolicy":"Always","ipAddress":{"ports":[{"protocol":"TCP","port":80}],"ip":"168.62.28.155","type":"Public"},"osType":"Linux","instanceView":{"events":[],"state":"Succeeded"}},"identity":{"principalId":"b07c5b68-8717-498b-ace5-27f9343a9738","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","type":"SystemAssigned"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + headers: + cache-control: [no-cache] + content-length: ['3127'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:19:20 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: '{"properties": {"roleDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c", + "principalId": "b07c5b68-8717-498b-ace5-27f9343a9738"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [container create] + Connection: [keep-alive] + Content-Length: ['233'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-authorization/0.50.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003/providers/Microsoft.Authorization/roleAssignments/ac6d8f6a-d06c-4826-9944-7bf92c239e3c?api-version=2018-01-01-preview + response: + body: {string: '{"properties":{"roleDefinitionId":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","principalId":"b07c5b68-8717-498b-ace5-27f9343a9738","principalType":"ServicePrincipal","scope":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003","createdOn":"2018-10-18T00:19:21.4624026Z","updatedOn":"2018-10-18T00:19:21.4624026Z","createdBy":null,"updatedBy":"facd2063-6d5d-4fd5-81f2-8d956c047170"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000003/providers/Microsoft.Authorization/roleAssignments/ac6d8f6a-d06c-4826-9944-7bf92c239e3c","type":"Microsoft.Authorization/roleAssignments","name":"ac6d8f6a-d06c-4826-9944-7bf92c239e3c"}'} + headers: + cache-control: [no-cache] + content-length: ['1025'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 00:19:23 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-IIS/10.0] + set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-request-charge: ['3'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + date: ['Thu, 18 Oct 2018 00:19:24 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdaSTVYSzdKUFNQTUpIVVRYM1ZMRllZMlk3NFg3UUVZNTZPVnxFQjY2RUFCQ0Y5NjkzRDQzLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] + status: {code: 202, message: Accepted} +version: 1 diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_vnet.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_vnet.yaml index 80cedac35ad..6a6c755a333 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_vnet.yaml +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_create_with_vnet.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-10-09T22:17:40Z"}}' + "date": "2018-10-18T00:19:24Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -11,22 +11,22 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:40Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:24Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:40 GMT'] + date: ['Thu, 18 Oct 2018 00:19:25 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 201, message: Created} - request: body: null @@ -38,17 +38,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:40Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:24Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:41 GMT'] + date: ['Thu, 18 Oct 2018 00:19:25 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -65,17 +65,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:40Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:24Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:41 GMT'] + date: ['Thu, 18 Oct 2018 00:19:26 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -92,17 +92,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:40Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:24Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:41 GMT'] + date: ['Thu, 18 Oct 2018 00:19:27 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -124,7 +124,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 @@ -136,13 +136,13 @@ interactions: cache-control: [no-cache] content-length: ['330'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:42 GMT'] + date: ['Thu, 18 Oct 2018 00:19:27 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['80'] - x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['98'] + x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['95'] x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 400, message: Bad Request} - request: @@ -156,7 +156,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -165,9 +165,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 09 Oct 2018 22:17:43 GMT'] + date: ['Thu, 18 Oct 2018 00:19:28 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdPWjZUN1FFN1M2V05TRFo0QzJKU0laMlZGN1Q2QjNPQ0JNN3xDRkYwRUUxMTk4NEI2MjRDLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc2V0w3R1BYRlpPQTRFWUtCWUdMV0RPQVJTUFBBQlhRTE9RNnwwOTE4MDE2RTg0MjEwQjNDLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_git_repo_volume_mount.yaml b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_git_repo_volume_mount.yaml index caa56233dad..1674f571de4 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_git_repo_volume_mount.yaml +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/recordings/test_container_git_repo_volume_mount.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-10-09T22:17:44Z"}}' + "date": "2018-10-18T00:19:29Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -11,22 +11,22 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:44Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:29Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:45 GMT'] + date: ['Thu, 18 Oct 2018 00:19:29 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1197'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: body: null @@ -38,17 +38,17 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T22:17:44Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T00:19:29Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:45 GMT'] + date: ['Thu, 18 Oct 2018 00:19:30 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -71,25 +71,25 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: body: {string: '{"properties":{"provisioningState":"Pending","containers":[{"name":"clicontainer000002","properties":{"image":"nginx","ports":[],"environmentVariables":[],"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}},"volumeMounts":[{"name":"gitrepo","mountPath":"/src"}]}}],"restartPolicy":"Always","osType":"Linux","volumes":[{"name":"gitrepo","gitRepo":{"repository":"https://github.com/yolo3301/dumb-flow.git","directory":"./test","revision":"5604f0a8f11bfe13e621418ab6f6a71973e208ce"}}],"instanceView":{"state":"Pending"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/1d76f815-9d9f-471f-82ab-550a5d8ecffa?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/868fb2df-7036-4aaa-8e89-51bd491e359c?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['875'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:17:49 GMT'] + date: ['Thu, 18 Oct 2018 00:19:34 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] x-ms-ratelimit-remaining-subscription-resource-requests-pt1h: ['79'] x-ms-ratelimit-remaining-subscription-resource-requests-pt5m: ['94'] - x-ms-ratelimit-remaining-subscription-writes: ['1197'] + x-ms-ratelimit-remaining-subscription-writes: ['1196'] status: {code: 201, message: Created} - request: body: null @@ -100,20 +100,20 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/1d76f815-9d9f-471f-82ab-550a5d8ecffa?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerInstance/locations/westus/operations/868fb2df-7036-4aaa-8e89-51bd491e359c?api-version=2018-06-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-09T22:17:49.9568305Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-09T22:17:54Z","lastTimestamp":"2018-10-09T22:17:54Z","name":"Pulling","message":"pulling - image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Pulled","message":"Successfully - pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Created","message":"Created - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Started","message":"Started - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"}]}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","status":"Succeeded","startTime":"2018-10-18T00:19:33.9513339Z","properties":{"events":[{"count":1,"firstTimestamp":"2018-10-18T00:19:50Z","lastTimestamp":"2018-10-18T00:19:50Z","name":"Pulling","message":"pulling + image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Pulled","message":"Successfully + pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Created","message":"Created + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Started","message":"Started + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"}]}}'} headers: cache-control: [no-cache] content-length: ['1097'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:18:20 GMT'] + date: ['Thu, 18 Oct 2018 00:20:04 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -130,20 +130,20 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"nginx","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:18:03Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:17:54Z","lastTimestamp":"2018-10-09T22:17:54Z","name":"Pulling","message":"pulling - image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Pulled","message":"Successfully - pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Created","message":"Created - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Started","message":"Started - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}},"volumeMounts":[{"name":"gitrepo","mountPath":"/src"}]}}],"restartPolicy":"Always","osType":"Linux","volumes":[{"name":"gitrepo","gitRepo":{"repository":"https://github.com/yolo3301/dumb-flow.git","directory":"./test","revision":"5604f0a8f11bfe13e621418ab6f6a71973e208ce"}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"nginx","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:19:59Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:19:50Z","lastTimestamp":"2018-10-18T00:19:50Z","name":"Pulling","message":"pulling + image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Pulled","message":"Successfully + pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Created","message":"Created + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Started","message":"Started + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}},"volumeMounts":[{"name":"gitrepo","mountPath":"/src"}]}}],"restartPolicy":"Always","osType":"Linux","volumes":[{"name":"gitrepo","gitRepo":{"repository":"https://github.com/yolo3301/dumb-flow.git","directory":"./test","revision":"5604f0a8f11bfe13e621418ab6f6a71973e208ce"}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] content-length: ['1807'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:18:20 GMT'] + date: ['Thu, 18 Oct 2018 00:20:04 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -160,21 +160,21 @@ interactions: Connection: [keep-alive] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-containerinstance/1.2.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002?api-version=2018-10-01 response: - body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"nginx","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-09T22:18:03Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-09T22:17:54Z","lastTimestamp":"2018-10-09T22:17:54Z","name":"Pulling","message":"pulling - image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Pulled","message":"Successfully - pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Created","message":"Created - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-09T22:18:03Z","lastTimestamp":"2018-10-09T22:18:03Z","name":"Started","message":"Started - container with id d96efdc82cfa634b8250d4ef77eff354a9bf143b28eec5646b020fbce0c70b39","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}},"volumeMounts":[{"name":"gitrepo","mountPath":"/src"}]}}],"restartPolicy":"Always","osType":"Linux","volumes":[{"name":"gitrepo","gitRepo":{"repository":"https://github.com/yolo3301/dumb-flow.git","directory":"./test","revision":"5604f0a8f11bfe13e621418ab6f6a71973e208ce"}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} + body: {string: '{"properties":{"provisioningState":"Succeeded","containers":[{"name":"clicontainer000002","properties":{"image":"nginx","ports":[],"environmentVariables":[],"instanceView":{"restartCount":0,"currentState":{"state":"Running","startTime":"2018-10-18T00:19:59Z","detailStatus":""},"events":[{"count":1,"firstTimestamp":"2018-10-18T00:19:50Z","lastTimestamp":"2018-10-18T00:19:50Z","name":"Pulling","message":"pulling + image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Pulled","message":"Successfully + pulled image \"nginx\"","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Created","message":"Created + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"},{"count":1,"firstTimestamp":"2018-10-18T00:19:59Z","lastTimestamp":"2018-10-18T00:19:59Z","name":"Started","message":"Started + container with id ab9239e7502df26d00a3013ffa70f874613ad313cbf0a64630f83b2c3748d133","type":"Normal"}]},"resources":{"requests":{"memoryInGB":1.5,"cpu":1.0}},"volumeMounts":[{"name":"gitrepo","mountPath":"/src"}]}}],"restartPolicy":"Always","osType":"Linux","volumes":[{"name":"gitrepo","gitRepo":{"repository":"https://github.com/yolo3301/dumb-flow.git","directory":"./test","revision":"5604f0a8f11bfe13e621418ab6f6a71973e208ce"}}],"instanceView":{"events":[],"state":"Running"}},"identity":{"type":"None"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerInstance/containerGroups/clicontainer000002","name":"clicontainer000002","type":"Microsoft.ContainerInstance/containerGroups","location":"westus","tags":{}}'} headers: cache-control: [no-cache] content-length: ['1807'] content-type: [application/json; charset=utf-8] - date: ['Tue, 09 Oct 2018 22:18:21 GMT'] + date: ['Thu, 18 Oct 2018 00:20:05 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -193,7 +193,7 @@ interactions: Content-Type: [application/json; charset=utf-8] User-Agent: [python/3.6.2 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -202,12 +202,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 09 Oct 2018 22:18:21 GMT'] + date: ['Thu, 18 Oct 2018 00:20:05 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc1NkNJU1hUT0pGRVNTRlhCT0xLU0syWVI2WTVVSjNXNlFLVXwzQUMwMzRFODgwNjlCQThGLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdFUkxFQk9ZRTRWWkhKRTRMUEVVUkkzWFBGNjdKVEJBRERFUnxDOTRDNEQyM0IxMTNDNjZCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/test_container_commands.py b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/test_container_commands.py index 19fe6be1278..3d096271d1b 100644 --- a/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/test_container_commands.py +++ b/src/command_modules/azure-cli-container/azure/cli/command_modules/container/tests/latest/test_container_commands.py @@ -5,7 +5,7 @@ import time import unittest -from azure.cli.testsdk import ScenarioTest, ResourceGroupPreparer +from azure.cli.testsdk import ScenarioTest, ResourceGroupPreparer, live_only class AzureContainerInstanceScenarioTest(ScenarioTest): @@ -128,7 +128,7 @@ def test_container_create_with_msi(self, resource_group, resource_group_location system_assigned_identity = '[system]' self.kwargs.update({ - 'user_assigned_identity_name': user_assigned_identity_name + 'user_assigned_identity_name': user_assigned_identity_name, }) msi_identity_result = self.cmd('identity create -g {rg} -n {user_assigned_identity_name}').get_output_in_json() @@ -142,7 +142,7 @@ def test_container_create_with_msi(self, resource_group, resource_group_location 'os_type': os_type, 'ip_address_type': ip_address_type, 'user_assigned_identity': msi_identity_result['id'], - 'system_assigned_identity': system_assigned_identity + 'system_assigned_identity': system_assigned_identity, }) # Test create system assigned identity @@ -178,6 +178,42 @@ def test_container_create_with_msi(self, resource_group, resource_group_location self.exists('ipAddress.ip'), self.check('containers[0].image', '{image}')]) + # Test create container using managed identities with scope. + @live_only() + @ResourceGroupPreparer() + def test_container_create_with_msi_scope(self, resource_group, resource_group_location): + container_group_name = self.create_random_name('clicontainer', 16) + image = 'alpine:latest' + os_type = 'Linux' + ip_address_type = 'Public' + storage_account_name = self.create_random_name('clistorage', 16) + + self.kwargs.update({ + 'storage_account_name': storage_account_name + }) + + storage_account_result = self.cmd('az storage account create -n {storage_account_name} -g {rg} ').get_output_in_json() + + self.kwargs.update({ + 'container_group_name1': container_group_name, + 'resource_group_location': resource_group_location, + 'image': image, + 'os_type': os_type, + 'ip_address_type': ip_address_type, + 'msi_scope': storage_account_result['id'] + }) + + # Test create system assigned identity with scope + self.cmd('container create -g {rg} -n {container_group_name1} --image {image} --os-type {os_type} ' + '--ip-address {ip_address_type} --assign-identity --scope {msi_scope}', + checks=[self.check('name', '{container_group_name1}'), + self.check('location', '{resource_group_location}'), + self.check('provisioningState', 'Succeeded'), + self.check('osType', '{os_type}'), + self.check('identity.type', 'SystemAssigned'), + self.exists('ipAddress.ip'), + self.check('containers[0].image', '{image}')]) + # Test create container with azure container registry image. # An ACR instance is required to re-record this test with 'nginx:latest' image available in the url. # see https://docs.microsoft.com/en-us/azure/container-registry/container-registry-get-started-docker-cli @@ -252,11 +288,11 @@ def test_container_create_with_vnet(self, resource_group, resource_group_locatio }) # Vnet name with no subnet - with self.assertRaisesRegexp(CLIError, "usage error: --vnet-name NAME --subnet NAME | --subnet ID"): - self.cmd('container create -g {rg} -n {container_group_name} --image nginx --vnet-name {vnet_name}') + with self.assertRaisesRegexp(CLIError, "usage error: --vnet NAME --subnet NAME | --vnet ID --subnet NAME | --subnet ID"): + self.cmd('container create -g {rg} -n {container_group_name} --image nginx --vnet {vnet_name}') # Subnet name with no vnet name - with self.assertRaisesRegexp(CLIError, "usage error: --vnet-name NAME --subnet NAME | --subnet ID"): + with self.assertRaisesRegexp(CLIError, "usage error: --vnet NAME --subnet NAME | --vnet ID --subnet NAME | --subnet ID"): self.cmd('container create -g {rg} -n {container_group_name} --image nginx ' '--subnet {subnet_name} ') diff --git a/src/command_modules/azure-cli-container/setup.py b/src/command_modules/azure-cli-container/setup.py index 7411a2c655e..f6436762ec0 100644 --- a/src/command_modules/azure-cli-container/setup.py +++ b/src/command_modules/azure-cli-container/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.3.6" +VERSION = "0.3.7" CLASSIFIERS = [ 'Development Status :: 4 - Beta', @@ -31,10 +31,11 @@ ] DEPENDENCIES = [ - 'azure-mgmt-containerinstance==1.2.0', + 'azure-mgmt-containerinstance==1.2.1', 'azure-mgmt-loganalytics==0.2.0', 'azure-mgmt-resource==2.0.0', 'azure-mgmt-network==2.2.1', + 'azure-mgmt-authorization==0.50.0', 'azure-cli-core', 'pyyaml>=3.13', 'colorama', diff --git a/src/command_modules/azure-cli-cosmosdb/HISTORY.rst b/src/command_modules/azure-cli-cosmosdb/HISTORY.rst index 764ffbcb9e1..1c4c36ab0f6 100644 --- a/src/command_modules/azure-cli-cosmosdb/HISTORY.rst +++ b/src/command_modules/azure-cli-cosmosdb/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.2.3 ++++++ +* Minor fixes. + 0.2.2 +++++ * `cosmosdb create`: Add `--enable-multiple-write-locations` support. diff --git a/src/command_modules/azure-cli-cosmosdb/setup.py b/src/command_modules/azure-cli-cosmosdb/setup.py index eee27b88ead..d72770a33d7 100644 --- a/src/command_modules/azure-cli-cosmosdb/setup.py +++ b/src/command_modules/azure-cli-cosmosdb/setup.py @@ -16,7 +16,7 @@ cmdclass = {} -VERSION = "0.2.2" +VERSION = "0.2.3" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ @@ -34,7 +34,7 @@ DEPENDENCIES = [ - 'azure-mgmt-cosmosdb==0.5.0', + 'azure-mgmt-cosmosdb==0.5.1', 'azure-cli-core', 'pydocumentdb>=2.0.1' ] diff --git a/src/command_modules/azure-cli-dls/HISTORY.rst b/src/command_modules/azure-cli-dls/HISTORY.rst index 69d07865984..cb636ff295f 100644 --- a/src/command_modules/azure-cli-dls/HISTORY.rst +++ b/src/command_modules/azure-cli-dls/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.1.4 ++++++ +* Update ADLS version(0.0.34). API version change to 2018-05-01 + 0.1.3 +++++ * Update ADLS version to latest(0.0.31) diff --git a/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_account_mgmt.yaml b/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_account_mgmt.yaml index 1a7fa20364e..002d3f7e126 100644 --- a/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_account_mgmt.yaml +++ b/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_account_mgmt.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-09-07T17:57:43Z"}}' + "date": "2018-10-16T20:15:43Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,19 +9,19 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0rc2 Azure-SDK-For-Python - AZURECLI/2.0.45] + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_mgmt000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001","name":"cli_test_adls_mgmt000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-07T17:57:43Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001","name":"cli_test_adls_mgmt000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-16T20:15:43Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 07 Sep 2018 17:57:49 GMT'] + date: ['Tue, 16 Oct 2018 20:15:44 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -38,20 +38,20 @@ interactions: Connection: [keep-alive] Content-Length: ['127'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"encryptionConfig":{"type":"ServiceManaged"},"provisioningState":"Creating","state":null,"endpoint":null,"accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"00000000-0000-0000-0000-000000000000","tenantId":"00000000-0000-0000-0000-000000000000"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"encryptionConfig":{"type":"ServiceManaged"},"provisioningState":"Creating","state":null,"endpoint":null,"accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"00000000-0000-0000-0000-000000000000","tenantId":"00000000-0000-0000-0000-000000000000"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c0081956-e730-4abb-940b-8bab50d7d0fe0?api-version=2016-11-01&expanded=true'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c6fad783-a35d-478c-85f8-641c7da9a2b90?api-version=2016-11-01&expanded=true'] cache-control: [no-cache] content-length: ['627'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:57:53 GMT'] + date: ['Tue, 16 Oct 2018 20:15:51 GMT'] expires: ['-1'] location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/operationresults/0?api-version=2016-11-01'] pragma: [no-cache] @@ -69,18 +69,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c0081956-e730-4abb-940b-8bab50d7d0fe0?api-version=2016-11-01&expanded=true + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c6fad783-a35d-478c-85f8-641c7da9a2b90?api-version=2016-11-01&expanded=true response: body: {string: '{"status":"InProgress"}'} headers: cache-control: [no-cache] content-length: ['23'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:04 GMT'] + date: ['Tue, 16 Oct 2018 20:16:01 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -98,18 +98,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c0081956-e730-4abb-940b-8bab50d7d0fe0?api-version=2016-11-01&expanded=true + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/c6fad783-a35d-478c-85f8-641c7da9a2b90?api-version=2016-11-01&expanded=true response: body: {string: '{"status":"Succeeded"}'} headers: cache-control: [no-cache] content-length: ['22'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:34 GMT'] + date: ['Tue, 16 Oct 2018 20:16:32 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -127,18 +127,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:57:55.8876121Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"88a1f0e3-e456-4718-a12b-f9ba5eeca6e1","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:15:52.696023Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"e549523a-bb68-4ef6-83d5-9db7367c0716","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] - content-length: ['1105'] + content-length: ['1103'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:35 GMT'] + date: ['Tue, 16 Oct 2018 20:16:33 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -157,19 +157,19 @@ interactions: CommandName: [dls account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:57:55.8876121Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"88a1f0e3-e456-4718-a12b-f9ba5eeca6e1","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:15:52.696023Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"e549523a-bb68-4ef6-83d5-9db7367c0716","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] - content-length: ['1105'] + content-length: ['1103'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:36 GMT'] + date: ['Tue, 16 Oct 2018 20:16:34 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -189,9 +189,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/enableKeyVault?api-version=2016-11-01 @@ -202,7 +202,7 @@ interactions: cache-control: [no-cache] content-length: ['138'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:37 GMT'] + date: ['Tue, 16 Oct 2018 20:16:36 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -220,19 +220,19 @@ interactions: CommandName: [dls account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01 response: - body: {string: '{"value":[{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:57:55.8876121Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}]}'} + body: {string: '{"value":[{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:15:52.696023Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}]}'} headers: cache-control: [no-cache] - content-length: ['600'] + content-length: ['598'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:39 GMT'] + date: ['Tue, 16 Oct 2018 20:16:37 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -251,48 +251,28 @@ interactions: CommandName: [dls account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01 response: - body: {string: '{"value":[{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlbench.azuredatalakestore.net","accountId":"7e6c2034-f570-46d3-a0f7-074cad4bd21f","creationTime":"2016-06-20T16:43:34.5827392Z","lastModifiedTime":"2018-03-31T01:13:03.158173Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlbench/providers/Microsoft.DataLakeStore/accounts/adlbench","name":"adlbench","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"azuresmrtestadls.azuredatalakestore.net","accountId":"37547777-2c45-4bbd-bc04-077a7ef6a04f","creationTime":"2017-08-16T17:21:36.0598116Z","lastModifiedTime":"2018-03-31T01:13:19.5466687Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-AZURESMR/providers/Microsoft.DataLakeStore/accounts/azuresmrtestadls","name":"azuresmrtestadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsbenchmark.azuredatalakestore.net","accountId":"7a94e450-6269-460c-9ead-a452e9ea4dc5","creationTime":"2017-03-21T17:44:18.21939Z","lastModifiedTime":"2018-03-31T02:11:45.7028683Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsbenchmark/providers/Microsoft.DataLakeStore/accounts/adlsbenchmark","name":"adlsbenchmark","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfalki.azuredatalakestore.net","accountId":"deb7e24e-079f-450d-afa8-dfb11bfe403b","creationTime":"2016-08-02T18:34:39.522057Z","lastModifiedTime":"2018-03-31T01:14:03.6639597Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Dan/providers/Microsoft.DataLakeStore/accounts/perfalki","name":"perfalki","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10.azuredatalakestore.net","accountId":"bf281f85-7644-4903-9fd3-1a8079894f05","creationTime":"2016-08-31T16:16:01.9928323Z","lastModifiedTime":"2018-03-31T01:15:28.6516476Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10","name":"hdiadlstest10","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11.azuredatalakestore.net","accountId":"4f9337ac-33c2-491a-a24c-0fcda22a8c31","creationTime":"2016-08-31T16:17:09.3174027Z","lastModifiedTime":"2018-03-31T01:15:50.3853728Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11","name":"hdiadlstest11","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11eus2e.azuredatalakestore.net","accountId":"7a3fb8ff-c91b-426f-85d9-7a0c39dd0643","creationTime":"2017-09-06T05:23:10.4119957Z","lastModifiedTime":"2018-03-31T01:16:01.1846506Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11eus2e","name":"hdiadlstest11eus2e","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest12.azuredatalakestore.net","accountId":"16e42b15-085e-43f5-90d1-5d0a646610c0","creationTime":"2016-08-31T16:17:56.7537438Z","lastModifiedTime":"2018-03-31T01:16:39.5751549Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest12","name":"hdiadlstest12","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"rtest00.azuredatalakestore.net","accountId":"a5e862de-3ca2-4b52-b1be-9d2d1cacadb2","creationTime":"2017-06-20T10:34:06.8813162Z","lastModifiedTime":"2018-03-31T01:20:13.8534744Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-R/providers/Microsoft.DataLakeStore/accounts/rtest00","name":"rtest00","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"rtest99.azuredatalakestore.net","accountId":"a3a7e6c8-174c-404b-8b3e-0c30a8945a36","creationTime":"2017-06-27T08:49:35.2416237Z","lastModifiedTime":"2018-03-31T01:20:16.9824714Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-R/providers/Microsoft.DataLakeStore/accounts/rtest99","name":"rtest99","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlse2eprodtest.azuredatalakestore.net","accountId":"d83ab66b-3207-4dce-a6e4-c2716330e601","creationTime":"2016-07-28T20:09:13.8775412Z","lastModifiedTime":"2018-03-31T01:32:12.8022498Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlse2eprodtest","name":"adlse2eprodtest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsfilefolderaclprodtst.azuredatalakestore.net","accountId":"0acd495d-e2d6-4227-a4fe-da2214f49260","creationTime":"2016-07-28T20:11:00.1862149Z","lastModifiedTime":"2018-03-31T01:32:16.8887506Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsfilefolderaclprodtst","name":"adlsfilefolderaclprodtst","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsflightm6.azuredatalakestore.net","accountId":"816b8994-db1f-406a-88c2-90e12df0bf55","creationTime":"2017-10-17T23:01:55.9445176Z","lastModifiedTime":"2018-03-31T01:32:19.5885783Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsflightm6","name":"adlsflightm6","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsflightm62.azuredatalakestore.net","accountId":"f7a50a4d-71c0-40a7-b84d-65d36887fda3","creationTime":"2017-10-21T01:24:54.6415061Z","lastModifiedTime":"2018-03-31T01:32:21.8505171Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsflightm62","name":"adlsflightm62","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsforsparkcluster01.azuredatalakestore.net","accountId":"7392dab6-92ba-499e-99cd-e02d2b18c959","creationTime":"2017-10-24T23:42:06.1072776Z","lastModifiedTime":"2018-03-31T01:32:24.2806904Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsforsparkcluster01","name":"adlsforsparkcluster01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshiveperfstoreeus01.azuredatalakestore.net","accountId":"34721fae-bbf3-4702-8401-776ed08a3660","creationTime":"2016-08-11T05:22:41.8644444Z","lastModifiedTime":"2018-03-31T01:32:31.115901Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlshiveperfstoreeus01","name":"adlshiveperfstoreeus01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfhive.azuredatalakestore.net","accountId":"223ea4ef-a34e-4406-8b65-a245c97f0620","creationTime":"2016-06-30T06:54:44.5890836Z","lastModifiedTime":"2018-03-31T01:32:36.9695494Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsperfhive","name":"adlsperfhive","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hadooptestsuite.azuredatalakestore.net","accountId":"f195b072-3cda-4d4e-8e90-84062a415300","creationTime":"2016-09-04T09:51:28.4566479Z","lastModifiedTime":"2018-03-31T01:33:12.5741232Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/hadooptestsuite","name":"hadooptestsuite","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"helloadl.azuredatalakestore.net","accountId":"fb043c05-4d70-430a-be0e-a02c9fa00f7a","creationTime":"2016-10-30T15:11:19.7298981Z","lastModifiedTime":"2018-03-31T01:33:18.7653754Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/helloadl","name":"helloadl","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshbase.azuredatalakestore.net","accountId":"6c85576b-1569-4c3e-906c-dd920e49d98c","creationTime":"2017-02-23T18:41:10.4720665Z","lastModifiedTime":"2018-03-31T02:13:28.1922732Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlshbase/providers/Microsoft.DataLakeStore/accounts/adlshbase","name":"adlshbase","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsinperftestseastus2.azuredatalakestore.net","accountId":"81d716b4-e7fa-4556-ac9c-83a0eb902c97","creationTime":"2016-10-07T01:23:20.1333622Z","lastModifiedTime":"2018-03-31T01:44:19.0286877Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsinperftestseastus2","name":"adlsinperftestseastus2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperf.azuredatalakestore.net","accountId":"464ed521-8aac-4f31-b26b-2463aef6b325","creationTime":"2016-09-13T20:57:04.9257624Z","lastModifiedTime":"2018-03-31T01:44:21.4177319Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperf","name":"adlsperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfadls.azuredatalakestore.net","accountId":"facbd129-e713-4b3e-b7a0-5ef403bf6e97","creationTime":"2016-09-22T00:36:19.5200201Z","lastModifiedTime":"2018-03-31T01:44:24.1796861Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfadls","name":"adlsperfadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompenc.azuredatalakestore.net","accountId":"872fd32e-d0c1-4ee6-8093-9de4dd310cc5","creationTime":"2016-09-15T21:05:45.587234Z","lastModifiedTime":"2018-03-31T01:44:27.1921795Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompenc","name":"adlsperfcompenc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompenc1.azuredatalakestore.net","accountId":"e62e5ac7-9e05-41ce-bf2e-c6b704b0b728","creationTime":"2016-09-15T21:06:01.5916257Z","lastModifiedTime":"2018-03-31T01:44:29.9098775Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompenc1","name":"adlsperfcompenc1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompenc2.azuredatalakestore.net","accountId":"fe3dc56b-b62c-4e8d-a401-48ace19878ef","creationTime":"2016-09-15T21:06:19.4351956Z","lastModifiedTime":"2018-03-31T01:44:32.2309937Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompenc2","name":"adlsperfcompenc2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompenc3.azuredatalakestore.net","accountId":"3dd459e3-9036-4bc1-82d1-ccde8f41fe7b","creationTime":"2016-09-20T00:02:32.3343922Z","lastModifiedTime":"2018-03-31T01:44:34.7361207Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompenc3","name":"adlsperfcompenc3","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompnoingest.azuredatalakestore.net","accountId":"adf8323f-c296-4462-b29b-be892974b1f4","creationTime":"2016-09-15T21:06:43.1496848Z","lastModifiedTime":"2018-03-31T01:44:37.4983884Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompnoingest","name":"adlsperfcompnoingest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompnoingest1.azuredatalakestore.net","accountId":"891174e7-dc71-4f5b-8ac9-f1b534fdd78a","creationTime":"2016-09-15T21:07:01.8313527Z","lastModifiedTime":"2018-03-31T01:44:40.2025055Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompnoingest1","name":"adlsperfcompnoingest1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfcompnoingest2.azuredatalakestore.net","accountId":"57bbf20f-a23d-445e-8d48-b78a996898a4","creationTime":"2016-09-15T21:07:15.522632Z","lastModifiedTime":"2018-03-31T01:44:44.6570758Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfcompnoingest2","name":"adlsperfcompnoingest2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfnocomp.azuredatalakestore.net","accountId":"2690f7be-277e-4467-8bc0-a927769228c6","creationTime":"2016-09-27T22:11:59.9626799Z","lastModifiedTime":"2018-03-31T01:44:47.1340175Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfnocomp","name":"adlsperfnocomp","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfspark.azuredatalakestore.net","accountId":"0e07e005-60ed-40ae-b6a2-d133b34cf2a6","creationTime":"2016-06-16T17:44:11.0765771Z","lastModifiedTime":"2018-03-31T01:44:50.0539827Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/adlsperfspark","name":"adlsperfspark","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"anupama.azuredatalakestore.net","accountId":"f7f71122-40d6-4246-bb5d-8d3858e00b1e","creationTime":"2016-12-01T10:53:05.5541426Z","lastModifiedTime":"2018-03-31T02:59:05.1051791Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperf/providers/Microsoft.DataLakeStore/accounts/anupama","name":"anupama","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"bn3adlsg1mbttest.azuredatalakestore.net","accountId":"4ce034d4-1526-4da8-8350-258e9c45e325","creationTime":"2018-08-18T04:53:21.7003037Z","lastModifiedTime":"2018-08-18T04:53:21.7003037Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/bn3adlsg1mbttest","name":"bn3adlsg1mbttest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"bn3adlsg1mbttestresult.azuredatalakestore.net","accountId":"8f51072f-c229-45de-b738-cf4854ee5da5","creationTime":"2018-08-29T17:01:07.5505102Z","lastModifiedTime":"2018-08-29T17:01:07.5505102Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/bn3adlsg1mbttestresult","name":"bn3adlsg1mbttestresult","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfalki1.azuredatalakestore.net","accountId":"9a903f50-883d-4a86-9e3b-9ec3d6662889","creationTime":"2016-08-02T20:07:56.0629856Z","lastModifiedTime":"2018-03-31T01:44:52.5969153Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/perfalki1","name":"perfalki1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfanalysis.azuredatalakestore.net","accountId":"73603ff3-8867-4bce-a1fa-9d48b5912c64","creationTime":"2016-07-25T23:29:56.6612365Z","lastModifiedTime":"2018-03-31T01:44:55.1811809Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/perfanalysis","name":"perfanalysis","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"pkaturidrperf.azuredatalakestore.net","accountId":"6b0bed1f-1ccd-4567-b0e5-9c102c41c0e3","creationTime":"2016-09-12T19:20:48.7101584Z","lastModifiedTime":"2018-03-31T01:45:05.506766Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/pkaturidrperf","name":"pkaturidrperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"srevadls.azuredatalakestore.net","accountId":"77bc983b-e299-4f7b-9bd1-343507f121bc","creationTime":"2016-08-04T05:49:51.6950227Z","lastModifiedTime":"2018-03-31T01:45:36.4955524Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/srevadls","name":"srevadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"testra.azuredatalakestore.net","accountId":"5140168b-a929-4f8a-b40f-6edc517d732f","creationTime":"2018-07-13T10:45:47.921134Z","lastModifiedTime":"2018-07-13T10:45:47.921134Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperf/providers/Microsoft.DataLakeStore/accounts/testra","name":"testra","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ycsbhbase01adls.azuredatalakestore.net","accountId":"c0dd6922-3aa1-4ee2-aff2-7695b84ea584","creationTime":"2016-05-26T04:12:17.5823171Z","lastModifiedTime":"2018-03-31T01:45:49.4634648Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/ycsbhbase01adls","name":"ycsbhbase01adls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperftesting.azuredatalakestore.net","accountId":"cb15751f-fb69-4399-ba60-895feb370383","creationTime":"2017-06-08T22:59:48.6704376Z","lastModifiedTime":"2018-03-31T03:07:05.2613451Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperftesting/providers/Microsoft.DataLakeStore/accounts/adlsperftesting","name":"adlsperftesting","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsforpython.azuredatalakestore.net","accountId":"d934d467-9dd5-4f9e-b21d-cb93100bba01","creationTime":"2018-04-03T18:47:20.3088635Z","lastModifiedTime":"2018-04-03T18:48:15.0447218Z"},"location":"eastus2","tags":{"Owner":"v-zhzha2"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlspython/providers/Microsoft.DataLakeStore/accounts/adlsforpython","name":"adlsforpython","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlspythonsdktravistests.azuredatalakestore.net","accountId":"06bbb56c-d385-4fc1-a71c-e29f1d72f618","creationTime":"2018-06-25T12:15:09.0582874Z","lastModifiedTime":"2018-06-25T12:15:09.0582874Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlspythonsdkrg/providers/Microsoft.DataLakeStore/accounts/adlspythonsdktravistests","name":"adlspythonsdktravistests","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defaulteastus2benchmark.azuredatalakestore.net","accountId":"7f8a477b-ff7b-4050-b0b9-09fd3cdd236e","creationTime":"2016-10-31T19:07:46.6368573Z","lastModifiedTime":"2018-03-31T01:56:48.3360627Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/defaulteastus2benchmark","name":"defaulteastus2benchmark","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfbenchmarkdatalake.azuredatalakestore.net","accountId":"3312ea15-8f65-4f89-a82c-ef0632be8fbe","creationTime":"2016-07-07T18:24:52.4405318Z","lastModifiedTime":"2018-03-31T01:56:57.6935574Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/perfbenchmarkdatalake","name":"perfbenchmarkdatalake","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsv2test.azuredatalakestore.net","accountId":"1ce64e6b-c670-4f7d-81b4-497f8f5ca2fc","creationTime":"2016-08-11T07:45:22.8804957Z","lastModifiedTime":"2018-03-31T02:00:52.2082432Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-V2-TEST/providers/Microsoft.DataLakeStore/accounts/adlsv2test","name":"adlsv2test","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlhadoopanalytics.azuredatalakestore.net","accountId":"9934f015-913b-4de3-9135-a7653c423f4a","creationTime":"2016-09-13T11:24:37.1977637Z","lastModifiedTime":"2018-03-31T02:04:29.336243Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-VDUSANE/providers/Microsoft.DataLakeStore/accounts/adlhadoopanalytics","name":"adlhadoopanalytics","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lteststore005.azuredatalakestore.net","accountId":"c4f94d53-231a-4f6c-953d-cd8874f61a54","creationTime":"2017-07-11T23:11:22.9593204Z","lastModifiedTime":"2018-03-31T03:46:18.4301579Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AdobeIngressEgressTest/providers/Microsoft.DataLakeStore/accounts/lteststore005","name":"lteststore005","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"akharitadls.azuredatalakestore.net","accountId":"ec654bf5-8976-4e63-9f5d-34c31c79959a","creationTime":"2018-07-24T18:00:45.2435193Z","lastModifiedTime":"2018-07-24T18:00:45.2435193Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/akharit-rg/providers/Microsoft.DataLakeStore/accounts/akharitadls","name":"akharitadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1bigtree1bn.azuredatalakestore.net","accountId":"663a31eb-6105-4a55-b7dc-2147c6f1a605","creationTime":"2017-02-01T23:59:51.9916491Z","lastModifiedTime":"2018-04-11T19:32:26.6893766Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikaria1bigtree1bn-RG/providers/Microsoft.DataLakeStore/accounts/asikaria1bigtree1bn","name":"asikaria1bigtree1bn","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1bn4driver.azuredatalakestore.net","accountId":"89cb1b1d-396f-45d8-8858-71c0935e2a4d","creationTime":"2017-03-10T01:57:10.7891489Z","lastModifiedTime":"2018-04-11T19:32:33.8442885Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikaria1bn4driver-RG/providers/Microsoft.DataLakeStore/accounts/asikaria1bn4driver","name":"asikaria1bn4driver","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1temp2.azuredatalakestore.net","accountId":"1bb5e6ad-644f-4852-9e31-024ab20eeb71","creationTime":"2018-01-23T19:54:15.0351773Z","lastModifiedTime":"2018-04-11T19:33:01.7540087Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikaria1-temp2-RG/providers/Microsoft.DataLakeStore/accounts/asikaria1temp2","name":"asikaria1temp2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1bn2driver.azuredatalakestore.net","accountId":"ff659c2e-2884-4177-8d6f-985743340750","creationTime":"2017-01-20T23:19:07.9591518Z","lastModifiedTime":"2018-04-11T19:32:29.0658094Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikariatest1bnRG/providers/Microsoft.DataLakeStore/accounts/asikaria1bn2driver","name":"asikaria1bn2driver","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1bn3client.azuredatalakestore.net","accountId":"4036c06a-20fb-4aec-9f02-0bb0bd2967d4","creationTime":"2017-01-20T23:19:45.4805555Z","lastModifiedTime":"2018-04-11T19:32:31.644728Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikariatest1bnRG/providers/Microsoft.DataLakeStore/accounts/asikaria1bn3client","name":"asikaria1bn3client","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikariatest1bn.azuredatalakestore.net","accountId":"8407eec5-dc43-47dd-92cb-25f05a6b157c","creationTime":"2016-12-19T23:00:45.3174176Z","lastModifiedTime":"2018-04-11T19:33:25.1144931Z"},"location":"eastus2","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikariatest1bnRG/providers/Microsoft.DataLakeStore/accounts/asikariatest1bn","name":"asikariatest1bn","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"gadlstest.azuredatalakestore.net","accountId":"1aaf5108-070a-463d-a051-d81935601b01","creationTime":"2017-11-22T18:23:18.6653667Z","lastModifiedTime":"2018-04-10T04:19:13.8065676Z"},"location":"eastus2","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/bn2-cluster-4-rg/providers/Microsoft.DataLakeStore/accounts/gadlstest","name":"gadlstest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perf01us15ds2.azuredatalakestore.net","accountId":"0693d35b-ab23-4f69-b2f9-6cb483c0e179","creationTime":"2016-11-03T19:16:54.4693645Z","lastModifiedTime":"2018-04-10T05:44:24.7265888Z"},"location":"eastus2","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cabosumameh/providers/Microsoft.DataLakeStore/accounts/perf01us15ds2","name":"perf01us15ds2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadls6qw4ge3e2s6upebak.azuredatalakestore.net","accountId":"fd0ef77b-d018-4946-b95f-fd3da2dd9345","creationTime":"2018-07-02T21:56:28.3675157Z","lastModifiedTime":"2018-07-02T21:56:28.3675157Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_accessdmij53n5xtb334ghjslhvqqbivtl6q2qy6rdpemo3bt6bjykxaypsct/providers/Microsoft.DataLakeStore/accounts/cliadls6qw4ge3e2s6upebak","name":"cliadls6qw4ge3e2s6upebak","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:57:55.8876121Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadlsfbikse6uggjayzag4.azuredatalakestore.net","accountId":"67bdb530-1279-4405-b9c2-4bf11382cb30","creationTime":"2018-08-15T01:14:15.0556669Z","lastModifiedTime":"2018-08-15T01:15:23.2072909Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmtvkullp7djocdv6oworgcdbf6e3qcusqrwihvsqnvj3e7dwz3rdrvjbugn/providers/Microsoft.DataLakeStore/accounts/cliadlsfbikse6uggjayzag4","name":"cliadlsfbikse6uggjayzag4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlclienttest.azuredatalakestore.net","accountId":"ea9cbd74-3d2b-4371-89c4-b02019c048a2","creationTime":"2016-04-01T10:10:19.6755711Z","lastModifiedTime":"2018-03-31T18:44:27.6681779Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-EastUS2/providers/Microsoft.DataLakeStore/accounts/adlclienttest","name":"adlclienttest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"dharmesh100tb.azuredatalakestore.net","accountId":"d5094bec-831b-4529-b8a7-f952fab557db","creationTime":"2016-11-09T00:05:17.7049496Z","lastModifiedTime":"2018-03-31T18:53:45.9061664Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/dharmesh100/providers/Microsoft.DataLakeStore/accounts/dharmesh100tb","name":"dharmesh100tb","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"diguptaadlseus.azuredatalakestore.net","accountId":"66305fc1-1963-44a7-91c4-6300a4623c77","creationTime":"2017-08-12T11:30:23.1703798Z","lastModifiedTime":"2018-03-31T18:57:50.6544028Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/digupta/providers/Microsoft.DataLakeStore/accounts/diguptaadlseus","name":"diguptaadlseus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbaseadlycsb.azuredatalakestore.net","accountId":"dbbe005f-86d6-4ad7-9be4-b81d0ad58a23","creationTime":"2016-03-21T05:54:07.2667316Z","lastModifiedTime":"2018-03-31T21:30:40.998608Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HBASE_YCSB/providers/Microsoft.DataLakeStore/accounts/hbaseadlycsb","name":"hbaseadlycsb","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladlsgauseast2.azuredatalakestore.net","accountId":"edd995e9-7eab-4178-8b29-c5ee918549dd","creationTime":"2017-10-11T01:26:23.262228Z","lastModifiedTime":"2018-03-31T22:13:01.4035048Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladlsgauseast2","name":"inteladlsgauseast2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladlstshddeastus2.azuredatalakestore.net","accountId":"fe9efa5d-7f64-4cb6-bed8-a29839aea443","creationTime":"2018-04-23T20:19:03.1313849Z","lastModifiedTime":"2018-04-23T20:19:03.1313849Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladlstshddeastus2","name":"inteladlstshddeastus2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"kugupt15.azuredatalakestore.net","accountId":"82b1daff-dfd5-4aad-a231-8ee7ff230596","creationTime":"2016-08-31T05:48:40.9584042Z","lastModifiedTime":"2018-03-31T22:33:40.8661481Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/kuguptresource/providers/Microsoft.DataLakeStore/accounts/kugupt15","name":"kugupt15","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lattedatainsightsadhoc.azuredatalakestore.net","accountId":"dd5b6f40-84e5-4742-890b-77880fa7191b","creationTime":"2017-08-11T12:35:54.3437916Z","lastModifiedTime":"2018-03-31T22:47:05.2338676Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Latte/providers/Microsoft.DataLakeStore/accounts/lattedatainsightsadhoc","name":"lattedatainsightsadhoc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsacctab2612a4.azuredatalakestore.net","accountId":"4c7674bc-2170-4e62-a6e0-877ffcf5f02f","creationTime":"2018-05-31T00:54:06.7380774Z","lastModifiedTime":"2018-06-13T01:37:52.5851724Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lewu-rg/providers/Microsoft.DataLakeStore/accounts/adlsacctab2612a4","name":"adlsacctab2612a4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lewudatalakestore.azuredatalakestore.net","accountId":"be4f19ec-017b-4f97-9d54-86c82176b302","creationTime":"2018-04-12T01:04:47.8918605Z","lastModifiedTime":"2018-06-11T20:46:48.9096707Z"},"location":"eastus2","tags":{"Owner":"lewu","Project":"SDK","Component":"debug","Evictable":"Dec - 31 2018"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lewu-rg/providers/Microsoft.DataLakeStore/accounts/lewudatalakestore","name":"lewudatalakestore","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lewudatalakestore2.azuredatalakestore.net","accountId":"67f6bbc2-2a4f-4194-ae30-60fd710a202b","creationTime":"2018-09-03T00:19:43.3220322Z","lastModifiedTime":"2018-09-03T00:19:43.3220322Z"},"location":"eastus2","tags":{},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lewu-rg/providers/Microsoft.DataLakeStore/accounts/lewudatalakestore2","name":"lewudatalakestore2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"michandnmbtperf.azuredatalakestore.net","accountId":"3eb06ae2-432b-4cdb-8728-fcca42ba9193","creationTime":"2017-08-03T09:14:14.9839597Z","lastModifiedTime":"2018-04-01T00:02:32.1909372Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MICHANDN-TEST/providers/Microsoft.DataLakeStore/accounts/michandnmbtperf","name":"michandnmbtperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"michandntesteus2e001.azuredatalakestore.net","accountId":"9d3370ea-6873-4990-90aa-13b43e434883","creationTime":"2017-05-30T07:38:14.1665011Z","lastModifiedTime":"2018-04-01T00:02:34.8345253Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MICHANDN-TEST/providers/Microsoft.DataLakeStore/accounts/michandntesteus2e001","name":"michandntesteus2e001","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkadlsdata.azuredatalakestore.net","accountId":"5f34c8d5-53b6-4d47-94a9-bd57f4b6c6c0","creationTime":"2016-10-06T20:07:13.6751662Z","lastModifiedTime":"2018-04-01T00:17:03.8608246Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mohaelrg1/providers/Microsoft.DataLakeStore/accounts/sparkadlsdata","name":"sparkadlsdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"nasachintest.azuredatalakestore.net","accountId":"c542f625-50f9-4f0a-8f3e-336c263f18ee","creationTime":"2016-11-29T05:25:20.3188638Z","lastModifiedTime":"2018-04-01T00:20:44.3694113Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/nasachin-rg/providers/Microsoft.DataLakeStore/accounts/nasachintest","name":"nasachintest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfstore1.azuredatalakestore.net","accountId":"9bda07e9-9a90-45f1-9e1c-213846845ff4","creationTime":"2016-08-23T23:53:29.5936908Z","lastModifiedTime":"2018-04-01T01:14:50.5778005Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/perfadlsteststorage/providers/Microsoft.DataLakeStore/accounts/adlsperfstore1","name":"adlsperfstore1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfstore2.azuredatalakestore.net","accountId":"63862970-0382-428b-9288-5b01b421924c","creationTime":"2016-08-28T05:54:06.8149634Z","lastModifiedTime":"2018-04-01T01:14:53.5192455Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/perfadlsteststorage/providers/Microsoft.DataLakeStore/accounts/adlsperfstore2","name":"adlsperfstore2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfstore3.azuredatalakestore.net","accountId":"b408b801-775d-4154-93be-7450e90db7e5","creationTime":"2016-09-15T00:16:38.7879796Z","lastModifiedTime":"2018-04-01T01:14:56.0488967Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/perfadlsteststorage/providers/Microsoft.DataLakeStore/accounts/adlsperfstore3","name":"adlsperfstore3","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"saannamaadls.azuredatalakestore.net","accountId":"a41c6666-725e-4d9f-92ab-ed9724b14e90","creationTime":"2016-08-05T11:06:00.4038339Z","lastModifiedTime":"2018-04-01T02:05:47.6130435Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/saannama/providers/Microsoft.DataLakeStore/accounts/saannamaadls","name":"saannamaadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"seandatalakestore.azuredatalakestore.net","accountId":"574314a3-7f83-4e22-b6bf-7d2600ba8a14","creationTime":"2018-02-28T19:59:43.1587852Z","lastModifiedTime":"2018-04-01T02:09:10.7920997Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/seanresourcegroup/providers/Microsoft.DataLakeStore/accounts/seandatalakestore","name":"seandatalakestore","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"gamonitoringencrypted.azuredatalakestore.net","accountId":"0a88cf64-effa-4a91-9931-8871f0541761","creationTime":"2017-12-27T10:13:44.8804575Z","lastModifiedTime":"2018-04-01T02:17:36.345358Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/gamonitoringencrypted","name":"gamonitoringencrypted","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmafortentbtera.azuredatalakestore.net","accountId":"90366951-4e87-49fc-9cf8-50adbdb58f0a","creationTime":"2017-08-31T05:49:40.1256351Z","lastModifiedTime":"2018-04-01T02:23:01.4278567Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmargsparkperf/providers/Microsoft.DataLakeStore/accounts/snvarmafortentbtera","name":"snvarmafortentbtera","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmasparkperf.azuredatalakestore.net","accountId":"7ae0eecc-86f9-4c94-8b55-a33507b6b6ec","creationTime":"2017-08-01T05:00:34.9172951Z","lastModifiedTime":"2018-04-01T02:23:04.0942692Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmargsparkperf/providers/Microsoft.DataLakeStore/accounts/snvarmasparkperf","name":"snvarmasparkperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmasparkteraadls.azuredatalakestore.net","accountId":"52f619ff-e79b-4ca3-b747-ddcbcfcdc3e0","creationTime":"2017-08-16T09:58:43.0022723Z","lastModifiedTime":"2018-04-01T02:23:06.7680082Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmargsparkperf/providers/Microsoft.DataLakeStore/accounts/snvarmasparkteraadls","name":"snvarmasparkteraadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmasparktest.azuredatalakestore.net","accountId":"137d6000-23a0-4368-9b1e-32b3c25b32ea","creationTime":"2017-08-30T12:56:42.563013Z","lastModifiedTime":"2018-04-01T02:23:09.1516723Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmargsparkperf/providers/Microsoft.DataLakeStore/accounts/snvarmasparktest","name":"snvarmasparktest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmatpchacc.azuredatalakestore.net","accountId":"5bcc29c7-927f-4890-b109-2b151263fd8e","creationTime":"2017-08-31T08:58:30.4347823Z","lastModifiedTime":"2018-04-01T02:23:11.7524566Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmargsparkperf/providers/Microsoft.DataLakeStore/accounts/snvarmatpchacc","name":"snvarmatpchacc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmasparkterav2.azuredatalakestore.net","accountId":"23ed42d5-9a36-4f83-9b1f-65db1597f453","creationTime":"2017-08-19T18:21:06.006737Z","lastModifiedTime":"2018-04-01T02:26:21.1760382Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmasparkterarg/providers/Microsoft.DataLakeStore/accounts/snvarmasparkterav2","name":"snvarmasparkterav2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cabotestbackup.azuredatalakestore.net","accountId":"2c13bb70-385d-4710-8b73-f3345e0a035b","creationTime":"2017-04-24T07:46:42.3356395Z","lastModifiedTime":"2018-04-01T02:31:59.2056178Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/cabotestbackup","name":"cabotestbackup","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"spiroperf.azuredatalakestore.net","accountId":"10516912-9e0f-4871-9cc3-bfdb8e3737a8","creationTime":"2017-05-08T14:38:56.5270208Z","lastModifiedTime":"2018-04-01T02:51:23.186358Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/spiroperf/providers/Microsoft.DataLakeStore/accounts/spiroperf","name":"spiroperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlseastus2acc.azuredatalakestore.net","accountId":"e3817bf4-aa3a-4a51-b0c9-f2f175ea7995","creationTime":"2018-03-07T11:56:23.8022528Z","lastModifiedTime":"2018-04-17T20:36:29.5535641Z"},"location":"eastus2","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/adlseastus2acc","name":"adlseastus2acc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"bn3adls.azuredatalakestore.net","accountId":"78fbd144-c11f-4203-81b3-a80c8d3ea240","creationTime":"2018-06-17T09:27:36.5799425Z","lastModifiedTime":"2018-06-17T09:27:36.5799425Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/bn3adls","name":"bn3adls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"stormadlsaccount.azuredatalakestore.net","accountId":"7df69700-e5fa-4064-872a-25f1df702ef3","creationTime":"2017-04-07T21:53:52.0132497Z","lastModifiedTime":"2018-04-01T03:28:43.2328669Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/stormadlsaccount_rg/providers/Microsoft.DataLakeStore/accounts/stormadlsaccount","name":"stormadlsaccount","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tempdatalakestore1.azuredatalakestore.net","accountId":"f9390b51-d542-4336-a661-294c1222d0d5","creationTime":"2016-09-07T01:56:33.3703229Z","lastModifiedTime":"2018-04-01T03:58:54.3697493Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TempADLSrg1/providers/Microsoft.DataLakeStore/accounts/tempdatalakestore1","name":"tempdatalakestore1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"testdkakadia.azuredatalakestore.net","accountId":"b9081932-cd99-49fa-b15e-6a5272c06e34","creationTime":"2017-01-23T00:32:41.4882272Z","lastModifiedTime":"2018-04-01T04:01:38.9800828Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testadlsdkakadia/providers/Microsoft.DataLakeStore/accounts/testdkakadia","name":"testdkakadia","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"dkakadiaeastus.azuredatalakestore.net","accountId":"3b0e4277-c557-4e3f-8e05-d2b313465c63","creationTime":"2017-07-28T22:49:45.7766431Z","lastModifiedTime":"2018-04-01T04:07:36.7082587Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testdkakadia/providers/Microsoft.DataLakeStore/accounts/dkakadiaeastus","name":"dkakadiaeastus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"testhdi003.azuredatalakestore.net","accountId":"11b98d5e-2515-4b9e-ad47-fa374c3a7639","creationTime":"2018-03-02T20:32:41.1077508Z","lastModifiedTime":"2018-04-01T04:17:19.4021277Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testhdi/providers/Microsoft.DataLakeStore/accounts/testhdi003","name":"testhdi003","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"testaccount.azuredatalakestore.net","accountId":"8931a6b9-377a-4e70-8e81-bdd5ff5139a0","creationTime":"2017-03-25T22:55:05.1939505Z","lastModifiedTime":"2018-04-01T04:32:43.7715432Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/testaccount","name":"testaccount","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"toyotametricsdata.azuredatalakestore.net","accountId":"439b477e-8888-4ed9-b0c4-9f628e52743b","creationTime":"2017-12-20T08:52:59.9101921Z","lastModifiedTime":"2018-04-01T04:36:19.1349404Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/toyota-perf/providers/Microsoft.DataLakeStore/accounts/toyotametricsdata","name":"toyotametricsdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"prodadlperf.azuredatalakestore.net","accountId":"f6b5dc78-40e6-4a33-96ef-9e23df319c19","creationTime":"2016-03-15T22:44:23.5519877Z","lastModifiedTime":"2018-04-01T04:52:33.2473067Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/USEAST2-ADL-PERF/providers/Microsoft.DataLakeStore/accounts/prodadlperf","name":"prodadlperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"vitalsignsarchive.azuredatalakestore.net","accountId":"15212e8b-2ee6-475c-964d-b5612ca33b15","creationTime":"2018-07-10T00:47:44.6610814Z","lastModifiedTime":"2018-07-10T00:47:44.6610814Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/vitalsigns/providers/Microsoft.DataLakeStore/accounts/vitalsignsarchive","name":"vitalsignsarchive","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"vitalsignscounterdata.azuredatalakestore.net","accountId":"f885f724-ad46-4fe0-827c-7a36138ee298","creationTime":"2018-05-18T22:11:31.5662119Z","lastModifiedTime":"2018-05-18T22:11:31.5662119Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/vitalsigns/providers/Microsoft.DataLakeStore/accounts/vitalsignscounterdata","name":"vitalsignscounterdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnewsdk35.azuredatalakestore.net","accountId":"72c8345d-87fb-42f2-8925-7f191b9cba6c","creationTime":"2016-09-15T08:55:21.1092818Z","lastModifiedTime":"2018-04-01T05:42:36.5887994Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlnewsdk35","name":"adlnewsdk35","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnoingestion.azuredatalakestore.net","accountId":"24752e11-3bea-44d2-a4db-d4de002a26e4","creationTime":"2016-08-25T08:39:47.2880297Z","lastModifiedTime":"2018-04-01T05:42:39.3084493Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlnoingestion","name":"adlnoingestion","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlperfeastus2.azuredatalakestore.net","accountId":"91652aff-b72b-4fb9-92b2-f894d8f42f13","creationTime":"2016-04-14T11:34:57.0454655Z","lastModifiedTime":"2018-04-01T05:42:41.9299828Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlperfeastus2","name":"adlperfeastus2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hivedata.azuredatalakestore.net","accountId":"c69782cc-b173-4344-b783-0093ae27b2ce","creationTime":"2016-04-19T11:21:12.5612Z","lastModifiedTime":"2018-04-01T05:43:13.5509777Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/hivedata","name":"hivedata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkdata.azuredatalakestore.net","accountId":"028a3ffd-0a62-4e7e-aa14-46bdb69509cc","creationTime":"2016-06-16T06:47:19.1283975Z","lastModifiedTime":"2018-04-01T05:43:20.0997435Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/sparkdata","name":"sparkdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparktestadhoc.azuredatalakestore.net","accountId":"0f0f6f55-dc7d-41e9-bfd0-f45433175b7e","creationTime":"2017-05-16T06:16:55.9288753Z","lastModifiedTime":"2018-04-01T05:43:29.5181036Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/sparktestadhoc","name":"sparktestadhoc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparktestadhoc1.azuredatalakestore.net","accountId":"aec6375c-d632-4166-a328-aa8d9cd11432","creationTime":"2017-05-16T06:17:43.0963855Z","lastModifiedTime":"2018-04-01T05:43:32.2822187Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/sparktestadhoc1","name":"sparktestadhoc1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"stormeastus2.azuredatalakestore.net","accountId":"70c23b57-102b-45ae-bcb7-173a64dde735","creationTime":"2016-03-17T10:33:38.4656431Z","lastModifiedTime":"2018-04-01T05:43:40.8703654Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/stormeastus2","name":"stormeastus2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"stormtopology.azuredatalakestore.net","accountId":"c8106d1b-23a8-4c1f-a558-178febbad1b8","creationTime":"2017-04-07T08:50:13.2635362Z","lastModifiedTime":"2018-04-01T05:43:43.7500826Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/stormtopology","name":"stormtopology","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"usqlbigbench.azuredatalakestore.net","accountId":"18c25230-91e4-4be0-a664-82a46f808f7d","creationTime":"2017-03-24T09:36:09.551662Z","lastModifiedTime":"2018-04-01T05:43:50.2060895Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/usqlbigbench","name":"usqlbigbench","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"usqloutput.azuredatalakestore.net","accountId":"1b1414e8-dc09-4198-a890-7cc6a56ae381","creationTime":"2017-02-15T07:52:32.6521284Z","lastModifiedTime":"2018-04-01T05:43:52.7450067Z"},"location":"eastus2","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/usqloutput","name":"usqloutput","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"zhawa.azuredatalakestore.net","accountId":"fa11687a-8038-488a-b7ea-a77573800f56","creationTime":"2018-07-20T18:33:57.4767729Z","lastModifiedTime":"2018-07-20T18:33:57.4767729Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/zhawa/providers/Microsoft.DataLakeStore/accounts/zhawa","name":"zhawa","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10nene.azuredatalakestore.net","accountId":"1000a635-d14b-4be1-a85c-7d3f7fc40922","creationTime":"2017-02-24T20:16:19.8370548Z","lastModifiedTime":"2018-03-31T01:15:40.7395619Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10nene","name":"hdiadlstest10nene","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11nee.azuredatalakestore.net","accountId":"d5903042-d462-45b7-8fed-3e0e90a3124e","creationTime":"2017-12-13T05:12:54.6155286Z","lastModifiedTime":"2018-03-31T01:16:07.8742357Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11nee","name":"hdiadlstest11nee","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11nene.azuredatalakestore.net","accountId":"af572986-d856-4fec-8b2e-2ad61f1f04ea","creationTime":"2017-02-23T16:45:29.8305591Z","lastModifiedTime":"2018-03-31T01:16:10.9325984Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11nene","name":"hdiadlstest11nene","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest12nee.azuredatalakestore.net","accountId":"3946ec91-0f80-4db2-8f97-c59909815608","creationTime":"2017-12-08T06:53:06.0982926Z","lastModifiedTime":"2018-03-31T01:16:47.40244Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest12nee","name":"hdiadlstest12nee","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest12neetsp1.azuredatalakestore.net","accountId":"dd11e8f8-b1fd-4f23-8683-5cf08f3d6a76","creationTime":"2017-12-08T06:36:55.0659084Z","lastModifiedTime":"2018-03-31T01:16:50.7198774Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest12neetsp1","name":"hdiadlstest12neetsp1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie11debugtest.azuredatalakestore.net","accountId":"084e2284-42ec-4fa9-acf9-078e99fa340e","creationTime":"2017-07-20T13:58:38.8182429Z","lastModifiedTime":"2018-03-31T01:31:55.5509328Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlie11debugtest","name":"adlie11debugtest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"triggertest.azuredatalakestore.net","accountId":"6ae118b4-3963-4d0f-ae1e-1b9f806f47f0","creationTime":"2017-08-30T08:32:14.3935155Z","lastModifiedTime":"2018-03-31T01:33:27.2054444Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/triggertest","name":"triggertest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"srevane.azuredatalakestore.net","accountId":"143d5b66-1c73-42a0-9683-34b49c9ef644","creationTime":"2017-07-20T10:43:51.4830513Z","lastModifiedTime":"2018-03-31T01:45:39.8359397Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/srevane","name":"srevane","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfanalyticstestadls.azuredatalakestore.net","accountId":"21e52b22-d117-4748-a755-13af1fc8b9ad","creationTime":"2017-03-21T18:06:26.1083237Z","lastModifiedTime":"2018-03-31T01:56:54.4751608Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/perfanalyticstestadls","name":"perfanalyticstestadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfbenchmarkneurope.azuredatalakestore.net","accountId":"610a39a7-41db-44e6-aaf0-daea8029cff9","creationTime":"2017-02-15T20:39:36.7519427Z","lastModifiedTime":"2018-03-31T01:57:01.2815776Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/perfbenchmarkneurope","name":"perfbenchmarkneurope","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfneuropenoencrypt.azuredatalakestore.net","accountId":"7c98d099-2e82-4cae-a1ef-37611324b728","creationTime":"2017-02-14T20:32:04.0368359Z","lastModifiedTime":"2018-03-31T01:57:04.4951963Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/perfneuropenoencrypt","name":"perfneuropenoencrypt","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"zhawa1.azuredatalakestore.net","accountId":"b212f080-cc3e-4ea5-82e4-47c0cad29104","creationTime":"2017-07-06T20:04:03.4954865Z","lastModifiedTime":"2018-03-31T02:00:20.8323202Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-TS-WD/providers/Microsoft.DataLakeStore/accounts/zhawa1","name":"zhawa1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"teststore004ne.azuredatalakestore.net","accountId":"3b74243d-bdad-4d3b-ad5e-ad39ca4b87d3","creationTime":"2017-07-07T00:49:22.8196285Z","lastModifiedTime":"2018-03-31T03:46:24.1692913Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adobeingressegresstest/providers/Microsoft.DataLakeStore/accounts/teststore004ne","name":"teststore004ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db3pperf01.azuredatalakestore.net","accountId":"0d0753d3-0fda-4a4f-9917-6109e3df220f","creationTime":"2018-01-29T23:40:03.1215144Z","lastModifiedTime":"2018-04-10T05:44:45.3602148Z"},"location":"northeurope","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/db3pperf01/providers/Microsoft.DataLakeStore/accounts/db3pperf01","name":"db3pperf01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"apiperfinvestigation.azuredatalakestore.net","accountId":"13569c55-9e6a-496a-ad13-fdbe9272be0c","creationTime":"2017-06-28T19:33:22.7629733Z","lastModifiedTime":"2018-03-31T21:01:47.7561185Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/apiperfinvestigation","name":"apiperfinvestigation","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladls1ga.azuredatalakestore.net","accountId":"d20ac59b-e9ce-42ac-b1de-a07bcc3604f9","creationTime":"2017-07-21T00:41:17.667818Z","lastModifiedTime":"2018-03-31T22:12:49.7301245Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladls1ga","name":"inteladls1ga","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"jooyoung.azuredatalakestore.net","accountId":"821218a4-070a-465d-92b4-0775e339e1bc","creationTime":"2017-11-29T21:23:45.5519457Z","lastModifiedTime":"2018-03-31T22:31:11.589687Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/jooyoung-rg/providers/Microsoft.DataLakeStore/accounts/jooyoung","name":"jooyoung","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lattedatainsightsdb3.azuredatalakestore.net","accountId":"09ae111c-e87e-4fa3-aa56-0baa020b20f1","creationTime":"2017-08-11T12:44:07.2514718Z","lastModifiedTime":"2018-03-31T22:47:12.8191512Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Latte/providers/Microsoft.DataLakeStore/accounts/lattedatainsightsdb3","name":"lattedatainsightsdb3","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"michandnneuropeadlie11.azuredatalakestore.net","accountId":"5c2e2a16-9315-4734-91c1-ef1bdd3c8c39","creationTime":"2017-10-05T07:51:04.7676486Z","lastModifiedTime":"2018-04-01T00:10:53.3637873Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/michandnneuropeadlie11rg/providers/Microsoft.DataLakeStore/accounts/michandnneuropeadlie11","name":"michandnneuropeadlie11","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsroyne.azuredatalakestore.net","accountId":"38e8100c-f6d5-4e1f-afd2-9cf8ec45e1a8","creationTime":"2017-02-14T23:38:03.1584151Z","lastModifiedTime":"2018-04-01T01:58:05.7973134Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgroyne/providers/Microsoft.DataLakeStore/accounts/adlsroyne","name":"adlsroyne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie11wasbtest.azuredatalakestore.net","accountId":"a03e3b06-6e4c-4798-a15f-79afaeee40b3","creationTime":"2018-02-20T06:47:46.7615406Z","lastModifiedTime":"2018-04-01T02:17:19.1070324Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/adlie11wasbtest","name":"adlie11wasbtest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshivedb3p.azuredatalakestore.net","accountId":"beb0a6f9-eed7-4ad9-85bd-31c53c69553f","creationTime":"2017-01-24T01:28:57.8970498Z","lastModifiedTime":"2018-04-01T02:58:03.5717454Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sssperf/providers/Microsoft.DataLakeStore/accounts/adlshivedb3p","name":"adlshivedb3p","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db3adlswas.azuredatalakestore.net","accountId":"c29467ad-2763-43dd-87a8-e85d3302fbcf","creationTime":"2017-12-01T20:37:53.5158522Z","lastModifiedTime":"2018-04-17T20:37:09.0357342Z"},"location":"northeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db3adlswas","name":"db3adlswas","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"testaccountne.azuredatalakestore.net","accountId":"c2691b41-4a7f-4883-8f1e-1854da4794d0","creationTime":"2017-05-19T20:20:50.8462371Z","lastModifiedTime":"2018-04-01T04:32:48.3305389Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/testaccountne","name":"testaccountne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfexitdefault.azuredatalakestore.net","accountId":"bc6762d3-ffd4-4456-a74c-fdaf528e6d8d","creationTime":"2017-02-02T05:48:02.3703098Z","lastModifiedTime":"2018-04-01T05:43:16.871118Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/perfexitdefault","name":"perfexitdefault","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkperfexitne.azuredatalakestore.net","accountId":"bf6e1522-f65a-4838-a02d-584da0e0677c","creationTime":"2017-02-02T06:33:10.814551Z","lastModifiedTime":"2018-04-01T05:43:26.8657367Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/sparkperfexitne","name":"sparkperfexitne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie11acltest.azuredatalakestore.net","accountId":"ce5ba7ed-3aad-43ff-be2f-9a634a75b235","creationTime":"2017-01-24T07:44:52.2647746Z","lastModifiedTime":"2018-04-01T05:54:43.3050693Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfstest/providers/Microsoft.DataLakeStore/accounts/adlie11acltest","name":"adlie11acltest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie11e2etest.azuredatalakestore.net","accountId":"08b5c210-7af9-41e3-8cb0-cab3832e726b","creationTime":"2017-01-24T07:42:39.1953149Z","lastModifiedTime":"2018-04-01T05:54:47.6308465Z"},"location":"northeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfstest/providers/Microsoft.DataLakeStore/accounts/adlie11e2etest","name":"adlie11e2etest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10cus.azuredatalakestore.net","accountId":"de857636-d8f4-4426-b2ba-38ef857b9af1","creationTime":"2017-03-09T09:11:56.2278773Z","lastModifiedTime":"2018-03-31T01:15:31.2402202Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10cus","name":"hdiadlstest10cus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11cus.azuredatalakestore.net","accountId":"2ec4a460-8eb0-4bae-896c-aac773307969","creationTime":"2017-03-09T09:12:40.3326319Z","lastModifiedTime":"2018-03-31T01:15:52.7985312Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11cus","name":"hdiadlstest11cus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11cuselh.azuredatalakestore.net","accountId":"7458bc08-e192-49f3-873a-cf8051e7e95d","creationTime":"2017-06-27T10:24:56.5930026Z","lastModifiedTime":"2018-03-31T01:15:55.8389429Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11cuselh","name":"hdiadlstest11cuselh","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11cuslh.azuredatalakestore.net","accountId":"df93c9e0-fcbc-418a-8194-26f7705b3be3","creationTime":"2017-04-07T18:12:15.1494655Z","lastModifiedTime":"2018-03-31T01:15:58.4864124Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11cuslh","name":"hdiadlstest11cuslh","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest12cus.azuredatalakestore.net","accountId":"cecb12d1-204a-4ea1-8d13-4cb33c78160f","creationTime":"2017-03-09T09:50:10.2269576Z","lastModifiedTime":"2018-03-31T01:16:44.13381Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest12cus","name":"hdiadlstest12cus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"vdusaneperfdm.azuredatalakestore.net","accountId":"85313406-811e-4eb7-ae0a-41938ecffd80","creationTime":"2016-10-17T07:32:39.8999493Z","lastModifiedTime":"2018-03-31T01:16:58.7179593Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/vdusaneperfdm","name":"vdusaneperfdm","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlus12acltest.azuredatalakestore.net","accountId":"374e1b55-2b83-49ac-a56b-fa37a1100a8d","creationTime":"2016-09-28T12:31:40.9815521Z","lastModifiedTime":"2018-03-31T01:32:52.3101607Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlus12acltest","name":"adlus12acltest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlus12acltestts.azuredatalakestore.net","accountId":"c48a3ea1-5e95-4cdc-8c95-b6e2a8c9aae3","creationTime":"2017-04-15T06:28:55.299521Z","lastModifiedTime":"2018-03-31T01:33:05.4565647Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlus12acltestts","name":"adlus12acltestts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlus12e2etest.azuredatalakestore.net","accountId":"e4b9352a-2088-427c-bba0-daa45d9d9294","creationTime":"2016-09-28T12:30:26.6405755Z","lastModifiedTime":"2018-03-31T01:33:07.8393571Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlus12e2etest","name":"adlus12e2etest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlus12e2etestts.azuredatalakestore.net","accountId":"6170b31c-ba23-475a-9075-d1de6c767cae","creationTime":"2017-04-15T06:20:23.2078348Z","lastModifiedTime":"2018-03-31T01:33:10.2683741Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlus12e2etestts","name":"adlus12e2etestts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tpmwdus12dm2p.azuredatalakestore.net","accountId":"6fba11c5-61c3-4e10-8bc1-6d81662bcde9","creationTime":"2017-04-25T22:25:10.1795074Z","lastModifiedTime":"2018-03-31T01:33:24.0563907Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/tpmwdus12dm2p","name":"tpmwdus12dm2p","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"spirombenchadls.azuredatalakestore.net","accountId":"151fb35a-6266-4f5f-8c6a-60f38f5c3786","creationTime":"2017-02-03T00:22:19.4054867Z","lastModifiedTime":"2018-03-31T01:45:18.8960499Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/spirombenchadls","name":"spirombenchadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfblog.azuredatalakestore.net","accountId":"a1c106a4-5714-43bb-adc3-a9e27adfff8e","creationTime":"2016-10-06T00:04:30.4586445Z","lastModifiedTime":"2018-03-31T03:02:11.3981142Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfblog/providers/Microsoft.DataLakeStore/accounts/adlsperfblog","name":"adlsperfblog","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfbloglarge.azuredatalakestore.net","accountId":"2fcee7b4-fc1e-4a9e-9647-7e04ddac3661","creationTime":"2016-11-08T19:39:16.9999833Z","lastModifiedTime":"2018-03-31T03:02:13.6129634Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfblog/providers/Microsoft.DataLakeStore/accounts/adlsperfbloglarge","name":"adlsperfbloglarge","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlssparkcluster.azuredatalakestore.net","accountId":"3e96cc15-94e1-4f50-b5d4-7f461ae21119","creationTime":"2016-11-04T00:13:14.3873053Z","lastModifiedTime":"2018-03-31T03:02:15.7902878Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfblog/providers/Microsoft.DataLakeStore/accounts/adlssparkcluster","name":"adlssparkcluster","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlssparkcluster2.azuredatalakestore.net","accountId":"576f1071-78d9-4087-8b39-a2db64e5a580","creationTime":"2016-11-09T19:38:31.6354522Z","lastModifiedTime":"2018-03-31T03:02:17.8304521Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfblog/providers/Microsoft.DataLakeStore/accounts/adlssparkcluster2","name":"adlssparkcluster2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfstoredm1.azuredatalakestore.net","accountId":"3412f0ff-1289-4e2f-bc46-3581dca21ff7","creationTime":"2016-10-05T22:51:27.4403267Z","lastModifiedTime":"2018-03-31T03:04:33.0453761Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfdm1/providers/Microsoft.DataLakeStore/accounts/adlsperfstoredm1","name":"adlsperfstoredm1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfstoredm2.azuredatalakestore.net","accountId":"7d44ba9c-883d-4531-a2fc-dd876a6e27f5","creationTime":"2016-10-07T21:14:11.7712263Z","lastModifiedTime":"2018-03-31T03:05:49.0446796Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adlsperfdm2rg/providers/Microsoft.DataLakeStore/accounts/adlsperfstoredm2","name":"adlsperfstoredm2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"teststore003adls.azuredatalakestore.net","accountId":"ddc2ff5f-28a3-46e3-9e51-c6c81624f5cc","creationTime":"2017-07-05T20:32:21.2167924Z","lastModifiedTime":"2018-03-31T03:46:21.1549339Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AdobeIngressEgressTest/providers/Microsoft.DataLakeStore/accounts/teststore003adls","name":"teststore003adls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperf03us12.azuredatalakestore.net","accountId":"1316c87f-0f2d-4df4-8916-bbf4d1fc0a5b","creationTime":"2017-02-27T18:32:26.6729375Z","lastModifiedTime":"2018-04-10T05:44:10.5993882Z"},"location":"centralus","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cabosumameh/providers/Microsoft.DataLakeStore/accounts/adlsperf03us12","name":"adlsperf03us12","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"bnavarmaadls.azuredatalakestore.net","accountId":"4925c5b7-fe28-4c2c-9fed-a665d119ddfb","creationTime":"2017-01-12T04:41:33.9269642Z","lastModifiedTime":"2018-03-31T18:13:32.1259108Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/DataLakeTesting/providers/Microsoft.DataLakeStore/accounts/bnavarmaadls","name":"bnavarmaadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"diguptaadlscentralus.azuredatalakestore.net","accountId":"00309881-4f00-452d-94a3-9db9320916b6","creationTime":"2017-08-12T08:43:36.3150342Z","lastModifiedTime":"2018-03-31T18:57:48.4941348Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/digupta/providers/Microsoft.DataLakeStore/accounts/diguptaadlscentralus","name":"diguptaadlscentralus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defaultconfigtestadls.azuredatalakestore.net","accountId":"596471b3-df63-4966-bcbe-a21b83567776","creationTime":"2017-05-12T04:30:46.6380485Z","lastModifiedTime":"2018-03-31T21:01:51.5745408Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/defaultconfigtestadls","name":"defaultconfigtestadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tpcxbb.azuredatalakestore.net","accountId":"8772fb68-07c5-4373-8707-eb2f5f897b9d","creationTime":"2016-12-06T22:43:19.1746486Z","lastModifiedTime":"2018-03-31T21:01:54.9046192Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/tpcxbb","name":"tpcxbb","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ingestionread.azuredatalakestore.net","accountId":"e0020588-b8fd-44e1-ac96-2cb2061ab0ca","creationTime":"2017-05-09T19:37:28.5540579Z","lastModifiedTime":"2018-03-31T22:06:27.3855574Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ingestionread_rg/providers/Microsoft.DataLakeStore/accounts/ingestionread","name":"ingestionread","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lattedatainsightsdm.azuredatalakestore.net","accountId":"be63fce1-29ba-4650-a451-265520a8d24b","creationTime":"2017-08-11T12:41:44.2310856Z","lastModifiedTime":"2018-03-31T22:47:16.0324434Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Latte/providers/Microsoft.DataLakeStore/accounts/lattedatainsightsdm","name":"lattedatainsightsdm","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"michandncentralusadlus12.azuredatalakestore.net","accountId":"abe3a11a-e001-473c-b77b-4af0c613abef","creationTime":"2017-10-04T13:47:11.5211403Z","lastModifiedTime":"2018-04-01T00:08:13.9778102Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/michandncentralusadlus12rg/providers/Microsoft.DataLakeStore/accounts/michandncentralusadlus12","name":"michandncentralusadlus12","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlssparkdata.azuredatalakestore.net","accountId":"f9678944-48ab-425d-8bd1-67aefd90a824","creationTime":"2016-10-07T18:21:10.6335949Z","lastModifiedTime":"2018-04-01T00:16:55.2208657Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mohaelrg1/providers/Microsoft.DataLakeStore/accounts/adlssparkdata","name":"adlssparkdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkadls180gb.azuredatalakestore.net","accountId":"a8796996-b753-4c5f-af03-9fa7fc4a2c4d","creationTime":"2016-10-11T21:04:55.1691974Z","lastModifiedTime":"2018-04-01T00:16:58.7471755Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mohaelrg1/providers/Microsoft.DataLakeStore/accounts/sparkadls180gb","name":"sparkadls180gb","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkadls180gbcompressed.azuredatalakestore.net","accountId":"7353019f-6f7a-43d5-8838-fe007148c268","creationTime":"2016-10-14T18:57:46.3778774Z","lastModifiedTime":"2018-04-01T00:17:01.2120093Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mohaelrg1/providers/Microsoft.DataLakeStore/accounts/sparkadls180gbcompressed","name":"sparkadls180gbcompressed","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkadlsstreamingdata.azuredatalakestore.net","accountId":"0ecf17a4-4471-4a36-a242-fb23aeb80ca6","creationTime":"2016-10-07T22:37:44.0581278Z","lastModifiedTime":"2018-04-01T00:17:06.4068856Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mohaelrg1/providers/Microsoft.DataLakeStore/accounts/sparkadlsstreamingdata","name":"sparkadlsstreamingdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"nigoydummy.azuredatalakestore.net","accountId":"db8520aa-7765-49f9-a6ea-f72bea686236","creationTime":"2017-09-18T09:07:26.8992234Z","lastModifiedTime":"2018-04-01T00:43:04.8358225Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/nigoyrg/providers/Microsoft.DataLakeStore/accounts/nigoydummy","name":"nigoydummy","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perftesttiered.azuredatalakestore.net","accountId":"b95e1b2e-8e4d-4769-b86e-624c20dee7e7","creationTime":"2017-03-08T10:31:01.4608227Z","lastModifiedTime":"2018-04-01T01:34:41.864784Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/perftesting/providers/Microsoft.DataLakeStore/accounts/perftesttiered","name":"perftesttiered","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlus12wasbtest2.azuredatalakestore.net","accountId":"8700f67c-f906-4159-83e8-79967bd9f851","creationTime":"2018-02-26T11:14:10.229506Z","lastModifiedTime":"2018-04-01T02:17:29.5205634Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/adlus12wasbtest2","name":"adlus12wasbtest2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkadls.azuredatalakestore.net","accountId":"045bf79a-b6a6-4a2a-a5b9-411798baa3f5","creationTime":"2016-10-06T18:57:57.6739391Z","lastModifiedTime":"2018-04-01T02:35:02.2345332Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sparkadlsrg/providers/Microsoft.DataLakeStore/accounts/sparkadls","name":"sparkadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshivedm.azuredatalakestore.net","accountId":"a37a367d-78dc-4ee5-8721-03cc2a195c04","creationTime":"2018-08-06T23:06:00.0362563Z","lastModifiedTime":"2018-08-06T23:06:00.0362563Z"},"location":"centralus","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sssperf/providers/Microsoft.DataLakeStore/accounts/adlshivedm","name":"adlshivedm","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlscentralusacc.azuredatalakestore.net","accountId":"a9dee058-d13d-4c34-8855-359cdefdf263","creationTime":"2018-03-07T11:07:43.970711Z","lastModifiedTime":"2018-04-17T20:36:26.4899967Z"},"location":"centralus","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/adlscentralusacc","name":"adlscentralusacc","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tpcxbb1.azuredatalakestore.net","accountId":"67970161-c8ca-46c8-8df5-2aac9e7638db","creationTime":"2017-10-06T19:51:51.513108Z","lastModifiedTime":"2018-04-01T04:07:40.3644176Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testdkakadia/providers/Microsoft.DataLakeStore/accounts/tpcxbb1","name":"tpcxbb1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tsperfadls.azuredatalakestore.net","accountId":"27acbb9d-7be0-4cba-a06b-c8106904bd05","creationTime":"2017-05-08T23:11:37.5945839Z","lastModifiedTime":"2018-04-01T04:32:51.9462841Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/tsperfadls","name":"tsperfadls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tpcxbbpubready.azuredatalakestore.net","accountId":"5aba66a5-e805-43e6-a785-160902c9a458","creationTime":"2016-12-08T21:48:55.8097474Z","lastModifiedTime":"2018-04-01T04:48:40.3448711Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tpcxbb_pub_readiness/providers/Microsoft.DataLakeStore/accounts/tpcxbbpubready","name":"tpcxbbpubready","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlstreamsparkdefault.azuredatalakestore.net","accountId":"56e91503-a736-46d3-98a8-cf3d6d53b870","creationTime":"2016-10-10T09:59:17.1233584Z","lastModifiedTime":"2018-04-01T05:42:44.9083623Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlstreamsparkdefault","name":"adlstreamsparkdefault","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"centralusadhocmr.azuredatalakestore.net","accountId":"aeb2d7f1-350c-4907-abc4-cb6f3de0984b","creationTime":"2017-05-16T07:24:14.6600208Z","lastModifiedTime":"2018-04-01T05:42:47.2900592Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/centralusadhocmr","name":"centralusadhocmr","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"centralussparktaxidata.azuredatalakestore.net","accountId":"b9265e33-0b5d-4136-8ad2-11f05b93c262","creationTime":"2017-05-09T12:36:53.8022588Z","lastModifiedTime":"2018-04-01T05:42:49.7234311Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/centralussparktaxidata","name":"centralussparktaxidata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"centrushadoop.azuredatalakestore.net","accountId":"00ca1166-0aa1-4859-8235-cd8f4c2c2f15","creationTime":"2017-05-29T11:42:21.9994428Z","lastModifiedTime":"2018-04-01T05:42:52.1312479Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/centrushadoop","name":"centrushadoop","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defaultcentralus.azuredatalakestore.net","accountId":"1501baad-3536-4216-aaf0-f88053bcd423","creationTime":"2017-01-27T05:14:32.7952888Z","lastModifiedTime":"2018-04-01T05:42:54.4916738Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/defaultcentralus","name":"defaultcentralus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defhivetpchcent.azuredatalakestore.net","accountId":"607caa47-2a38-48b0-8689-5f7db119816e","creationTime":"2017-04-05T09:09:34.5754146Z","lastModifiedTime":"2018-04-01T05:43:00.6225809Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/defhivetpchcent","name":"defhivetpchcent","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hadoopmrcentralus.azuredatalakestore.net","accountId":"7364c35e-7b03-4652-a8dc-159520556ae2","creationTime":"2017-05-16T06:55:21.4476566Z","lastModifiedTime":"2018-04-01T05:43:06.8800514Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/hadoopmrcentralus","name":"hadoopmrcentralus","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yogi.azuredatalakestore.net","accountId":"61ba2540-4524-4bce-99c7-69405372eef4","creationTime":"2017-01-12T08:46:20.6910312Z","lastModifiedTime":"2018-04-01T15:52:23.6666643Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/yogi/providers/Microsoft.DataLakeStore/accounts/yogi","name":"yogi","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yokamath.azuredatalakestore.net","accountId":"0bbc7322-37cc-4c5f-8bd0-0e22fd6b0f39","creationTime":"2017-03-02T07:12:18.6493909Z","lastModifiedTime":"2018-04-01T16:05:25.5352412Z"},"location":"centralus","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/yokamath/providers/Microsoft.DataLakeStore/accounts/yokamath","name":"yokamath","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11wethelh.azuredatalakestore.net","accountId":"1f233735-12c0-4889-a679-743a296edfb8","creationTime":"2017-07-11T07:30:56.4988803Z","lastModifiedTime":"2018-03-31T01:16:36.7911325Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11wethelh","name":"hdiadlstest11wethelh","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10acltestts.azuredatalakestore.net","accountId":"a155d0b6-d439-4156-9e84-f0febd1a93f7","creationTime":"2017-06-02T07:16:35.4474447Z","lastModifiedTime":"2018-03-31T01:31:58.866414Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlnl10acltestts","name":"adlnl10acltestts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10contractts.azuredatalakestore.net","accountId":"9a2c4a9d-2152-4bba-8a61-0e6b0060ef3f","creationTime":"2017-06-09T11:12:35.3874377Z","lastModifiedTime":"2018-03-31T01:32:02.7145463Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlnl10contractts","name":"adlnl10contractts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10dvp.azuredatalakestore.net","accountId":"1bcd321a-15ac-424a-bafd-4e6d01bdafb5","creationTime":"2017-08-30T06:47:35.0312959Z","lastModifiedTime":"2018-03-31T01:32:06.1224027Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlnl10dvp","name":"adlnl10dvp","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10e2etestts.azuredatalakestore.net","accountId":"3f251b51-6321-47c4-a047-f02b20212876","creationTime":"2017-05-30T10:21:39.8306497Z","lastModifiedTime":"2018-03-31T01:32:09.5820193Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlnl10e2etestts","name":"adlnl10e2etestts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfhdd.azuredatalakestore.net","accountId":"7ca3660b-447d-4ef7-8f4c-0a5eedbd2102","creationTime":"2017-06-13T16:41:42.8946749Z","lastModifiedTime":"2018-03-31T01:32:34.3433523Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsperfhdd","name":"adlsperfhdd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfwehdd.azuredatalakestore.net","accountId":"6aa054c0-b00a-4704-8afa-20171670fb24","creationTime":"2017-06-14T00:56:42.3913734Z","lastModifiedTime":"2018-03-31T01:32:43.6008206Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsperfwehdd","name":"adlsperfwehdd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfwehdd2.azuredatalakestore.net","accountId":"72824e90-ee00-4144-b628-7f453d6dc217","creationTime":"2017-08-02T22:44:45.6222924Z","lastModifiedTime":"2018-03-31T01:32:47.1063506Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsperfwehdd2","name":"adlsperfwehdd2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sssam3plonghaults.azuredatalakestore.net","accountId":"b929f2cd-bbec-4700-a790-1d21d02eb481","creationTime":"2017-11-30T21:51:40.3640861Z","lastModifiedTime":"2018-03-31T01:45:43.6782841Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/sssam3plonghaults","name":"sssam3plonghaults","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tpmwdnl10am3p.azuredatalakestore.net","accountId":"d4e618a4-cdb9-435c-afd5-aa30e72bc788","creationTime":"2017-05-12T17:19:49.1834382Z","lastModifiedTime":"2018-03-31T02:00:15.697563Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-TS-WD/providers/Microsoft.DataLakeStore/accounts/tpmwdnl10am3p","name":"tpmwdnl10am3p","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"amsperf03.azuredatalakestore.net","accountId":"11179b16-af32-46b3-a5b2-8d09fa8976f7","creationTime":"2018-03-05T19:32:29.5877865Z","lastModifiedTime":"2018-03-31T04:18:49.5567141Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amsperf03-rg/providers/Microsoft.DataLakeStore/accounts/amsperf03","name":"amsperf03","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"amsperfold01.azuredatalakestore.net","accountId":"789f47a9-91de-4261-b746-9167a84cc072","creationTime":"2018-01-18T23:02:26.425391Z","lastModifiedTime":"2018-04-09T20:52:02.3696589Z"},"location":"westeurope","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amsperfold01/providers/Microsoft.DataLakeStore/accounts/amsperfold01","name":"amsperfold01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfam3p06.azuredatalakestore.net","accountId":"83eb74ec-f95a-4354-877c-5b634889f36e","creationTime":"2017-04-28T01:16:20.7718094Z","lastModifiedTime":"2018-04-10T05:44:15.3829003Z"},"location":"westeurope","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cabosumameh/providers/Microsoft.DataLakeStore/accounts/adlsperfam3p06","name":"adlsperfam3p06","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3pperfns1.azuredatalakestore.net","accountId":"14960711-6bce-47f9-8442-ad30d61f18b3","creationTime":"2018-01-11T11:09:47.0633311Z","lastModifiedTime":"2018-04-10T05:44:20.1308437Z"},"location":"westeurope","tags":{"Component":"ADL_Perf","Project":"ADL_CapacityTesting","Evictable":"6/30/2018","Owner":"sumameh"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cabosumameh/providers/Microsoft.DataLakeStore/accounts/am3pperfns1","name":"am3pperfns1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cdhadlsperfwe.azuredatalakestore.net","accountId":"9c3c8d19-6a5d-478e-ad27-cdedf9ba34c5","creationTime":"2017-08-24T23:31:51.6963032Z","lastModifiedTime":"2018-03-31T17:26:06.2909674Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cdhadlsperfwe/providers/Microsoft.DataLakeStore/accounts/cdhadlsperfwe","name":"cdhadlsperfwe","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsam3phdd.azuredatalakestore.net","accountId":"3263ec06-3e38-4a9e-bb7d-42b4066b50fd","creationTime":"2017-06-13T22:45:08.7014672Z","lastModifiedTime":"2018-03-31T21:01:30.4609803Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/adlsam3phdd","name":"adlsam3phdd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsam3phddp0.azuredatalakestore.net","accountId":"05158e9e-112c-4858-965d-cfbf9b31ca9e","creationTime":"2017-06-13T23:56:03.2057073Z","lastModifiedTime":"2018-03-31T21:01:34.5994545Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/adlsam3phddp0","name":"adlsam3phddp0","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsam3pssd.azuredatalakestore.net","accountId":"15e4a48d-29e0-4553-a4ab-7c47b158b4bb","creationTime":"2017-06-13T23:54:13.5064961Z","lastModifiedTime":"2018-03-31T21:01:38.9080002Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/adlsam3pssd","name":"adlsam3pssd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsam3pwas.azuredatalakestore.net","accountId":"65096387-a369-4a16-915a-d7d9b2c3bb86","creationTime":"2017-04-28T04:31:08.1598228Z","lastModifiedTime":"2018-03-31T21:01:43.3139926Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/EndToEnd_PerfTest/providers/Microsoft.DataLakeStore/accounts/adlsam3pwas","name":"adlsam3pwas","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladlsgawesteurope.azuredatalakestore.net","accountId":"91814cb5-9ccf-415c-9b8d-136c462d621b","creationTime":"2018-04-05T22:04:05.4587011Z","lastModifiedTime":"2018-04-05T22:04:05.4587011Z"},"location":"westeurope","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladlsgawesteurope","name":"inteladlsgawesteurope","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladlstshddwesteurope.azuredatalakestore.net","accountId":"8489de7a-fb07-4e5e-a439-b12db1769723","creationTime":"2018-04-05T22:12:11.4171754Z","lastModifiedTime":"2018-04-05T22:12:11.4171754Z"},"location":"westeurope","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladlstshddwesteurope","name":"inteladlstshddwesteurope","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteltpcxbb.azuredatalakestore.net","accountId":"d3085bc5-6f0f-4c8b-b826-668c97a24678","creationTime":"2017-08-02T18:09:23.6596498Z","lastModifiedTime":"2018-03-31T22:13:14.7254112Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteltpcxbb","name":"inteltpcxbb","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"lattedatainsightsam.azuredatalakestore.net","accountId":"a48777b7-af15-4e63-a7da-5fa529db1ee3","creationTime":"2017-08-11T12:45:41.2808515Z","lastModifiedTime":"2018-03-31T22:47:08.8782865Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Latte/providers/Microsoft.DataLakeStore/accounts/lattedatainsightsam","name":"lattedatainsightsam","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10chelantest.azuredatalakestore.net","accountId":"88e9c96e-1a42-4b35-aa75-6cd3c3e6f05d","creationTime":"2018-02-20T07:15:57.957405Z","lastModifiedTime":"2018-04-01T02:17:23.1278251Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/adlnl10chelantest","name":"adlnl10chelantest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10wasbtest.azuredatalakestore.net","accountId":"01f71ee2-d0d4-42cf-a760-8eef2ddee8c7","creationTime":"2018-02-20T06:51:47.0962918Z","lastModifiedTime":"2018-04-01T02:17:26.1814095Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/adlnl10wasbtest","name":"adlnl10wasbtest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"chelanmonitoringssd.azuredatalakestore.net","accountId":"cf8f0805-6435-4d7f-a3ed-7f28d19635c5","creationTime":"2017-12-24T18:07:13.5316068Z","lastModifiedTime":"2018-04-01T02:17:33.9680121Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/chelanmonitoringssd","name":"chelanmonitoringssd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmalogstoragewas.azuredatalakestore.net","accountId":"bcea4ca8-7a6c-43f4-8864-33255d833ce0","creationTime":"2018-02-05T07:51:55.585453Z","lastModifiedTime":"2018-04-01T02:17:39.8701626Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/snvarmalogstoragewas","name":"snvarmalogstoragewas","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmawehddp4.azuredatalakestore.net","accountId":"a0ceb526-4d24-4e6a-9f62-e5e623350158","creationTime":"2018-02-01T09:24:41.3865691Z","lastModifiedTime":"2018-04-01T02:17:46.1175381Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/snvarmawehddp4","name":"snvarmawehddp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmawessdp4.azuredatalakestore.net","accountId":"a8bfc151-4d43-4d3e-9198-e14f3bb628bc","creationTime":"2018-02-01T08:50:06.1771908Z","lastModifiedTime":"2018-04-01T02:17:49.1350729Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/snvarmawessdp4","name":"snvarmawessdp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsam3p.azuredatalakestore.net","accountId":"9940b65f-25db-4c9f-bda4-767d57f34f7a","creationTime":"2017-04-28T01:21:36.1801705Z","lastModifiedTime":"2018-04-01T02:57:59.6801257Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sssperf/providers/Microsoft.DataLakeStore/accounts/adlsam3p","name":"adlsam3p","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshiveweu.azuredatalakestore.net","accountId":"c94c26f8-8da2-4964-901e-f6e68e706d92","creationTime":"2017-03-17T23:41:25.0668896Z","lastModifiedTime":"2018-04-01T02:58:11.3084849Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sssperf/providers/Microsoft.DataLakeStore/accounts/adlshiveweu","name":"adlshiveweu","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp1.azuredatalakestore.net","accountId":"d463bfd5-a5e1-4abb-9b12-fbc12550dcfc","creationTime":"2017-12-01T23:04:22.8248309Z","lastModifiedTime":"2018-04-17T20:36:33.263831Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp1","name":"am3adlshddp1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp1stress.azuredatalakestore.net","accountId":"123b7f9b-6d5a-4e68-b723-c7123ee771da","creationTime":"2017-12-01T23:06:42.0729611Z","lastModifiedTime":"2018-04-17T20:36:37.3036373Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp1stress","name":"am3adlshddp1stress","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp2.azuredatalakestore.net","accountId":"18ca15a4-086f-4c69-a696-a9608e67007b","creationTime":"2017-12-01T23:07:57.2493348Z","lastModifiedTime":"2018-04-17T20:36:40.9132475Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp2","name":"am3adlshddp2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp4.azuredatalakestore.net","accountId":"69097090-7b1c-457c-b556-e4d5c5ab4122","creationTime":"2017-12-01T20:39:56.4737636Z","lastModifiedTime":"2018-04-17T20:36:45.403987Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp4","name":"am3adlshddp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp4stress.azuredatalakestore.net","accountId":"fc24fd3b-581e-452c-afad-bd985af141b5","creationTime":"2017-12-01T22:04:06.5203739Z","lastModifiedTime":"2018-04-17T20:36:49.084771Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp4stress","name":"am3adlshddp4stress","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlshddp5.azuredatalakestore.net","accountId":"0813a7a1-57f6-4a49-a473-a275ab48ce6c","creationTime":"2017-12-01T20:40:48.4644517Z","lastModifiedTime":"2018-04-17T20:36:52.8427526Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlshddp5","name":"am3adlshddp5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlsssdp2.azuredatalakestore.net","accountId":"09728cb9-7ee6-4e1e-950c-5e7cbb35a5f2","creationTime":"2017-12-08T23:56:52.5532322Z","lastModifiedTime":"2018-04-17T20:36:56.7441321Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlsssdp2","name":"am3adlsssdp2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlsssdp4.azuredatalakestore.net","accountId":"02acb9c8-2a6f-406f-8606-5542299e822d","creationTime":"2017-12-08T23:57:46.8128001Z","lastModifiedTime":"2018-04-17T20:37:00.3047376Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlsssdp4","name":"am3adlsssdp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"am3adlswas.azuredatalakestore.net","accountId":"1105c65e-6871-4292-849c-70755a233de8","creationTime":"2018-03-19T16:32:53.2956555Z","lastModifiedTime":"2018-04-17T20:37:04.9366422Z"},"location":"westeurope","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/am3adlswas","name":"am3adlswas","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"weuropehddhadoop.azuredatalakestore.net","accountId":"9912ef22-23e9-4a2a-a979-daf3dd154905","creationTime":"2017-06-27T08:51:07.6274517Z","lastModifiedTime":"2018-04-01T05:43:56.5598829Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/weuropehddhadoop","name":"weuropehddhadoop","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10acltest.azuredatalakestore.net","accountId":"1a7bdbd6-5426-4a3c-98e0-81131cb26569","creationTime":"2017-01-24T07:43:13.36745Z","lastModifiedTime":"2018-04-01T05:54:52.3387101Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfstest/providers/Microsoft.DataLakeStore/accounts/adlnl10acltest","name":"adlnl10acltest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlnl10e2etest.azuredatalakestore.net","accountId":"b1324195-8e3d-41d1-bd10-daea392bced5","creationTime":"2017-01-24T07:41:51.5297051Z","lastModifiedTime":"2018-04-01T05:54:56.9786732Z"},"location":"westeurope","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfstest/providers/Microsoft.DataLakeStore/accounts/adlnl10e2etest","name":"adlnl10e2etest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01hddqi.azuredatalakestore.net","accountId":"b4324640-4932-439d-be11-632e0bcf985a","creationTime":"2017-07-21T19:26:46.9050899Z","lastModifiedTime":"2018-03-31T02:09:31.0096873Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS_PERF_HIVE/providers/Microsoft.DataLakeStore/accounts/adlie01hddqi","name":"adlie01hddqi","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01hddsteven.azuredatalakestore.net","accountId":"b071b7d0-f617-433a-8afa-b82d4bfdc3f9","creationTime":"2017-07-21T19:25:32.4198724Z","lastModifiedTime":"2018-03-31T02:09:36.0116068Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS_PERF_HIVE/providers/Microsoft.DataLakeStore/accounts/adlie01hddsteven","name":"adlie01hddsteven","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsdan2.azuredatalakestore.net","accountId":"3df36cdb-5bc0-4a52-82bb-00a8d88638ea","creationTime":"2016-08-01T20:17:24.0411332Z","lastModifiedTime":"2018-03-31T01:13:59.0439231Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Dan/providers/Microsoft.DataLakeStore/accounts/adlsdan2","name":"adlsdan2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Failed","state":null,"endpoint":null,"accountId":"c1464836-edf3-4ecf-9eae-d61de707f982"},"location":"ukwest","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Dan/providers/Microsoft.DataLakeStore/accounts/adlsperfsdkdb5","name":"adlsperfsdkdb5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10ne.azuredatalakestore.net","accountId":"0822f55a-1dd1-445f-b0d2-fd4329d35847","creationTime":"2016-11-18T04:47:37.439593Z","lastModifiedTime":"2018-03-31T01:15:34.5035797Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10ne","name":"hdiadlstest10ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10nee.azuredatalakestore.net","accountId":"7c3d4f64-49f6-4ff1-998e-c5f893bd0b95","creationTime":"2017-02-14T06:27:51.7555079Z","lastModifiedTime":"2018-03-31T01:15:37.7550514Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10nee","name":"hdiadlstest10nee","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10net.azuredatalakestore.net","accountId":"62142fa4-7edc-4495-9ae6-b73165f01ebb","creationTime":"2017-02-02T18:31:39.2427043Z","lastModifiedTime":"2018-03-31T01:15:44.2412489Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10net","name":"hdiadlstest10net","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest10netws.azuredatalakestore.net","accountId":"88f5abaf-7195-4eaa-909c-c64301fd6501","creationTime":"2017-02-17T05:00:49.4962861Z","lastModifiedTime":"2018-03-31T01:15:47.6690522Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest10netws","name":"hdiadlstest10netws","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11ne.azuredatalakestore.net","accountId":"4891ce60-28d2-4a83-ac02-6d9ba45bec79","creationTime":"2016-11-21T17:04:23.5353517Z","lastModifiedTime":"2018-03-31T01:16:04.251318Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11ne","name":"hdiadlstest11ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11net.azuredatalakestore.net","accountId":"a3b59db6-89e3-4c4e-8b2c-1f153d06706d","creationTime":"2017-02-02T18:32:24.2550597Z","lastModifiedTime":"2018-03-31T01:16:14.2968026Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11net","name":"hdiadlstest11net","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11netlh.azuredatalakestore.net","accountId":"14fd9a8e-97d9-43c1-bbd0-1aba0efdb3d7","creationTime":"2017-04-26T05:40:13.1442874Z","lastModifiedTime":"2018-03-31T01:16:17.6846899Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11netlh","name":"hdiadlstest11netlh","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11netws.azuredatalakestore.net","accountId":"c9b89626-2d5a-443c-8ea9-f1b289051abf","creationTime":"2017-02-17T00:27:04.1394757Z","lastModifiedTime":"2018-03-31T01:16:21.1632805Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11netws","name":"hdiadlstest11netws","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11ukwethp0.azuredatalakestore.net","accountId":"729542de-88e5-4208-b4a5-7baf182ce4ec","creationTime":"2017-08-01T06:27:47.5437557Z","lastModifiedTime":"2018-03-31T01:16:25.3225112Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11ukwethp0","name":"hdiadlstest11ukwethp0","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11ukwethp1.azuredatalakestore.net","accountId":"f7920609-74da-40f7-b6a7-ffd4cb214840","creationTime":"2017-08-08T19:15:12.2300619Z","lastModifiedTime":"2018-03-31T01:16:28.5702791Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11ukwethp1","name":"hdiadlstest11ukwethp1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest11ukwethp4.azuredatalakestore.net","accountId":"ebe82b81-2a39-4f39-bc6b-094be6426296","creationTime":"2017-08-01T06:50:42.8592483Z","lastModifiedTime":"2018-03-31T01:16:33.4758189Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest11ukwethp4","name":"hdiadlstest11ukwethp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdiadlstest12ukwetsp1.azuredatalakestore.net","accountId":"ddbd6525-ab8a-4c10-b33c-c551efe9b7af","creationTime":"2017-12-08T06:44:33.2776949Z","lastModifiedTime":"2018-03-31T01:16:55.4997239Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-PERF-HBASE/providers/Microsoft.DataLakeStore/accounts/hdiadlstest12ukwetsp1","name":"hdiadlstest12ukwetsp1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlshiveperfneu02.azuredatalakestore.net","accountId":"c7b14187-0157-4169-87b6-c4e5bdf3eb8c","creationTime":"2016-08-14T12:34:29.8506767Z","lastModifiedTime":"2018-03-31T01:32:27.5458455Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlshiveperfneu02","name":"adlshiveperfneu02","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfhiveclusterneu3.azuredatalakestore.net","accountId":"361a2b09-8823-4fe2-8de9-51f7a9a89b53","creationTime":"2016-08-10T15:32:24.140567Z","lastModifiedTime":"2018-03-31T01:32:40.1424632Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/adlsperfhiveclusterneu3","name":"adlsperfhiveclusterneu3","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdfscontractdb5.azuredatalakestore.net","accountId":"d2ff2328-8303-4004-8e78-78cf762bd7f4","creationTime":"2016-12-02T17:35:30.4520765Z","lastModifiedTime":"2018-03-31T01:33:15.9145543Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/hdfscontractdb5","name":"hdfscontractdb5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"nasachinadlie.azuredatalakestore.net","accountId":"b570be58-c7db-45de-9156-36fb15ad23ba","creationTime":"2017-11-02T09:45:45.242065Z","lastModifiedTime":"2018-03-31T01:33:21.7765887Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-E2E-TEST/providers/Microsoft.DataLakeStore/accounts/nasachinadlie","name":"nasachinadlie","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlswas.azuredatalakestore.net","accountId":"c7612127-aa71-4401-b677-2ba1813173be","creationTime":"2018-06-08T07:34:14.3081452Z","lastModifiedTime":"2018-06-08T07:34:14.3081452Z"},"location":"ukwest","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/db5adlswas","name":"db5adlswas","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"perfdata.azuredatalakestore.net","accountId":"796c14ea-ac71-4606-994f-b98ad6683201","creationTime":"2016-09-28T21:31:23.2768503Z","lastModifiedTime":"2018-03-31T01:44:59.4750676Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/perfdata","name":"perfdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"spiromdublin.azuredatalakestore.net","accountId":"09507c0a-9027-4478-9d5d-8a962471845d","creationTime":"2016-11-30T02:31:23.7410758Z","lastModifiedTime":"2018-03-31T01:45:26.7026264Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/spiromdublin","name":"spiromdublin","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"srevadlne.azuredatalakestore.net","accountId":"5c0b4479-aea6-45ae-9f16-d5f0bdd3b576","creationTime":"2016-08-23T07:33:20.9254485Z","lastModifiedTime":"2018-03-31T01:45:30.6277881Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/srevadlne","name":"srevadlne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"srevadlne2.azuredatalakestore.net","accountId":"91729377-8e21-455a-856b-56bb4e3675ef","creationTime":"2016-08-23T18:52:37.6002246Z","lastModifiedTime":"2018-03-31T01:45:33.90568Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/srevadlne2","name":"srevadlne2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sssdb5longhaults.azuredatalakestore.net","accountId":"1e5ae6b7-0c02-44c9-bed9-8efc711e48f2","creationTime":"2017-11-30T21:44:50.3646972Z","lastModifiedTime":"2018-03-31T01:45:46.7604537Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-PERF/providers/Microsoft.DataLakeStore/accounts/sssdb5longhaults","name":"sssdb5longhaults","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"benchmarktierstoressd.azuredatalakestore.net","accountId":"182d5ae3-eb34-4cf5-818a-b6b6852e0e3c","creationTime":"2017-01-04T18:52:03.0583152Z","lastModifiedTime":"2018-03-31T01:56:45.885344Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/benchmarktierstoressd","name":"benchmarktierstoressd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defaultneuropebenchmark.azuredatalakestore.net","accountId":"cda29fcc-3852-4426-bbe9-82d6262b8781","creationTime":"2016-10-31T19:13:05.981294Z","lastModifiedTime":"2018-03-31T01:56:51.2727628Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ADLS-Steven/providers/Microsoft.DataLakeStore/accounts/defaultneuropebenchmark","name":"defaultneuropebenchmark","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"asikaria1db5.azuredatalakestore.net","accountId":"12f7fe24-3ec9-4ac5-84c4-9effaff9f3e1","creationTime":"2017-01-20T19:21:00.1410263Z","lastModifiedTime":"2018-04-11T19:32:38.079129Z"},"location":"ukwest","tags":{"Component":"ADLS-SDK","Project":"ADLS-SDK","Evictable":"06/30/2019","Owner":"asikaria"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/asikaria1db5RG2/providers/Microsoft.DataLakeStore/accounts/asikaria1db5","name":"asikaria1db5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Failed","state":null,"endpoint":null,"accountId":"22168c37-5763-438c-93d6-6ca84dcb26d7"},"location":"ukwest","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cabosumameh/providers/Microsoft.DataLakeStore/accounts/adlie01perf21","name":"adlie01perf21","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"chakrabdb5.azuredatalakestore.net","accountId":"ff4f9272-831d-41e0-bbe0-edcfc01548d2","creationTime":"2016-11-13T17:19:30.4372677Z","lastModifiedTime":"2018-03-31T17:28:05.5459394Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/chakrab/providers/Microsoft.DataLakeStore/accounts/chakrabdb5","name":"chakrabdb5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Failed","state":null,"endpoint":null,"accountId":"83c1abef-ecc7-47f8-a2c6-d24824240ffb","creationTime":"2016-04-22T06:59:19.5098042Z","lastModifiedTime":"2016-04-22T06:59:19.5098042Z"},"location":"ukwest","tags":{},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-24-DB5/providers/Microsoft.DataLakeStore/accounts/adldevtest22","name":"adldevtest22","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Failed","state":null,"endpoint":null,"accountId":"14bb3218-8bd0-4698-8c0e-736752f20552","creationTime":"2016-04-22T07:22:17.5991588Z","lastModifiedTime":"2016-04-22T07:22:17.5991588Z"},"location":"ukwest","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-24-DB5/providers/Microsoft.DataLakeStore/accounts/adldevtest44","name":"adldevtest44","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha1hadl25ne.azuredatalakestore.net","accountId":"6a0a35ea-8579-45a2-8b27-f7cd3207a1aa","creationTime":"2016-08-30T05:38:00.2941735Z","lastModifiedTime":"2018-03-31T21:44:54.9322373Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha1hadl25ne","name":"ha1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha2hadl25ne.azuredatalakestore.net","accountId":"59f55c75-15b9-48a8-8b3e-c7a4a5747f43","creationTime":"2016-08-30T05:38:40.3547083Z","lastModifiedTime":"2018-03-31T21:45:03.9307886Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha2hadl25ne","name":"ha2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha3hadl25ne.azuredatalakestore.net","accountId":"905c70a2-85a8-4af1-ba51-91444013fe1b","creationTime":"2016-08-30T05:39:21.9604376Z","lastModifiedTime":"2018-03-31T21:45:07.6532759Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha3hadl25ne","name":"ha3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha4hadl25ne.azuredatalakestore.net","accountId":"fce86758-e58b-4e97-bea9-980a7939fbb7","creationTime":"2016-08-30T05:40:00.0313711Z","lastModifiedTime":"2018-03-31T21:45:12.5374189Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha4hadl25ne","name":"ha4hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha6hadl25ne.azuredatalakestore.net","accountId":"d14d0207-9f35-4bf4-bd14-e32ebd9c5089","creationTime":"2016-08-30T05:40:42.3936987Z","lastModifiedTime":"2018-03-31T21:45:20.5864799Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha6hadl25ne","name":"ha6hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha7hadl25ne.azuredatalakestore.net","accountId":"9e92de8e-5d7e-44b1-8cc2-484960583b83","creationTime":"2016-08-30T05:41:25.5080004Z","lastModifiedTime":"2018-03-31T21:45:36.4667887Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha7hadl25ne","name":"ha7hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha8hadl25ne.azuredatalakestore.net","accountId":"8a8a318e-f5e2-4d8b-b6e6-2ed8b0537f9f","creationTime":"2016-08-30T05:42:10.2637249Z","lastModifiedTime":"2018-03-31T21:45:40.7127804Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha8hadl25ne","name":"ha8hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ha9hadl25ne.azuredatalakestore.net","accountId":"d546a37e-edd3-4869-83cf-6e27876798a5","creationTime":"2016-08-30T05:42:49.6958597Z","lastModifiedTime":"2018-03-31T21:45:45.0927348Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/ha9hadl25ne","name":"ha9hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hahb1hadl25ne.azuredatalakestore.net","accountId":"1573b0e7-3f4a-484c-a3f3-7ccd177bba4c","creationTime":"2016-08-30T05:43:31.1545774Z","lastModifiedTime":"2018-03-31T21:45:50.8548948Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hahb1hadl25ne","name":"hahb1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hahb2hadl25ne.azuredatalakestore.net","accountId":"f1d6b3a5-c961-4eb9-b3e3-b3b2d056f569","creationTime":"2016-08-30T05:44:14.9382158Z","lastModifiedTime":"2018-03-31T21:45:56.6144139Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hahb2hadl25ne","name":"hahb2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hahb3hadl25ne.azuredatalakestore.net","accountId":"ecdbc2f1-c5a2-49d7-b887-b485761ce723","creationTime":"2016-08-30T05:44:54.3430817Z","lastModifiedTime":"2018-03-31T21:46:01.5869976Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hahb3hadl25ne","name":"hahb3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbase1hadl25ne.azuredatalakestore.net","accountId":"a4e87cb1-344e-4511-a2f8-8b6ffea3b0d4","creationTime":"2016-08-30T05:45:34.8012894Z","lastModifiedTime":"2018-03-31T21:46:07.1575716Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hbase1hadl25ne","name":"hbase1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbase2hadl25ne.azuredatalakestore.net","accountId":"0795776f-62bc-4c36-a2bd-8ad214a2f779","creationTime":"2016-08-30T05:46:16.6473788Z","lastModifiedTime":"2018-03-31T21:46:12.4729551Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hbase2hadl25ne","name":"hbase2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbase3hadl25ne.azuredatalakestore.net","accountId":"4bcde730-ed96-4f40-9f3c-68587a5e6102","creationTime":"2016-08-30T05:46:58.2718863Z","lastModifiedTime":"2018-03-31T21:46:16.6847121Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hbase3hadl25ne","name":"hbase3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbase4hadl25ne.azuredatalakestore.net","accountId":"d4406f8d-d171-4f63-9111-c47882838f52","creationTime":"2016-08-30T05:47:39.6017623Z","lastModifiedTime":"2018-03-31T21:46:23.1390286Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hbase4hadl25ne","name":"hbase4hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hbase5hadl25ne.azuredatalakestore.net","accountId":"b2a4d876-fa5a-4e7b-9040-4c44083345fe","creationTime":"2016-08-30T05:48:23.3100983Z","lastModifiedTime":"2018-03-31T21:46:29.1950899Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hbase5hadl25ne","name":"hbase5hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hcathadl25ne.azuredatalakestore.net","accountId":"f6a119fb-9552-4362-b9f4-98602de0ea80","creationTime":"2016-08-30T05:49:01.413833Z","lastModifiedTime":"2018-03-31T21:46:33.7711438Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hcathadl25ne","name":"hcathadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hdfshadl25ne.azuredatalakestore.net","accountId":"a5cdfe19-27bd-4872-b5c9-32faea3ce88a","creationTime":"2016-08-30T05:49:45.3076958Z","lastModifiedTime":"2018-03-31T21:46:38.8795675Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hdfshadl25ne","name":"hdfshadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hive1hadl25ne.azuredatalakestore.net","accountId":"748ad20c-b2cb-4f12-a522-83582f4ac526","creationTime":"2016-08-30T05:50:24.9113215Z","lastModifiedTime":"2018-03-31T21:46:43.5742127Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hive1hadl25ne","name":"hive1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hive2hadl25ne.azuredatalakestore.net","accountId":"b81a0fea-6c7a-44e3-b614-b90de921bad2","creationTime":"2016-08-30T05:51:07.2562061Z","lastModifiedTime":"2018-03-31T21:46:47.8746535Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hive2hadl25ne","name":"hive2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hive3hadl25ne.azuredatalakestore.net","accountId":"ef6801a6-c991-4068-8d70-4cf703b59124","creationTime":"2016-08-30T05:51:47.3923847Z","lastModifiedTime":"2018-03-31T21:46:52.1647331Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hive3hadl25ne","name":"hive3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hive4hadl25ne.azuredatalakestore.net","accountId":"84704e84-2499-48c6-9295-4a06b369ad91","creationTime":"2016-08-30T05:52:29.7211477Z","lastModifiedTime":"2018-03-31T21:46:56.3318737Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hive4hadl25ne","name":"hive4hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs210hadl25ne.azuredatalakestore.net","accountId":"41a08413-8b94-45ba-8fd5-d762ff767905","creationTime":"2016-08-30T05:53:51.2442336Z","lastModifiedTime":"2018-03-31T21:47:00.3883915Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs210hadl25ne","name":"hs210hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs211hadl25ne.azuredatalakestore.net","accountId":"1d350e7f-68da-43f7-9497-00dcd480b46f","creationTime":"2016-08-30T05:54:33.9100445Z","lastModifiedTime":"2018-03-31T21:47:04.731629Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs211hadl25ne","name":"hs211hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs212hadl25ne.azuredatalakestore.net","accountId":"2413658e-80d5-4626-b16b-8559e11e4685","creationTime":"2016-08-30T05:55:16.1825835Z","lastModifiedTime":"2018-03-31T21:47:08.8653861Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs212hadl25ne","name":"hs212hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs213hadl25ne.azuredatalakestore.net","accountId":"69be05c2-3da2-49e8-a972-b318f97f528b","creationTime":"2016-08-30T05:55:55.2954321Z","lastModifiedTime":"2018-03-31T21:47:12.8510078Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs213hadl25ne","name":"hs213hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs214hadl25ne.azuredatalakestore.net","accountId":"044ea28e-685d-4f45-a870-9080ebd865af","creationTime":"2016-08-30T05:56:38.47935Z","lastModifiedTime":"2018-03-31T21:47:17.4207323Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs214hadl25ne","name":"hs214hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs215hadl25ne.azuredatalakestore.net","accountId":"a406cdec-716d-401e-b637-1398252cca9f","creationTime":"2016-08-30T05:57:20.0123412Z","lastModifiedTime":"2018-03-31T21:47:21.4661206Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs215hadl25ne","name":"hs215hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs216hadl25ne.azuredatalakestore.net","accountId":"dfa79136-b15f-486d-a744-807e3c439d3f","creationTime":"2016-08-30T05:58:03.3212767Z","lastModifiedTime":"2018-03-31T21:47:25.3445039Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs216hadl25ne","name":"hs216hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs217hadl25ne.azuredatalakestore.net","accountId":"df589cd8-2535-4545-9338-7d583bcdc781","creationTime":"2016-08-30T05:58:42.042751Z","lastModifiedTime":"2018-03-31T21:47:29.4020084Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs217hadl25ne","name":"hs217hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs218hadl25ne.azuredatalakestore.net","accountId":"5900ed38-6512-47df-9976-1b0ae2f5164f","creationTime":"2016-08-30T05:59:21.5617045Z","lastModifiedTime":"2018-03-31T21:47:34.4407026Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs218hadl25ne","name":"hs218hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs219hadl25ne.azuredatalakestore.net","accountId":"446536a3-b6b8-4706-b828-40b0ed602196","creationTime":"2016-08-30T06:00:02.7805496Z","lastModifiedTime":"2018-03-31T21:47:38.9991093Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs219hadl25ne","name":"hs219hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs21hadl25ne.azuredatalakestore.net","accountId":"e1056993-84ad-4c75-9aff-63a819756338","creationTime":"2016-08-30T05:53:10.4893613Z","lastModifiedTime":"2018-03-31T21:47:42.9019895Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs21hadl25ne","name":"hs21hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs22hadl25ne.azuredatalakestore.net","accountId":"dc6c6962-beb2-4c5d-ac79-396e2754f4d7","creationTime":"2016-08-30T06:00:44.6306996Z","lastModifiedTime":"2018-03-31T21:47:46.7898642Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs22hadl25ne","name":"hs22hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs23hadl25ne.azuredatalakestore.net","accountId":"7e805752-92b0-4fc9-a4a0-4193938967a0","creationTime":"2016-08-30T06:01:24.7524018Z","lastModifiedTime":"2018-03-31T21:47:50.9210855Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs23hadl25ne","name":"hs23hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs24hadl25ne.azuredatalakestore.net","accountId":"be5f84d0-0aad-4653-b8e8-a43a7645ef30","creationTime":"2016-08-30T06:02:04.3489769Z","lastModifiedTime":"2018-03-31T21:47:54.9105981Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs24hadl25ne","name":"hs24hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs25hadl25ne.azuredatalakestore.net","accountId":"82282756-b7d1-45d6-8de1-4212df4a46ff","creationTime":"2016-08-30T06:02:45.9334808Z","lastModifiedTime":"2018-03-31T21:47:59.2123203Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs25hadl25ne","name":"hs25hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs26hadl25ne.azuredatalakestore.net","accountId":"70eb27b6-51f6-49eb-826f-4e09ed1144f4","creationTime":"2016-08-30T06:03:26.4368147Z","lastModifiedTime":"2018-03-31T21:48:03.3279333Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs26hadl25ne","name":"hs26hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs27hadl25ne.azuredatalakestore.net","accountId":"1ef2a07b-4ccd-4a41-a65f-72eee88e7970","creationTime":"2016-08-30T06:04:08.0911811Z","lastModifiedTime":"2018-03-31T21:48:07.476711Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs27hadl25ne","name":"hs27hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs28hadl25ne.azuredatalakestore.net","accountId":"f766acf0-2b52-4c34-8ad0-4aa6735992c0","creationTime":"2016-08-30T06:04:50.3828989Z","lastModifiedTime":"2018-03-31T21:48:11.6921987Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs28hadl25ne","name":"hs28hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hs29hadl25ne.azuredatalakestore.net","accountId":"a122e897-8c0f-4d16-a33c-01da4a538b37","creationTime":"2016-08-30T06:05:29.0192936Z","lastModifiedTime":"2018-03-31T21:48:15.3890009Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hs29hadl25ne","name":"hs29hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hsrv2hadl25ne.azuredatalakestore.net","accountId":"961e4a64-e2ad-43e5-8e2a-7f88f23dd51d","creationTime":"2016-08-30T06:06:08.7463475Z","lastModifiedTime":"2018-03-31T21:48:19.4594045Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/hsrv2hadl25ne","name":"hsrv2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"mahouthadl25ne.azuredatalakestore.net","accountId":"d93502cb-ebc2-4a47-a466-1927041f1611","creationTime":"2016-08-30T06:06:51.1072948Z","lastModifiedTime":"2018-03-31T21:48:23.7977194Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/mahouthadl25ne","name":"mahouthadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"mapred1hadl25ne.azuredatalakestore.net","accountId":"6f73d58d-c23c-4a54-8333-0186abe356e2","creationTime":"2016-08-30T06:07:33.5953146Z","lastModifiedTime":"2018-03-31T21:48:28.1771533Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/mapred1hadl25ne","name":"mapred1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"mapred2hadl25ne.azuredatalakestore.net","accountId":"b034fac2-e341-43d9-9b8d-af596f6c4a80","creationTime":"2016-08-30T06:08:13.1233329Z","lastModifiedTime":"2018-03-31T21:48:32.3796412Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/mapred2hadl25ne","name":"mapred2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"oozie1hadl25ne.azuredatalakestore.net","accountId":"6bbdedbd-dc24-4a83-a1d7-c54f5fe03721","creationTime":"2016-08-30T06:08:53.6092079Z","lastModifiedTime":"2018-03-31T21:48:37.2194044Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/oozie1hadl25ne","name":"oozie1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"oozie2hadl25ne.azuredatalakestore.net","accountId":"dc92badd-306f-4cc9-8c6e-c410e8c986cf","creationTime":"2016-08-30T06:09:34.3989858Z","lastModifiedTime":"2018-03-31T21:48:41.3815867Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/oozie2hadl25ne","name":"oozie2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"oozie3hadl25ne.azuredatalakestore.net","accountId":"51d3e160-2247-4999-8d24-3fd002e47b12","creationTime":"2016-08-30T06:10:15.7253463Z","lastModifiedTime":"2018-03-31T21:48:45.5575868Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/oozie3hadl25ne","name":"oozie3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"phoenix1hadl25ne.azuredatalakestore.net","accountId":"9d03e20f-fd5e-474c-b1a3-b11647637fa3","creationTime":"2016-09-01T04:55:37.8207185Z","lastModifiedTime":"2018-03-31T21:48:49.642653Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/phoenix1hadl25ne","name":"phoenix1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"phoenix2hadl25ne.azuredatalakestore.net","accountId":"082090c5-291f-440e-8d0f-41742e810306","creationTime":"2016-09-01T04:56:18.088745Z","lastModifiedTime":"2018-03-31T21:48:53.3227577Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/phoenix2hadl25ne","name":"phoenix2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"pig2hadl25ne.azuredatalakestore.net","accountId":"6824fcbb-fa04-435b-8537-693dc721b6fe","creationTime":"2016-08-30T06:12:58.7637934Z","lastModifiedTime":"2018-03-31T21:48:57.4151292Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/pig2hadl25ne","name":"pig2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"pighadl25ne.azuredatalakestore.net","accountId":"fe9111f3-0bf2-4cec-b13a-bd3227f77554","creationTime":"2016-08-30T06:12:18.5935066Z","lastModifiedTime":"2018-03-31T21:49:01.4858375Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/pighadl25ne","name":"pighadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"pqchadl25ne.azuredatalakestore.net","accountId":"e25ae48f-85bf-410e-a005-0cf0d6d0e189","creationTime":"2016-09-01T04:56:57.2281902Z","lastModifiedTime":"2018-03-31T21:49:05.5915094Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/pqchadl25ne","name":"pqchadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"pqshadl25ne.azuredatalakestore.net","accountId":"4d4c921d-ec2d-45d0-9b33-e80d7de857e4","creationTime":"2016-09-01T04:57:39.1878734Z","lastModifiedTime":"2018-03-31T21:49:10.5103353Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/pqshadl25ne","name":"pqshadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sliderhadl25ne.azuredatalakestore.net","accountId":"8782993a-220b-424f-8520-961524fe1692","creationTime":"2016-08-30T06:15:01.022262Z","lastModifiedTime":"2018-03-31T21:49:14.6311452Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/sliderhadl25ne","name":"sliderhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"spark2hadl25ne.azuredatalakestore.net","accountId":"6fbf7182-20df-41d9-878e-f6460dd24f98","creationTime":"2016-08-30T06:16:21.1970202Z","lastModifiedTime":"2018-03-31T21:49:18.2466516Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/spark2hadl25ne","name":"spark2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkhadl25ne.azuredatalakestore.net","accountId":"769662a7-3ecf-499f-bb46-ded59f0f3395","creationTime":"2016-08-30T06:15:40.9834203Z","lastModifiedTime":"2018-03-31T21:49:22.3730036Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/sparkhadl25ne","name":"sparkhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkhhadl25ne.azuredatalakestore.net","accountId":"cfac02cb-8d4c-49e0-9303-48af6923e387","creationTime":"2016-08-30T06:17:00.2666617Z","lastModifiedTime":"2018-03-31T21:49:26.5782652Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/sparkhhadl25ne","name":"sparkhhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sqoophadl25ne.azuredatalakestore.net","accountId":"36ea99f5-241b-4937-9ba2-ac0dcc549bd3","creationTime":"2016-08-30T06:17:40.7203741Z","lastModifiedTime":"2018-03-31T21:49:30.8070405Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/sqoophadl25ne","name":"sqoophadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"stormhadl25ne.azuredatalakestore.net","accountId":"db778174-e1f5-4128-b1b0-136af06cb57e","creationTime":"2016-08-30T06:18:23.2550976Z","lastModifiedTime":"2018-03-31T21:49:35.389229Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/stormhadl25ne","name":"stormhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tez1hadl25ne.azuredatalakestore.net","accountId":"ee63470e-74d7-49fd-a6ee-59ba3efe768a","creationTime":"2016-08-30T06:19:03.7991921Z","lastModifiedTime":"2018-03-31T21:49:39.6178459Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tez1hadl25ne","name":"tez1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tez2hadl25ne.azuredatalakestore.net","accountId":"a49ded70-45ae-4f5b-86fe-e26a5c7873ba","creationTime":"2016-08-30T06:19:45.1187954Z","lastModifiedTime":"2018-03-31T21:49:43.6315595Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tez2hadl25ne","name":"tez2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tez3hadl25ne.azuredatalakestore.net","accountId":"c1ab3720-c239-43cb-a189-1d56cadbf95d","creationTime":"2016-08-30T06:20:25.2233559Z","lastModifiedTime":"2018-03-31T21:49:47.6285609Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tez3hadl25ne","name":"tez3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tezv21hadl25ne.azuredatalakestore.net","accountId":"06c1164c-2a47-4e40-8a13-8fdaa21fad9e","creationTime":"2016-09-01T04:58:20.8559754Z","lastModifiedTime":"2018-03-31T21:49:51.7429698Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tezv21hadl25ne","name":"tezv21hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tezv22hadl25ne.azuredatalakestore.net","accountId":"b9abee6b-5ace-4b72-a7f2-73dcdaee55ce","creationTime":"2016-09-01T04:59:00.3220011Z","lastModifiedTime":"2018-03-31T21:49:55.9602602Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tezv22hadl25ne","name":"tezv22hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tezv23hadl25ne.azuredatalakestore.net","accountId":"861f550c-2695-4d0e-b5e4-e856b1d04caf","creationTime":"2016-09-01T04:59:43.5067238Z","lastModifiedTime":"2018-03-31T21:50:00.0650762Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/tezv23hadl25ne","name":"tezv23hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"webhhadl25ne.azuredatalakestore.net","accountId":"d1d68ca8-2f40-4888-b3c8-7fbd5f83d85a","creationTime":"2016-08-30T06:23:13.2621621Z","lastModifiedTime":"2018-03-31T21:50:04.4692025Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/webhhadl25ne","name":"webhhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yarn1hadl25ne.azuredatalakestore.net","accountId":"20f90712-dab6-48a4-804b-5d5bfaa6faa4","creationTime":"2016-08-30T06:23:50.3524793Z","lastModifiedTime":"2018-03-31T21:50:08.3615545Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/yarn1hadl25ne","name":"yarn1hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yarn2hadl25ne.azuredatalakestore.net","accountId":"c5cb9c6c-c221-4a3c-ac88-cd07f9375b01","creationTime":"2016-08-30T06:24:35.5819011Z","lastModifiedTime":"2018-03-31T21:50:12.0816007Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/yarn2hadl25ne","name":"yarn2hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yarn3hadl25ne.azuredatalakestore.net","accountId":"933f0568-c11e-4095-8b85-e7fdb6c94e67","creationTime":"2016-08-30T06:25:14.3144237Z","lastModifiedTime":"2018-03-31T21:50:15.9253679Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/yarn3hadl25ne","name":"yarn3hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yarn4hadl25ne.azuredatalakestore.net","accountId":"b14cd603-a84a-414a-8c47-e82da3015b0b","creationTime":"2016-08-30T06:25:54.3838675Z","lastModifiedTime":"2018-03-31T21:50:19.882303Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/yarn4hadl25ne","name":"yarn4hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"yarn5hadl25ne.azuredatalakestore.net","accountId":"04357a09-f866-412b-a925-84aa8c33bb6a","creationTime":"2016-08-30T06:26:35.2347374Z","lastModifiedTime":"2018-03-31T21:50:23.8639528Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/yarn5hadl25ne","name":"yarn5hadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"zeppelinhadl25ne.azuredatalakestore.net","accountId":"3aef3090-cf28-4793-b9e7-e2ccec0f8c5f","creationTime":"2016-09-01T05:00:23.9140272Z","lastModifiedTime":"2018-03-31T21:50:28.3951464Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/zeppelinhadl25ne","name":"zeppelinhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"zkhadl25ne.azuredatalakestore.net","accountId":"64899a19-4768-4326-ae4e-8096632963c7","creationTime":"2016-08-30T06:27:57.9373178Z","lastModifiedTime":"2018-03-31T21:50:32.7016405Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/HWX-CERT-25-PROD-NE/providers/Microsoft.DataLakeStore/accounts/zkhadl25ne","name":"zkhadl25ne","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladls.azuredatalakestore.net","accountId":"e699494f-d3ec-404e-8658-3d4b91ff27dd","creationTime":"2017-07-15T00:03:29.7685318Z","lastModifiedTime":"2018-03-31T22:18:54.3581948Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Intel_RG/providers/Microsoft.DataLakeStore/accounts/inteladls","name":"inteladls","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladls1.azuredatalakestore.net","accountId":"8996258f-3321-4f57-a94f-570e10484584","creationTime":"2017-07-14T02:12:00.3896709Z","lastModifiedTime":"2018-03-31T22:12:44.923806Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladls1","name":"inteladls1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladls1gaukwest.azuredatalakestore.net","accountId":"623b0183-8d5e-4386-b802-dc785a6a0b2d","creationTime":"2017-10-04T20:27:04.0214126Z","lastModifiedTime":"2018-03-31T22:12:53.6092342Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladls1gaukwest","name":"inteladls1gaukwest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladls1tshdd.azuredatalakestore.net","accountId":"62616fe7-7f13-4023-b9c2-a6a56334b07e","creationTime":"2017-07-14T02:19:51.7013002Z","lastModifiedTime":"2018-03-31T22:12:57.6977402Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladls1tshdd","name":"inteladls1tshdd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"inteladlstshdd.azuredatalakestore.net","accountId":"22859fcb-a6c6-4cc9-b385-700f900f7a4a","creationTime":"2017-07-15T00:12:35.9767391Z","lastModifiedTime":"2018-03-31T22:13:10.1423533Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/intel-rg/providers/Microsoft.DataLakeStore/accounts/inteladlstshdd","name":"inteladlstshdd","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"michandnwestukadlie01.azuredatalakestore.net","accountId":"5d504edd-c121-4b37-92fc-560dac7a3b33","creationTime":"2017-10-03T13:17:46.0528945Z","lastModifiedTime":"2018-04-01T00:05:14.4378101Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/michandn-west-uk-adlie01-rg/providers/Microsoft.DataLakeStore/accounts/michandnwestukadlie01","name":"michandnwestukadlie01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlprodd5.azuredatalakestore.net","accountId":"04a69429-c7d9-4b86-ab49-f56d27c5515b","creationTime":"2016-04-11T08:37:05.8614261Z","lastModifiedTime":"2018-04-01T00:49:13.7408953Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/North-Europe-ADL-PERF/providers/Microsoft.DataLakeStore/accounts/adlprodd5","name":"adlprodd5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"proddb5adlperf.azuredatalakestore.net","accountId":"0f8729d3-f1e2-4798-bd2e-c2002a0f93b9","creationTime":"2016-03-30T21:53:20.2388694Z","lastModifiedTime":"2018-04-01T00:49:17.7855141Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/North-Europe-ADL-PERF/providers/Microsoft.DataLakeStore/accounts/proddb5adlperf","name":"proddb5adlperf","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sarvav2perf19.azuredatalakestore.net","accountId":"cd4e052e-6e32-4f72-a640-d87c9483bdf1","creationTime":"2016-05-25T23:24:12.6640527Z","lastModifiedTime":"2018-04-01T00:49:22.4013815Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/North-Europe-ADL-PERF/providers/Microsoft.DataLakeStore/accounts/sarvav2perf19","name":"sarvav2perf19","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01hddregresion.azuredatalakestore.net","accountId":"1568b459-160c-47f7-9c5e-ddd52dd71e9a","creationTime":"2017-05-23T16:10:25.4521078Z","lastModifiedTime":"2018-04-01T01:05:32.1492499Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Perf_regression_test/providers/Microsoft.DataLakeStore/accounts/adlie01hddregresion","name":"adlie01hddregresion","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01perf01.azuredatalakestore.net","accountId":"14bd30ee-8c8a-452c-9486-80e429fb43cf","creationTime":"2016-05-20T23:34:25.2288477Z","lastModifiedTime":"2018-04-01T01:55:03.4732745Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/proddb-group/providers/Microsoft.DataLakeStore/accounts/adlie01perf01","name":"adlie01perf01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01perf03.azuredatalakestore.net","accountId":"354fa943-53bb-4c92-b59b-442b3d101de0","creationTime":"2016-06-07T23:19:29.613588Z","lastModifiedTime":"2018-04-01T01:55:08.2959682Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/proddb-group/providers/Microsoft.DataLakeStore/accounts/adlie01perf03","name":"adlie01perf03","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"metadatav2adlie01.azuredatalakestore.net","accountId":"cb7d850d-99f5-43ab-95c6-bde1bb94e748","creationTime":"2016-05-03T18:02:05.7806576Z","lastModifiedTime":"2018-04-01T01:55:13.2853629Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/proddb-group/providers/Microsoft.DataLakeStore/accounts/metadatav2adlie01","name":"metadatav2adlie01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"metadatav2defaultadlie01.azuredatalakestore.net","accountId":"ab398629-c58b-44df-9982-71596cd073e7","creationTime":"2016-05-04T23:13:40.683082Z","lastModifiedTime":"2018-04-01T01:55:17.7489671Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/proddb-group/providers/Microsoft.DataLakeStore/accounts/metadatav2defaultadlie01","name":"metadatav2defaultadlie01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"metadatav2niadlie01.azuredatalakestore.net","accountId":"83c34764-56e9-4abb-8505-5ba3daa07dfa","creationTime":"2016-05-04T01:01:00.0349098Z","lastModifiedTime":"2018-04-01T01:55:22.7749466Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/proddb-group/providers/Microsoft.DataLakeStore/accounts/metadatav2niadlie01","name":"metadatav2niadlie01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsroyukwest.azuredatalakestore.net","accountId":"6f92a58a-ffbc-4ce1-8c7a-754b62f46083","creationTime":"2017-02-07T00:50:41.3386661Z","lastModifiedTime":"2018-04-01T02:00:47.4495552Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgroyukwest/providers/Microsoft.DataLakeStore/accounts/adlsroyukwest","name":"adlsroyukwest","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsforshim.azuredatalakestore.net","accountId":"c9fe10ee-93fd-4242-8530-7f3f26b23724","creationTime":"2017-12-13T21:59:06.24278Z","lastModifiedTime":"2018-04-12T21:19:53.2889971Z"},"location":"ukwest","tags":{"Component":"ADL_HADOOP_TeraStar","Project":"ADL_SHIM","Evictable":"6/30/2018","Owner":"v-zhzha2"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/shimhadoop/providers/Microsoft.DataLakeStore/accounts/adlsforshim","name":"adlsforshim","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvarmanontiered.azuredatalakestore.net","accountId":"dea863c0-96c0-4fe1-ae72-76e95ae5ddae","creationTime":"2018-03-01T04:49:22.607866Z","lastModifiedTime":"2018-04-01T02:17:42.8573048Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvarmarg/providers/Microsoft.DataLakeStore/accounts/snvarmanontiered","name":"snvarmanontiered","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01contracthdfsts.azuredatalakestore.net","accountId":"b1af17bc-409d-4f96-a13d-1dfba88c1d34","creationTime":"2017-02-23T07:42:35.4022803Z","lastModifiedTime":"2018-04-01T02:31:43.1918981Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/adlie01contracthdfsts","name":"adlie01contracthdfsts","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01hadooptests.azuredatalakestore.net","accountId":"33837399-2977-46b6-93a9-2bb651470908","creationTime":"2016-12-02T07:39:34.0415998Z","lastModifiedTime":"2018-04-01T02:31:47.3531452Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/adlie01hadooptests","name":"adlie01hadooptests","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlie01mocktestsn.azuredatalakestore.net","accountId":"1c7fec1a-9c57-4599-8358-c5b58ae7fab2","creationTime":"2016-11-17T20:13:30.1190684Z","lastModifiedTime":"2018-04-01T02:31:51.8746481Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/adlie01mocktestsn","name":"adlie01mocktestsn","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvijayaadlie01.azuredatalakestore.net","accountId":"9da526a7-56e4-44ae-9882-91bee9d1b9f5","creationTime":"2018-04-20T10:41:14.7364669Z","lastModifiedTime":"2018-04-20T10:41:14.7364669Z"},"location":"ukwest","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/snvijayaadlie01","name":"snvijayaadlie01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"snvijayaadlie01tiered.azuredatalakestore.net","accountId":"5c9cc710-1a47-4279-9836-efb646f1d43e","creationTime":"2018-03-28T08:57:00.3013126Z","lastModifiedTime":"2018-04-01T02:32:03.7240708Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/snvijaya/providers/Microsoft.DataLakeStore/accounts/snvijayaadlie01tiered","name":"snvijayaadlie01tiered","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"spiromplayground.azuredatalakestore.net","accountId":"0e48caee-4139-479b-9ede-90a0bbf0fd9b","creationTime":"2017-11-14T22:27:28.1204153Z","lastModifiedTime":"2018-04-01T02:54:06.9222372Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/spirotest/providers/Microsoft.DataLakeStore/accounts/spiromplayground","name":"spiromplayground","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp1.azuredatalakestore.net","accountId":"9227bfe5-2c1b-4249-927c-21fd2ab4ba3c","creationTime":"2017-12-01T23:19:26.4351047Z","lastModifiedTime":"2018-04-17T20:37:12.614558Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp1","name":"db5adlshddp1","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp1stress.azuredatalakestore.net","accountId":"9e5b7bd9-e5a2-4db3-8f07-bc1d75682868","creationTime":"2017-12-01T23:22:07.8890238Z","lastModifiedTime":"2018-04-17T20:37:16.2153536Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp1stress","name":"db5adlshddp1stress","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp2.azuredatalakestore.net","accountId":"668a3407-3c01-4543-baa6-8c2a01c61b73","creationTime":"2017-12-01T23:21:10.2760998Z","lastModifiedTime":"2018-04-17T20:37:19.7560427Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp2","name":"db5adlshddp2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp4.azuredatalakestore.net","accountId":"639130c7-ecb0-4ace-9fd3-13c0325c7fd0","creationTime":"2017-12-01T20:44:35.8821664Z","lastModifiedTime":"2018-04-17T20:37:23.4488759Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp4","name":"db5adlshddp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp4stress.azuredatalakestore.net","accountId":"8eb4655e-80d0-410f-a5dd-bce99613831f","creationTime":"2017-12-08T23:36:45.9201858Z","lastModifiedTime":"2018-04-17T20:37:29.0542712Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp4stress","name":"db5adlshddp4stress","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlshddp5.azuredatalakestore.net","accountId":"b7d1e807-34f8-4e76-83fb-39068f6c663a","creationTime":"2017-12-01T20:45:29.4561999Z","lastModifiedTime":"2018-04-17T20:37:34.0820523Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlshddp5","name":"db5adlshddp5","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlsssdp2.azuredatalakestore.net","accountId":"64a467a2-0ad9-4e80-97e3-6b20187e9663","creationTime":"2017-12-08T23:49:39.1623162Z","lastModifiedTime":"2018-04-17T20:37:37.9290226Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlsssdp2","name":"db5adlsssdp2","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"db5adlsssdp4.azuredatalakestore.net","accountId":"e803a8af-764c-415c-a144-217c40591b47","creationTime":"2017-12-08T23:48:02.5217289Z","lastModifiedTime":"2018-04-17T20:37:42.7172383Z"},"location":"ukwest","tags":{"Component":"ADL - GA and Chelan Performance tracking","Project":"Performance Automation Framework","Evictable":"04/17/2020","Owner":"chrishes"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/StoreTeamAutomationPerformanceFramework/providers/Microsoft.DataLakeStore/accounts/db5adlsssdp4","name":"db5adlsssdp4","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlsperfencrypt.azuredatalakestore.net","accountId":"ba2d9642-4949-4a88-8f16-4eab72f302e6","creationTime":"2016-08-31T23:00:02.5312056Z","lastModifiedTime":"2018-04-01T03:37:11.7378491Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/t-chatal/providers/Microsoft.DataLakeStore/accounts/adlsperfencrypt","name":"adlsperfencrypt","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tsperfadlshdd01.azuredatalakestore.net","accountId":"da319cb6-228f-4385-8615-29722e231054","creationTime":"2017-03-14T18:22:53.0679221Z","lastModifiedTime":"2018-04-01T04:32:56.0440123Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/tsperfadlshdd01","name":"tsperfadlshdd01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tsperfadlsssd01.azuredatalakestore.net","accountId":"4ea62145-0948-4e2b-a08a-a67da40d19eb","creationTime":"2017-03-14T18:22:12.6209174Z","lastModifiedTime":"2018-04-01T04:33:00.6190116Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/tsperfadlsssd01","name":"tsperfadlsssd01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"tsperfadlswas01.azuredatalakestore.net","accountId":"b6bbe00d-d05e-4f87-adb9-eadcda3cfdcd","creationTime":"2017-03-14T17:59:30.3146858Z","lastModifiedTime":"2018-04-01T04:33:05.0804265Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/TIEREDSTORE-PERF/providers/Microsoft.DataLakeStore/accounts/tsperfadlswas01","name":"tsperfadlswas01","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlperfd5northeur.azuredatalakestore.net","accountId":"957fb7e2-f298-458c-9fe3-724f40d7de7a","creationTime":"2016-04-11T09:39:18.8080019Z","lastModifiedTime":"2018-04-01T05:36:57.3218396Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperf/providers/Microsoft.DataLakeStore/accounts/adlperfd5northeur","name":"adlperfd5northeur","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlcompressionencryption.azuredatalakestore.net","accountId":"d2ce33fd-e2c2-4200-aadf-99272327e630","creationTime":"2016-09-02T10:23:10.4462681Z","lastModifiedTime":"2018-04-01T05:42:19.4245719Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlcompressionencryption","name":"adlcompressionencryption","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlcompressiononly.azuredatalakestore.net","accountId":"19bcde03-1e91-44a6-bcc6-ea608fea9562","creationTime":"2016-09-02T10:12:03.3340021Z","lastModifiedTime":"2018-04-01T05:42:22.6508705Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlcompressiononly","name":"adlcompressiononly","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adldailynorthrun.azuredatalakestore.net","accountId":"d69240f9-d397-45eb-bcda-76f27bbb4605","creationTime":"2016-08-16T12:08:29.0465243Z","lastModifiedTime":"2018-04-01T05:42:26.231679Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adldailynorthrun","name":"adldailynorthrun","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlencryptiononly.azuredatalakestore.net","accountId":"573b85bb-81ba-46e5-a60d-3ed012988f17","creationTime":"2016-09-06T09:26:34.5828193Z","lastModifiedTime":"2018-04-01T05:42:29.7887184Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlencryptiononly","name":"adlencryptiononly","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"adlneuropenoral.azuredatalakestore.net","accountId":"c884ebcc-e005-463f-8b39-10425b517070","creationTime":"2016-08-16T06:23:44.0536674Z","lastModifiedTime":"2018-04-01T05:42:33.8458918Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/adlneuropenoral","name":"adlneuropenoral","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"defhivetpch.azuredatalakestore.net","accountId":"4f892916-ca00-4f30-9b45-cb2d1e633e03","creationTime":"2017-03-09T09:15:55.1954594Z","lastModifiedTime":"2018-04-01T05:42:57.9728163Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/defhivetpch","name":"defhivetpch","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"deftpchhive.azuredatalakestore.net","accountId":"3527d10e-8c7f-4287-b1f5-c87c1b618f20","creationTime":"2017-03-30T05:49:05.548991Z","lastModifiedTime":"2018-04-01T05:43:04.1821337Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/deftpchhive","name":"deftpchhive","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"hddhivetpch.azuredatalakestore.net","accountId":"8839fb84-5b25-4352-8455-2d2c5c264734","creationTime":"2017-03-09T09:14:07.6023544Z","lastModifiedTime":"2018-04-01T05:43:10.9194068Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/hddhivetpch","name":"hddhivetpch","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"sparkexpdata.azuredatalakestore.net","accountId":"efbd100f-ea9e-4f2f-b669-dcf117f34859","creationTime":"2016-08-16T06:50:12.711012Z","lastModifiedTime":"2018-04-01T05:43:23.2856747Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/sparkexpdata","name":"sparkexpdata","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ssdhivetpch.azuredatalakestore.net","accountId":"061d0712-d054-464b-b20d-aab318d82603","creationTime":"2017-03-09T09:15:01.9097677Z","lastModifiedTime":"2018-04-01T05:43:36.4056471Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/ssdhivetpch","name":"ssdhivetpch","type":"Microsoft.DataLakeStore/accounts"},{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"ukwestdefaultaccount.azuredatalakestore.net","accountId":"33650619-da1b-48a6-806b-216252dcc685","creationTime":"2017-01-20T12:07:40.8833919Z","lastModifiedTime":"2018-04-01T05:43:47.5726756Z"},"location":"ukwest","tags":{"Component":"ADLS_DefaultComponent","Project":"ADLS_Defaultproject","Evictable":"6/30/2018","Owner":"MyAlias"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/webhdfsperfrunner/providers/Microsoft.DataLakeStore/accounts/ukwestdefaultaccount","name":"ukwestdefaultaccount","type":"Microsoft.DataLakeStore/accounts"}]}'} + body: {string: '{"value":[{"properties":{"provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:15:52.696023Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}]}'} headers: cache-control: [no-cache] - content-length: ['238480'] - content-type: [application/json; charset=utf-8] - date: ['Fri, 07 Sep 2018 17:58:41 GMT'] + content-length: ['598'] + content-type: [application/json] + date: ['Tue, 16 Oct 2018 20:16:38 GMT'] expires: ['-1'] pragma: [no-cache] + server: [Microsoft-IIS/8.5] strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] vary: [Accept-Encoding] + x-aspnet-version: [4.0.30319] x-content-type-options: [nosniff] - x-ms-original-request-ids: [6b238bf1-1e58-4a5b-8100-40b0cccf9e7a, a89defd3-95ff-4222-b6ce-69217cd64969, - b0fc1c6e-ab36-4e6c-b4da-28f14a522ffd, ae59a2cc-039c-4e9a-98bd-e706054d1caa, - 135e18fd-d2dd-45df-846d-2ae315a97f1d] + x-powered-by: [ASP.NET] status: {code: 200, message: OK} - request: body: '{"properties": {"firewallState": "Enabled", "trustedIdProviderState": "Enabled"}}' @@ -303,19 +283,19 @@ interactions: Connection: [keep-alive] Content-Length: ['81'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PATCH uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Enabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Enabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:58:43.3029317Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"88a1f0e3-e456-4718-a12b-f9ba5eeca6e1","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Enabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Enabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:16:39.8129931Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"e549523a-bb68-4ef6-83d5-9db7367c0716","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] - content-length: ['1103'] + content-length: ['1102'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:43 GMT'] + date: ['Tue, 16 Oct 2018 20:16:39 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -335,19 +315,19 @@ interactions: CommandName: [dls account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Enabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Enabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c0081956-e730-4abb-940b-8bab50d7d0fe","creationTime":"2018-09-07T17:57:55.8876121Z","lastModifiedTime":"2018-09-07T17:58:43.3029317Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"88a1f0e3-e456-4718-a12b-f9ba5eeca6e1","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Enabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Enabled","trustedIdProviders":[],"encryptionState":"Enabled","encryptionConfig":{"type":"ServiceManaged"},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"c6fad783-a35d-478c-85f8-641c7da9a2b9","creationTime":"2018-10-16T20:15:52.696023Z","lastModifiedTime":"2018-10-16T20:16:39.8129931Z"},"location":"eastus2","identity":{"type":"SystemAssigned","principalId":"e549523a-bb68-4ef6-83d5-9db7367c0716","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] - content-length: ['1103'] + content-length: ['1102'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:43 GMT'] + date: ['Tue, 16 Oct 2018 20:16:39 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -367,9 +347,9 @@ interactions: Connection: [keep-alive] Content-Length: ['76'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules/testfirewallrule01?api-version=2016-11-01 @@ -379,7 +359,7 @@ interactions: cache-control: [no-cache] content-length: ['407'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:44 GMT'] + date: ['Tue, 16 Oct 2018 20:16:41 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -399,9 +379,9 @@ interactions: CommandName: [dls account firewall show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules/testfirewallrule01?api-version=2016-11-01 @@ -411,7 +391,7 @@ interactions: cache-control: [no-cache] content-length: ['407'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:46 GMT'] + date: ['Tue, 16 Oct 2018 20:16:42 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -431,9 +411,9 @@ interactions: Connection: [keep-alive] Content-Length: ['45'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PATCH uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules/testfirewallrule01?api-version=2016-11-01 @@ -443,7 +423,7 @@ interactions: cache-control: [no-cache] content-length: ['407'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:47 GMT'] + date: ['Tue, 16 Oct 2018 20:16:43 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -463,9 +443,9 @@ interactions: CommandName: [dls account firewall show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules/testfirewallrule01?api-version=2016-11-01 @@ -475,7 +455,7 @@ interactions: cache-control: [no-cache] content-length: ['407'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:49 GMT'] + date: ['Tue, 16 Oct 2018 20:16:45 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -494,9 +474,9 @@ interactions: CommandName: [dls account firewall list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules?api-version=2016-11-01 @@ -506,7 +486,7 @@ interactions: cache-control: [no-cache] content-length: ['419'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:50 GMT'] + date: ['Tue, 16 Oct 2018 20:16:46 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -526,9 +506,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules/testfirewallrule01?api-version=2016-11-01 @@ -537,7 +517,7 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 07 Sep 2018 17:58:51 GMT'] + date: ['Tue, 16 Oct 2018 20:16:48 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -555,9 +535,9 @@ interactions: CommandName: [dls account firewall list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/firewallRules?api-version=2016-11-01 @@ -567,7 +547,7 @@ interactions: cache-control: [no-cache] content-length: ['12'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:52 GMT'] + date: ['Tue, 16 Oct 2018 20:16:48 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -587,9 +567,9 @@ interactions: Connection: [keep-alive] Content-Length: ['175'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -599,7 +579,7 @@ interactions: cache-control: [no-cache] content-length: ['500'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:55 GMT'] + date: ['Tue, 16 Oct 2018 20:16:52 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -619,9 +599,9 @@ interactions: CommandName: [dls account network-rule show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -631,7 +611,7 @@ interactions: cache-control: [no-cache] content-length: ['517'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:55 GMT'] + date: ['Tue, 16 Oct 2018 20:16:53 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -650,9 +630,9 @@ interactions: CommandName: [dls account network-rule update] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -662,7 +642,7 @@ interactions: cache-control: [no-cache] content-length: ['517'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:57 GMT'] + date: ['Tue, 16 Oct 2018 20:16:54 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -682,9 +662,9 @@ interactions: Connection: [keep-alive] Content-Length: ['183'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -694,7 +674,7 @@ interactions: cache-control: [no-cache] content-length: ['508'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:58:59 GMT'] + date: ['Tue, 16 Oct 2018 20:16:55 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -714,9 +694,9 @@ interactions: CommandName: [dls account network-rule show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -726,7 +706,7 @@ interactions: cache-control: [no-cache] content-length: ['525'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:00 GMT'] + date: ['Tue, 16 Oct 2018 20:16:57 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -745,9 +725,9 @@ interactions: CommandName: [dls account network-rule list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules?api-version=2016-11-01 @@ -757,7 +737,7 @@ interactions: cache-control: [no-cache] content-length: ['537'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:01 GMT'] + date: ['Tue, 16 Oct 2018 20:16:58 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -777,9 +757,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules/lewuVNET?api-version=2016-11-01 @@ -788,7 +768,7 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 07 Sep 2018 17:59:03 GMT'] + date: ['Tue, 16 Oct 2018 20:17:00 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -806,9 +786,9 @@ interactions: CommandName: [dls account network-rule list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/virtualNetworkRules?api-version=2016-11-01 @@ -818,7 +798,7 @@ interactions: cache-control: [no-cache] content-length: ['12'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:04 GMT'] + date: ['Tue, 16 Oct 2018 20:17:01 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -838,9 +818,9 @@ interactions: Connection: [keep-alive] Content-Length: ['94'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders/testprovider01?api-version=2016-11-01 @@ -850,7 +830,7 @@ interactions: cache-control: [no-cache] content-length: ['429'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:06 GMT'] + date: ['Tue, 16 Oct 2018 20:17:03 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -859,7 +839,7 @@ interactions: vary: [Accept-Encoding] x-aspnet-version: [4.0.30319] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] x-powered-by: [ASP.NET] status: {code: 200, message: OK} - request: @@ -870,9 +850,9 @@ interactions: CommandName: [dls account trusted-provider show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders/testprovider01?api-version=2016-11-01 @@ -882,7 +862,7 @@ interactions: cache-control: [no-cache] content-length: ['429'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:07 GMT'] + date: ['Tue, 16 Oct 2018 20:17:04 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -902,9 +882,9 @@ interactions: Connection: [keep-alive] Content-Length: ['94'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: PATCH uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders/testprovider01?api-version=2016-11-01 @@ -914,7 +894,7 @@ interactions: cache-control: [no-cache] content-length: ['429'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:08 GMT'] + date: ['Tue, 16 Oct 2018 20:17:05 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -923,7 +903,7 @@ interactions: vary: [Accept-Encoding] x-aspnet-version: [4.0.30319] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] x-powered-by: [ASP.NET] status: {code: 200, message: OK} - request: @@ -934,9 +914,9 @@ interactions: CommandName: [dls account trusted-provider show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders/testprovider01?api-version=2016-11-01 @@ -946,7 +926,7 @@ interactions: cache-control: [no-cache] content-length: ['429'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:09 GMT'] + date: ['Tue, 16 Oct 2018 20:17:06 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -965,9 +945,9 @@ interactions: CommandName: [dls account trusted-provider list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders?api-version=2016-11-01 @@ -977,7 +957,7 @@ interactions: cache-control: [no-cache] content-length: ['441'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:10 GMT'] + date: ['Tue, 16 Oct 2018 20:17:06 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -997,9 +977,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders/testprovider01?api-version=2016-11-01 @@ -1008,14 +988,14 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 07 Sep 2018 17:59:11 GMT'] + date: ['Tue, 16 Oct 2018 20:17:08 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] strict-transport-security: [max-age=31536000; includeSubDomains] x-aspnet-version: [4.0.30319] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] x-powered-by: [ASP.NET] status: {code: 200, message: OK} - request: @@ -1026,9 +1006,9 @@ interactions: CommandName: [dls account trusted-provider list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/trustedIdProviders?api-version=2016-11-01 @@ -1038,7 +1018,7 @@ interactions: cache-control: [no-cache] content-length: ['12'] content-type: [application/json] - date: ['Fri, 07 Sep 2018 17:59:13 GMT'] + date: ['Tue, 16 Oct 2018 20:17:09 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -1058,9 +1038,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 @@ -1069,7 +1049,7 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 07 Sep 2018 17:59:15 GMT'] + date: ['Tue, 16 Oct 2018 20:17:11 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -1087,9 +1067,9 @@ interactions: CommandName: [dls account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_mgmt000001/providers/Microsoft.DataLakeStore/accounts?api-version=2016-11-01 @@ -1099,7 +1079,7 @@ interactions: cache-control: [no-cache] content-length: ['12'] content-type: [application/json; charset=utf-8] - date: ['Fri, 07 Sep 2018 17:59:17 GMT'] + date: ['Tue, 16 Oct 2018 20:17:12 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -1115,9 +1095,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0rc2 Azure-SDK-For-Python - AZURECLI/2.0.45] + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_mgmt000001?api-version=2018-05-01 @@ -1126,9 +1106,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 07 Sep 2018 17:59:17 GMT'] + date: ['Tue, 16 Oct 2018 20:17:14 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURMUzo1Rk1HTVRRVERRUDNTTkg3UUVMTkZFSlZCQVA3U3xFNEVDREYzOEY3MEZEQ0FFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURMUzo1Rk1HTVRZVUtITElLWEdaREFLMjMzQVdQWDQ3MnxFNDM4OTAzOEE1OUQwOUVFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_file_access_mgmt.yaml b/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_file_access_mgmt.yaml index 58ff29fb065..452f30f049f 100644 --- a/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_file_access_mgmt.yaml +++ b/src/command_modules/azure-cli-dls/azure/cli/command_modules/dls/tests/latest/recordings/test_dls_file_access_mgmt.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-08-15T18:14:13Z"}}' + "date": "2018-10-16T20:12:53Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,24 +9,24 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0rc2 Azure-SDK-For-Python - AZURECLI/2.0.44] + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_access000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001","name":"cli_test_adls_access000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-08-15T18:14:13Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001","name":"cli_test_adls_access000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-16T20:12:53Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:14:13 GMT'] + date: ['Tue, 16 Oct 2018 20:12:55 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: body: '{"location": "eastus2", "properties": {"encryptionState": "Disabled"}}' @@ -37,20 +37,263 @@ interactions: Connection: [keep-alive] Content-Length: ['70'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python + AZURECLI/2.0.48] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 + response: + body: {string: '{"error":{"code":"MissingSubscriptionRegistration","message":"The + subscription is not registered to use namespace ''Microsoft.DataLakeStore''. + See https://aka.ms/rps-not-found for how to register subscriptions.","details":[{"code":"MissingSubscriptionRegistration","target":"Microsoft.DataLakeStore","message":"The + subscription is not registered to use namespace ''Microsoft.DataLakeStore''. + See https://aka.ms/rps-not-found for how to register subscriptions."}]}}'} + headers: + cache-control: [no-cache] + content-length: ['460'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:12:57 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 409, message: Conflict} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['0'] + User-Agent: [python-requests/2.19.1] + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/register?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:12:58 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:08 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:18 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:28 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:38 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:48 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registering"}'} + headers: + cache-control: [no-cache] + content-length: ['1416'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:13:58 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.19.1] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore?api-version=2016-02-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore","namespace":"Microsoft.DataLakeStore","authorization":{"applicationId":"e9f49c6b-5ce5-44c8-925d-015017e9f7ad","roleDefinitionId":"17eb9cca-f08a-4499-b2d3-852d175f614f"},"resourceTypes":[{"resourceType":"accounts","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"],"capabilities":"CrossResourceGroupResourceMove, + CrossSubscriptionResourceMove, SystemAssignedResourceIdentity"},{"resourceType":"accounts/firewallRules","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"accounts/eventGridFilters","locations":["East + US 2","North Europe","Central US","West Europe"],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/operationresults","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/checkNameAvailability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"locations/capability","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]},{"resourceType":"operations","locations":[],"apiVersions":["2016-11-01","2015-10-01-preview"]}],"registrationState":"Registered"}'} + headers: + cache-control: [no-cache] + content-length: ['1415'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 20:14:09 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: '{"location": "eastus2", "properties": {"encryptionState": "Disabled"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [dls account create] + Connection: [keep-alive] + Content-Length: ['70'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.44] + AZURECLI/2.0.48] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"encryptionState":"Disabled","provisioningState":"Creating","state":null,"endpoint":null,"accountId":"d22b8354-3d71-4ac1-8308-8123f3abe525"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"encryptionState":"Disabled","provisioningState":"Creating","state":null,"endpoint":null,"accountId":"99adcd16-172c-4468-87b0-ed59911ccf8c"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/d22b8354-3d71-4ac1-8308-8123f3abe5250?api-version=2016-11-01&expanded=true'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/99adcd16-172c-4468-87b0-ed59911ccf8c0?api-version=2016-11-01&expanded=true'] cache-control: [no-cache] content-length: ['471'] content-type: [application/json] - date: ['Wed, 15 Aug 2018 18:14:15 GMT'] + date: ['Tue, 16 Oct 2018 20:14:10 GMT'] expires: ['-1'] location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002/operationresults/0?api-version=2016-11-01'] pragma: [no-cache] @@ -58,7 +301,7 @@ interactions: strict-transport-security: [max-age=31536000; includeSubDomains] x-aspnet-version: [4.0.30319] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] x-powered-by: [ASP.NET] status: {code: 201, message: Created} - request: @@ -68,18 +311,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.44] + AZURECLI/2.0.48] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/d22b8354-3d71-4ac1-8308-8123f3abe5250?api-version=2016-11-01&expanded=true + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/99adcd16-172c-4468-87b0-ed59911ccf8c0?api-version=2016-11-01&expanded=true response: body: {string: '{"status":"InProgress"}'} headers: cache-control: [no-cache] content-length: ['23'] content-type: [application/json] - date: ['Wed, 15 Aug 2018 18:14:26 GMT'] + date: ['Tue, 16 Oct 2018 20:14:20 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -97,18 +340,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.44] + AZURECLI/2.0.48] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/d22b8354-3d71-4ac1-8308-8123f3abe5250?api-version=2016-11-01&expanded=true + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DataLakeStore/locations/eastus2/operationResults/99adcd16-172c-4468-87b0-ed59911ccf8c0?api-version=2016-11-01&expanded=true response: body: {string: '{"status":"Succeeded"}'} headers: cache-control: [no-cache] content-length: ['22'] content-type: [application/json] - date: ['Wed, 15 Aug 2018 18:14:56 GMT'] + date: ['Tue, 16 Oct 2018 20:14:50 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -126,18 +369,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [dls account create] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.44] + AZURECLI/2.0.48] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Disabled","encryptionConfig":{},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"d22b8354-3d71-4ac1-8308-8123f3abe525","creationTime":"2018-08-15T18:14:16.6858672Z","lastModifiedTime":"2018-08-15T18:14:16.6858672Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Disabled","encryptionConfig":{},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"99adcd16-172c-4468-87b0-ed59911ccf8c","creationTime":"2018-10-16T20:14:11.2929224Z","lastModifiedTime":"2018-10-16T20:14:11.2929224Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] content-length: ['943'] content-type: [application/json] - date: ['Wed, 15 Aug 2018 18:14:58 GMT'] + date: ['Tue, 16 Oct 2018 20:14:52 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -156,19 +399,19 @@ interactions: CommandName: [dls account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-datalake-store/0.5.0 Azure-SDK-For-Python - AZURECLI/2.0.44] + AZURECLI/2.0.48] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002?api-version=2016-11-01 response: - body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Disabled","encryptionConfig":{},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"d22b8354-3d71-4ac1-8308-8123f3abe525","creationTime":"2018-08-15T18:14:16.6858672Z","lastModifiedTime":"2018-08-15T18:14:16.6858672Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} + body: {string: '{"properties":{"firewallState":"Disabled","firewallAllowAzureIps":"Disabled","firewallAllowDataLakeAnalytics":"Disabled","firewallRules":[],"virtualNetworkRules":[],"trustedIdProviderState":"Disabled","trustedIdProviders":[],"encryptionState":"Disabled","encryptionConfig":{},"currentTier":"Consumption","newTier":"Consumption","dataLakePerformanceTierState":"Disabled","provisioningState":"Succeeded","state":"Active","endpoint":"cliadls000002.azuredatalakestore.net","accountId":"99adcd16-172c-4468-87b0-ed59911ccf8c","creationTime":"2018-10-16T20:14:11.2929224Z","lastModifiedTime":"2018-10-16T20:14:11.2929224Z"},"location":"eastus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_adls_access000001/providers/Microsoft.DataLakeStore/accounts/cliadls000002","name":"cliadls000002","type":"Microsoft.DataLakeStore/accounts"}'} headers: cache-control: [no-cache] content-length: ['943'] content-type: [application/json] - date: ['Wed, 15 Aug 2018 18:14:58 GMT'] + date: ['Tue, 16 Oct 2018 20:14:53 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-IIS/8.5] @@ -185,18 +428,18 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2018-05-01 response: body: {string: '{"RemoteException":{"exception":"FileNotFoundException","message":"File/Folder - does not exist: /adltestfolder01 [a6b077e0-9b0f-4a1d-b8d3-279637a9d7b0][2018-08-15T11:15:04.6117131-07:00]","javaClassName":"java.io.FileNotFoundException"}}'} + does not exist: /adltestfolder01 [4e412ba0-adbe-419f-bcc6-286da3e38a01][2018-10-16T13:14:56.9190221-07:00]","javaClassName":"java.io.FileNotFoundException"}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['236'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:03 GMT'] + date: ['Tue, 16 Oct 2018 20:14:56 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x8309000A'] @@ -211,17 +454,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MKDIRS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MKDIRS&api-version=2018-05-01 response: body: {string: '{"boolean":true}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['16'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:04 GMT'] + date: ['Tue, 16 Oct 2018 20:14:56 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -235,17 +478,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2018-05-01 response: - body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1534356904746,"modificationTime":1534356904746,"replication":0,"permission":"770","owner":"ca846d27-5f6c-4e60-a68b-937ead3cb3ed","group":"ca846d27-5f6c-4e60-a68b-937ead3cb3ed","aclBit":false}}'} + body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1539720897056,"modificationTime":1539720897056,"replication":0,"permission":"770","owner":"6d86a146-d7dc-49d0-862f-1897c5dd2afe","group":"6d86a146-d7dc-49d0-862f-1897c5dd2afe","aclBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['280'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:05 GMT'] + date: ['Tue, 16 Oct 2018 20:14:57 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -260,16 +503,16 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETOWNER&api-version=2016-11-01&owner=6361e05d-c381-4275-a932-5535806bb323&group=80a3ed5f-959e-4696-ba3c-d3c8b2db6766 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETOWNER&api-version=2018-05-01&owner=6361e05d-c381-4275-a932-5535806bb323&group=80a3ed5f-959e-4696-ba3c-d3c8b2db6766 response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] - date: ['Wed, 15 Aug 2018 18:15:06 GMT'] + date: ['Tue, 16 Oct 2018 20:14:57 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -283,17 +526,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2018-05-01 response: - body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1534356904746,"modificationTime":1534356904746,"replication":0,"permission":"770","owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","aclBit":false}}'} + body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1539720897056,"modificationTime":1539720897056,"replication":0,"permission":"770","owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","aclBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['280'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:06 GMT'] + date: ['Tue, 16 Oct 2018 20:14:58 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -308,16 +551,16 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETPERMISSION&api-version=2016-11-01&permission=777 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETPERMISSION&api-version=2018-05-01&permission=777 response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] - date: ['Wed, 15 Aug 2018 18:15:07 GMT'] + date: ['Tue, 16 Oct 2018 20:14:59 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -331,17 +574,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=GETFILESTATUS&api-version=2018-05-01 response: - body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1534356904746,"modificationTime":1534356904746,"replication":0,"permission":"777","owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","aclBit":false}}'} + body: {string: '{"FileStatus":{"length":0,"pathSuffix":"","type":"DIRECTORY","blockSize":0,"accessTime":1539720897056,"modificationTime":1539720897056,"replication":0,"permission":"777","owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","aclBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['280'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:07 GMT'] + date: ['Tue, 16 Oct 2018 20:15:00 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -355,17 +598,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","group::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['196'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:09 GMT'] + date: ['Tue, 16 Oct 2018 20:15:01 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -380,17 +623,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETACL&api-version=2016-11-01&aclSpec=user%3A%3Arwx%2Cgroup%3A%3Arwx%2Cother%3A%3Arwx%2Cuser%3A470c0ccf-c91a-4597-98cd-48507d2f1486%3Arwx + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=SETACL&api-version=2018-05-01&aclSpec=user%3A%3Arwx%2Cgroup%3A%3Arwx%2Cother%3A%3Arwx%2Cuser%3A470c0ccf-c91a-4597-98cd-48507d2f1486%3Arwx response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] contentlength: ['0'] - date: ['Wed, 15 Aug 2018 18:15:09 GMT'] + date: ['Tue, 16 Oct 2018 20:15:01 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -404,17 +647,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","user:470c0ccf-c91a-4597-98cd-48507d2f1486:rwx","group::rwx","mask::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['256'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:10 GMT'] + date: ['Tue, 16 Oct 2018 20:15:02 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -429,17 +672,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MODIFYACLENTRIES&api-version=2016-11-01&aclSpec=user%3A470c0ccf-c91a-4597-98cd-48507d2f1486%3A-w- + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MODIFYACLENTRIES&api-version=2018-05-01&aclSpec=user%3A470c0ccf-c91a-4597-98cd-48507d2f1486%3A-w- response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] contentlength: ['0'] - date: ['Wed, 15 Aug 2018 18:15:11 GMT'] + date: ['Tue, 16 Oct 2018 20:15:03 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -453,17 +696,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","user:470c0ccf-c91a-4597-98cd-48507d2f1486:-w-","group::rwx","mask::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['256'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:11 GMT'] + date: ['Tue, 16 Oct 2018 20:15:04 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -478,17 +721,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEACLENTRIES&api-version=2016-11-01&aclSpec=user%3A470c0ccf-c91a-4597-98cd-48507d2f1486 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEACLENTRIES&api-version=2018-05-01&aclSpec=user%3A470c0ccf-c91a-4597-98cd-48507d2f1486 response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] contentlength: ['0'] - date: ['Wed, 15 Aug 2018 18:15:12 GMT'] + date: ['Tue, 16 Oct 2018 20:15:04 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -502,17 +745,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","group::rwx","mask::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['208'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:12 GMT'] + date: ['Tue, 16 Oct 2018 20:15:06 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -527,17 +770,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEDEFAULTACL&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEDEFAULTACL&api-version=2018-05-01 response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] contentlength: ['0'] - date: ['Wed, 15 Aug 2018 18:15:14 GMT'] + date: ['Tue, 16 Oct 2018 20:15:06 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -551,17 +794,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","group::rwx","mask::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['208'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:15 GMT'] + date: ['Tue, 16 Oct 2018 20:15:07 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -576,17 +819,17 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: PUT - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEACL&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=REMOVEACL&api-version=2018-05-01 response: body: {string: ''} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['0'] contentlength: ['0'] - date: ['Wed, 15 Aug 2018 18:15:15 GMT'] + date: ['Tue, 16 Oct 2018 20:15:08 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -600,17 +843,17 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.22 + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) azure.datalake.store.lib/0.0.34 Azure-Data-Lake-Store-SDK-For-Python] method: GET - uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2016-11-01 + uri: https://cliadls000002.azuredatalakestore.net/webhdfs/v1/adltestfolder01?OP=MSGETACLSTATUS&api-version=2018-05-01 response: body: {string: '{"AclStatus":{"entries":["user::rwx","group::rwx","other::rwx"],"owner":"6361e05d-c381-4275-a932-5535806bb323","group":"80a3ed5f-959e-4696-ba3c-d3c8b2db6766","permission":"777","stickyBit":false}}'} headers: cache-control: ['no-cache, no-cache, no-store, max-age=0'] content-length: ['196'] content-type: [application/json; charset=utf-8] - date: ['Wed, 15 Aug 2018 18:15:16 GMT'] + date: ['Tue, 16 Oct 2018 20:15:08 GMT'] expires: ['-1'] pragma: [no-cache] status: ['0x0'] @@ -627,9 +870,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.3 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0rc2 Azure-SDK-For-Python - AZURECLI/2.0.44] + User-Agent: [python/3.6.3 (Windows-10-10.0.14393-SP0) requests/2.19.1 msrest/0.5.4 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_adls_access000001?api-version=2018-05-01 @@ -638,9 +881,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Wed, 15 Aug 2018 18:15:18 GMT'] + date: ['Tue, 16 Oct 2018 20:15:10 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURMUzo1RkFDQ0VTU0Q3SkpOTlBTR1RHRjdNWkhWR1dBSnxFOTM1QThCMzBDRjAwMUZCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURMUzo1RkFDQ0VTUzdOQTRBRUFQTlBDRkpDQzJFRzRWT3xGODg4MjJDQUQ0RkEwMUFCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-dls/setup.py b/src/command_modules/azure-cli-dls/setup.py index 29bec11244c..4963bdd20dd 100644 --- a/src/command_modules/azure-cli-dls/setup.py +++ b/src/command_modules/azure-cli-dls/setup.py @@ -16,7 +16,7 @@ cmdclass = {} -VERSION = "0.1.3" +VERSION = "0.1.4" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ @@ -35,7 +35,7 @@ DEPENDENCIES = [ 'azure-mgmt-datalake-store==0.5.0', - 'azure-datalake-store==0.0.31', + 'azure-datalake-store==0.0.34', 'azure-cli-core', ] diff --git a/src/command_modules/azure-cli-extension/HISTORY.rst b/src/command_modules/azure-cli-extension/HISTORY.rst index 07630ea1c5c..b25f0b3cec5 100644 --- a/src/command_modules/azure-cli-extension/HISTORY.rst +++ b/src/command_modules/azure-cli-extension/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.2.3 ++++++ +* Minor fixes. + 0.2.2 +++++ * Attempting to add an extension that is already installed will not raise an exception. diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_completers.py b/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_completers.py index cddbc5ecab5..b39d8907ed3 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_completers.py +++ b/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/_completers.py @@ -4,9 +4,9 @@ # -------------------------------------------------------------------------------------------- from azure.cli.core.decorators import Completer -from azure.cli.core.extension import get_extension_names +from azure.cli.core.extensions import get_extension_names -from azure.cli.command_modules.extension.custom import get_index_extensions +from azure.cli.core.extensions.operations import get_index_extensions @Completer diff --git a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/custom.py b/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/custom.py index bf7de487fad..f37c6ab5b9e 100644 --- a/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/custom.py +++ b/src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/custom.py @@ -2,347 +2,37 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import sys -import os -import tempfile -import shutil -import zipfile -import traceback -import hashlib -from subprocess import check_output, STDOUT, CalledProcessError -from six.moves.urllib.parse import urlparse # pylint: disable=import-error -from collections import OrderedDict - -import requests -from wheel.install import WHEEL_INFO_RE -from pkg_resources import parse_version - from knack.log import get_logger -from azure.cli.core.util import CLIError -from azure.cli.core.extension import (extension_exists, get_extension_path, get_extensions, - get_extension, ext_compat_with_cli, EXT_METADATA_ISPREVIEW, - WheelExtension, ExtensionNotInstalledException) -from azure.cli.core.telemetry import set_extension_management_detail - -from ._homebrew_patch import HomebrewPipPatch -from ._index import get_index_extensions -from ._resolve import resolve_from_index, NoExtensionCandidatesError +from azure.cli.core.extensions.operations import ( + add_extension, remove_extension, list_extensions, show_extension, + list_available_extensions, update_extension) logger = get_logger(__name__) -OUT_KEY_NAME = 'name' -OUT_KEY_VERSION = 'version' -OUT_KEY_TYPE = 'extensionType' -OUT_KEY_METADATA = 'metadata' - -IS_WINDOWS = sys.platform.lower() in ['windows', 'win32'] -LIST_FILE_PATH = os.path.join(os.sep, 'etc', 'apt', 'sources.list.d', 'azure-cli.list') -LSB_RELEASE_FILE = os.path.join(os.sep, 'etc', 'lsb-release') - - -def _run_pip(pip_exec_args): - cmd = [sys.executable, '-m', 'pip'] + pip_exec_args + ['-vv', '--disable-pip-version-check', '--no-cache-dir'] - logger.debug('Running: %s', cmd) - try: - log_output = check_output(cmd, stderr=STDOUT, universal_newlines=True) - logger.debug(log_output) - returncode = 0 - except CalledProcessError as e: - logger.debug(e.output) - logger.debug(e) - returncode = e.returncode - return returncode - - -def _whl_download_from_url(url_parse_result, ext_file): - from azure.cli.core.util import should_disable_connection_verify - url = url_parse_result.geturl() - r = requests.get(url, stream=True, verify=(not should_disable_connection_verify())) - if r.status_code != 200: - raise CLIError("Request to {} failed with {}".format(url, r.status_code)) - with open(ext_file, 'wb') as f: - for chunk in r.iter_content(chunk_size=1024): - if chunk: # ignore keep-alive new chunks - f.write(chunk) - - -def _validate_whl_cli_compat(azext_metadata): - is_compatible, cli_core_version, min_required, max_required = ext_compat_with_cli(azext_metadata) - logger.debug("Extension compatibility result: is_compatible=%s cli_core_version=%s min_required=%s " - "max_required=%s", is_compatible, cli_core_version, min_required, max_required) - if not is_compatible: - min_max_msg_fmt = "The extension is not compatible with this version of the CLI.\n" \ - "You have CLI core version {} and this extension " \ - "requires ".format(cli_core_version) - if min_required and max_required: - min_max_msg_fmt += 'a min of {} and max of {}.'.format(min_required, max_required) - elif min_required: - min_max_msg_fmt += 'a min of {}.'.format(min_required) - elif max_required: - min_max_msg_fmt += 'a max of {}.'.format(max_required) - raise CLIError(min_max_msg_fmt) - - -def _validate_whl_extension(ext_file): - tmp_dir = tempfile.mkdtemp() - zip_ref = zipfile.ZipFile(ext_file, 'r') - zip_ref.extractall(tmp_dir) - zip_ref.close() - azext_metadata = WheelExtension.get_azext_metadata(tmp_dir) - shutil.rmtree(tmp_dir) - _validate_whl_cli_compat(azext_metadata) - - -def _add_whl_ext(source, ext_sha256=None, pip_extra_index_urls=None, pip_proxy=None): # pylint: disable=too-many-statements - if not source.endswith('.whl'): - raise ValueError('Unknown extension type. Only Python wheels are supported.') - url_parse_result = urlparse(source) - is_url = (url_parse_result.scheme == 'http' or url_parse_result.scheme == 'https') - logger.debug('Extension source is url? %s', is_url) - whl_filename = os.path.basename(url_parse_result.path) if is_url else os.path.basename(source) - parsed_filename = WHEEL_INFO_RE(whl_filename) - # Extension names can have - but .whl format changes it to _ (PEP 0427). Undo this. - extension_name = parsed_filename.groupdict().get('name').replace('_', '-') if parsed_filename else None - if not extension_name: - raise CLIError('Unable to determine extension name from {}. Is the file name correct?'.format(source)) - if extension_exists(extension_name): - raise CLIError('The extension {} already exists.'.format(extension_name)) - ext_file = None - if is_url: - # Download from URL - tmp_dir = tempfile.mkdtemp() - ext_file = os.path.join(tmp_dir, whl_filename) - logger.debug('Downloading %s to %s', source, ext_file) - try: - _whl_download_from_url(url_parse_result, ext_file) - except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError) as err: - raise CLIError('Please ensure you have network connection. Error detail: {}'.format(str(err))) - logger.debug('Downloaded to %s', ext_file) - else: - # Get file path - ext_file = os.path.realpath(os.path.expanduser(source)) - if not os.path.isfile(ext_file): - raise CLIError("File {} not found.".format(source)) - # Validate the extension - logger.debug('Validating the extension %s', ext_file) - if ext_sha256: - valid_checksum, computed_checksum = is_valid_sha256sum(ext_file, ext_sha256) - if valid_checksum: - logger.debug("Checksum of %s is OK", ext_file) - else: - logger.debug("Invalid checksum for %s. Expected '%s', computed '%s'.", - ext_file, ext_sha256, computed_checksum) - raise CLIError("The checksum of the extension does not match the expected value. " - "Use --debug for more information.") - try: - _validate_whl_extension(ext_file) - except AssertionError: - logger.debug(traceback.format_exc()) - raise CLIError('The extension is invalid. Use --debug for more information.') - except CLIError as e: - raise e - logger.debug('Validation successful on %s', ext_file) - # Check for distro consistency - check_distro_consistency() - # Install with pip - extension_path = get_extension_path(extension_name) - pip_args = ['install', '--target', extension_path, ext_file] - - if pip_proxy: - pip_args = pip_args + ['--proxy', pip_proxy] - if pip_extra_index_urls: - for extra_index_url in pip_extra_index_urls: - pip_args = pip_args + ['--extra-index-url', extra_index_url] - - logger.debug('Executing pip with args: %s', pip_args) - with HomebrewPipPatch(): - pip_status_code = _run_pip(pip_args) - if pip_status_code > 0: - logger.debug('Pip failed so deleting anything we might have installed at %s', extension_path) - shutil.rmtree(extension_path, ignore_errors=True) - raise CLIError('An error occurred. Pip failed with status code {}. ' - 'Use --debug for more information.'.format(pip_status_code)) - # Save the whl we used to install the extension in the extension dir. - dst = os.path.join(extension_path, whl_filename) - shutil.copyfile(ext_file, dst) - logger.debug('Saved the whl to %s', dst) - -def is_valid_sha256sum(a_file, expected_sum): - sha256 = hashlib.sha256() - with open(a_file, 'rb') as f: - sha256.update(f.read()) - computed_hash = sha256.hexdigest() - return expected_sum == computed_hash, computed_hash - - -def _augment_telemetry_with_ext_info(extension_name): - # The extension must be available before calling this otherwise we can't get the version from metadata - if not extension_name: - return - try: - ext = get_extension(extension_name) - ext_version = ext.version - set_extension_management_detail(extension_name, ext_version) - except Exception: # nopa pylint: disable=broad-except - # Don't error on telemetry - pass - - -def add_extension(source=None, extension_name=None, index_url=None, yes=None, # pylint: disable=unused-argument - pip_extra_index_urls=None, pip_proxy=None): - ext_sha256 = None - if extension_name: - if extension_exists(extension_name): - logger.warning("The extension '%s' already exists.", extension_name) - return - try: - source, ext_sha256 = resolve_from_index(extension_name, index_url=index_url) - except NoExtensionCandidatesError as err: - logger.debug(err) - raise CLIError("No matching extensions for '{}'. Use --debug for more information.".format(extension_name)) - _add_whl_ext(source, ext_sha256=ext_sha256, pip_extra_index_urls=pip_extra_index_urls, pip_proxy=pip_proxy) - _augment_telemetry_with_ext_info(extension_name) - try: - if extension_name and get_extension(extension_name).preview: - logger.warning("The installed extension '%s' is in preview.", extension_name) - except ExtensionNotInstalledException: - pass - - -def remove_extension(extension_name): - def log_err(func, path, exc_info): - logger.debug("Error occurred attempting to delete item from the extension '%s'.", extension_name) - logger.debug("%s: %s - %s", func, path, exc_info) - - try: - # Get the extension and it will raise an error if it doesn't exist - get_extension(extension_name) - # We call this just before we remove the extension so we can get the metadata before it is gone - _augment_telemetry_with_ext_info(extension_name) - shutil.rmtree(get_extension_path(extension_name), onerror=log_err) - except ExtensionNotInstalledException as e: - raise CLIError(e) - - -def list_extensions(): - return [{OUT_KEY_NAME: ext.name, OUT_KEY_VERSION: ext.version, OUT_KEY_TYPE: ext.ext_type} - for ext in get_extensions()] - - -def show_extension(extension_name): - try: - extension = get_extension(extension_name) - return {OUT_KEY_NAME: extension.name, - OUT_KEY_VERSION: extension.version, - OUT_KEY_TYPE: extension.ext_type, - OUT_KEY_METADATA: extension.metadata} - except ExtensionNotInstalledException as e: - raise CLIError(e) - - -def update_extension(extension_name, index_url=None, pip_extra_index_urls=None, pip_proxy=None): - try: - ext = get_extension(extension_name) - cur_version = ext.get_version() - try: - download_url, ext_sha256 = resolve_from_index(extension_name, cur_version=cur_version, index_url=index_url) - except NoExtensionCandidatesError as err: - logger.debug(err) - raise CLIError("No updates available for '{}'. Use --debug for more information.".format(extension_name)) - # 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 = get_extension_path(extension_name) - 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(download_url, ext_sha256=ext_sha256, +def add_extension_cmd(source=None, extension_name=None, index_url=None, yes=None, + pip_extra_index_urls=None, pip_proxy=None): + return add_extension(source=source, extension_name=extension_name, index_url=index_url, yes=yes, pip_extra_index_urls=pip_extra_index_urls, pip_proxy=pip_proxy) - 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)) - except ExtensionNotInstalledException as e: - raise CLIError(e) - -def list_available_extensions(index_url=None, show_details=False): - index_data = get_index_extensions(index_url=index_url) - if show_details: - return index_data - installed_extensions = get_extensions() - installed_extension_names = [e.name for e in installed_extensions] - results = [] - for name, items in OrderedDict(sorted(index_data.items())).items(): - # exclude extensions/versions incompatible with current CLI version - items = [item for item in items if ext_compat_with_cli(item['metadata'])[0]] - if not items: - continue - latest = max(items, key=lambda c: parse_version(c['metadata']['version'])) - installed = False - if name in installed_extension_names: - installed = True - ext_version = get_extension(name).version - if ext_version and parse_version(latest['metadata']['version']) > parse_version(ext_version): - installed = str(True) + ' (upgrade available)' - results.append({ - 'name': name, - 'version': latest['metadata']['version'], - 'summary': latest['metadata']['summary'], - 'preview': latest['metadata'].get(EXT_METADATA_ISPREVIEW, False), - 'installed': installed - }) - return results +def remove_extension_cmd(extension_name): + return remove_extension(extension_name) -def get_lsb_release(): - try: - with open(LSB_RELEASE_FILE, 'r') as lr: - lsb = lr.readlines() - desc = lsb[2] - desc_split = desc.split('=') - rel = desc_split[1] - return rel.strip() - except Exception: # pylint: disable=broad-except - return None +def list_extensions_cmd(): + return list_extensions() -def check_distro_consistency(): - if IS_WINDOWS: - return +def show_extension_cmd(extension_name): + return show_extension(extension_name) - try: - logger.debug('Linux distro check: Reading from: %s', LIST_FILE_PATH) - with open(LIST_FILE_PATH, 'r') as list_file: - package_source = list_file.read() - stored_linux_dist_name = package_source.split(" ")[3] - logger.debug('Linux distro check: Found in list file: %s', stored_linux_dist_name) - current_linux_dist_name = get_lsb_release() - logger.debug('Linux distro check: Reported by API: %s', current_linux_dist_name) +def update_extension_cmd(extension_name, index_url=None, pip_extra_index_urls=None, pip_proxy=None): + return update_extension(extension_name, index_url=index_url, pip_extra_index_urls=pip_extra_index_urls, + pip_proxy=pip_proxy) - except Exception as err: # pylint: disable=broad-except - current_linux_dist_name = None - stored_linux_dist_name = None - logger.debug('Linux distro check: An error occurred while checking ' - 'linux distribution version source list consistency.') - logger.debug(err) - if current_linux_dist_name != stored_linux_dist_name: - logger.debug("Linux distro check: Mismatch distribution " - "name in %s file", LIST_FILE_PATH) - logger.debug("Linux distro check: If command fails, install the appropriate package " - "for your distribution or change the above file accordingly.") - logger.debug("Linux distro check: %s has '%s', current distro is '%s'", - LIST_FILE_PATH, stored_linux_dist_name, current_linux_dist_name) +def list_available_extensions_cmd(index_url=None, show_details=False): + return list_available_extensions(index_url=index_url, show_details=show_details) diff --git a/src/command_modules/azure-cli-extension/setup.py b/src/command_modules/azure-cli-extension/setup.py index 9be1694a9e2..63c63145383 100644 --- a/src/command_modules/azure-cli-extension/setup.py +++ b/src/command_modules/azure-cli-extension/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.2.2" +VERSION = "0.2.3" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', diff --git a/src/command_modules/azure-cli-interactive/HISTORY.rst b/src/command_modules/azure-cli-interactive/HISTORY.rst index 73d8662b616..7931d790207 100644 --- a/src/command_modules/azure-cli-interactive/HISTORY.rst +++ b/src/command_modules/azure-cli-interactive/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.3.31 +++++++ +* Ensure global subscription parameter appears in parameters. + 0.3.30 ++++++ * Fix error found on windows where commands fail to run properly. diff --git a/src/command_modules/azure-cli-interactive/azure/cli/command_modules/interactive/azclishell/_dump_commands.py b/src/command_modules/azure-cli-interactive/azure/cli/command_modules/interactive/azclishell/_dump_commands.py index 19619cb55e0..6acb8a66eff 100644 --- a/src/command_modules/azure-cli-interactive/azure/cli/command_modules/interactive/azclishell/_dump_commands.py +++ b/src/command_modules/azure-cli-interactive/azure/cli/command_modules/interactive/azclishell/_dump_commands.py @@ -11,7 +11,6 @@ from knack.help_files import helps from knack.log import get_logger from azure.cli.core import MainCommandsLoader -from azure.cli.core.commands.arm import add_id_parameters logger = get_logger(__name__) @@ -76,6 +75,8 @@ def __init__(self, shell_ctx): def dump_command_table(self, shell_ctx=None): """ dumps the command table """ + from azure.cli.core.commands.arm import register_global_subscription_argument, register_ids_argument + from knack import events import timeit start_time = timeit.default_timer() @@ -84,7 +85,9 @@ def dump_command_table(self, shell_ctx=None): main_loader.load_command_table(None) main_loader.load_arguments(None) - add_id_parameters(None, commands_loader=main_loader) + register_global_subscription_argument(shell_ctx.cli_ctx) + register_ids_argument(shell_ctx.cli_ctx) + shell_ctx.cli_ctx.raise_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, commands_loader=main_loader) cmd_table = main_loader.command_table cmd_table_data = {} diff --git a/src/command_modules/azure-cli-interactive/setup.py b/src/command_modules/azure-cli-interactive/setup.py index 379f9b63b9c..55663e721eb 100644 --- a/src/command_modules/azure-cli-interactive/setup.py +++ b/src/command_modules/azure-cli-interactive/setup.py @@ -14,7 +14,7 @@ cmdclass = {} # Version is also defined in azclishell.__init__.py. -VERSION = "0.3.30" +VERSION = "0.3.31" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ diff --git a/src/command_modules/azure-cli-iot/HISTORY.rst b/src/command_modules/azure-cli-iot/HISTORY.rst index ddb4a85e2e0..cac42ae881e 100644 --- a/src/command_modules/azure-cli-iot/HISTORY.rst +++ b/src/command_modules/azure-cli-iot/HISTORY.rst @@ -2,9 +2,13 @@ Release History =============== +0.3.4 ++++++ +* Minor fixes + 0.3.3 +++++ -* Added extension installation comand to first-run banner +* Added extension installation command to first-run banner 0.3.2 +++++ diff --git a/src/command_modules/azure-cli-iot/azure/cli/command_modules/iot/__init__.py b/src/command_modules/azure-cli-iot/azure/cli/command_modules/iot/__init__.py index 149c8b81ff8..34c5ed32b61 100644 --- a/src/command_modules/azure-cli-iot/azure/cli/command_modules/iot/__init__.py +++ b/src/command_modules/azure-cli-iot/azure/cli/command_modules/iot/__init__.py @@ -8,7 +8,7 @@ from azure.cli.core import AzCommandsLoader from azure.cli.core.commands import CliCommandType import azure.cli.command_modules.iot._help # pylint: disable=unused-import -from azure.cli.core.extension import extension_exists +from azure.cli.core.extensions import extension_exists def handler(ctx, **kwargs): diff --git a/src/command_modules/azure-cli-iot/setup.py b/src/command_modules/azure-cli-iot/setup.py index e913c4cd95e..e9603c1058b 100644 --- a/src/command_modules/azure-cli-iot/setup.py +++ b/src/command_modules/azure-cli-iot/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.3.3" +VERSION = "0.3.4" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ diff --git a/src/command_modules/azure-cli-iotcentral/HISTORY.rst b/src/command_modules/azure-cli-iotcentral/HISTORY.rst index 29dfb10d6cd..8dac7f195b9 100644 --- a/src/command_modules/azure-cli-iotcentral/HISTORY.rst +++ b/src/command_modules/azure-cli-iotcentral/HISTORY.rst @@ -3,6 +3,12 @@ Release History =============== +0.1.3 ++++++ +* Added template and display name options for IoT Central Application creation. +* BREAKING CHANGE: The F1 Sku is no longer supported. +* Please use the S1 Sku (default) for app creation. + 0.1.2 +++++ * Minor fixes diff --git a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_help.py b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_help.py index fe8375ca49c..3b1cf578273 100644 --- a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_help.py +++ b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_help.py @@ -20,15 +20,18 @@ helps['iotcentral app create'] = """ type: command short-summary: Create an IoT Central application. - long-summary: For an introduction to IoT Central, see https://docs.microsoft.com/en-us/azure/iot-central/ + long-summary: | + For an introduction to IoT Central, see https://docs.microsoft.com/en-us/azure/iot-central/. + The F1 Sku is no longer supported. Please use the S1 Sku (default) for app creation. + For more pricing information, please visit https://azure.microsoft.com/en-us/pricing/details/iot-central/. examples: - - name: Create an IoT Central application with the free pricing tier F1, in the region of the resource group. + - name: Create an IoT Central application in the standard pricing tier S1, in the region of the resource group. text: > - az iotcentral app create --resource-group MyResourceGroup --name MyApp --subdomain myapp - - name: Create an IoT Central application with the standard pricing tier S1 in the 'westus' region. + az iotcentral app create --resource-group MyResourceGroup --name my-app-resource --subdomain my-app-subdomain + - name: Create an IoT Central application with the standard pricing tier S1 in the 'westus' region, with a custom display name, based on the iotc-default template. text: > - az iotcentral app create --resource-group MyResourceGroup --name MyApp --sku S1 --location westus - --subdomain myapp + az iotcentral app create --resource-group MyResourceGroup --name my-app-resource-name --sku S1 --location westus + --subdomain my-app-subdomain --template iotc-default@1.0.0 --display-name 'My Custom Display Name' """ helps['iotcentral app show'] = """ diff --git a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_params.py b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_params.py index d0ded6b1cae..d0994f20aa6 100644 --- a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_params.py +++ b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/_params.py @@ -30,6 +30,10 @@ def load_arguments(self, _): c.argument('location', get_location_type(self.cli_ctx), help='Location of your IoT Central application. Default is the location of target resource group.') c.argument('sku', arg_type=get_enum_type(AppSku), - help='Pricing tier for IoT Central applications. Default value is F1, which is free.') + help='Pricing tier for IoT Central applications. Default value is S1.') c.argument( 'subdomain', help='Subdomain for the IoT Central URL. Each application must have a unique subdomain.') + c.argument( + 'template', help='IoT Central application template name. Default is a custom application.') + c.argument( + 'display_name', help='Custom display name for the IoT Central application. Default is resource name.') diff --git a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/custom.py b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/custom.py index e98aaa44c21..10cc1d56ff4 100644 --- a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/custom.py +++ b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/custom.py @@ -14,17 +14,21 @@ logger = get_logger(__name__) -def iotcentral_app_create(cmd, client, app_name, resource_group_name, subdomain, sku="F1", location=None): +def iotcentral_app_create( + cmd, client, app_name, resource_group_name, subdomain, sku="S1", + location=None, template=None, display_name=None +): cli_ctx = cmd.cli_ctx _check_name_availability(client, app_name) location = _ensure_location(cli_ctx, resource_group_name, location) - + display_name = _ensure_display_name(app_name, display_name) appSku = AppSkuInfo(name=sku) app = App(subdomain=subdomain, location=location, - display_name=app_name, - sku=appSku) + display_name=display_name, + sku=appSku, + template=template) createResult = client.apps.create_or_update( resource_group_name, app_name, app) @@ -74,6 +78,12 @@ def _ensure_location(cli_ctx, resource_group_name, location): return location +def _ensure_display_name(app_name, display_name): + if not display_name or display_name.isspace(): + return app_name + return display_name + + def _get_iotcentral_app_by_name(client, app_name): """Search the current subscription for an app with the given name. :param object client: IoTCentralClient diff --git a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/recordings/test_iotcentral_app.yaml b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/recordings/test_iotcentral_app.yaml index 6f5ccb37e83..481d5867cc7 100644 --- a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/recordings/test_iotcentral_app.yaml +++ b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/recordings/test_iotcentral_app.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: !!python/unicode '{"location": "westus", "tags": {"date": "2018-08-08T20:03:48Z", - "product": "azurecli", "cause": "automation"}}' + body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", + "date": "2018-10-09T17:21:06Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,19 +9,19 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.47] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-08-08T20:03:48Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T17:21:06Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:03:52 GMT'] + date: ['Tue, 09 Oct 2018 17:21:11 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -29,38 +29,36 @@ interactions: x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: - body: !!python/unicode '{"name": "iotcentral-app-for-cli-test"}' + body: 'b''{"name": "iotc-cli-test000002"}''' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] CommandName: [iotcentral app create] Connection: [keep-alive] - Content-Length: ['39'] + Content-Length: ['36'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.IoTCentral/checkNameAvailability?api-version=2018-09-01 response: - body: {string: !!python/unicode '{"nameAvailable":true}'} + body: {string: '{"nameAvailable":true}'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] content-length: ['22'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:03:54 GMT'] + date: ['Tue, 09 Oct 2018 17:21:12 GMT'] etag: [W/"16-4/x+wI91pK3bZiWtoOg+Zr/n2HE"] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] vary: ['Accept-Encoding,Accept-Encoding'] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] x-ms-ratelimit-remaining-subscription-writes: ['1199'] - x-msedge-ref: ['Ref A: F20836FC51A943409342E3B7BF6E229A Ref B: CO1EDGE0220 Ref - C: 2018-08-08T20:03:54Z'] x-powered-by: [Express] status: {code: 200, message: OK} - request: @@ -71,19 +69,19 @@ interactions: CommandName: [iotcentral app create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.47] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-08-08T20:03:48Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T17:21:06Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:03:54 GMT'] + date: ['Tue, 09 Oct 2018 17:21:12 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -91,37 +89,35 @@ interactions: x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: !!python/unicode '{"sku": {"name": "S1"}, "properties": {"subdomain": "iotcentral-app-for-cli-test", - "displayName": "iotcentral-app-for-cli-test"}, "location": "westus"}' + body: 'b''{"location": "westus", "properties": {"displayName": "iotc-cli-test000002", + "subdomain": "iotc-cli-test000002"}, "sku": {"name": "S1"}}''' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] CommandName: [iotcentral app create] Connection: [keep-alive] - Content-Length: ['151'] + Content-Length: ['145'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] accept-language: [en-US] method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002?api-version=2018-09-01 response: - body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test","name":"iotcentral-app-for-cli-test","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"e90a34f5-fcc2-4200-8e76-8af36d71de7f","state":"created","displayName":"iotcentral-app-for-cli-test","subdomain":"iotcentral-app-for-cli-test","createdDate":"2018-08-08T20:03:57.894Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"bb00e498-0000-0000-0000-5b6b4cac0000\""}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002","name":"iotc-cli-test000002","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"26972ef4-c1c5-4487-a770-30b7a2bab871","state":"created","displayName":"iotc-cli-test000002","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002","createdDate":"2018-10-09T17:21:14.885Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"00000541-0000-0000-0000-5bbce38a0000\""}'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] - content-length: ['630'] + content-length: ['666'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:03:56 GMT'] - etag: ['"bb00e498-0000-0000-0000-5b6b4cac0000"'] + date: ['Tue, 09 Oct 2018 17:21:14 GMT'] + etag: ['"00000541-0000-0000-0000-5bbce38a0000"'] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] x-ms-ratelimit-remaining-subscription-writes: ['1199'] - x-msedge-ref: ['Ref A: F38078064FA24380BA4A39135D5208A1 Ref B: CO1EDGE0512 Ref - C: 2018-08-08T20:03:57Z'] x-powered-by: [Express] status: {code: 201, message: Created} - request: @@ -131,28 +127,181 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [iotcentral app create] Connection: [keep-alive] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002?api-version=2018-09-01 response: - body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test","name":"iotcentral-app-for-cli-test","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"e90a34f5-fcc2-4200-8e76-8af36d71de7f","state":"created","displayName":"iotcentral-app-for-cli-test","subdomain":"iotcentral-app-for-cli-test","createdDate":"2018-08-08T20:03:57.894Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"bb00e498-0000-0000-0000-5b6b4cac0000\""}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002","name":"iotc-cli-test000002","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"26972ef4-c1c5-4487-a770-30b7a2bab871","state":"created","displayName":"iotc-cli-test000002","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002","createdDate":"2018-10-09T17:21:14.885Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"00000541-0000-0000-0000-5bbce38a0000\""}'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] - content-length: ['630'] + content-length: ['666'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:04:27 GMT'] - etag: [W/"bb00e498-0000-0000-0000-5b6b4cac0000"] + date: ['Tue, 09 Oct 2018 17:21:46 GMT'] + etag: [W/"00000541-0000-0000-0000-5bbce38a0000"] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] vary: ['Accept-Encoding,Accept-Encoding'] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] - x-msedge-ref: ['Ref A: EE16F80A5E054358B755A447731BA12C Ref B: CO1EDGE0915 Ref - C: 2018-08-08T20:04:28Z'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-powered-by: [Express] + status: {code: 200, message: OK} +- request: + body: 'b''{"name": "iotc-cli-test000002-template"}''' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app create] + Connection: [keep-alive] + Content-Length: ['45'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.IoTCentral/checkNameAvailability?api-version=2018-09-01 + response: + body: {string: '{"nameAvailable":true}'} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + content-length: ['22'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:21:47 GMT'] + etag: [W/"16-4/x+wI91pK3bZiWtoOg+Zr/n2HE"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-powered-by: [Express] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.47] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-09T17:21:06Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:21:47 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: 'b''{"location": "westus", "properties": {"displayName": "My Custom App + Display Name", "subdomain": "iotc-cli-test000002-template", "template": "iotc-devkit-sample@1.0.0"}, + "sku": {"name": "S1"}}''' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app create] + Connection: [keep-alive] + Content-Length: ['196'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template?api-version=2018-09-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template","name":"iotc-cli-test000002-template","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"09c38123-3f4b-43a8-bdd7-a277e531e893","state":"created","displayName":"My + Custom App Display Name","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002-template","createdDate":"2018-10-09T17:21:49.964Z","template":"iotc-devkit-sample@1.0.0"},"sku":{"name":"S1"},"etag":"\"2d005842-0000-0000-0000-5bbce3ad0000\""}'} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + content-length: ['701'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:21:49 GMT'] + etag: ['"2d005842-0000-0000-0000-5bbce3ad0000"'] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-powered-by: [Express] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app create] + Connection: [keep-alive] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template?api-version=2018-09-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template","name":"iotc-cli-test000002-template","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"09c38123-3f4b-43a8-bdd7-a277e531e893","state":"created","displayName":"My + Custom App Display Name","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002-template","createdDate":"2018-10-09T17:21:49.964Z","template":"iotc-devkit-sample@1.0.0"},"sku":{"name":"S1"},"etag":"\"2d005842-0000-0000-0000-5bbce3ad0000\""}'} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + content-length: ['701'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:22:20 GMT'] + etag: [W/"2d005842-0000-0000-0000-5bbce3ad0000"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-powered-by: [Express] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app show] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002?api-version=2018-09-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002","name":"iotc-cli-test000002","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"26972ef4-c1c5-4487-a770-30b7a2bab871","state":"created","displayName":"iotc-cli-test000002","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002","createdDate":"2018-10-09T17:21:14.885Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"00000541-0000-0000-0000-5bbce38a0000\""}'} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + content-length: ['666'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:22:21 GMT'] + etag: [W/"00000541-0000-0000-0000-5bbce38a0000"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] x-powered-by: [Express] status: {code: 200, message: OK} - request: @@ -163,31 +312,92 @@ interactions: CommandName: [iotcentral app show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] accept-language: [en-US] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template?api-version=2018-09-01 response: - body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test","name":"iotcentral-app-for-cli-test","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"e90a34f5-fcc2-4200-8e76-8af36d71de7f","state":"created","displayName":"iotcentral-app-for-cli-test","subdomain":"iotcentral-app-for-cli-test","createdDate":"2018-08-08T20:03:57.894Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"bb00e498-0000-0000-0000-5b6b4cac0000\""}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template","name":"iotc-cli-test000002-template","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"09c38123-3f4b-43a8-bdd7-a277e531e893","state":"created","displayName":"My + Custom App Display Name","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002-template","createdDate":"2018-10-09T17:21:49.964Z","template":"iotc-devkit-sample@1.0.0"},"sku":{"name":"S1"},"etag":"\"2d005842-0000-0000-0000-5bbce3ad0000\""}'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] - content-length: ['630'] + content-length: ['701'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:04:28 GMT'] - etag: [W/"bb00e498-0000-0000-0000-5b6b4cac0000"] + date: ['Tue, 09 Oct 2018 17:22:22 GMT'] + etag: [W/"2d005842-0000-0000-0000-5bbce3ad0000"] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] vary: ['Accept-Encoding,Accept-Encoding'] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] - x-msedge-ref: ['Ref A: F29B1A8CF58F4589B9DEBD44A7CCFC0B Ref B: CO1EDGE0911 Ref - C: 2018-08-08T20:04:29Z'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] x-powered-by: [Express] status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template?api-version=2018-09-01 + response: + body: {string: '"{\"message\":\"Header X-IoT-Subject is required.\",\"code\":\"400.030.006.002\"}"'} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + connection: [close] + content-length: ['82'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:22:23 GMT'] + etag: [W/"52-i+3T86wxZcJ1AQBjEXMUOAdScB8"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-failure-cause: [service] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-powered-by: [Express] + status: {code: 500, message: Internal Server Error} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002-template?api-version=2018-09-01 + response: + body: {string: ''} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + date: ['Tue, 09 Oct 2018 17:22:24 GMT'] + etag: [W/"48-49tb709nJYOz7SyvcfMdAh/S/Bg"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-powered-by: [Express] + status: {code: 204, message: No Content} - request: body: null headers: @@ -196,29 +406,27 @@ interactions: CommandName: [iotcentral app list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps?api-version=2018-09-01 response: - body: {string: !!python/unicode '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test","name":"iotcentral-app-for-cli-test","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"e90a34f5-fcc2-4200-8e76-8af36d71de7f","state":"created","displayName":"iotcentral-app-for-cli-test","subdomain":"iotcentral-app-for-cli-test","createdDate":"2018-08-08T20:03:57.894Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"bb00e498-0000-0000-0000-5b6b4cac0000\""}],"nextLink":null}'} + body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002","name":"iotc-cli-test000002","type":"Microsoft.IoTCentral/IoTApps","location":"westus","properties":{"applicationId":"26972ef4-c1c5-4487-a770-30b7a2bab871","state":"created","displayName":"iotc-cli-test000002","tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47","subdomain":"iotc-cli-test000002","createdDate":"2018-10-09T17:21:14.885Z","template":"iotc-default@1.0.0"},"sku":{"name":"S1"},"etag":"\"00000541-0000-0000-0000-5bbce38a0000\""}],"nextLink":null}'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] - content-length: ['658'] + content-length: ['694'] content-type: [application/json; charset=utf-8] - date: ['Wed, 08 Aug 2018 20:04:29 GMT'] - etag: [W/"292-/wvjZUNtt8/Qgfn4reJK7fvR/K4"] + date: ['Tue, 09 Oct 2018 17:22:25 GMT'] + etag: [W/"2b6-e4ZphsnwdtBGqXTX4tVZtQ3ZaX8"] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] vary: ['Accept-Encoding,Accept-Encoding'] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] - x-msedge-ref: ['Ref A: 7CE40C8813A44750AD8DC30920BF08A3 Ref B: CO1EDGE0113 Ref - C: 2018-08-08T20:04:30Z'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] x-powered-by: [Express] status: {code: 200, message: OK} - request: @@ -230,28 +438,59 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] accept-language: [en-US] method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotcentral-app-for-cli-test?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002?api-version=2018-09-01 response: - body: {string: !!python/unicode ''} + body: {string: '"{\"message\":\"Header X-IoT-Subject is required.\",\"code\":\"400.030.006.002\"}"'} headers: cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, post-check=0, pre-check=0'] - content-length: ['0'] - date: ['Wed, 08 Aug 2018 20:04:40 GMT'] + connection: [close] + content-length: ['82'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 09 Oct 2018 17:22:26 GMT'] + etag: [W/"52-i+3T86wxZcJ1AQBjEXMUOAdScB8"] + server: [openresty] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-iot-cluster: [iotcprodwestus01] - x-iot-version: ['20180802.3'] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-failure-cause: [service] x-ms-ratelimit-remaining-subscription-deletes: ['14999'] - x-msedge-ref: ['Ref A: BDE7E30AA2654C6289B4693B7804FCFA Ref B: CO1EDGE0322 Ref - C: 2018-08-08T20:04:31Z'] x-powered-by: [Express] - status: {code: 200, message: OK} + status: {code: 500, message: Internal Server Error} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [iotcentral app delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 azure-mgmt-iotcentral/0.2.0 Azure-SDK-For-Python AZURECLI/2.0.47] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.IoTCentral/IoTApps/iotc-cli-test000002?api-version=2018-09-01 + response: + body: {string: ''} + headers: + cache-control: ['no-store, must-revalidate, no-cache, max-stale=0, private, + post-check=0, pre-check=0'] + date: ['Tue, 09 Oct 2018 17:22:27 GMT'] + etag: [W/"48-49tb709nJYOz7SyvcfMdAh/S/Bg"] + server: [openresty] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-iot-cluster: [iotcprodeastus01] + x-iot-version: ['20181004.13'] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-powered-by: [Express] + status: {code: 204, message: No Content} - request: body: null headers: @@ -261,20 +500,20 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/2.7.12 (Linux-4.4.0-17134-Microsoft-x86_64-with-Ubuntu-16.04-xenial) - requests/2.19.1 msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 - Azure-SDK-For-Python AZURECLI/2.0.44] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.47] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: !!python/unicode ''} + body: {string: ''} headers: cache-control: [no-cache] content-length: ['0'] - date: ['Wed, 08 Aug 2018 20:04:41 GMT'] + date: ['Tue, 09 Oct 2018 17:22:28 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdNSlBWWEtINENERzJXM1UyWTVPM0RLSDJQR0FTRUpaUVdNN3w3NkY0QzcxQzg5MUIzRDRELVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdTQ1hSTFRCSVRRTkJNR00yTFNISFZLQ0VKNE5XMkNKV1dFSHw4QjNFMkMwQzMzMEI2OTFCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/test_iotcentral_commands.py b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/test_iotcentral_commands.py index 29e0ca9fc9f..0f744cf4d0a 100644 --- a/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/test_iotcentral_commands.py +++ b/src/command_modules/azure-cli-iotcentral/azure/cli/command_modules/iotcentral/tests/latest/test_iotcentral_commands.py @@ -10,9 +10,12 @@ class IoTCentralTest(ScenarioTest): @ResourceGroupPreparer() # name_prefix not required, but can be useful def test_iotcentral_app(self, resource_group, resource_group_location): - app_name = 'iotcentral-app-for-cli-test' + app_name = self.create_random_name(prefix='iotc-cli-test', length=24) + template_app_name = app_name + '-template' + template_app_display_name = "My Custom App Display Name" rg = resource_group location = resource_group_location + template = 'iotc-devkit-sample@1.0.0' # Test 'az iotcentral app create' self.cmd('iotcentral app create -n {0} -g {1} --sku S1 --subdomain {2}'.format(app_name, rg, app_name), checks=[ @@ -22,6 +25,16 @@ def test_iotcentral_app(self, resource_group, resource_group_location): self.check('displayName', app_name), self.check('sku.name', 'S1')]) + # Test 'az iotcentral app create with template and display name' + self.cmd('iotcentral app create -n {0} -g {1} --sku S1 --subdomain {2} --template {3} --display-name \"{4}\"' + .format(template_app_name, rg, template_app_name, template, template_app_display_name), checks=[ + self.check('resourceGroup', rg), + self.check('location', location), + self.check('subdomain', template_app_name), + self.check('displayName', template_app_display_name), + self.check('sku.name', 'S1'), + self.check('template', template)]) + # Test 'az iotcentral app show' self.cmd('iotcentral app show -n {0} -g {1}'.format(app_name, rg), checks=[ self.check('resourceGroup', rg), @@ -30,6 +43,19 @@ def test_iotcentral_app(self, resource_group, resource_group_location): self.check('displayName', app_name), self.check('sku.name', 'S1')]) + # Test 'az iotcentral app show with template and display name' + self.cmd('iotcentral app show -n {0} -g {1}'.format(template_app_name, rg), checks=[ + self.check('resourceGroup', rg), + self.check('location', location), + self.check('subdomain', template_app_name), + self.check('displayName', template_app_display_name), + self.check('sku.name', 'S1'), + self.check('template', template)]) + + # Test 'az iotcentral app delete with template and display name' + self.cmd('iotcentral app delete -n {0} -g {1}'.format(template_app_name, rg), checks=[ + self.is_empty()]) + # Test 'az iotcentral app list' self.cmd('iotcentral app list -g {0}'.format(rg), checks=[ self.check('length([*])', 1), diff --git a/src/command_modules/azure-cli-iotcentral/setup.py b/src/command_modules/azure-cli-iotcentral/setup.py index 3ca371c9fee..61376fa2ab7 100644 --- a/src/command_modules/azure-cli-iotcentral/setup.py +++ b/src/command_modules/azure-cli-iotcentral/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.1.2" +VERSION = "0.1.3" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/command_modules/azure-cli-keyvault/HISTORY.rst b/src/command_modules/azure-cli-keyvault/HISTORY.rst index 135e9e42bea..01335856c72 100644 --- a/src/command_modules/azure-cli-keyvault/HISTORY.rst +++ b/src/command_modules/azure-cli-keyvault/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +2.2.5 ++++++ +* Minor changes 2.2.4 +++++ diff --git a/src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/custom.py b/src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/custom.py index 3359df26cdf..0fd2445cca1 100644 --- a/src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/custom.py +++ b/src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/custom.py @@ -161,7 +161,7 @@ def list_keyvault(client, resource_group_name=None): def _get_current_user_object_id(graph_client): from msrestazure.azure_exceptions import CloudError try: - current_user = graph_client.objects.get_current_user() + current_user = graph_client.signed_in_user.get() if current_user and current_user.object_id: # pylint:disable=no-member return current_user.object_id # pylint:disable=no-member except CloudError: diff --git a/src/command_modules/azure-cli-keyvault/setup.py b/src/command_modules/azure-cli-keyvault/setup.py index 90ac234bd5f..9875981f91a 100644 --- a/src/command_modules/azure-cli-keyvault/setup.py +++ b/src/command_modules/azure-cli-keyvault/setup.py @@ -15,7 +15,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.2.4" +VERSION = "2.2.5" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -36,7 +36,7 @@ DEPENDENCIES = [ 'azure-mgmt-keyvault==1.1.0', 'azure-keyvault==1.1.0', - 'azure-graphrbac==0.40.0', + 'azure-graphrbac==0.51.1', 'azure-cli-core', 'pyOpenSSL' ] diff --git a/src/command_modules/azure-cli-lab/HISTORY.rst b/src/command_modules/azure-cli-lab/HISTORY.rst index d355cbf0343..294c5e785a2 100644 --- a/src/command_modules/azure-cli-lab/HISTORY.rst +++ b/src/command_modules/azure-cli-lab/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.1.2 ++++++ +* Minor changes 0.1.1 +++++ diff --git a/src/command_modules/azure-cli-lab/setup.py b/src/command_modules/azure-cli-lab/setup.py index 5d88cd171b4..1429a565660 100644 --- a/src/command_modules/azure-cli-lab/setup.py +++ b/src/command_modules/azure-cli-lab/setup.py @@ -12,7 +12,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.1.1" +VERSION = "0.1.2" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', @@ -29,7 +29,7 @@ DEPENDENCIES = [ 'azure-cli-core', - 'azure-graphrbac==0.40.0', + 'azure-graphrbac==0.51.1', 'azure-mgmt-devtestlabs==2.2.0' ] diff --git a/src/command_modules/azure-cli-monitor/HISTORY.rst b/src/command_modules/azure-cli-monitor/HISTORY.rst index 673e498aabf..8e39a4a6926 100644 --- a/src/command_modules/azure-cli-monitor/HISTORY.rst +++ b/src/command_modules/azure-cli-monitor/HISTORY.rst @@ -3,8 +3,21 @@ Release History =============== +0.2.6 ++++++ +* `monitor metrics alert create/update`: `--condition` now supports metric names which include characters forward-slash (/) and period (.). + 0.2.5 +++++ +* `monitor activity-log list`: + Allow listing all events at the subscription level. + Added `--offset` parameter to more easily create time queries. + Improved validation for --start-time and --end-time to use wider range of ISO8601 formats and more user-friendly datetime formats. + Added `--namespace` as alias for deprecated option `--resource-provider`. + Deprecated `--filters` because no values other than those with strongly-typed options are supported by the service. +* `monitor metrics list`: + Added `--offset` parameter to more easily create time queries. + Improved validation for --start-time and --end-time to use wider range of ISO8601 formats and more user-friendly datetime formats. * `monitor diagnostic-settings create`: Improve validation for arguments `--event-hub` and `--event-hub-rule`. 0.2.4 diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/__init__.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/__init__.py index 34b9f847dc9..8904bc1dd47 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/__init__.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/__init__.py @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------- from azure.cli.core import AzCommandsLoader -from azure.cli.core.commands import AzArgumentContext +from azure.cli.core.commands import AzArgumentContext, CliCommandType from azure.cli.command_modules.monitor._help import helps # pylint: disable=unused-import @@ -32,9 +32,14 @@ def resource_parameter(self, dest, arg_group=None, required=True, skip_validator class MonitorCommandsLoader(AzCommandsLoader): def __init__(self, cli_ctx=None): + from azure.cli.command_modules.monitor._exception_handler import monitor_exception_handler + monitor_custom = CliCommandType( + operations_tmpl='azure.cli.command_modules.monitor.custom#{}', + exception_handler=monitor_exception_handler) super(MonitorCommandsLoader, self).__init__(cli_ctx=cli_ctx, min_profile='2017-03-10-profile', - argument_context_cls=MonitorArgumentContext) + argument_context_cls=MonitorArgumentContext, + custom_command_type=monitor_custom) def load_command_table(self, args): from azure.cli.command_modules.monitor.commands import load_command_table diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py index 72b276debfe..fb505489e5d 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py @@ -133,30 +133,27 @@ short-summary: List the metric values for a resource. parameters: - name: --aggregation - type: string short-summary: The list of aggregation types (space-separated) to retrieve. - name: --interval - type: string - short-summary: The interval of the metric query. In ISO 8601 duration format, eg "PT1M" - - name: --start-time - type: string - short-summary: > - The start time of the query. In ISO format with explicit indication of timezone, 1970-01-01T00:00:00Z, 1970-01-01T00:00:00-0500. - Defaults to 1 Hour prior to the current time. - - name: --end-time - type: string short-summary: > - The end time of the query. In ISO format with explicit indication of timezone, 1970-01-01T00:00:00Z, 1970-01-01T00:00:00-0500. - Defaults to the current time. + The interval over which to aggregate metrics, in ##h##m format. - name: --filter - type: string short-summary: A string used to reduce the set of metric data returned. eg. "BlobType eq '*'" long-summary: 'For a full list of filters, see the filter string reference at https://docs.microsoft.com/en-us/rest/api/monitor/metrics/list' - name: --metadata short-summary: Returns the metadata values instead of metric data - name: --dimension - type: string short-summary: The list of dimensions (space-separated) the metrics are queried into. + - name: --namespace + short-summary: Namespace to query metric definitions for. + - name: --offset + short-summary: > + Time offset of the query range, in ##d##h format. + long-summary: > + Can be used with either --start-time or --end-time. If used with --start-time, then + the end time will be calculated by adding the offset. If used with --end-time (default), then + the start time will be calculated by subtracting the offset. If --start-time and --end-time are + provided, then --offset will be ignored. examples: - name: List a VM's CPU usage for the past hour text: > @@ -329,6 +326,8 @@ helps['monitor diagnostic-settings create'] = """ type: command short-summary: Create diagnostic settings for the specified resource. + long-summary: > + For more information, visit: https://docs.microsoft.com/en-us/rest/api/monitor/diagnosticsettings/createorupdate#metricsettings parameters: - name: --name -n short-summary: The name of the diagnostic settings. @@ -354,6 +353,31 @@ Name or ID an event hub. If none is specified, the default event hub will be selected. - name: --event-hub-rule short-summary: Name or ID of the event hub authorization rule. + examples: + - name: Create diagnostic settings with EventHub. + text: | + az monitor diagnostic-settings create --resource {ID} -n {name} + --event-hub-rule {eventHubRuleID} --storage-account {storageAccount} + --logs '[ + { + "category": "WorkflowRuntime", + "enabled": true, + "retentionPolicy": { + "enabled": false, + "days": 0 + } + } + ]' + --metrics '[ + { + "category": "WorkflowRuntime", + "enabled": true, + "retentionPolicy": { + "enabled": false, + "days": 0 + } + } + ]' """ helps['monitor diagnostic-settings update'] = """ type: command @@ -822,37 +846,38 @@ helps['monitor activity-log list'] = """ type: command - short-summary: List events from the activity log. + short-summary: List and query activity log events. parameters: - - name: --filters - short-summary: > - The OData filter for the list activity logs. If this argument is provided OData Filter - Arguments will be ignored. - name: --correlation-id - short-summary: Correlation ID of the query. - - name: --resource-group - short-summary: Resource group to query. + short-summary: Correlation ID to query. - name: --resource-id - short-summary: Identifier of the resource. - - name: --resource-provider - short-summary: Resource provider - - name: --start-time - short-summary: > - Start time of the query. ISO format with explicit indication of timezone: 1970-01-01T00:00:00Z, - 1970-01-01T00:00:00-0500. Defaults to 1 Hour prior to the current time. - - name: --end-time - short-summary: > - End time of the query. ISO format with explicit indication of timezone: 1970-01-01T00:00:00Z, - 1970-01-01T00:00:00-0500. Defaults to current time. + short-summary: ARM ID of a resource. + - name: --namespace + short-summary: Resource provider namespace. - name: --caller - short-summary: Caller to look for when querying. + short-summary: Caller to query for, such as an e-mail address or service principal ID. - name: --status short-summary: > - Status value to query (ex: Failed) + Status to query for (ex: Failed) - name: --max-events - short-summary: Maximum number of records to be returned by the command. + short-summary: Maximum number of records to return. - name: --select - short-summary: Space-separated list of event names to select. + short-summary: Space-separated list of properties to return. + - name: --offset + short-summary: > + Time offset of the query range, in ##d##h format. + long-summary: > + Can be used with either --start-time or --end-time. If used with --start-time, then + the end time will be calculated by adding the offset. If used with --end-time (default), then + the start time will be calculated by subtracting the offset. If --start-time and --end-time are + provided, then --offset will be ignored. + examples: + - name: List all events from July 1st, looking forward one week. + text: az monitor activity-log list --start-date 2018-07-01 --offset 7d + - name: List events within the past six hours based on a correlation ID. + text: az monitor activity-log list --correlation-id b5eac9d2-e829-4c9a-9efb-586d19417c5f + - name: List events within the past hour based on resource group. + text: az monitor activity-log list -g {ResourceGroup} --offset 1h """ helps['monitor activity-log list-categories'] = """ diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_params.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_params.py index 5509f051e64..7687bb17df1 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_params.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_params.py @@ -8,22 +8,22 @@ from azure.cli.core.util import get_json_object from azure.cli.core.commands.parameters import ( - get_location_type, tags_type, get_three_state_flag, get_enum_type, get_datetime_type) + get_location_type, tags_type, get_three_state_flag, get_enum_type, get_datetime_type, resource_group_name_type) from azure.cli.core.commands.validators import get_default_location_from_resource_group from azure.cli.command_modules.monitor.actions import ( AlertAddAction, AlertRemoveAction, ConditionAction, AutoscaleAddAction, AutoscaleRemoveAction, - AutoscaleScaleAction, AutoscaleConditionAction, period_type, + AutoscaleScaleAction, AutoscaleConditionAction, get_period_type, timezone_offset_type, timezone_name_type, MetricAlertConditionAction, MetricAlertAddAction) from azure.cli.command_modules.monitor.util import get_operator_map, get_aggregation_map from azure.cli.command_modules.monitor.validators import ( process_webhook_prop, validate_autoscale_recurrence, validate_autoscale_timegrain, get_action_group_validator, - get_action_group_id_validator) + get_action_group_id_validator, validate_metric_dimension) # pylint: disable=line-too-long, too-many-statements def load_arguments(self, _): - from azure.mgmt.monitor.models import ConditionOperator, TimeAggregationOperator + from azure.mgmt.monitor.models import ConditionOperator, TimeAggregationOperator, EventData name_arg_type = CLIArgumentType(options_list=['--name', '-n'], metavar='NAME') webhook_prop_type = CLIArgumentType(validator=process_webhook_prop, nargs='*') @@ -73,7 +73,7 @@ def load_arguments(self, _): c.argument('operator', arg_type=get_enum_type(get_operator_map().keys())) c.argument('threshold') c.argument('aggregation', arg_type=get_enum_type(get_aggregation_map().keys())) - c.argument('period', type=period_type) + c.argument('period', type=get_period_type()) for scope in ['monitor alert show-incident', 'monitor alert list-incidents']: with self.argument_context(scope) as c: @@ -92,26 +92,30 @@ def load_arguments(self, _): c.resource_parameter('resource_uri', arg_group='Target Resource') with self.argument_context('monitor metrics list') as c: - from .validators import (process_metric_timespan, process_metric_aggregation, process_metric_result_type, - process_metric_dimension, validate_metric_names) from azure.mgmt.monitor.models import AggregationType - c.resource_parameter('resource_uri', arg_group='Target Resource') - c.extra('start_time', options_list=['--start-time'], validator=process_metric_timespan, arg_group='Time') - c.extra('end_time', options_list=['--end-time'], arg_group='Time') - c.extra('metadata', options_list=['--metadata'], action='store_true', validator=process_metric_result_type) - c.extra('dimension', options_list=['--dimension'], nargs='*', validator=process_metric_dimension) - c.argument('interval', arg_group='Time') - c.argument('aggregation', arg_type=get_enum_type(t for t in AggregationType if t.name != 'none'), nargs='*', validator=process_metric_aggregation) - c.argument('metricnames', options_list=['--metrics'], nargs='+', help='Space-separated list of metric names to retrieve.', validator=validate_metric_names) - c.ignore('timespan', 'result_type') + c.resource_parameter('resource', arg_group='Target Resource') + c.argument('metadata', action='store_true') + c.argument('dimension', nargs='*', validator=validate_metric_dimension) + c.argument('aggregation', arg_type=get_enum_type(t for t in AggregationType if t.name != 'none'), nargs='*') + c.argument('metrics', nargs='+', help='Space-separated list of metric names to retrieve.') + c.argument('orderby', help='Aggregation to use for sorting results and the direction of the sort. Only one order can be specificed. Examples: sum asc') + c.argument('top', help='Max number of records to retrieve. Valid only if --filter used.') + c.argument('filters', options_list='--filter') + c.argument('metric_namespace', options_list='--namespace') + + with self.argument_context('monitor metrics list', arg_group='Time') as c: + c.argument('start_time', arg_type=get_datetime_type(help='Start time of the query.')) + c.argument('end_time', arg_type=get_datetime_type(help='End time of the query. Defaults to the current time.')) + c.argument('offset', type=get_period_type(as_timedelta=True)) + c.argument('interval', arg_group='Time', type=get_period_type()) # endregion # region MetricAlerts with self.argument_context('monitor metrics alert') as c: c.argument('rule_name', name_arg_type, id_part='name', help='Name of the alert rule.') c.argument('severity', type=int, help='Severity of the alert from 0 (low) to 4 (high).') - c.argument('window_size', type=period_type, help='Time over which to aggregate metrics in "##h##m##s" format.') - c.argument('evaluation_frequency', type=period_type, help='Frequency with which to evaluate the rule in "##h##m##s" format.') + c.argument('window_size', type=get_period_type(), help='Time over which to aggregate metrics in "##h##m##s" format.') + c.argument('evaluation_frequency', type=get_period_type(), help='Frequency with which to evaluate the rule in "##h##m##s" format.') c.argument('auto_mitigate', arg_type=get_three_state_flag(), help='Automatically resolve the alert.') c.argument('condition', options_list=['--condition'], action=MetricAlertConditionAction, nargs='+') c.argument('description', help='Free-text description of the rule.') @@ -249,17 +253,23 @@ def load_arguments(self, _): # region ActivityLog with self.argument_context('monitor activity-log list') as c: - c.argument('select', nargs='+') + activity_log_props = [x['key'] for x in EventData()._attribute_map.values()] # pylint: disable=protected-access + c.argument('select', nargs='+', arg_type=get_enum_type(activity_log_props)) + c.argument('max_events', type=int) + + with self.argument_context('monitor activity-log list', arg_group='Time') as c: + c.argument('start_time', arg_type=get_datetime_type(help='Start time of the query.')) + c.argument('end_time', arg_type=get_datetime_type(help='End time of the query. Defaults to the current time.')) + c.argument('offset', type=get_period_type(as_timedelta=True)) - with self.argument_context('monitor activity-log list', arg_group='OData Filter') as c: + with self.argument_context('monitor activity-log list', arg_group='Filter') as c: + c.argument('filters', deprecate_info=c.deprecate(target='--filters', hide=True, expiration='2.1.0'), help='OData filters. Will ignore other filter arguments.') c.argument('correlation_id') - c.argument('caller') - c.argument('resource_group') + c.argument('resource_group', resource_group_name_type) c.argument('resource_id') - c.argument('resource_provider') + c.argument('resource_provider', options_list=['--namespace', c.deprecate(target='--resource-provider', redirect='--namespace', hide=True, expiration='2.1.0')]) + c.argument('caller') c.argument('status') - c.argument('start_time') - c.argument('end_time') # endregion # region ActionGroup diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/actions.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/actions.py index 8149258c7c5..4c9fdcf5bc4 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/actions.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/actions.py @@ -4,8 +4,8 @@ # -------------------------------------------------------------------------------------------- import argparse - import antlr4 +from knack.util import CLIError from azure.cli.command_modules.monitor.util import ( get_aggregation_map, get_operator_map, get_autoscale_operator_map, @@ -16,7 +16,6 @@ def timezone_name_type(value): from azure.cli.command_modules.monitor._autoscale_util import AUTOSCALE_TIMEZONES zone = next((x['name'] for x in AUTOSCALE_TIMEZONES if x['name'].lower() == value.lower()), None) if not zone: - from knack.util import CLIError raise CLIError( "Invalid time zone: '{}'. Run 'az monitor autoscale profile list-timezones' for values.".format(value)) return zone @@ -33,7 +32,6 @@ def timezone_offset_type(value): hour = int(hour) if hour > 14 or hour < -12: - from knack.util import CLIError raise CLIError('Offset out of range: -12 to +14') if hour >= 0 and hour < 10: @@ -49,31 +47,44 @@ def timezone_offset_type(value): return value -def period_type(value): +def get_period_type(as_timedelta=False): + + def period_type(value): + + import re - import re + def _get_substring(indices): + if indices == tuple([-1, -1]): + return '' + return value[indices[0]: indices[1]] - def _get_substring(indices): - if indices == tuple([-1, -1]): - return '' - return value[indices[0]: indices[1]] + regex = r'(p)?(\d+y)?(\d+m)?(\d+d)?(t)?(\d+h)?(\d+m)?(\d+s)?' + match = re.match(regex, value.lower()) + match_len = match.span(0) + if match_len != tuple([0, len(value)]): + raise ValueError + # simply return value if a valid ISO8601 string is supplied + if match.span(1) != tuple([-1, -1]) and match.span(5) != tuple([-1, -1]): + return value - regex = r'(p)?(\d+y)?(\d+m)?(\d+d)?(t)?(\d+h)?(\d+m)?(\d+s)?' - match = re.match(regex, value.lower()) - match_len = match.regs[0] - if match_len != tuple([0, len(value)]): - raise ValueError - # simply return value if a valid ISO8601 string is supplied - if match.regs[1] != tuple([-1, -1]) and match.regs[5] != tuple([-1, -1]): - return value + # if shorthand is used, only support days, minutes, hours, seconds + # ensure M is interpretted as minutes + days = _get_substring(match.span(4)) + hours = _get_substring(match.span(6)) + minutes = _get_substring(match.span(7)) or _get_substring(match.span(3)) + seconds = _get_substring(match.span(8)) - # if shorthand is used, only support days, minutes, hours, seconds - # ensure M is interpretted as minutes - days = _get_substring(match.regs[4]) - minutes = _get_substring(match.regs[6]) or _get_substring(match.regs[3]) - hours = _get_substring(match.regs[7]) - seconds = _get_substring(match.regs[8]) - return 'P{}T{}{}{}'.format(days, minutes, hours, seconds).upper() + if as_timedelta: + from datetime import timedelta + return timedelta( + days=int(days[:-1]) if days else 0, + hours=int(hours[:-1]) if hours else 0, + minutes=int(minutes[:-1]) if minutes else 0, + seconds=int(seconds[:-1]) if seconds else 0 + ) + return 'P{}T{}{}{}'.format(days, minutes, hours, seconds).upper() + + return period_type # pylint: disable=protected-access, too-few-public-methods @@ -83,6 +94,10 @@ def __call__(self, parser, namespace, values, option_string=None): from azure.cli.command_modules.monitor.grammar import ( MetricAlertConditionLexer, MetricAlertConditionParser, MetricAlertConditionValidator) + usage = 'usage error: --condition {avg,min,max,total} [NAMESPACE.]METRIC {=,!=,>,>=,<,<=} THRESHOLD\n' \ + ' [where DIMENSION {includes,excludes} VALUE [or VALUE ...]\n' \ + ' [and DIMENSION {includes,excludes} VALUE [or VALUE ...] ...]]' + string_val = ' '.join(values) lexer = MetricAlertConditionLexer(antlr4.InputStream(string_val)) @@ -90,10 +105,16 @@ def __call__(self, parser, namespace, values, option_string=None): parser = MetricAlertConditionParser(stream) tree = parser.expression() - validator = MetricAlertConditionValidator() - walker = antlr4.ParseTreeWalker() - walker.walk(validator, tree) - metric_condition = validator.result() + try: + validator = MetricAlertConditionValidator() + walker = antlr4.ParseTreeWalker() + walker.walk(validator, tree) + metric_condition = validator.result() + for item in ['time_aggregation', 'metric_name', 'threshold', 'operator']: + if not getattr(metric_condition, item, None): + raise CLIError(usage) + except (AttributeError, TypeError, KeyError): + raise CLIError(usage) super(MetricAlertConditionAction, self).__call__(parser, namespace, metric_condition, option_string) @@ -123,13 +144,12 @@ def __call__(self, parser, namespace, values, option_string=None): # specified as a quoted expression values = values[0].split(' ') if len(values) < 5: - from knack.util import CLIError raise CLIError('usage error: --condition METRIC {>,>=,<,<=} THRESHOLD {avg,min,max,total,last} DURATION') metric_name = ' '.join(values[:-4]) operator = get_operator_map()[values[-4]] threshold = int(values[-3]) aggregation = get_aggregation_map()[values[-2].lower()] - window = period_type(values[-1]) + window = get_period_type()(values[-1]) metric = RuleMetricDataSource(resource_uri=None, metric_name=metric_name) # target URI will be filled in later condition = ThresholdRuleCondition( operator=operator, threshold=threshold, data_source=metric, @@ -144,7 +164,6 @@ def __call__(self, parser, namespace, values, option_string=None): super(AlertAddAction, self).__call__(parser, namespace, action, option_string) def get_action(self, values, option_string): # pylint: disable=no-self-use - from knack.util import CLIError _type = values[0].lower() if _type == 'email': from azure.mgmt.monitor.models import RuleEmailAction @@ -169,7 +188,6 @@ def __call__(self, parser, namespace, values, option_string=None): def get_action(self, values, option_string): # pylint: disable=no-self-use # TYPE is artificially enforced to create consistency with the --add-action argument # but it could be enhanced to do additional validation in the future. - from knack.util import CLIError _type = values[0].lower() if _type not in ['email', 'webhook']: raise CLIError('usage error: {} TYPE KEY [KEY ...]'.format(option_string)) @@ -183,7 +201,6 @@ def __call__(self, parser, namespace, values, option_string=None): super(AutoscaleAddAction, self).__call__(parser, namespace, action, option_string) def get_action(self, values, option_string): # pylint: disable=no-self-use - from knack.util import CLIError _type = values[0].lower() if _type == 'email': from azure.mgmt.monitor.models import EmailNotification @@ -208,7 +225,6 @@ def __call__(self, parser, namespace, values, option_string=None): def get_action(self, values, option_string): # pylint: disable=no-self-use # TYPE is artificially enforced to create consistency with the --add-action argument # but it could be enhanced to do additional validation in the future. - from knack.util import CLIError _type = values[0].lower() if _type not in ['email', 'webhook']: raise CLIError('usage error: {} TYPE KEY [KEY ...]'.format(option_string)) @@ -228,9 +244,8 @@ def __call__(self, parser, namespace, values, option_string=None): operator = get_autoscale_operator_map()[values[-4]] threshold = int(values[-3]) aggregation = get_autoscale_aggregation_map()[values[-2].lower()] - window = period_type(values[-1]) + window = get_period_type()(values[-1]) except (IndexError, KeyError): - from knack.util import CLIError raise CLIError('usage error: --condition METRIC {==,!=,>,>=,<,<=} ' 'THRESHOLD {avg,min,max,total,count} PERIOD') condition = MetricTrigger( @@ -254,7 +269,6 @@ def __call__(self, parser, namespace, values, option_string=None): # specified as a quoted expression values = values[0].split(' ') if len(values) != 2: - from knack.util import CLIError raise CLIError('usage error: --scale {in,out,to} VALUE[%]') dir_val = values[0] amt_val = values[1] @@ -303,7 +317,6 @@ def deserialize_object(self, type_name, type_properties): class ActionGroupReceiverParameterAction(MultiObjectsDeserializeAction): def deserialize_object(self, type_name, type_properties): from azure.mgmt.monitor.models import EmailReceiver, SmsReceiver, WebhookReceiver - from knack.util import CLIError if type_name == 'email': try: diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/commands.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/commands.py index b28cae5b258..a7e3cc2fda8 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/commands.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/commands.py @@ -10,13 +10,17 @@ def load_command_table(self, _): from ._client_factory import ( - cf_alert_rules, cf_metrics, cf_metric_def, cf_alert_rule_incidents, cf_log_profiles, cf_autoscale, + cf_alert_rules, cf_metric_def, cf_alert_rule_incidents, cf_log_profiles, cf_autoscale, cf_diagnostics, cf_activity_log, cf_action_groups, cf_activity_log_alerts, cf_event_categories, cf_metric_alerts) from ._exception_handler import monitor_exception_handler, missing_resource_handler from .transformers import (action_group_list_table) from .validators import process_autoscale_create_namespace + monitor_custom = CliCommandType( + operations_tmpl='azure.cli.command_modules.monitor.custom#{}', + exception_handler=monitor_exception_handler) + action_group_sdk = CliCommandType( operations_tmpl='azure.mgmt.monitor.operations.action_groups_operations#ActionGroupsOperations.{}', client_factory=cf_action_groups, @@ -27,9 +31,9 @@ def load_command_table(self, _): client_factory=cf_action_groups, exception_handler=monitor_exception_handler) - activity_log_custom = CliCommandType( - operations_tmpl='azure.cli.command_modules.monitor.operations.activity_log#{}', - client_factory=cf_activity_log, + activity_log_sdk = CliCommandType( + operations_tmpl='azure.mgmt.monitor.operations.event_categories_operations#EventCategoriesOperations.{}', + client_factory=cf_event_categories, exception_handler=monitor_exception_handler) activity_log_alerts_sdk = CliCommandType( @@ -87,11 +91,6 @@ def load_command_table(self, _): client_factory=cf_log_profiles, exception_handler=monitor_exception_handler) - metric_operations_sdk = CliCommandType( - operations_tmpl='azure.mgmt.monitor.operations.metrics_operations#MetricsOperations.{}', - client_factory=cf_metrics, - exception_handler=monitor_exception_handler) - alert_custom = CliCommandType( operations_tmpl='azure.cli.command_modules.monitor.operations.metric_alert#{}', client_factory=cf_alert_rules, @@ -116,9 +115,9 @@ def load_command_table(self, _): g.generic_update_command('update', custom_func_name='update_action_groups', setter_arg_name='action_group', table_transformer=action_group_list_table) - with self.command_group('monitor activity-log', activity_log_custom) as g: - g.command('list', 'list_activity_log') - g.command('list-categories', 'list', operations_tmpl='azure.mgmt.monitor.operations.event_categories_operations#EventCategoriesOperations.{}', client_factory=cf_event_categories) + with self.command_group('monitor activity-log', activity_log_sdk) as g: + g.custom_command('list', 'list_activity_log', client_factory=cf_activity_log) + g.command('list-categories', 'list') with self.command_group('monitor activity-log alert', activity_log_alerts_sdk, custom_command_type=activity_log_alerts_custom) as g: g.custom_command('list', 'list_activity_logs_alert') @@ -191,7 +190,7 @@ def load_command_table(self, _): with self.command_group('monitor metrics') as g: from .transformers import metrics_table, metrics_definitions_table - g.command('list', 'list', command_type=metric_operations_sdk, table_transformer=metrics_table) + g.command('list', 'list_metrics', command_type=monitor_custom, table_transformer=metrics_table) g.command('list-definitions', 'list', command_type=metric_definitions_sdk, table_transformer=metrics_definitions_table) with self.command_group('monitor metrics alert', metric_alert_sdk, custom_command_type=alert_custom, client_factory=cf_metric_alerts) as g: diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/activity_log.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/custom.py similarity index 53% rename from src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/activity_log.py rename to src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/custom.py index 486aa243ee0..4982ab2fb38 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/activity_log.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/custom.py @@ -3,48 +3,46 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.cli.command_modules.monitor.util import validate_time_range_and_add_defaults +from knack.log import get_logger +from azure.cli.command_modules.monitor._client_factory import cf_metrics +logger = get_logger(__name__) + + +# region ActivityLog def list_activity_log(client, filters=None, correlation_id=None, resource_group=None, resource_id=None, resource_provider=None, start_time=None, end_time=None, caller=None, status=None, max_events=50, - select=None): + select=None, offset='6h'): if filters: odata_filters = filters else: - from knack.util import CLIError - collection = [correlation_id, resource_group, resource_id, resource_provider] - if not _single(collection): - raise CLIError("usage error: [--correlation-id ID | --resource-group NAME | " - "--resource-id ID | --resource-provider PROVIDER]") - odata_filters = _build_activity_log_odata_filter(correlation_id, resource_group, resource_id, resource_provider, - start_time, end_time, caller, status) - - if max_events: - max_events = int(max_events) + start_time, end_time, caller, status, offset) select_filters = _activity_log_select_filter_builder(select) + logger.info('OData Filter: %s', odata_filters) + logger.info('Select Filter: %s', select_filters) activity_log = client.list(filter=odata_filters, select=select_filters) return _limit_results(activity_log, max_events) def _build_activity_log_odata_filter(correlation_id=None, resource_group=None, resource_id=None, resource_provider=None, - start_time=None, end_time=None, caller=None, status=None): - """Builds odata filter string. - :param str correlation_id: The correlation id of the query - :param str resource_group: The resource group - :param str resource_id: The identifier of the resource - :param str resource_provider: The resource provider - :param str start_time: The start time of the query. In ISO format with explicit indication of - timezone: 1970-01-01T00:00:00Z, 1970-01-01T00:00:00-0500 - :param str end_time: The end time of the query. In ISO format with explicit indication of - timezone: 1970-01-01T00:00:00Z, 1970-01-01T00:00:00-0500. - :param str caller: The caller to look for when querying - :param str status: The status value to query (ex: Failed) - """ - formatter = "eventTimestamp ge {} and eventTimestamp le {}" - odata_filters = validate_time_range_and_add_defaults(start_time, end_time, formatter=formatter) + start_time=None, end_time=None, caller=None, status=None, offset=None): + from datetime import datetime + import dateutil.parser + + if not start_time and not end_time: + # if neither value provided, end_time is now + end_time = datetime.utcnow().isoformat() + if not start_time: + # if no start_time, apply offset backwards from end_time + start_time = (dateutil.parser.parse(end_time) - offset).isoformat() + elif not end_time: + # if no end_time, apply offset fowards from start_time + end_time = (dateutil.parser.parse(start_time) + offset).isoformat() + + odata_filters = 'eventTimestamp ge {} and eventTimestamp le {}'.format(start_time, end_time) if correlation_id: odata_filters = _build_odata_filter(odata_filters, 'correlation_id', correlation_id, 'correlationId') @@ -96,3 +94,43 @@ def _limit_results(paged, limit): else: break return list(results) +# endregion + + +# region Metrics +# pylint:disable=unused-argument +def list_metrics(cmd, resource, + start_time=None, end_time=None, offset='1h', interval='1m', + metadata=None, dimension=None, aggregation=None, metrics=None, + filters=None, metric_namespace=None, orderby=None, top=10): + + from azure.mgmt.monitor.models import ResultType + from datetime import datetime + import dateutil.parser + from six.moves.urllib.parse import quote_plus + + if not start_time and not end_time: + # if neither value provided, end_time is now + end_time = datetime.utcnow().isoformat() + if not start_time: + # if no start_time, apply offset backwards from end_time + start_time = (dateutil.parser.parse(end_time) - offset).isoformat() + elif not end_time: + # if no end_time, apply offset fowards from start_time + end_time = (dateutil.parser.parse(start_time) + offset).isoformat() + + timespan = '{}/{}'.format(start_time, end_time) + + client = cf_metrics(cmd.cli_ctx, None) + return client.list( + resource_uri=resource, + timespan=quote_plus(timespan), + interval=interval, + metricnames=','.join(metrics) if metrics else None, + aggregation=','.join(aggregation) if aggregation else None, + top=top, + orderby=orderby, + filter=filters, + result_type=ResultType.metadata if metadata else None, + metricnamespace=metric_namespace) +# endregion diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.g4 b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.g4 index 45b448f064c..8926924f015 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.g4 +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.g4 @@ -10,7 +10,7 @@ aggregation : WORD WHITESPACE ; namespace : WORD ; -metric : (WORD | WHITESPACE)+; +metric : (WORD | WHITESPACE | '.' | '/')+; operator : OPERATOR WHITESPACE ; @@ -69,3 +69,4 @@ QUOTE : ('\'' | '"') ; WHITESPACE : (' ' | '\t')+ ; NEWLINE : ('\r'? '\n' | '\r')+ ; WORD : (LOWERCASE | UPPERCASE | DIGIT | '_')+ ; + diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.tokens b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.tokens index bb37544df85..90ee6ad3e71 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.tokens +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.tokens @@ -1,15 +1,17 @@ T__0=1 T__1=2 -WHERE=3 -AND=4 -IN=5 -IS=6 -OR=7 -OPERATOR=8 -NUMBER=9 -QUOTE=10 -WHITESPACE=11 -NEWLINE=12 -WORD=13 +T__2=3 +WHERE=4 +AND=5 +INCLUDES=6 +EXCLUDES=7 +OR=8 +OPERATOR=9 +NUMBER=10 +QUOTE=11 +WHITESPACE=12 +NEWLINE=13 +WORD=14 '.'=1 -','=2 +'/'=2 +','=3 diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionLexer.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionLexer.py index e108494ea7a..002e3463eeb 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionLexer.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionLexer.py @@ -16,79 +16,81 @@ def serializedATN(): with StringIO() as buf: buf.write(u"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2") - buf.write(u"\17\u00b4\b\1\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6") + buf.write(u"\20\u00b8\b\1\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6") buf.write(u"\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\4\f\t\f\4") buf.write(u"\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t") buf.write(u"\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27") buf.write(u"\4\30\t\30\4\31\t\31\4\32\t\32\4\33\t\33\4\34\t\34\4") - buf.write(u"\35\t\35\4\36\t\36\4\37\t\37\3\2\3\2\3\3\3\3\3\4\3\4") - buf.write(u"\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\13") - buf.write(u"\3\13\3\f\3\f\3\r\3\r\3\16\3\16\3\17\3\17\3\20\3\20\3") - buf.write(u"\21\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\25\3\25\3\25") - buf.write(u"\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3") - buf.write(u"\27\3\27\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30") - buf.write(u"\3\30\3\30\3\30\3\30\3\31\3\31\3\31\3\32\3\32\3\32\3") - buf.write(u"\32\3\32\3\32\3\32\3\32\3\32\5\32\u008e\n\32\3\33\6\33") - buf.write(u"\u0091\n\33\r\33\16\33\u0092\3\33\3\33\6\33\u0097\n\33") - buf.write(u"\r\33\16\33\u0098\5\33\u009b\n\33\3\34\3\34\3\35\6\35") - buf.write(u"\u00a0\n\35\r\35\16\35\u00a1\3\36\5\36\u00a5\n\36\3\36") - buf.write(u"\3\36\6\36\u00a9\n\36\r\36\16\36\u00aa\3\37\3\37\3\37") - buf.write(u"\3\37\6\37\u00b1\n\37\r\37\16\37\u00b2\2\2 \3\3\5\4\7") - buf.write(u"\2\t\2\13\2\r\2\17\2\21\2\23\2\25\2\27\2\31\2\33\2\35") - buf.write(u"\2\37\2!\2#\2%\2\'\2)\5+\6-\7/\b\61\t\63\n\65\13\67\f") - buf.write(u"9\r;\16=\17\3\2\26\4\2CCcc\4\2EEee\4\2FFff\4\2GGgg\4") - buf.write(u"\2JJjj\4\2KKkk\4\2NNnn\4\2PPpp\4\2QQqq\4\2TTtt\4\2UU") - buf.write(u"uu\4\2WWww\4\2YYyy\4\2ZZzz\3\2\62;\3\2c|\3\2C\\\4\2.") - buf.write(u".\60\60\4\2$$))\4\2\13\13\"\"\2\u00b2\2\3\3\2\2\2\2\5") - buf.write(u"\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2") - buf.write(u"\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2") - buf.write(u"\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\3?\3\2\2\2\5A\3\2\2") - buf.write(u"\2\7C\3\2\2\2\tE\3\2\2\2\13G\3\2\2\2\rI\3\2\2\2\17K\3") - buf.write(u"\2\2\2\21M\3\2\2\2\23O\3\2\2\2\25Q\3\2\2\2\27S\3\2\2") - buf.write(u"\2\31U\3\2\2\2\33W\3\2\2\2\35Y\3\2\2\2\37[\3\2\2\2!]") - buf.write(u"\3\2\2\2#_\3\2\2\2%a\3\2\2\2\'c\3\2\2\2)e\3\2\2\2+k\3") - buf.write(u"\2\2\2-o\3\2\2\2/x\3\2\2\2\61\u0081\3\2\2\2\63\u008d") - buf.write(u"\3\2\2\2\65\u0090\3\2\2\2\67\u009c\3\2\2\29\u009f\3\2") - buf.write(u"\2\2;\u00a8\3\2\2\2=\u00b0\3\2\2\2?@\7\60\2\2@\4\3\2") - buf.write(u"\2\2AB\7.\2\2B\6\3\2\2\2CD\t\2\2\2D\b\3\2\2\2EF\t\3\2") - buf.write(u"\2F\n\3\2\2\2GH\t\4\2\2H\f\3\2\2\2IJ\t\5\2\2J\16\3\2") - buf.write(u"\2\2KL\t\6\2\2L\20\3\2\2\2MN\t\7\2\2N\22\3\2\2\2OP\t") - buf.write(u"\b\2\2P\24\3\2\2\2QR\t\t\2\2R\26\3\2\2\2ST\t\n\2\2T\30") - buf.write(u"\3\2\2\2UV\t\13\2\2V\32\3\2\2\2WX\t\f\2\2X\34\3\2\2\2") - buf.write(u"YZ\t\r\2\2Z\36\3\2\2\2[\\\t\16\2\2\\ \3\2\2\2]^\t\17") - buf.write(u"\2\2^\"\3\2\2\2_`\t\20\2\2`$\3\2\2\2ab\t\21\2\2b&\3\2") - buf.write(u"\2\2cd\t\22\2\2d(\3\2\2\2ef\5\37\20\2fg\5\17\b\2gh\5") - buf.write(u"\r\7\2hi\5\31\r\2ij\5\r\7\2j*\3\2\2\2kl\5\7\4\2lm\5\25") - buf.write(u"\13\2mn\5\13\6\2n,\3\2\2\2op\5\21\t\2pq\5\25\13\2qr\5") - buf.write(u"\t\5\2rs\5\23\n\2st\5\35\17\2tu\5\13\6\2uv\5\r\7\2vw") - buf.write(u"\5\33\16\2w.\3\2\2\2xy\5\r\7\2yz\5!\21\2z{\5\t\5\2{|") - buf.write(u"\5\23\n\2|}\5\35\17\2}~\5\13\6\2~\177\5\r\7\2\177\u0080") - buf.write(u"\5\33\16\2\u0080\60\3\2\2\2\u0081\u0082\5\27\f\2\u0082") - buf.write(u"\u0083\5\31\r\2\u0083\62\3\2\2\2\u0084\u008e\7>\2\2\u0085") - buf.write(u"\u0086\7>\2\2\u0086\u008e\7?\2\2\u0087\u008e\7?\2\2\u0088") - buf.write(u"\u0089\7@\2\2\u0089\u008e\7?\2\2\u008a\u008e\7@\2\2\u008b") - buf.write(u"\u008c\7#\2\2\u008c\u008e\7?\2\2\u008d\u0084\3\2\2\2") - buf.write(u"\u008d\u0085\3\2\2\2\u008d\u0087\3\2\2\2\u008d\u0088") - buf.write(u"\3\2\2\2\u008d\u008a\3\2\2\2\u008d\u008b\3\2\2\2\u008e") - buf.write(u"\64\3\2\2\2\u008f\u0091\5#\22\2\u0090\u008f\3\2\2\2\u0091") - buf.write(u"\u0092\3\2\2\2\u0092\u0090\3\2\2\2\u0092\u0093\3\2\2") - buf.write(u"\2\u0093\u009a\3\2\2\2\u0094\u0096\t\23\2\2\u0095\u0097") - buf.write(u"\5#\22\2\u0096\u0095\3\2\2\2\u0097\u0098\3\2\2\2\u0098") - buf.write(u"\u0096\3\2\2\2\u0098\u0099\3\2\2\2\u0099\u009b\3\2\2") - buf.write(u"\2\u009a\u0094\3\2\2\2\u009a\u009b\3\2\2\2\u009b\66\3") - buf.write(u"\2\2\2\u009c\u009d\t\24\2\2\u009d8\3\2\2\2\u009e\u00a0") - buf.write(u"\t\25\2\2\u009f\u009e\3\2\2\2\u00a0\u00a1\3\2\2\2\u00a1") - buf.write(u"\u009f\3\2\2\2\u00a1\u00a2\3\2\2\2\u00a2:\3\2\2\2\u00a3") - buf.write(u"\u00a5\7\17\2\2\u00a4\u00a3\3\2\2\2\u00a4\u00a5\3\2\2") - buf.write(u"\2\u00a5\u00a6\3\2\2\2\u00a6\u00a9\7\f\2\2\u00a7\u00a9") - buf.write(u"\7\17\2\2\u00a8\u00a4\3\2\2\2\u00a8\u00a7\3\2\2\2\u00a9") - buf.write(u"\u00aa\3\2\2\2\u00aa\u00a8\3\2\2\2\u00aa\u00ab\3\2\2") - buf.write(u"\2\u00ab<\3\2\2\2\u00ac\u00b1\5%\23\2\u00ad\u00b1\5\'") - buf.write(u"\24\2\u00ae\u00b1\5#\22\2\u00af\u00b1\7a\2\2\u00b0\u00ac") - buf.write(u"\3\2\2\2\u00b0\u00ad\3\2\2\2\u00b0\u00ae\3\2\2\2\u00b0") - buf.write(u"\u00af\3\2\2\2\u00b1\u00b2\3\2\2\2\u00b2\u00b0\3\2\2") - buf.write(u"\2\u00b2\u00b3\3\2\2\2\u00b3>\3\2\2\2\r\2\u008d\u0092") - buf.write(u"\u0098\u009a\u00a1\u00a4\u00a8\u00aa\u00b0\u00b2\2") + buf.write(u"\35\t\35\4\36\t\36\4\37\t\37\4 \t \3\2\3\2\3\3\3\3\3") + buf.write(u"\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3") + buf.write(u"\n\3\13\3\13\3\f\3\f\3\r\3\r\3\16\3\16\3\17\3\17\3\20") + buf.write(u"\3\20\3\21\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\25\3") + buf.write(u"\25\3\26\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27") + buf.write(u"\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3") + buf.write(u"\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32") + buf.write(u"\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u0092") + buf.write(u"\n\33\3\34\6\34\u0095\n\34\r\34\16\34\u0096\3\34\3\34") + buf.write(u"\6\34\u009b\n\34\r\34\16\34\u009c\5\34\u009f\n\34\3\35") + buf.write(u"\3\35\3\36\6\36\u00a4\n\36\r\36\16\36\u00a5\3\37\5\37") + buf.write(u"\u00a9\n\37\3\37\3\37\6\37\u00ad\n\37\r\37\16\37\u00ae") + buf.write(u"\3 \3 \3 \3 \6 \u00b5\n \r \16 \u00b6\2\2!\3\3\5\4\7") + buf.write(u"\5\t\2\13\2\r\2\17\2\21\2\23\2\25\2\27\2\31\2\33\2\35") + buf.write(u"\2\37\2!\2#\2%\2\'\2)\2+\6-\7/\b\61\t\63\n\65\13\67\f") + buf.write(u"9\r;\16=\17?\20\3\2\26\4\2CCcc\4\2EEee\4\2FFff\4\2GG") + buf.write(u"gg\4\2JJjj\4\2KKkk\4\2NNnn\4\2PPpp\4\2QQqq\4\2TTtt\4") + buf.write(u"\2UUuu\4\2WWww\4\2YYyy\4\2ZZzz\3\2\62;\3\2c|\3\2C\\\4") + buf.write(u"\2..\60\60\4\2$$))\4\2\13\13\"\"\2\u00b6\2\3\3\2\2\2") + buf.write(u"\2\5\3\2\2\2\2\7\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2") + buf.write(u"\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2") + buf.write(u"\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\3A\3") + buf.write(u"\2\2\2\5C\3\2\2\2\7E\3\2\2\2\tG\3\2\2\2\13I\3\2\2\2\r") + buf.write(u"K\3\2\2\2\17M\3\2\2\2\21O\3\2\2\2\23Q\3\2\2\2\25S\3\2") + buf.write(u"\2\2\27U\3\2\2\2\31W\3\2\2\2\33Y\3\2\2\2\35[\3\2\2\2") + buf.write(u"\37]\3\2\2\2!_\3\2\2\2#a\3\2\2\2%c\3\2\2\2\'e\3\2\2\2") + buf.write(u")g\3\2\2\2+i\3\2\2\2-o\3\2\2\2/s\3\2\2\2\61|\3\2\2\2") + buf.write(u"\63\u0085\3\2\2\2\65\u0091\3\2\2\2\67\u0094\3\2\2\29") + buf.write(u"\u00a0\3\2\2\2;\u00a3\3\2\2\2=\u00ac\3\2\2\2?\u00b4\3") + buf.write(u"\2\2\2AB\7\60\2\2B\4\3\2\2\2CD\7\61\2\2D\6\3\2\2\2EF") + buf.write(u"\7.\2\2F\b\3\2\2\2GH\t\2\2\2H\n\3\2\2\2IJ\t\3\2\2J\f") + buf.write(u"\3\2\2\2KL\t\4\2\2L\16\3\2\2\2MN\t\5\2\2N\20\3\2\2\2") + buf.write(u"OP\t\6\2\2P\22\3\2\2\2QR\t\7\2\2R\24\3\2\2\2ST\t\b\2") + buf.write(u"\2T\26\3\2\2\2UV\t\t\2\2V\30\3\2\2\2WX\t\n\2\2X\32\3") + buf.write(u"\2\2\2YZ\t\13\2\2Z\34\3\2\2\2[\\\t\f\2\2\\\36\3\2\2\2") + buf.write(u"]^\t\r\2\2^ \3\2\2\2_`\t\16\2\2`\"\3\2\2\2ab\t\17\2\2") + buf.write(u"b$\3\2\2\2cd\t\20\2\2d&\3\2\2\2ef\t\21\2\2f(\3\2\2\2") + buf.write(u"gh\t\22\2\2h*\3\2\2\2ij\5!\21\2jk\5\21\t\2kl\5\17\b\2") + buf.write(u"lm\5\33\16\2mn\5\17\b\2n,\3\2\2\2op\5\t\5\2pq\5\27\f") + buf.write(u"\2qr\5\r\7\2r.\3\2\2\2st\5\23\n\2tu\5\27\f\2uv\5\13\6") + buf.write(u"\2vw\5\25\13\2wx\5\37\20\2xy\5\r\7\2yz\5\17\b\2z{\5\35") + buf.write(u"\17\2{\60\3\2\2\2|}\5\17\b\2}~\5#\22\2~\177\5\13\6\2") + buf.write(u"\177\u0080\5\25\13\2\u0080\u0081\5\37\20\2\u0081\u0082") + buf.write(u"\5\r\7\2\u0082\u0083\5\17\b\2\u0083\u0084\5\35\17\2\u0084") + buf.write(u"\62\3\2\2\2\u0085\u0086\5\31\r\2\u0086\u0087\5\33\16") + buf.write(u"\2\u0087\64\3\2\2\2\u0088\u0092\7>\2\2\u0089\u008a\7") + buf.write(u">\2\2\u008a\u0092\7?\2\2\u008b\u0092\7?\2\2\u008c\u008d") + buf.write(u"\7@\2\2\u008d\u0092\7?\2\2\u008e\u0092\7@\2\2\u008f\u0090") + buf.write(u"\7#\2\2\u0090\u0092\7?\2\2\u0091\u0088\3\2\2\2\u0091") + buf.write(u"\u0089\3\2\2\2\u0091\u008b\3\2\2\2\u0091\u008c\3\2\2") + buf.write(u"\2\u0091\u008e\3\2\2\2\u0091\u008f\3\2\2\2\u0092\66\3") + buf.write(u"\2\2\2\u0093\u0095\5%\23\2\u0094\u0093\3\2\2\2\u0095") + buf.write(u"\u0096\3\2\2\2\u0096\u0094\3\2\2\2\u0096\u0097\3\2\2") + buf.write(u"\2\u0097\u009e\3\2\2\2\u0098\u009a\t\23\2\2\u0099\u009b") + buf.write(u"\5%\23\2\u009a\u0099\3\2\2\2\u009b\u009c\3\2\2\2\u009c") + buf.write(u"\u009a\3\2\2\2\u009c\u009d\3\2\2\2\u009d\u009f\3\2\2") + buf.write(u"\2\u009e\u0098\3\2\2\2\u009e\u009f\3\2\2\2\u009f8\3\2") + buf.write(u"\2\2\u00a0\u00a1\t\24\2\2\u00a1:\3\2\2\2\u00a2\u00a4") + buf.write(u"\t\25\2\2\u00a3\u00a2\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5") + buf.write(u"\u00a3\3\2\2\2\u00a5\u00a6\3\2\2\2\u00a6<\3\2\2\2\u00a7") + buf.write(u"\u00a9\7\17\2\2\u00a8\u00a7\3\2\2\2\u00a8\u00a9\3\2\2") + buf.write(u"\2\u00a9\u00aa\3\2\2\2\u00aa\u00ad\7\f\2\2\u00ab\u00ad") + buf.write(u"\7\17\2\2\u00ac\u00a8\3\2\2\2\u00ac\u00ab\3\2\2\2\u00ad") + buf.write(u"\u00ae\3\2\2\2\u00ae\u00ac\3\2\2\2\u00ae\u00af\3\2\2") + buf.write(u"\2\u00af>\3\2\2\2\u00b0\u00b5\5\'\24\2\u00b1\u00b5\5") + buf.write(u")\25\2\u00b2\u00b5\5%\23\2\u00b3\u00b5\7a\2\2\u00b4\u00b0") + buf.write(u"\3\2\2\2\u00b4\u00b1\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b4") + buf.write(u"\u00b3\3\2\2\2\u00b5\u00b6\3\2\2\2\u00b6\u00b4\3\2\2") + buf.write(u"\2\u00b6\u00b7\3\2\2\2\u00b7@\3\2\2\2\r\2\u0091\u0096") + buf.write(u"\u009c\u009e\u00a5\u00a8\u00ac\u00ae\u00b4\u00b6\2") return buf.getvalue() @@ -100,34 +102,35 @@ class MetricAlertConditionLexer(Lexer): T__0 = 1 T__1 = 2 - WHERE = 3 - AND = 4 - INCLUDES = 5 - EXCLUDES = 6 - OR = 7 - OPERATOR = 8 - NUMBER = 9 - QUOTE = 10 - WHITESPACE = 11 - NEWLINE = 12 - WORD = 13 + T__2 = 3 + WHERE = 4 + AND = 5 + INCLUDES = 6 + EXCLUDES = 7 + OR = 8 + OPERATOR = 9 + NUMBER = 10 + QUOTE = 11 + WHITESPACE = 12 + NEWLINE = 13 + WORD = 14 channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ] modeNames = [ u"DEFAULT_MODE" ] literalNames = [ u"", - u"'.'", u"','" ] + u"'.'", u"'/'", u"','" ] symbolicNames = [ u"", u"WHERE", u"AND", u"INCLUDES", u"EXCLUDES", u"OR", u"OPERATOR", u"NUMBER", u"QUOTE", u"WHITESPACE", u"NEWLINE", u"WORD" ] - ruleNames = [ u"T__0", u"T__1", u"A", u"C", u"D", u"E", u"H", u"I", - u"L", u"N", u"O", u"R", u"S", u"U", u"W", u"X", u"DIGIT", - u"LOWERCASE", u"UPPERCASE", u"WHERE", u"AND", u"INCLUDES", - u"EXCLUDES", u"OR", u"OPERATOR", u"NUMBER", u"QUOTE", - u"WHITESPACE", u"NEWLINE", u"WORD" ] + ruleNames = [ u"T__0", u"T__1", u"T__2", u"A", u"C", u"D", u"E", u"H", + u"I", u"L", u"N", u"O", u"R", u"S", u"U", u"W", u"X", + u"DIGIT", u"LOWERCASE", u"UPPERCASE", u"WHERE", u"AND", + u"INCLUDES", u"EXCLUDES", u"OR", u"OPERATOR", u"NUMBER", + u"QUOTE", u"WHITESPACE", u"NEWLINE", u"WORD" ] grammarFileName = u"MetricAlertCondition.g4" diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionParser.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionParser.py index 33a2037ffd3..3179f830020 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionParser.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/grammar/MetricAlertConditionParser.py @@ -15,7 +15,7 @@ def serializedATN(): with StringIO() as buf: buf.write(u"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3") - buf.write(u"\17{\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7") + buf.write(u"\20{\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7") buf.write(u"\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\4\f\t\f\4\r\t\r\4") buf.write(u"\16\t\16\4\17\t\17\4\20\t\20\3\2\3\2\3\2\3\2\7\2%\n\2") buf.write(u"\f\2\16\2(\13\2\3\2\3\2\3\2\3\2\3\2\3\2\5\2\60\n\2\3") @@ -26,32 +26,32 @@ def serializedATN(): buf.write(u"\13\3\13\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\16\3\17") buf.write(u"\3\17\3\17\3\17\7\17q\n\17\f\17\16\17t\13\17\3\20\6\20") buf.write(u"w\n\20\r\20\16\20x\3\20\2\2\21\2\4\6\b\n\f\16\20\22\24") - buf.write(u"\26\30\32\34\36\2\7\4\2\r\r\17\17\4\2\4\4\6\6\3\2\7\b") - buf.write(u"\4\2\4\4\t\t\5\2\13\13\r\r\17\17\2s\2 \3\2\2\2\4@\3\2") - buf.write(u"\2\2\6C\3\2\2\2\bF\3\2\2\2\nJ\3\2\2\2\fM\3\2\2\2\16O") - buf.write(u"\3\2\2\2\20R\3\2\2\2\22\\\3\2\2\2\24`\3\2\2\2\26c\3\2") - buf.write(u"\2\2\30f\3\2\2\2\32i\3\2\2\2\34l\3\2\2\2\36v\3\2\2\2") - buf.write(u" &\5\4\3\2!\"\5\6\4\2\"#\7\3\2\2#%\3\2\2\2$!\3\2\2\2") - buf.write(u"%(\3\2\2\2&$\3\2\2\2&\'\3\2\2\2\'/\3\2\2\2(&\3\2\2\2") - buf.write(u")*\7\f\2\2*+\5\b\5\2+,\7\f\2\2,-\7\r\2\2-\60\3\2\2\2") - buf.write(u".\60\5\b\5\2/)\3\2\2\2/.\3\2\2\2\60\61\3\2\2\2\61\62") - buf.write(u"\5\n\6\2\62\67\5\f\7\2\63\64\7\r\2\2\64\66\5\20\t\2\65") - buf.write(u"\63\3\2\2\2\669\3\2\2\2\67\65\3\2\2\2\678\3\2\2\28=\3") - buf.write(u"\2\2\29\67\3\2\2\2:<\7\16\2\2;:\3\2\2\2\3\2\2\2>\3\3\2\2\2?=\3\2\2\2@A\7\17\2\2AB\7") - buf.write(u"\r\2\2B\5\3\2\2\2CD\7\17\2\2D\7\3\2\2\2EG\t\2\2\2FE\3") - buf.write(u"\2\2\2GH\3\2\2\2HF\3\2\2\2HI\3\2\2\2I\t\3\2\2\2JK\7\n") - buf.write(u"\2\2KL\7\r\2\2L\13\3\2\2\2MN\7\13\2\2N\r\3\2\2\2OP\7") - buf.write(u"\5\2\2PQ\7\r\2\2Q\17\3\2\2\2RS\5\16\b\2SY\5\22\n\2TU") - buf.write(u"\5\24\13\2UV\5\22\n\2VX\3\2\2\2WT\3\2\2\2X[\3\2\2\2Y") - buf.write(u"W\3\2\2\2YZ\3\2\2\2Z\21\3\2\2\2[Y\3\2\2\2\\]\5\32\16") - buf.write(u"\2]^\5\26\f\2^_\5\34\17\2_\23\3\2\2\2`a\t\3\2\2ab\7\r") - buf.write(u"\2\2b\25\3\2\2\2cd\t\4\2\2de\7\r\2\2e\27\3\2\2\2fg\t") - buf.write(u"\5\2\2gh\7\r\2\2h\31\3\2\2\2ij\7\17\2\2jk\7\r\2\2k\33") - buf.write(u"\3\2\2\2lr\5\36\20\2mn\5\30\r\2no\5\36\20\2oq\3\2\2\2") - buf.write(u"pm\3\2\2\2qt\3\2\2\2rp\3\2\2\2rs\3\2\2\2s\35\3\2\2\2") - buf.write(u"tr\3\2\2\2uw\t\6\2\2vu\3\2\2\2wx\3\2\2\2xv\3\2\2\2xy") - buf.write(u"\3\2\2\2y\37\3\2\2\2\n&/\67=HYrx") + buf.write(u"\26\30\32\34\36\2\7\5\2\3\4\16\16\20\20\4\2\5\5\7\7\3") + buf.write(u"\2\b\t\4\2\5\5\n\n\5\2\f\f\16\16\20\20\2s\2 \3\2\2\2") + buf.write(u"\4@\3\2\2\2\6C\3\2\2\2\bF\3\2\2\2\nJ\3\2\2\2\fM\3\2\2") + buf.write(u"\2\16O\3\2\2\2\20R\3\2\2\2\22\\\3\2\2\2\24`\3\2\2\2\26") + buf.write(u"c\3\2\2\2\30f\3\2\2\2\32i\3\2\2\2\34l\3\2\2\2\36v\3\2") + buf.write(u"\2\2 &\5\4\3\2!\"\5\6\4\2\"#\7\3\2\2#%\3\2\2\2$!\3\2") + buf.write(u"\2\2%(\3\2\2\2&$\3\2\2\2&\'\3\2\2\2\'/\3\2\2\2(&\3\2") + buf.write(u"\2\2)*\7\r\2\2*+\5\b\5\2+,\7\r\2\2,-\7\16\2\2-\60\3\2") + buf.write(u"\2\2.\60\5\b\5\2/)\3\2\2\2/.\3\2\2\2\60\61\3\2\2\2\61") + buf.write(u"\62\5\n\6\2\62\67\5\f\7\2\63\64\7\16\2\2\64\66\5\20\t") + buf.write(u"\2\65\63\3\2\2\2\669\3\2\2\2\67\65\3\2\2\2\678\3\2\2") + buf.write(u"\28=\3\2\2\29\67\3\2\2\2:<\7\17\2\2;:\3\2\2\2\3\2\2\2>\3\3\2\2\2?=\3\2\2\2@A\7\20\2") + buf.write(u"\2AB\7\16\2\2B\5\3\2\2\2CD\7\20\2\2D\7\3\2\2\2EG\t\2") + buf.write(u"\2\2FE\3\2\2\2GH\3\2\2\2HF\3\2\2\2HI\3\2\2\2I\t\3\2\2") + buf.write(u"\2JK\7\13\2\2KL\7\16\2\2L\13\3\2\2\2MN\7\f\2\2N\r\3\2") + buf.write(u"\2\2OP\7\6\2\2PQ\7\16\2\2Q\17\3\2\2\2RS\5\16\b\2SY\5") + buf.write(u"\22\n\2TU\5\24\13\2UV\5\22\n\2VX\3\2\2\2WT\3\2\2\2X[") + buf.write(u"\3\2\2\2YW\3\2\2\2YZ\3\2\2\2Z\21\3\2\2\2[Y\3\2\2\2\\") + buf.write(u"]\5\32\16\2]^\5\26\f\2^_\5\34\17\2_\23\3\2\2\2`a\t\3") + buf.write(u"\2\2ab\7\16\2\2b\25\3\2\2\2cd\t\4\2\2de\7\16\2\2e\27") + buf.write(u"\3\2\2\2fg\t\5\2\2gh\7\16\2\2h\31\3\2\2\2ij\7\20\2\2") + buf.write(u"jk\7\16\2\2k\33\3\2\2\2lr\5\36\20\2mn\5\30\r\2no\5\36") + buf.write(u"\20\2oq\3\2\2\2pm\3\2\2\2qt\3\2\2\2rp\3\2\2\2rs\3\2\2") + buf.write(u"\2s\35\3\2\2\2tr\3\2\2\2uw\t\6\2\2vu\3\2\2\2wx\3\2\2") + buf.write(u"\2xv\3\2\2\2xy\3\2\2\2y\37\3\2\2\2\n&/\67=HYrx") return buf.getvalue() @@ -65,11 +65,12 @@ class MetricAlertConditionParser ( Parser ): sharedContextCache = PredictionContextCache() - literalNames = [ u"", u"'.'", u"','" ] + literalNames = [ u"", u"'.'", u"'/'", u"','" ] - symbolicNames = [ u"", u"", u"", u"WHERE", - u"AND", u"INCLUDES", u"EXCLUDES", u"OR", u"OPERATOR", - u"NUMBER", u"QUOTE", u"WHITESPACE", u"NEWLINE", u"WORD" ] + symbolicNames = [ u"", u"", u"", u"", + u"WHERE", u"AND", u"INCLUDES", u"EXCLUDES", u"OR", + u"OPERATOR", u"NUMBER", u"QUOTE", u"WHITESPACE", u"NEWLINE", + u"WORD" ] RULE_expression = 0 RULE_aggregation = 1 @@ -95,17 +96,18 @@ class MetricAlertConditionParser ( Parser ): EOF = Token.EOF T__0=1 T__1=2 - WHERE=3 - AND=4 - INCLUDES=5 - EXCLUDES=6 - OR=7 - OPERATOR=8 - NUMBER=9 - QUOTE=10 - WHITESPACE=11 - NEWLINE=12 - WORD=13 + T__2=3 + WHERE=4 + AND=5 + INCLUDES=6 + EXCLUDES=7 + OR=8 + OPERATOR=9 + NUMBER=10 + QUOTE=11 + WHITESPACE=12 + NEWLINE=13 + WORD=14 def __init__(self, input, output=sys.stdout): super(MetricAlertConditionParser, self).__init__(input, output=output) @@ -218,7 +220,7 @@ def expression(self): self.state = 42 self.match(MetricAlertConditionParser.WHITESPACE) pass - elif token in [MetricAlertConditionParser.WHITESPACE, MetricAlertConditionParser.WORD]: + elif token in [MetricAlertConditionParser.T__0, MetricAlertConditionParser.T__1, MetricAlertConditionParser.WHITESPACE, MetricAlertConditionParser.WORD]: self.state = 44 self.metric() pass @@ -387,7 +389,7 @@ def metric(self): while True: self.state = 67 _la = self._input.LA(1) - if not(_la==MetricAlertConditionParser.WHITESPACE or _la==MetricAlertConditionParser.WORD): + if not((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << MetricAlertConditionParser.T__0) | (1 << MetricAlertConditionParser.T__1) | (1 << MetricAlertConditionParser.WHITESPACE) | (1 << MetricAlertConditionParser.WORD))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -395,7 +397,7 @@ def metric(self): self.state = 70 self._errHandler.sync(self) _la = self._input.LA(1) - if not (_la==MetricAlertConditionParser.WHITESPACE or _la==MetricAlertConditionParser.WORD): + if not ((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << MetricAlertConditionParser.T__0) | (1 << MetricAlertConditionParser.T__1) | (1 << MetricAlertConditionParser.WHITESPACE) | (1 << MetricAlertConditionParser.WORD))) != 0)): break except RecognitionException as re: @@ -585,7 +587,7 @@ def dimensions(self): self.state = 87 self._errHandler.sync(self) _la = self._input.LA(1) - while _la==MetricAlertConditionParser.T__1 or _la==MetricAlertConditionParser.AND: + while _la==MetricAlertConditionParser.T__2 or _la==MetricAlertConditionParser.AND: self.state = 82 self.dim_separator() self.state = 83 @@ -689,7 +691,7 @@ def dim_separator(self): self.enterOuterAlt(localctx, 1) self.state = 94 _la = self._input.LA(1) - if not(_la==MetricAlertConditionParser.T__1 or _la==MetricAlertConditionParser.AND): + if not(_la==MetricAlertConditionParser.T__2 or _la==MetricAlertConditionParser.AND): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -792,7 +794,7 @@ def dim_val_separator(self): self.enterOuterAlt(localctx, 1) self.state = 100 _la = self._input.LA(1) - if not(_la==MetricAlertConditionParser.T__1 or _la==MetricAlertConditionParser.OR): + if not(_la==MetricAlertConditionParser.T__2 or _la==MetricAlertConditionParser.OR): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/diagnostics_settings.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/diagnostics_settings.py index f6f73b59c8f..9b6ba1ef53d 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/diagnostics_settings.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/operations/diagnostics_settings.py @@ -13,7 +13,6 @@ def create_diagnostics_settings(client, name, resource_uri, storage_account=None, workspace=None): from azure.mgmt.monitor.models import DiagnosticSettingsResource - parameters = DiagnosticSettingsResource(storage_account_id=storage_account, workspace_id=workspace, event_hub_name=event_hub, diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_activity_log_list_scenario.yaml b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_activity_log_list_scenario.yaml new file mode 100644 index 00000000000..8d65a6b52bd --- /dev/null +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_activity_log_list_scenario.yaml @@ -0,0 +1,201 @@ +interactions: +- request: + body: '{"location": "southcentralus", "tags": {"product": "azurecli", "cause": + "automation", "date": "2018-10-18T15:40:18Z"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group create] + Connection: [keep-alive] + Content-Length: ['118'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"southcentralus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T15:40:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['392'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 15:40:21 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "location": "westus", + "properties": {"supportsHttpsTrafficOnly": false}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + Content-Length: ['125'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002?api-version=2018-03-01-preview + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + content-type: [text/plain; charset=utf-8] + date: ['Thu, 18 Oct 2018 15:40:24 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/ffb03813-dff1-4b50-950a-b540fcb4db7d?monitor=true&api-version=2018-03-01-preview'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 202, message: Accepted} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/ffb03813-dff1-4b50-950a-b540fcb4db7d?monitor=true&api-version=2018-03-01-preview + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + content-type: [text/plain; charset=utf-8] + date: ['Thu, 18 Oct 2018 15:40:41 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/ffb03813-dff1-4b50-950a-b540fcb4db7d?monitor=true&api-version=2018-03-01-preview'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + status: {code: 202, message: Accepted} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/ffb03813-dff1-4b50-950a-b540fcb4db7d?monitor=true&api-version=2018-03-01-preview + response: + body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","name":"clitest000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-18T15:40:24.2532206Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-18T15:40:24.2532206Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-18T15:40:24.1750746Z","primaryEndpoints":{"blob":"https://clitest000002.blob.core.windows.net/","queue":"https://clitest000002.queue.core.windows.net/","table":"https://clitest000002.table.core.windows.net/","file":"https://clitest000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'} + headers: + cache-control: [no-cache] + content-length: ['1169'] + content-type: [application/json] + date: ['Thu, 18 Oct 2018 15:40:44 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account keys list] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/listKeys?api-version=2018-03-01-preview + response: + body: {string: '{"keys": [{"keyName": "key1", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}, {"keyName": "key2", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}]}'} + headers: + cache-control: [no-cache] + content-length: ['288'] + content-type: [application/json] + date: ['Thu, 18 Oct 2018 15:40:45 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [monitor activity-log list] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-monitor/0.5.2 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.insights/eventtypes/management/values?api-version=2015-04-01&$filter=eventTimestamp%20ge%202018-01-01T00%3A00%3A00%2B00%3A00%20and%20eventTimestamp%20le%202999-01-01T00%3A00%3A00%2B00%3A00 + response: + body: {string: '{"Code":"BadRequest","Message":"The start time cannot be more + than 90 days in the past."}'} + headers: + cache-control: [no-cache] + content-length: ['89'] + content-type: [application/json; charset=utf-8] + date: ['Thu, 18 Oct 2018 15:40:46 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-IIS/8.5] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + status: {code: 400, message: Bad Request} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + date: ['Thu, 18 Oct 2018 15:40:48 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdJM1lHSTQ0WkdYRktCQllTNFZEUEpLN1Y3VDNFNEVUMktLUHxFQURFRkQ2REU4MzFGRUJFLVNPVVRIQ0VOVFJBTFVTIiwiam9iTG9jYXRpb24iOiJzb3V0aGNlbnRyYWx1cyJ9?api-version=2018-05-01'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + status: {code: 202, message: Accepted} +version: 1 diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_monitor_metrics_scenario.yaml b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_monitor_metrics_scenario.yaml index d524620251b..a3560b96a90 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_monitor_metrics_scenario.yaml +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/recordings/test_monitor_metrics_scenario.yaml @@ -1,26 +1,26 @@ interactions: - request: - body: '{"location": "southcentralus", "tags": {"use": "az-test"}}' + body: '{"location": "southcentralus", "tags": {"product": "azurecli", "cause": + "automation", "date": "2018-10-18T15:42:17Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] CommandName: [group create] Connection: [keep-alive] - Content-Length: ['58'] + Content-Length: ['118'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"southcentralus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"southcentralus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-18T15:42:17Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] - content-length: ['336'] + content-length: ['392'] content-type: [application/json; charset=utf-8] - date: ['Thu, 15 Mar 2018 16:42:39 GMT'] + date: ['Thu, 18 Oct 2018 15:42:20 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -37,8 +37,8 @@ interactions: Connection: [keep-alive] Content-Length: ['125'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-storage/1.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002?api-version=2018-03-01-preview @@ -48,15 +48,15 @@ interactions: cache-control: [no-cache] content-length: ['0'] content-type: [text/plain; charset=utf-8] - date: ['Thu, 15 Mar 2018 16:42:41 GMT'] + date: ['Thu, 18 Oct 2018 15:42:22 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/dd80b296-ec79-4a83-b078-bf81bba37303?monitor=true&api-version=2017-10-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/5f53215c-e1d4-454c-ac0e-ef05d61bf6f2?monitor=true&api-version=2018-03-01-preview'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0'] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 202, message: Accepted} - request: body: null @@ -65,19 +65,43 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [storage account create] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-storage/1.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] - accept-language: [en-US] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/5f53215c-e1d4-454c-ac0e-ef05d61bf6f2?monitor=true&api-version=2018-03-01-preview + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + content-type: [text/plain; charset=utf-8] + date: ['Thu, 18 Oct 2018 15:42:39 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/5f53215c-e1d4-454c-ac0e-ef05d61bf6f2?monitor=true&api-version=2018-03-01-preview'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + status: {code: 202, message: Accepted} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage account create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/dd80b296-ec79-4a83-b078-bf81bba37303?monitor=true&api-version=2017-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/5f53215c-e1d4-454c-ac0e-ef05d61bf6f2?monitor=true&api-version=2018-03-01-preview response: - body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","name":"clitest000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["54826b22-38d6-4fb2-bad9-b7b93a3e9c5a"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-03-15T16:42:42.1470827Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-03-15T16:42:42.1470827Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-03-15T16:42:42.0689571Z","primaryEndpoints":{"blob":"https://clitest000002.blob.core.windows.net/","queue":"https://clitest000002.queue.core.windows.net/","table":"https://clitest000002.table.core.windows.net/","file":"https://clitest000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'} + body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","name":"clitest000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-18T15:42:22.6765282Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-18T15:42:22.6765282Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-18T15:42:22.5830090Z","primaryEndpoints":{"blob":"https://clitest000002.blob.core.windows.net/","queue":"https://clitest000002.queue.core.windows.net/","table":"https://clitest000002.table.core.windows.net/","file":"https://clitest000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'} headers: cache-control: [no-cache] - content-length: ['1231'] + content-length: ['1169'] content-type: [application/json] - date: ['Thu, 15 Mar 2018 16:42:59 GMT'] + date: ['Thu, 18 Oct 2018 15:42:42 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -96,18 +120,20 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-storage/1.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/listKeys?api-version=2018-03-01-preview response: - body: {string: '{"keys":[{"keyName":"key1","value":"pPlExOgGyyy+tjvI+cyR4QYH3I6CkOKpYdQtqgTS7O72G94s4LGlErxbe73nfsRsey8Qa5ym23pjiEYlbLBRZw==","permissions":"FULL"},{"keyName":"key2","value":"xXNTAuUmCzWoVGtRMWKZ+WDI+9VSvaZ/QmkFer2ksFzasDxYX73ET8GoUbxjYLEeAFZct9G/P/QhuWzjn4MYYg==","permissions":"FULL"}]}'} + body: {string: '{"keys": [{"keyName": "key1", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}, {"keyName": "key2", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}]}'} headers: cache-control: [no-cache] content-length: ['288'] content-type: [application/json] - date: ['Thu, 15 Mar 2018 16:43:00 GMT'] + date: ['Thu, 18 Oct 2018 15:42:44 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -126,18 +152,18 @@ interactions: CommandName: [storage account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-storage/1.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002?api-version=2018-03-01-preview response: - body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","name":"clitest000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["54826b22-38d6-4fb2-bad9-b7b93a3e9c5a"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-03-15T16:42:42.1470827Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-03-15T16:42:42.1470827Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-03-15T16:42:42.0689571Z","primaryEndpoints":{"blob":"https://clitest000002.blob.core.windows.net/","queue":"https://clitest000002.queue.core.windows.net/","table":"https://clitest000002.table.core.windows.net/","file":"https://clitest000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'} + body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","name":"clitest000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-18T15:42:22.6765282Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-18T15:42:22.6765282Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-18T15:42:22.5830090Z","primaryEndpoints":{"blob":"https://clitest000002.blob.core.windows.net/","queue":"https://clitest000002.queue.core.windows.net/","table":"https://clitest000002.table.core.windows.net/","file":"https://clitest000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'} headers: cache-control: [no-cache] - content-length: ['1231'] + content-length: ['1169'] content-type: [application/json] - date: ['Thu, 15 Mar 2018 16:43:00 GMT'] + date: ['Thu, 18 Oct 2018 15:42:44 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -155,29 +181,29 @@ interactions: CommandName: [monitor metrics list-definitions] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-monitor/0.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-monitor/0.5.2 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricDefinitions?api-version=2018-01-01&metricnamespace=Microsoft.Storage%2FstorageAccounts response: body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/UsedCapacity","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Capacity","name":{"value":"UsedCapacity","localizedValue":"Used - capacity"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Average","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Transactions","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Transactions","localizedValue":"Transactions"},"isDimensionRequired":false,"unit":"Count","primaryAggregationType":"Total","supportedAggregationTypes":["Total"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"ResponseType","localizedValue":"Response + capacity"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Total","supportedAggregationTypes":["Total"],"metricAvailabilities":[{"timeGrain":"PT1H","retention":"P93D"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Transactions","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Transactions","localizedValue":"Transactions"},"isDimensionRequired":false,"unit":"Count","primaryAggregationType":"Total","supportedAggregationTypes":["Total"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"ResponseType","localizedValue":"Response type"},{"value":"GeoType","localizedValue":"Geo type"},{"value":"ApiName","localizedValue":"API - name"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Ingress","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Ingress","localizedValue":"Ingress"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Total","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo - type"},{"value":"ApiName","localizedValue":"API name"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Egress","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Egress","localizedValue":"Egress"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Total","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo - type"},{"value":"ApiName","localizedValue":"API name"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/SuccessServerLatency","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"SuccessServerLatency","localizedValue":"Success + name"},{"value":"Authentication","localizedValue":"Authentication"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Ingress","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Ingress","localizedValue":"Ingress"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Total","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo + type"},{"value":"ApiName","localizedValue":"API name"},{"value":"Authentication","localizedValue":"Authentication"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Egress","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Egress","localizedValue":"Egress"},"isDimensionRequired":false,"unit":"Bytes","primaryAggregationType":"Total","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo + type"},{"value":"ApiName","localizedValue":"API name"},{"value":"Authentication","localizedValue":"Authentication"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/SuccessServerLatency","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"SuccessServerLatency","localizedValue":"Success Server Latency"},"isDimensionRequired":false,"unit":"MilliSeconds","primaryAggregationType":"Average","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo - type"},{"value":"ApiName","localizedValue":"API name"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/SuccessE2ELatency","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"SuccessE2ELatency","localizedValue":"Success + type"},{"value":"ApiName","localizedValue":"API name"},{"value":"Authentication","localizedValue":"Authentication"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/SuccessE2ELatency","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"SuccessE2ELatency","localizedValue":"Success E2E Latency"},"isDimensionRequired":false,"unit":"MilliSeconds","primaryAggregationType":"Average","supportedAggregationTypes":["Total","Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo - type"},{"value":"ApiName","localizedValue":"API name"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Availability","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Availability","localizedValue":"Availability"},"isDimensionRequired":false,"unit":"Percent","primaryAggregationType":"Average","supportedAggregationTypes":["Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo - type"},{"value":"ApiName","localizedValue":"API name"}]}]}'} + type"},{"value":"ApiName","localizedValue":"API name"},{"value":"Authentication","localizedValue":"Authentication"}]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metricdefinitions/Availability","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002","namespace":"Microsoft.Storage/storageAccounts","category":"Transaction","name":{"value":"Availability","localizedValue":"Availability"},"isDimensionRequired":false,"unit":"Percent","primaryAggregationType":"Average","supportedAggregationTypes":["Average","Minimum","Maximum"],"metricAvailabilities":[{"timeGrain":"PT1M","retention":"P93D"},{"timeGrain":"PT5M","retention":"P93D"},{"timeGrain":"PT15M","retention":"P93D"},{"timeGrain":"PT30M","retention":"P93D"},{"timeGrain":"PT1H","retention":"P93D"},{"timeGrain":"PT6H","retention":"P93D"},{"timeGrain":"PT12H","retention":"P93D"},{"timeGrain":"P1D","retention":"P93D"}],"dimensions":[{"value":"GeoType","localizedValue":"Geo + type"},{"value":"ApiName","localizedValue":"API name"},{"value":"Authentication","localizedValue":"Authentication"}]}]}'} headers: - __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-black_MetricsMP_IN_6] + __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-black_MetricsMP_IN_0] cache-control: [no-cache] - content-length: ['8519'] + content-length: ['8733'] content-type: [application/json] - date: ['Thu, 15 Mar 2018 16:43:00 GMT'] + date: ['Thu, 18 Oct 2018 15:42:46 GMT'] server: [Microsoft-IIS/8.5] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -194,19 +220,77 @@ interactions: CommandName: [monitor metrics list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 azure-mgmt-monitor/0.5.0 Azure-SDK-For-Python AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-monitor/0.5.2 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metrics?timespan=2018-01-01T00%3A00%3A00Z%2F2999-01-01T00%3A00%3A00Z&metricnames=Ingress%2CEgress&api-version=2018-01-01&metricnamespace=Microsoft.Storage%2FstorageAccounts + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metrics?timespan=2018-01-01T00%253A00%253A00%252B00%253A00%252F2999-01-01T00%253A00%253A00%252B00%253A00&interval=PT1M&metricnames=Ingress%2CEgress&top=10&api-version=2018-01-01&metricnamespace=Microsoft.Storage%2FstorageAccounts response: body: {string: '{"cost":0,"timespan":"2998-12-01T00:00:00Z/2999-01-01T00:00:00Z","interval":"PT1M","value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Ingress","type":"Microsoft.Insights/metrics","name":{"value":"Ingress","localizedValue":"Ingress"},"unit":"Bytes","timeseries":[]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Egress","type":"Microsoft.Insights/metrics","name":{"value":"Egress","localizedValue":"Egress"},"unit":"Bytes","timeseries":[]}],"namespace":"Microsoft.Storage/storageAccounts","resourceregion":"westus"}'} headers: - __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-red_MetricsMP_IN_6] + __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-black_MetricsMP_IN_0] + cache-control: [no-cache] + content-length: ['938'] + content-type: [application/json] + date: ['Thu, 18 Oct 2018 15:42:46 GMT'] + server: [Microsoft-IIS/8.5] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [monitor metrics list] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-monitor/0.5.2 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metrics?timespan=2018-01-01T00%253A00%253A00%252B00%253A00%252F2031-09-10T00%253A00%253A00%252B00%253A00&interval=PT1M&metricnames=Ingress%2CEgress&top=10&api-version=2018-01-01 + response: + body: {string: '{"cost":0,"timespan":"2031-08-10T00:00:00Z/2031-09-10T00:00:00Z","interval":"PT1M","value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Ingress","type":"Microsoft.Insights/metrics","name":{"value":"Ingress","localizedValue":"Ingress"},"unit":"Bytes","timeseries":[]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Egress","type":"Microsoft.Insights/metrics","name":{"value":"Egress","localizedValue":"Egress"},"unit":"Bytes","timeseries":[]}],"namespace":"Microsoft.Storage/storageAccounts","resourceregion":"westus"}'} + headers: + __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-red_MetricsMP_IN_8] + cache-control: [no-cache] + content-length: ['938'] + content-type: [application/json] + date: ['Thu, 18 Oct 2018 15:42:48 GMT'] + server: [Microsoft-IIS/8.5] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: ['Accept-Encoding,Accept-Encoding'] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [monitor metrics list] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + azure-mgmt-monitor/0.5.2 Azure-SDK-For-Python AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/microsoft.insights/metrics?timespan=2011-04-25T00%253A00%253A00%252B00%253A00%252F2025-01-01T00%253A00%253A00%252B00%253A00&interval=PT1M&metricnames=Ingress%2CEgress&top=10&api-version=2018-01-01 + response: + body: {string: '{"cost":0,"timespan":"2024-12-01T00:00:00Z/2025-01-01T00:00:00Z","interval":"PT1M","value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Ingress","type":"Microsoft.Insights/metrics","name":{"value":"Ingress","localizedValue":"Ingress"},"unit":"Bytes","timeseries":[]},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/providers/Microsoft.Insights/metrics/Egress","type":"Microsoft.Insights/metrics","name":{"value":"Egress","localizedValue":"Egress"},"unit":"Bytes","timeseries":[]}],"namespace":"Microsoft.Storage/storageAccounts","resourceregion":"westus"}'} + headers: + __handlingserverid__: [shoeboxproxyustwo_shoeboxproxyustwo-red_MetricsMP_IN_8] cache-control: [no-cache] content-length: ['938'] content-type: [application/json] - date: ['Thu, 15 Mar 2018 16:43:01 GMT'] + date: ['Thu, 18 Oct 2018 15:42:48 GMT'] server: [Microsoft-IIS/8.5] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -224,9 +308,8 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.1 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.27 - msrest_azure/0.4.22 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.30] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -235,12 +318,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Thu, 15 Mar 2018 16:43:02 GMT'] + date: ['Thu, 18 Oct 2018 15:42:50 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkcyWlNQM0NKSFRPNEoyRUM3SFhBSE1KRElZQkdYRUVFSUNJQnxCRkExN0JGQTZFNkMwOEQ0LVNPVVRIQ0VOVFJBTFVTIiwiam9iTG9jYXRpb24iOiJzb3V0aGNlbnRyYWx1cyJ9?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdDUEdISVJDS0VTQVRHN01WUTQ3NTVIRklaQjNIS0dMVElKN3xGOTFBN0E4ODBGREI3NjUzLVNPVVRIQ0VOVFJBTFVTIiwiam9iTG9jYXRpb24iOiJzb3V0aGNlbnRyYWx1cyJ9?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_components.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_components.py deleted file mode 100644 index 42930c3ea46..00000000000 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_components.py +++ /dev/null @@ -1,72 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -import unittest -import re - -from knack.util import CLIError - -from azure.cli.command_modules.monitor.operations.activity_log import (_build_activity_log_odata_filter, - _activity_log_select_filter_builder, - _build_odata_filter) - - -class TestActivityLogODataBuilderComponents(unittest.TestCase): - def test_build_activity_logs_odata_filter(self): - correlation_id = '1234-34567-56789-34567' - resource_group = 'test' - resource_id = '/subscriptions/xxxx-xxxx-xxxx-xxx/resourceGroups/testrg/providers/Microsoft.Web/sites/testwebapp' - resource_provider = 'Microsoft.Web' - caller = 'contoso@contoso.com' - status = 'RunsSucceeded' - - filter_output = _build_activity_log_odata_filter(correlation_id) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(correlationId eq).*$' - assert bool(re.search(regex, filter_output)) - - filter_output = _build_activity_log_odata_filter(resource_group=resource_group) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(resourceGroupName eq).*$' - assert bool(re.search(regex, filter_output)) - - filter_output = _build_activity_log_odata_filter(resource_id=resource_id) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(resourceId eq).*$' - assert bool(re.search(regex, filter_output)) - - filter_output = _build_activity_log_odata_filter(resource_provider=resource_provider) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(resourceProvider eq).*$' - assert bool(re.search(regex, filter_output)) - - filter_output = _build_activity_log_odata_filter(caller=caller) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(caller eq).*$' - assert bool(re.search(regex, filter_output)) - - filter_output = _build_activity_log_odata_filter(status=status) - regex = r'^(eventTimestamp ge).*(eventTimestamp le).*(status eq).*$' - assert bool(re.search(regex, filter_output)) - - def test_activity_logs_select_filter_builder(self): - select_output = _activity_log_select_filter_builder() - assert select_output is None - - events = ['channels'] - select_output = _activity_log_select_filter_builder(events) - assert select_output == '{}'.format(events[0]) - - events = ['eventDataId', 'eventSource'] - select_output = _activity_log_select_filter_builder(events) - assert select_output == '{} , {}'.format(events[0], events[1]) - - def test_build_odata_filter(self): - default_filter = "timeGrain eq duration'PT1M'" - field_name = 'correlation_id' - field_value = '1234-34567-56789-34567' - field_label = 'correlationId' - - filter_output = _build_odata_filter(default_filter, field_name, field_value, field_label) - regex = r'^({} and {} eq \'{}\')$'.format(default_filter, field_label, field_value) - assert bool(re.search(regex, filter_output)) - - with self.assertRaises(CLIError): - _build_odata_filter(default_filter, field_name, None, field_label) diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_scenario.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_scenario.py index 53d42b20d2d..cf2d4008207 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_scenario.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_activity_log_scenario.py @@ -4,20 +4,18 @@ # -------------------------------------------------------------------------------------------- from time import sleep -from azure.cli.testsdk import LiveScenarioTest, ResourceGroupPreparer, StorageAccountPreparer +from azure.cli.testsdk import ScenarioTest, ResourceGroupPreparer, StorageAccountPreparer +from azure_devtools.scenario_tests import AllowLargeResponse + +from knack.util import CLIError # This is a live test because the start and end time can't be determined dynamically -class TestActivityLogScenarios(LiveScenarioTest): +class TestActivityLogScenarios(ScenarioTest): + + @AllowLargeResponse() @ResourceGroupPreparer(location='southcentralus') @StorageAccountPreparer() def test_activity_log_list_scenario(self, resource_group): - - for count in range(3): - logs = self.cmd('monitor activity-log list --resource-group {}'.format(resource_group)).get_output_in_json() - if len(logs) > 0: - break - - sleep(2 ** count) # Wait 1, 2, and 4 seconds incrementally to let the activity log catch up. - else: - self.assertTrue(False, 'After three try the command fails to retrieve any activity log.') + with self.assertRaisesRegexp(CLIError, 'start time cannot be more than 90 days in the past'): + self.cmd('monitor activity-log list --start-time 2018-01-01T00:00:00Z --end-time 2999-01-01T00:00:00Z') diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_metrics.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_metrics.py index a77f921dc8c..308e27bae17 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_metrics.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_metrics.py @@ -13,5 +13,9 @@ def test_monitor_metrics_scenario(self, resource_group, storage_account): self.kwargs.update({}) self.kwargs['sa_id'] = self.cmd('az storage account show -n {sa} -g {rg}').get_output_in_json()['id'] self.cmd('az monitor metrics list-definitions --resource {sa_id} --namespace Microsoft.Storage/storageAccounts') - self.cmd('az monitor metrics list --resource {sa_id} --namespace Microsoft.Storage/storageAccounts --metrics "Ingress" "Egress" --start-time 2018-01-01T00:00:00Z --end-time 2999-01-01T00:00:00Z', + self.cmd('az monitor metrics list --resource {sa_id} --namespace Microsoft.Storage/storageAccounts --metrics Ingress Egress --start-time 2018-01-01T00:00:00Z --end-time 2999-01-01T00:00:00Z', + checks=self.check('length(@.value)', 2)) + self.cmd('az monitor metrics list --resource {sa_id} --metrics Ingress Egress --start-time 2018-01-01 00:00:00 +00:00 --offset 5000d', + checks=self.check('length(@.value)', 2)) + self.cmd('az monitor metrics list --resource {sa_id} --metrics Ingress Egress --end-time 2025-01-01 00:00:00 +00:00 --offset 5000d', checks=self.check('length(@.value)', 2)) diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_unittest.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_unittest.py index ce6fb1a769e..6c96050f5c3 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_unittest.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/tests/latest/test_monitor_unittest.py @@ -88,3 +88,66 @@ def test_monitor_resource_id(self): self.assertFalse(hasattr(ns, 'namespace')) self.assertFalse(hasattr(ns, 'parent')) self.assertFalse(hasattr(ns, 'resource_type')) + + +class MonitorMetricAlertActionTest(unittest.TestCase): + + def _build_namespace(self, name_or_id=None, resource_group=None, provider_namespace=None, parent=None, + resource_type=None): + from argparse import Namespace + return Namespace() + + def call_condition(self, ns, value): + from azure.cli.command_modules.monitor.actions import MetricAlertConditionAction + MetricAlertConditionAction('--condition', 'condition').__call__(None, ns, value.split(), '--condition') + + def check_condition(self, ns, time_aggregation, metric_namespace, metric_name, operator, threshold): + prop = ns.condition[0] + self.assertEqual(prop.time_aggregation, time_aggregation) + self.assertEqual(prop.metric_name, metric_name) + self.assertEqual(prop.operator, operator) + self.assertEqual(prop.threshold, threshold) + self.assertEqual(prop.metric_namespace, metric_namespace) + + def check_dimension(self, ns, index, name, operator, values): + dim = ns.condition[0].dimensions[index] + self.assertEqual(dim.name, name) + self.assertEqual(dim.operator, operator) + self.assertEqual(dim.values, values) + + def test_monitor_metric_alert_condition_action(self): + + from knack.util import CLIError + + ns = self._build_namespace() + self.call_condition(ns, 'avg ns."CPU Percent" > 90') + self.check_condition(ns, 'Average', 'ns', 'CPU Percent', 'GreaterThan', '90') + + ns = self._build_namespace() + self.call_condition(ns, 'avg ns."a.b/c_d" > 90') + self.check_condition(ns, 'Average', 'ns', 'a.b/c_d', 'GreaterThan', '90') + + ns = self._build_namespace() + self.call_condition(ns, 'avg CPU Percent > 90') + self.check_condition(ns, 'Average', None, 'CPU Percent', 'GreaterThan', '90') + + ns = self._build_namespace() + self.call_condition(ns, 'avg "a.b/c_d" > 90') + self.check_condition(ns, 'Average', None, 'a.b/c_d', 'GreaterThan', '90') + + ns = self._build_namespace() + self.call_condition(ns, 'avg SuccessE2ELatency > 250 where ApiName includes GetBlob or PutBlob') + self.check_condition(ns, 'Average', None, 'SuccessE2ELatency', 'GreaterThan', '250') + self.check_dimension(ns, 0, 'ApiName', 'includes', ['GetBlob', 'PutBlob']) + + ns = self._build_namespace() + self.call_condition(ns, 'avg ns.foo/bar_doo > 90') + self.check_condition(ns, 'Average', 'ns', 'foo/bar_doo', 'GreaterThan', '90') + + ns = self._build_namespace() + with self.assertRaisesRegexp(CLIError, 'usage error: --condition'): + self.call_condition(ns, 'avg blah"what > 90') + + ns = self._build_namespace() + with self.assertRaisesRegexp(CLIError, 'usage error: --condition'): + self.call_condition(ns, 'avg Wra!!ga * woo') diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/util.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/util.py index 75d681015ae..8d43de79375 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/util.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/util.py @@ -55,20 +55,3 @@ def get_autoscale_scale_direction_map(): return {'to': ScaleDirection.none, 'out': ScaleDirection.increase, 'in': ScaleDirection.decrease} # endregion - - -def validate_time_range_and_add_defaults(start_time, end_time, formatter='startTime eq {} and endTime eq {}'): - from datetime import datetime, timedelta - try: - end_time = datetime.strptime(end_time, DATE_TIME_FORMAT) if end_time else datetime.utcnow() - except ValueError: - raise ValueError("Input '{}' is not valid datetime. Valid example: 2000-12-31T12:59:59Z".format(end_time)) - - try: - start_time = datetime.strptime(start_time, DATE_TIME_FORMAT) if start_time else end_time - timedelta(hours=1) - if start_time >= end_time: - raise ValueError("Start time cannot be later than end time.") - except ValueError: - raise ValueError("Input '{}' is not valid datetime. Valid example: 2000-12-31T12:59:59Z".format(start_time)) - - return formatter.format(start_time.strftime('%Y-%m-%dT%H:%M:%SZ'), end_time.strftime('%Y-%m-%dT%H:%M:%SZ')) diff --git a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/validators.py b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/validators.py index 7fbf18c13b1..881fee90ea6 100644 --- a/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/validators.py +++ b/src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/validators.py @@ -67,7 +67,7 @@ def _validate_weekly_recurrence(namespace): def validate_autoscale_timegrain(namespace): from azure.mgmt.monitor.models import MetricTrigger - from azure.cli.command_modules.monitor.actions import period_type + from azure.cli.command_modules.monitor.actions import get_period_type from azure.cli.command_modules.monitor.util import get_autoscale_statistic_map values = namespace.timegrain @@ -77,10 +77,10 @@ def validate_autoscale_timegrain(namespace): values = values[0].split(' ') name_offset = 0 try: - time_grain = period_type(values[1]) + time_grain = get_period_type()(values[1]) name_offset += 1 except ValueError: - time_grain = period_type('1m') + time_grain = get_period_type()('1m') try: statistic = get_autoscale_statistic_map()[values[0]] name_offset += 1 @@ -231,49 +231,16 @@ def process_action_group_detail_for_creation(namespace): ns['action_group'] = ActionGroupResource(**action_group_resource_properties) -def process_metric_timespan(namespace): - from .util import validate_time_range_and_add_defaults +def validate_metric_dimension(namespace): - ns = vars(namespace) - start_time = ns.pop('start_time', None) - end_time = ns.pop('end_time', None) - ns['timespan'] = validate_time_range_and_add_defaults(start_time, end_time, formatter='{}/{}') - - -def process_metric_aggregation(namespace): - ns = vars(namespace) - aggregation = ns.pop('aggregation', None) - if aggregation: - ns['aggregation'] = ','.join(aggregation) - - -def process_metric_result_type(namespace): - from azure.mgmt.monitor.models import ResultType - - ns = vars(namespace) - metadata_only = ns.pop('metadata', False) - if metadata_only: - ns['result_type'] = ResultType.metadata - - -def process_metric_dimension(namespace): - ns = vars(namespace) - - dimensions = ns.pop('dimension', None) - if not dimensions: + if not namespace.dimension: return - param_filter = ns.pop('filter', None) - if param_filter: + if namespace.filters: from knack.util import CLIError raise CLIError('usage: --dimension and --filter parameters are mutually exclusive.') - ns['filter'] = ' and '.join("{} eq '*'".format(d) for d in dimensions) - - -def validate_metric_names(namespace): - if namespace.metricnames: - namespace.metricnames = ','.join(namespace.metricnames) + namespace.filters = ' and '.join("{} eq '*'".format(d) for d in namespace.dimension) def process_webhook_prop(namespace): diff --git a/src/command_modules/azure-cli-monitor/setup.py b/src/command_modules/azure-cli-monitor/setup.py index 69a335967d2..2df00b9a5fd 100644 --- a/src/command_modules/azure-cli-monitor/setup.py +++ b/src/command_modules/azure-cli-monitor/setup.py @@ -12,7 +12,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.2.5" +VERSION = "0.2.6" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', diff --git a/src/command_modules/azure-cli-network/HISTORY.rst b/src/command_modules/azure-cli-network/HISTORY.rst index 4e4d03c2cac..71f40b0c4c7 100644 --- a/src/command_modules/azure-cli-network/HISTORY.rst +++ b/src/command_modules/azure-cli-network/HISTORY.rst @@ -3,6 +3,12 @@ Release History =============== +2.2.8 ++++++ +* Deprecated `network interface-endpoint` command names in favor of `network private-endpoint`. +* `express-route peering connection create`: Fix issue where `--peer-circuit` would not accept an ID. +* `public-ip create`: Fix issue where `--ip-tags` did not work correctly. + 2.2.7 +++++ * `nic create` - Add `--app-gateway-address-pools` and `--gateway-name` arguments to support adding application diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_help.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_help.py index d5b86825ed1..ec98ab38df3 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_help.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_help.py @@ -1977,16 +1977,6 @@ short-summary: Manage interface endpoints. """ -# helps['network interface-endpoint create'] = """ -# type: command -# short-summary: Create an interface endpoint. -# """ - -# helps['network interface-endpoint delete'] = """ -# type: command -# short-summary: Delete an interface endpoint. -# """ - helps['network interface-endpoint list'] = """ type: command short-summary: List interface endpoints. @@ -1996,13 +1986,27 @@ type: command short-summary: Get the details of an interface endpoint. """ +# endregion + +# region Private Endpoint +helps['network private-endpoint'] = """ + type: group + short-summary: Manage private endpoints. +""" + -# helps['network interface-endpoint update'] = """ -# type: command -# short-summary: Update an interface endpoint. -# """ +helps['network private-endpoint list'] = """ + type: command + short-summary: List private endpoints. +""" + +helps['network private-endpoint show'] = """ + type: command + short-summary: Get the details of an private endpoint. +""" # endregion + # region Load Balancer helps['network lb'] = """ type: group diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py index 797fdf001c0..6e6430d3e7c 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_params.py @@ -28,7 +28,6 @@ get_asg_validator, get_vnet_validator, validate_ip_tags, validate_ddos_name_or_id, validate_service_endpoint_policy, validate_delegations, validate_subresource_list, validate_er_peer_circuit, validate_ag_address_pools) -from azure.mgmt.network.models import ApplicationGatewaySslProtocol from azure.mgmt.trafficmanager.models import MonitorProtocol, ProfileStatus from azure.cli.command_modules.network._completers import ( subnet_completion_list, get_lb_subresource_completion_list, get_ag_subresource_completion_list, @@ -40,13 +39,15 @@ def load_arguments(self, _): (Access, ApplicationGatewayFirewallMode, ApplicationGatewayProtocol, ApplicationGatewayRedirectType, - ApplicationGatewayRequestRoutingRuleType, ApplicationGatewaySkuName, AuthenticationMethod, Direction, + ApplicationGatewayRequestRoutingRuleType, ApplicationGatewaySkuName, ApplicationGatewaySslProtocol, AuthenticationMethod, + Direction, ExpressRouteCircuitSkuFamily, ExpressRouteCircuitSkuTier, HTTPMethod, IPAllocationMethod, IPVersion, LoadBalancerSkuName, LoadDistribution, ProbeProtocol, ProcessorArchitecture, Protocol, PublicIPAddressSkuName, RouteNextHopType, SecurityRuleAccess, SecurityRuleProtocol, SecurityRuleDirection, TransportProtocol, VirtualNetworkGatewaySkuName, VirtualNetworkGatewayType, VpnClientProtocol, VpnType, ZoneType) = self.get_models( 'Access', 'ApplicationGatewayFirewallMode', 'ApplicationGatewayProtocol', 'ApplicationGatewayRedirectType', - 'ApplicationGatewayRequestRoutingRuleType', 'ApplicationGatewaySkuName', 'AuthenticationMethod', 'Direction', + 'ApplicationGatewayRequestRoutingRuleType', 'ApplicationGatewaySkuName', 'ApplicationGatewaySslProtocol', 'AuthenticationMethod', + 'Direction', 'ExpressRouteCircuitSkuFamily', 'ExpressRouteCircuitSkuTier', 'HTTPMethod', 'IPAllocationMethod', 'IPVersion', 'LoadBalancerSkuName', 'LoadDistribution', 'ProbeProtocol', 'ProcessorArchitecture', 'Protocol', 'PublicIPAddressSkuName', 'RouteNextHopType', 'SecurityRuleAccess', 'SecurityRuleProtocol', 'SecurityRuleDirection', 'TransportProtocol', @@ -468,11 +469,12 @@ def load_arguments(self, _): # endregion # region InterfaceEndpoint - interface_endpoint_name = CLIArgumentType(options_list='--endpoint-name', id_part='name', help='Name of the interface endpoint.', completer=get_resource_name_completion_list('Microsoft.Network/interfaceEndpoints')) + private_endpoint_name = CLIArgumentType(options_list='--endpoint-name', id_part='name', help='Name of the private endpoint.', completer=get_resource_name_completion_list('Microsoft.Network/interfaceEndpoints')) - with self.argument_context('network interface-endpoint') as c: - c.argument('interface_endpoint_name', interface_endpoint_name, options_list=['--name', '-n']) - c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group) + for scope in ['interface-endpoint', 'private-endpoint']: + with self.argument_context('network {}'.format(scope)) as c: + c.argument('interface_endpoint_name', private_endpoint_name, options_list=['--name', '-n']) + c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group) # endregion # region LoadBalancers diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py index 1d90702bed5..117d58a5c2d 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py @@ -244,6 +244,8 @@ def validate_er_peer_circuit(cmd, namespace): name=namespace.peer_circuit, child_type_1='peerings', child_name_1=namespace.peering_name) + else: + peer_id = namespace.peer_circuit # if the circuit ID is provided, we need to append /peerings/{peering_name} if namespace.peering_name not in peer_id: @@ -711,6 +713,7 @@ def process_nic_create_namespace(cmd, namespace): def process_public_ip_create_namespace(cmd, namespace): get_default_location_from_resource_group(cmd, namespace) validate_public_ip_prefix(cmd, namespace) + validate_ip_tags(cmd, namespace) validate_tags(namespace) diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py index a575c6a09f0..15623cb681d 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py @@ -129,7 +129,7 @@ def load_command_table(self, _): client_factory=cf_express_route_circuit_peerings ) - network_interface_endpoint_sdk = CliCommandType( + network_private_endpoint_sdk = CliCommandType( operations_tmpl='azure.mgmt.network.operations.interface_endpoints_operations#InterfaceEndpointsOperations.{}', client_factory=cf_interface_endpoints, min_api='2018-08-01' @@ -446,14 +446,15 @@ def _make_singular(value): g.show_command('show') # endregion - # region InterfaceEndpoint - with self.command_group('network interface-endpoint', network_interface_endpoint_sdk) as g: + # region PrivateEndpoint + with self.command_group('network interface-endpoint', network_private_endpoint_sdk, deprecate_info=self.deprecate(redirect='network private-endpoint', hide=True)) as g: + g.custom_command('list', 'list_private_endpoints') + g.show_command('show') + + with self.command_group('network private-endpoint', network_private_endpoint_sdk) as g: # TODO: Re-enable when service team asks. See issue #7271 - # g.custom_command('create', 'create_interface_endpoint') - # g.command('delete', 'delete') - g.custom_command('list', 'list_interface_endpoints') + g.custom_command('list', 'list_private_endpoints') g.show_command('show') - # g.generic_update_command('update', custom_func_name='update_interface_endpoint') # endregion # region LoadBalancers diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py index ce5c0505731..e79e9b9f68f 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py @@ -1662,9 +1662,9 @@ def update_express_route_peering(cmd, instance, peer_asn=None, primary_peer_addr # endregion -# region InterfaceEndpoints -def create_interface_endpoint(cmd, resource_group_name, interface_endpoint_name, subnet, location=None, tags=None, - fqdn=None, endpoint_service=None, nics=None): +# region PrivateEndpoints +def create_private_endpoint(cmd, resource_group_name, interface_endpoint_name, subnet, location=None, tags=None, + fqdn=None, endpoint_service=None, nics=None): client = network_client_factory(cmd.cli_ctx).interface_endpoints InterfaceEndpoint, SubResource = cmd.get_models( 'InterfaceEndpoint', 'SubResource') @@ -1679,7 +1679,7 @@ def create_interface_endpoint(cmd, resource_group_name, interface_endpoint_name, return client.create_or_update(resource_group_name, interface_endpoint_name, endpoint) -def list_interface_endpoints(cmd, resource_group_name=None): +def list_private_endpoints(cmd, resource_group_name=None): client = network_client_factory(cmd.cli_ctx).interface_endpoints if resource_group_name: return client.list(resource_group_name) diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/recordings/test_network_private_endpoints.yaml b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/recordings/test_network_private_endpoints.yaml new file mode 100644 index 00000000000..d469ef15c50 --- /dev/null +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/recordings/test_network_private_endpoints.yaml @@ -0,0 +1,134 @@ +interactions: +- request: + body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", + "date": "2018-10-19T22:46:51Z"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group create] + Connection: [keep-alive] + Content-Length: ['110'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_network_private_endpoints000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_network_private_endpoints000001","name":"cli_test_network_private_endpoints000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-19T22:46:51Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 19 Oct 2018 22:46:54 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network private-endpoint list] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/interfaceEndpoints?api-version=2018-08-01 + response: + body: {string: '{"value":[]}'} + headers: + cache-control: [no-cache] + content-length: ['12'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 19 Oct 2018 22:46:56 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network private-endpoint list] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_network_private_endpoints000001/providers/Microsoft.Network/interfaceEndpoints?api-version=2018-08-01 + response: + body: {string: '{"value":[]}'} + headers: + cache-control: [no-cache] + content-length: ['12'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 19 Oct 2018 22:46:56 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network private-endpoint show] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_network_private_endpoints000001/providers/Microsoft.Network/interfaceEndpoints/dummy?api-version=2018-08-01 + response: + body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/interfaceEndpoints/dummy'' + under resource group ''cli_test_network_private_endpoints000001'' was not + found."}}'} + headers: + cache-control: [no-cache] + content-length: ['221'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 19 Oct 2018 22:46:57 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 404, message: Not Found} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_network_private_endpoints000001?api-version=2018-05-01 + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + date: ['Fri, 19 Oct 2018 22:46:58 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGTkVUV09SSzo1RlBSSVZBVEU6NUZFTkRQT0lOVFNVRlZSWXw0MTc1NzExNkI5QUNBMEE4LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + status: {code: 202, message: Accepted} +version: 1 diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/test_network_commands.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/test_network_commands.py index 468869efa04..404f8fd9653 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/test_network_commands.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/latest/test_network_commands.py @@ -70,18 +70,18 @@ def test_network_lb_sku(self, resource_group): ]) -class NetworkInterfaceEndpoints(ScenarioTest): +class NetworkPrivateEndpoints(ScenarioTest): - @ResourceGroupPreparer(name_prefix='cli_test_network_interface_endpoints') - def test_network_interface_endpoints(self, resource_group): + @ResourceGroupPreparer(name_prefix='cli_test_network_private_endpoints') + def test_network_private_endpoints(self, resource_group): # unable to create resource so we can only verify the commands don't fail (or fail expectedly) - self.cmd('network interface-endpoint list') - self.cmd('network interface-endpoint list -g {rg}') + self.cmd('network private-endpoint list') + self.cmd('network private-endpoint list -g {rg}') # system code 3 for 'not found' with self.assertRaisesRegexp(SystemExit, '3'): - self.cmd('network interface-endpoint show -g {rg} -n dummy') + self.cmd('network private-endpoint show -g {rg} -n dummy') class NetworkLoadBalancerWithZone(ScenarioTest): diff --git a/src/command_modules/azure-cli-network/setup.py b/src/command_modules/azure-cli-network/setup.py index d0752bd1772..d773023db17 100644 --- a/src/command_modules/azure-cli-network/setup.py +++ b/src/command_modules/azure-cli-network/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.2.7" +VERSION = "2.2.8" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', diff --git a/src/command_modules/azure-cli-rdbms/HISTORY.rst b/src/command_modules/azure-cli-rdbms/HISTORY.rst index f4abdf6d421..ded80bf70ca 100644 --- a/src/command_modules/azure-cli-rdbms/HISTORY.rst +++ b/src/command_modules/azure-cli-rdbms/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.3.3 ++++++ +* Minor fixes + 0.3.2 +++++ * Add support for MariaDB service diff --git a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py index 11cad58bbe3..2059fbc5e1a 100644 --- a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py +++ b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py @@ -26,10 +26,10 @@ def add_helps(command_group, server_type): text: az {1} server create -l northeurope -g testgroup -n testsvr -u username -p password - name: Create a {0} server with a Standard performance tier and 2 vcore in North Europe. text: az {1} server create -l northeurope -g testgroup -n testsvr -u username -p password \\ - --sku-name GP_Gen4_2 + --sku-name GP_Gen5_2 - name: Create a {0} server with all paramaters set. text: az {1} server create -l northeurope -g testgroup -n testsvr -u username -p password \\ - --sku-name B_Gen4_2 --ssl-enforcement Disabled \\ + --sku-name B_Gen5_2 --ssl-enforcement Disabled \\ --storage-size 51200 --tags "key=value" --version {{server-version}} """.format(server_type, command_group) helps['{} server restore'.format(command_group)] = """ @@ -61,7 +61,7 @@ def add_helps(command_group, server_type): short-summary: Update a server. examples: - name: Update a server's sku. - text: az {0} server update -g testgroup -n testsvrnew --sku-name GP_Gen4_4 + text: az {0} server update -g testgroup -n testsvrnew --sku-name GP_Gen5_4 - name: Update a server's tags. text: az {0} server update -g testgroup -n testsvrnew --tags "k1=v1" "k2=v2" """.format(command_group) @@ -189,9 +189,9 @@ def add_helps(command_group, server_type): short-summary: Create a {0} database. examples: - name: Create database 'testdb' in the server 'testsvr' with the default parameters. - text: az {1} db create -g testgroup -s testsvr -n testdb + text: az {1} db create -g testgroup -s testsvr -n testdb --admin-user myadmin --admin-password {{server_admin_password}} --sku-name GP_Gen4_2 --version 5.7 - name: Create database 'testdb' in server 'testsvr' with a given character set and collation rules. - text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} + text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} --admin-user myadmin --admin-password {{server_admin_password}} --sku-name GP_Gen4_2 --version 5.7 """.format(server_type, command_group) helps['{} db delete'.format(command_group)] = """ type: command diff --git a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_params.py b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_params.py index a45928556d4..de982349325 100644 --- a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_params.py +++ b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_params.py @@ -23,7 +23,7 @@ def load_arguments(self, _): # pylint: disable=too-many-statements def _complex_params(command_group): with self.argument_context('{} server create'.format(command_group)) as c: - c.argument('sku_name', options_list=['--sku-name'], required=True, help='The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.') + c.argument('sku_name', options_list=['--sku-name'], required=True, help='The name of the sku, typically, tier + family + cores, e.g. B_Gen5_1, GP_Gen5_8.') c.argument('backup_retention', type=int, options_list=['--backup-retention'], help='The number of days a backup is retained.') c.argument('geo_redundant_backup', options_list=['--geo-redundant-backup'], help='Enable Geo-redundant or not for server backup.') @@ -37,7 +37,7 @@ def _complex_params(command_group): with self.argument_context('{} server update'.format(command_group)) as c: c.ignore('family', 'capacity', 'tier') - c.argument('sku_name', options_list=['--sku-name'], help='The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.') + c.argument('sku_name', options_list=['--sku-name'], help='The name of the sku, typically, tier + family + cores, e.g. B_Gen5_1, GP_Gen5_8.') with self.argument_context('{} server restore'. format(command_group)) as c: c.argument('source_server', options_list=['--source-server', '-s'], help='The name or ID of the source server to restore from.') @@ -45,7 +45,7 @@ def _complex_params(command_group): with self.argument_context('{} server georestore'. format(command_group)) as c: c.argument('location', arg_type=get_location_type(self.cli_ctx), required=True) - c.argument('sku_name', options_list=['--sku-name'], required=False, help='The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.') + c.argument('sku_name', options_list=['--sku-name'], required=False, help='The name of the sku, typically, tier + family + cores, e.g. B_Gen5_1, GP_Gen5_8.') c.argument('source_server', options_list=['--source-server', '-s'], required=True, help='The name or ID of the source server to restore from.') c.argument('backup_retention', options_list=['--backup-retention'], type=int, help='The max days of retention, unit is days.') c.argument('geo_redundant_backup', options_list=['--geo-redundant-backup'], help='Enable Geo-redundant or not for server backup.') diff --git a/src/command_modules/azure-cli-rdbms/setup.py b/src/command_modules/azure-cli-rdbms/setup.py index 776d63ca960..c5ba4383b2c 100644 --- a/src/command_modules/azure-cli-rdbms/setup.py +++ b/src/command_modules/azure-cli-rdbms/setup.py @@ -12,7 +12,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.3.2" +VERSION = "0.3.3" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/recordings/test_global_ids.yaml b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/recordings/test_global_ids.yaml new file mode 100644 index 00000000000..4ffef9054ec --- /dev/null +++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/recordings/test_global_ids.yaml @@ -0,0 +1,247 @@ +interactions: +- request: + body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", + "date": "2018-10-12T22:04:59Z"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group create] + Connection: [keep-alive] + Content-Length: ['110'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_global_ids000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001","name":"cli_test_global_ids000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-12T22:04:59Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:02 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_global_ids000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001","name":"cli_test_global_ids000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-12T22:04:59Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:03 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: '{"location": "westus", "tags": {}, "properties": {"addressSpace": {"addressPrefixes": + ["10.0.0.0/16"]}, "dhcpOptions": {}}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet create] + Connection: [keep-alive] + Content-Length: ['123'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1?api-version=2018-08-01 + response: + body: {string: "{\r\n \"name\": \"vnet1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1\",\r\n + \ \"etag\": \"W/\\\"8f2d7d44-d8fa-45be-a8ae-adc2f50b2641\\\"\",\r\n \"type\": + \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"westus\",\r\n + \ \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n + \ \"resourceGuid\": \"7475371c-ea65-4fcb-9a95-2b5377272e70\",\r\n \"addressSpace\": + {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n + \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n + \ \"subnets\": [],\r\n \"virtualNetworkPeerings\": [],\r\n \"enableDdosProtection\": + false,\r\n \"enableVmProtection\": false\r\n }\r\n}"} + headers: + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/64236506-f28e-449f-b78c-9e51a4c0a1ac?api-version=2018-08-01'] + cache-control: [no-cache] + content-length: ['766'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:04 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.48] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/64236506-f28e-449f-b78c-9e51a4c0a1ac?api-version=2018-08-01 + response: + body: {string: "{\r\n \"status\": \"InProgress\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['30'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:08 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.48] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/64236506-f28e-449f-b78c-9e51a4c0a1ac?api-version=2018-08-01 + response: + body: {string: "{\r\n \"status\": \"Succeeded\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['29'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:18 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet create] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.48] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1?api-version=2018-08-01 + response: + body: {string: "{\r\n \"name\": \"vnet1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1\",\r\n + \ \"etag\": \"W/\\\"ca644146-350f-40b2-938d-bedad52fb013\\\"\",\r\n \"type\": + \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"westus\",\r\n + \ \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n + \ \"resourceGuid\": \"7475371c-ea65-4fcb-9a95-2b5377272e70\",\r\n \"addressSpace\": + {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n + \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n + \ \"subnets\": [],\r\n \"virtualNetworkPeerings\": [],\r\n \"enableDdosProtection\": + false,\r\n \"enableVmProtection\": false\r\n }\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['767'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:19 GMT'] + etag: [W/"ca644146-350f-40b2-938d-bedad52fb013"] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [network vnet show] + Connection: [keep-alive] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 networkmanagementclient/2.2.1 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1?api-version=2018-08-01 + response: + body: {string: "{\r\n \"name\": \"vnet1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_global_ids000001/providers/Microsoft.Network/virtualNetworks/vnet1\",\r\n + \ \"etag\": \"W/\\\"ca644146-350f-40b2-938d-bedad52fb013\\\"\",\r\n \"type\": + \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"westus\",\r\n + \ \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n + \ \"resourceGuid\": \"7475371c-ea65-4fcb-9a95-2b5377272e70\",\r\n \"addressSpace\": + {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n + \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n + \ \"subnets\": [],\r\n \"virtualNetworkPeerings\": [],\r\n \"enableDdosProtection\": + false,\r\n \"enableVmProtection\": false\r\n }\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['767'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 12 Oct 2018 22:05:20 GMT'] + etag: [W/"ca644146-350f-40b2-938d-bedad52fb013"] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [group delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.1 (Windows-10-10.0.17763-SP0) requests/2.19.1 msrest/0.5.5 + msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.48] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_global_ids000001?api-version=2018-05-01 + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + date: ['Fri, 12 Oct 2018 22:05:21 GMT'] + expires: ['-1'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGR0xPQkFMOjVGSURTRDNMQTZIQ1hBV0dWU1NBTFZTVVpOUnwyMzNEMTRBQzExOUUwRDAxLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + status: {code: 202, message: Accepted} +version: 1 diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/test_resource.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/test_resource.py index 6a2027f4245..5023e6bf9c6 100644 --- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/test_resource.py +++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/test_resource.py @@ -155,6 +155,53 @@ def test_resource_id_scenario(self, resource_group): self.cmd('resource delete --id {vnet_id}', checks=self.is_empty()) +class ResourceGenericUpdate(LiveScenarioTest): + @ResourceGroupPreparer(name_prefix='cli_test_resource_id') + def test_resource_id_scenario(self, resource_group): + self.kwargs.update({ + 'stor_1': self.create_random_name(prefix='stor1', length=10), + 'stor_2': self.create_random_name(prefix='stor2', length=10) + }) + + # create storage accounts + self.cmd('az storage account create -g {rg} -n {stor_1}') + self.cmd('az storage account create -g {rg} -n {stor_2}') + + # get ids + self.kwargs['stor_ids'] = " ".join(self.cmd('az storage account list -g {rg} --query "[].id"').get_output_in_json()) + + # update tags + self.cmd('az storage account update --ids {stor_ids} --set tags.isTag=True tags.isNotTag=False') + + self.cmd('az storage account show --name {stor_1} -g {rg}', checks=[ + self.check('tags.isTag', 'True'), + self.check('tags.isNotTag', 'False') + ]) + self.cmd('az storage account show --name {stor_2} -g {rg}', checks=[ + self.check('tags.isTag', 'True'), + self.check('tags.isNotTag', 'False') + ]) + + # delete tags.isTag + self.cmd('az storage account update --ids {stor_ids} --remove tags.isTag') + + self.cmd('az storage account show --name {stor_1} -g {rg} --query "tags"', checks=[ + self.check('isNotTag', 'False'), + self.check('isTag', None) + ]) + self.cmd('az storage account show --name {stor_2} -g {rg} --query "tags"', checks=[ + self.check('isNotTag', 'False'), + self.check('isTag', None) + ]) + + # delete tags.isNotTag + self.cmd('az storage account update --ids {stor_ids} --remove tags.isNotTag') + + # check tags is empty. + self.cmd('az storage account show --name {stor_1} -g {rg} --query "tags"', checks=self.is_empty()) + self.cmd('az storage account show --name {stor_2} -g {rg} --query "tags"', checks=self.is_empty()) + + class ResourceCreateAndShowScenarioTest(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_resource_create') @@ -881,5 +928,17 @@ def test_invoke_action(self, resource_group): self.cmd('resource invoke-action --action capture --ids {vm_id} --request-body {request_body}') +class GlobalIdsScenarioTest(ScenarioTest): + @ResourceGroupPreparer(name_prefix='cli_test_global_ids') + def test_global_ids(self, resource_group): + + self.kwargs.update({ + 'vnet': 'vnet1' + }) + self.kwargs['vnet_id'] = self.cmd('network vnet create -g {rg} -n {vnet}').get_output_in_json()['newVNet']['id'] + # command will fail if the other parameters were actually used + self.cmd('network vnet show --subscription fakesub --resource-group fakerg -n fakevnet --ids {vnet_id}') + + if __name__ == '__main__': unittest.main() diff --git a/src/command_modules/azure-cli-role/HISTORY.rst b/src/command_modules/azure-cli-role/HISTORY.rst index 9d6d2b2496d..48c32216a5d 100644 --- a/src/command_modules/azure-cli-role/HISTORY.rst +++ b/src/command_modules/azure-cli-role/HISTORY.rst @@ -2,6 +2,14 @@ Release History =============== +2.1.9 +++++++ +* `ad sp create-for-rbac`: clarify the confusion between displayName and service principal name +* support grant permissions to AAD apps + +2.1.8 +++++++ +* support add/remove/list owner on AAD Applciation and Group objects 2.1.7 ++++++ diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py index 7dbdb73e49f..1e2f5e715d1 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_help.py @@ -12,7 +12,7 @@ short-summary: Create a service principal and configure its access to Azure resources. parameters: - name: --name -n - short-summary: Name or app URI to associate the RBAC with. If not present, a name will be generated. + short-summary: a URI to use as the logic name. It doesn't need to exist. If not present, CLI will generate one. - name: --password -p short-summary: The password used to log in. long-summary: If not present and `--cert` is not specified, a random password will be generated. @@ -167,6 +167,32 @@ type: command short-summary: List application owners. """ +helps['ad app owner add'] = """ + type: command + short-summary: add an application owner. +""" +helps['ad app owner remove'] = """ + type: command + short-summary: remove an application owner. +""" +helps['ad app permission'] = """ + type: group + short-summary: manage an application's OAuth2 permissions. +""" +helps['ad app permission grant'] = """ + type: command + short-summary: Grant an app permissions from another app + examples: + - name: Grant a native application with permissions to access an existing API with TTL of 2 years + text: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --app-id a0322f79-57df-498f-9d9f-12678 --expires 2 +""" +helps['ad app permission list'] = """ + type: command + short-summary: List the app permissions + examples: + - name: List the OAuth2 permissions for an existing AAD app + text: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234 +""" helps['ad user list'] = """ type: command short-summary: List Azure Active Directory users. @@ -300,6 +326,22 @@ type: command short-summary: Check if a member is in a group. """ +helps['ad group owner'] = """ + type: group + short-summary: Manage Azure Active Directory group owners. +""" +helps['ad group owner list'] = """ + type: command + short-summary: List group owners. +""" +helps['ad group owner add'] = """ + type: command + short-summary: add a group owner. +""" +helps['ad group owner remove'] = """ + type: command + short-summary: remove a group owner. +""" helps['ad sp'] = """ type: group short-summary: Manage Azure Active Directory service principals for automation authentication. diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py index e86110a3dca..a9b9effc8dd 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/_params.py @@ -20,6 +20,7 @@ def load_arguments(self, _): with self.argument_context('ad') as c: c.argument('_subscription') # hide global subscription param + c.argument('owner_object_id', help="owner's object id") with self.argument_context('ad app') as c: c.argument('app_id', help='application id') @@ -45,6 +46,13 @@ def load_arguments(self, _): with self.argument_context('ad app owner list') as c: c.argument('identifier', options_list=['--id'], help='identifier uri, application id, or object id of the application') + with self.argument_context('ad app permission grant') as c: + c.argument('app_id', help='clientId of an existing app from which you want to grant permissions to your app') + c.argument('expires', help='Expiry date for the permissions in years, options include 1, 2 or never.') + + with self.argument_context('ad app permission list') as c: + c.argument('identifier', options_list=['--id'], help='identifier uri, application id, or object id of the associated application') + with self.argument_context('ad sp') as c: c.argument('identifier', options_list=['--id'], help='service principal name, or object id') diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/commands.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/commands.py index 99b968e7b61..a4728d400ff 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/commands.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/commands.py @@ -24,7 +24,7 @@ def transform_assignment_list(result): def graph_err_handler(ex): - from azure.graphrbac.models.graph_error import GraphErrorException + from azure.graphrbac.models import GraphErrorException if isinstance(ex, GraphErrorException): from knack.util import CLIError raise CLIError(ex.message) @@ -84,13 +84,16 @@ def load_command_table(self, _): g.custom_command('delete', 'delete_application') g.custom_command('list', 'list_apps') g.custom_show_command('show', 'show_application') + g.custom_command('permission grant', 'grant_application') + g.custom_command('permission list', 'list_granted_application') g.generic_update_command('update', setter_name='patch_application', setter_type=role_custom, getter_name='show_application', getter_type=role_custom, custom_func_name='update_application', custom_func_type=role_custom) with self.command_group('ad app owner', exception_handler=graph_err_handler) as g: - g.custom_command('list', 'list_application_owners', client_factory=get_graph_client_applications) - # TODO: Add support for 'add' and 'remove' + g.custom_command('list', 'list_application_owners') + g.custom_command('add', 'add_application_owner') + g.custom_command('remove', 'remove_application_owner') with self.command_group('ad sp', resource_type=PROFILE_TYPE, exception_handler=graph_err_handler) as g: g.custom_command('create', 'create_service_principal') @@ -100,7 +103,6 @@ def load_command_table(self, _): with self.command_group('ad sp owner', exception_handler=graph_err_handler) as g: g.custom_command('list', 'list_service_principal_owners') - # TODO: Add support for 'add' and 'remove' # RBAC related with self.command_group('ad sp', exception_handler=graph_err_handler) as g: @@ -123,6 +125,11 @@ def load_command_table(self, _): g.command('get-member-groups', 'get_member_groups') g.custom_command('list', 'list_groups', client_factory=get_graph_client_groups) + with self.command_group('ad group owner', exception_handler=graph_err_handler) as g: + g.custom_command('list', 'list_group_owners') + g.custom_command('add', 'add_group_owner') + g.custom_command('remove', 'remove_group_owner') + with self.command_group('ad group member', role_group_sdk, exception_handler=graph_err_handler) as g: g.command('list', 'get_group_members') g.command('add', 'add_member') diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py index f25d140047b..bef72cf15ad 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/custom.py @@ -19,7 +19,7 @@ from msrest.serialization import TZ_UTC from msrestazure.azure_exceptions import CloudError from azure.cli.core.profiles import ResourceType, get_api_version -from azure.graphrbac.models.graph_error import GraphErrorException +from azure.graphrbac.models import GraphErrorException from azure.cli.core.util import get_file_json, shell_safe_json_parse @@ -386,9 +386,9 @@ def _backfill_assignments_for_co_admins(cli_ctx, auth_client, assignee=None): def _get_displayable_name(graph_object): - if graph_object.user_principal_name: + if getattr(graph_object, 'user_principal_name', None): return graph_object.user_principal_name - elif graph_object.service_principal_names: + elif getattr(graph_object, 'service_principal_names', None): return graph_object.service_principal_names[0] return graph_object.display_name or '' @@ -501,9 +501,19 @@ def list_apps(client, app_id=None, display_name=None, identifier_uri=None, query def list_application_owners(cmd, identifier): - client = _graph_client_factory(cmd.cli_ctx) - object_id = _resolve_application(client.applications, identifier) - return client.applications.list_owners(object_id) + client = _graph_client_factory(cmd.cli_ctx).applications + return client.list_owners(_resolve_application(client, identifier)) + + +def add_application_owner(cmd, owner_object_id, identifier): + graph_client = _graph_client_factory(cmd.cli_ctx) + owner_url = _get_owner_url(cmd, owner_object_id) + return graph_client.applications.add_owner(_resolve_application(graph_client.applications, identifier), owner_url) + + +def remove_application_owner(cmd, owner_object_id, identifier): + client = _graph_client_factory(cmd.cli_ctx).applications + return client.remove_owner(_resolve_application(client, identifier), owner_object_id) def list_sps(client, spn=None, display_name=None, query_filter=None): @@ -581,6 +591,33 @@ def list_groups(client, display_name=None, query_filter=None): return client.list(filter=(' and ').join(sub_filters)) +def list_group_owners(cmd, group_id): + client = _graph_client_factory(cmd.cli_ctx).groups + return client.list_owners(_resolve_group(client, group_id)) + + +def add_group_owner(cmd, owner_object_id, group_id): + graph_client = _graph_client_factory(cmd.cli_ctx) + owner_url = _get_owner_url(cmd, owner_object_id) + return graph_client.groups.add_owner(_resolve_group(graph_client.groups, group_id), owner_url) + + +def remove_group_owner(cmd, owner_object_id, group_id): + client = _graph_client_factory(cmd.cli_ctx).groups + return client.remove_owner(_resolve_group(client, group_id), owner_object_id) + + +def _resolve_group(client, identifier): + if not _is_guid(identifier): + res = list(list_groups(client, display_name=identifier)) + if not res: + raise CLIError('Group {} is not found in Graph '.format(identifier)) + if len(res) != 1: + raise CLIError('More than 1 group objects has the display name of ' + identifier) + identifier = res[0].object_id + return identifier + + def create_application(client, display_name, homepage=None, identifier_uris=None, available_to_other_tenants=False, password=None, reply_urls=None, key_value=None, key_type=None, key_usage=None, start_date=None, end_date=None, @@ -632,6 +669,53 @@ def create_application(client, display_name, homepage=None, identifier_uris=None return result +def list_granted_application(cmd, identifier): + graph_client = _graph_client_factory(cmd.cli_ctx) + + # Get the Service Principal ObjectId for the client app + client_sp_object_id = _resolve_service_principal(graph_client.service_principals, identifier) + + # Get the OAuth2 permissions client app + permissions = graph_client.oauth2.get( + filter="clientId eq '{}'".format(client_sp_object_id)) # pylint: disable=no-member + + return permissions.additional_properties['value'] + + +def grant_application(cmd, identifier, app_id, expires='1'): + graph_client = _graph_client_factory(cmd.cli_ctx) + + # Get the Service Principal ObjectId for the client app + client_sp_object_id = _resolve_service_principal(graph_client.service_principals, identifier) + + # Get the Service Principal ObjectId for associated app + associated_sp_object_id = _resolve_service_principal(graph_client.service_principals, app_id) + + # Build payload + start_date = datetime.datetime.utcnow() + end_date = start_date + relativedelta(years=1) + + if expires == '2': + end_date = start_date + relativedelta(years=2) + elif expires.lower() == 'never': + end_date = start_date + relativedelta(years=1000) + + payload = { + "odata.type": "Microsoft.DirectoryServices.OAuth2PermissionGrant", + "clientId": client_sp_object_id, + "consentType": "AllPrincipals", + "resourceId": associated_sp_object_id, + "scope": "user_impersonation", + "startTime": start_date.isoformat(), + "expiryTime": end_date.isoformat() + } + + # Grant OAuth2 permissions + response = graph_client.oauth2.grant(payload) # pylint: disable=no-member + + return response + + def update_application(instance, display_name=None, homepage=None, # pylint: disable=unused-argument identifier_uris=None, password=None, reply_urls=None, key_value=None, key_type=None, key_usage=None, start_date=None, end_date=None, available_to_other_tenants=None, @@ -757,7 +841,7 @@ def _create_service_principal(cli_ctx, identifier, resolve_app=True): except GraphErrorException: pass # fallback to appid (maybe from an external tenant?) - return client.service_principals.create(ServicePrincipalCreateParameters(app_id, True)) + return client.service_principals.create(ServicePrincipalCreateParameters(app_id=app_id, account_enabled=True)) def show_service_principal(client, identifier): @@ -944,14 +1028,18 @@ def create_service_principal_for_rbac( app_display_name = None if name and '://' not in name: + prefix = "http://" app_display_name = name - name = "http://" + name # normalize be a valid graph service principal name + logger.warning('Changing "%s" to a valid URI of "%s%s", which is the required format' + ' used for service principal names', name, prefix, name) + name = prefix + name # normalize be a valid graph service principal name if name: query_exp = 'servicePrincipalNames/any(x:x eq \'{}\')'.format(name) aad_sps = list(graph_client.service_principals.list(filter=query_exp)) if aad_sps: raise CLIError("'{}' already exists.".format(name)) + app_display_name = name.split('://')[-1] app_start_date = datetime.datetime.now(TZ_UTC) app_end_date = app_start_date + relativedelta(years=years or 1) @@ -1311,6 +1399,16 @@ def _get_object_stubs(graph_client, assignees): return result +def _get_owner_url(cmd, owner_object_id): + if '://' in owner_object_id: + return owner_object_id + graph_url = cmd.cli_ctx.cloud.endpoints.active_directory_graph_resource_id + from azure.cli.core._profile import Profile + profile = Profile(cli_ctx=cmd.cli_ctx) + _, _2, tenant_id = profile.get_login_credentials() + return graph_url + tenant_id + '/directoryObjects/' + owner_object_id + + # for injecting test seams to produce predicatable role assignment id for playback def _gen_guid(): return uuid.uuid4() diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/recordings/test_graph_ownership.yaml b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/recordings/test_graph_ownership.yaml new file mode 100644 index 00000000000..3e93c7780a2 --- /dev/null +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/recordings/test_graph_ownership.yaml @@ -0,0 +1,746 @@ +interactions: +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad user show] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users/example%40example.com?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"e7e158d3-7cdc-47cd-8825-5859d7ab2b55","deletionTimestamp":null,"accountEnabled":true,"ageGroup":null,"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"consentProvidedForMinor":null,"country":null,"createdDateTime":"2016-01-21T22:10:16Z","creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"admin3","employeeId":null,"facsimileTelephoneNumber":null,"givenName":"admin3","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"legalAgeGroupClassification":null,"mail":null,"mailNickname":"admin3","mobile":null,"onPremisesDistinguishedName":null,"onPremisesSecurityIdentifier":null,"otherMails":["yugangw@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":"en-US","provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2018-09-11T22:32:04Z","showInAddressList":null,"signInNames":[],"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"sdk","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/e7e158d3-7cdc-47cd-8825-5859d7ab2b55/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userIdentities":[],"userPrincipalName":"example@example.com","userState":null,"userStateChangedOn":null,"userType":"Member"}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1579'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:22 GMT'] + duration: ['346720'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [pMP8f8RT8BuYgTu1dfMWey3W85KBh0EioUNuKG1c8Zw=] + ocp-aad-session-key: [2MAahiQR0D3UMZ0_PvY_OnQ_hB1b74FxfymM6w9JePFlamhBDZrUuJ7zgkAG1ZwVhhrbUxXiSQbn1-rNlOkAtYwC67jo948n6-Ufvvv7zvVEM6csZBF9NQ6SOTVzlhnzalxQCse1yMKYU9gIkOdSiw.uk4CVO5Hq6r59mWsxERvmaLDo_WJxtW-1ueL73wGnfA] + pragma: [no-cache] + request-id: [36ff9e91-c22b-4f9e-851f-1fb6ddd78cc9] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: '{"homepage": "https://azure-cli-2018-10-16-00-28-22", "identifierUris": + ["http://azure-cli-2018-10-16-00-28-22"], "displayName": "azure-cli-2018-10-16-00-28-22", + "availableToOtherTenants": false, "passwordCredentials": [{"startDate": "2018-10-16T00:28:22.791385Z", + "endDate": "2019-10-16T00:28:22.791385Z", "keyId": "221ca85d-ad52-4634-9431-98ccb1812b22", + "value": "3c95ec58-8f19-4d4e-81d5-b67b1fcef3d5"}]}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp create-for-rbac] + Connection: [keep-alive] + Content-Length: ['406'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: POST + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects/Microsoft.DirectoryServices.Application/@Element","odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaContentType":"application/json;odata=minimalmetadata; + charset=utf-8","logoUrl":null,"oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2087'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:23 GMT'] + duration: ['6095495'] + expires: ['-1'] + location: ['https://graph.windows.net/00000000-0000-0000-0000-000000000000/directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application'] + ocp-aad-diagnostics-server-name: [sddddXJCDv27jmu91AjCY4cjIA04nWQAsEkxbrysAOg=] + ocp-aad-session-key: [8KZDRvraHXIOmri6z3MQviNl0rY_kJ3gsUK42PSoYhZfU8CZTWNbtPiozUyPRgmRl93FS76ieDDGdSXQoC-8SKk7nwfrcQ9h-YdT32uvjlx5Ijj17Zqa93pRmNITMCLfjoiC01eXL2l-lcTYlix4rw.Czyy2IkQj-N2wrS87PRTpZ8EYVgDLpz4re2tZMnibpM] + pragma: [no-cache] + request-id: [a803f174-9ba4-4169-ac20-d2d2635459da] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 201, message: Created} +- request: + body: '{"accountEnabled": true, "appId": "1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c"}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp create-for-rbac] + Connection: [keep-alive] + Content-Length: ['73'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: POST + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/servicePrincipals?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects/Microsoft.DirectoryServices.ServicePrincipal/@Element","odata.type":"Microsoft.DirectoryServices.ServicePrincipal","objectType":"ServicePrincipal","objectId":"3435b2ef-82ac-493c-b8c8-297cbc5435e8","deletionTimestamp":null,"accountEnabled":true,"addIns":[],"alternativeNames":[],"appDisplayName":"azure-cli-2018-10-16-00-28-22","appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appOwnerTenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","appRoleAssignmentRequired":false,"appRoles":[],"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","keyCredentials":[],"logoutUrl":null,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"passwordCredentials":[],"preferredTokenSigningKeyThumbprint":null,"publisherName":"AzureSDKTeam","replyUrls":[],"samlMetadataUrl":null,"servicePrincipalNames":["1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","http://azure-cli-2018-10-16-00-28-22"],"servicePrincipalType":"Application","signInAudience":"AzureADMyOrg","tags":[],"tokenEncryptionKeyId":null}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1571'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:24 GMT'] + duration: ['2349395'] + expires: ['-1'] + location: ['https://graph.windows.net/00000000-0000-0000-0000-000000000000/directoryObjects/3435b2ef-82ac-493c-b8c8-297cbc5435e8/Microsoft.DirectoryServices.ServicePrincipal'] + ocp-aad-diagnostics-server-name: [J4iPke7YPfBuYA4E3b307ck09pRqAOuzQKQ03+b041M=] + ocp-aad-session-key: [LesYZNqGd2qI4tRE4hohjEiuzNt3JsQVKjLtwkHXAn3cfi3Q27TAvCOUeM0JXRkSAEcQPORzvFvXDvdxzKqVEwFwpn3Pab5GDebJP92Rv7BwRhOtGHILWST13B3fn4ecfpDsgTIlAECV4103i_06ow.s6K8gSlwifq_cEO82BrF6R8f7feMxNgcXklhXHyc99Y] + pragma: [no-cache] + request-id: [67cd3f29-a5fc-481d-b404-b0fe8479617a] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner add] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=identifierUris%2Fany%28s%3As%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['121'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:25 GMT'] + duration: ['250322'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [EvOfLP9PQAD26fpwk0dE/RFcscWviL1fU6DjjzXB7dc=] + ocp-aad-session-key: [W0Are5dNQyGuOr9zDkLLlZUXEVTOwXiDghQnIhX0dHGZU3eeV8fY-EKNBl1H64jWCIG7YvY7Am6ULswabYp_Kr6u2FxCT55KANfA7FUbaFxVUHQqHFDl2PzRXg6NI0fQGfS8xbGfrdXQRry1I1w81w.ayhBP8uOx0k-kAH8Kvs18jDh-OgyiRMlAelfBRwe4wo] + pragma: [no-cache] + request-id: [b98a8dc7-4256-4699-b132-0b9fbafb0665] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner add] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=appId%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/logo","logoUrl":null,"mainLogo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/mainLogo","oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2228'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:25 GMT'] + duration: ['423388'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [k+a8loBjbxraN1otxCzpa/lm7sS3uSMfCmXQCJ5UeOg=] + ocp-aad-session-key: [nEzb33u0SsElakT1uu8v3sCVAMAJcx4q175qYmhjm6MWM5Loer8IbCk-jxe_1rjISqbGm2A0I9Sc_sOdEvS8jzzy794W_YZUs88CnhwdzxryFSSRg2C3e_ra-mJF55zxOm_iuLYfiwMQgbFD6sqvMg.Pq8fzXECYPb0kl-TzHEDCGrwwEHE_VzA9oyocB5O8Kw] + pragma: [no-cache] + request-id: [58f1c9fc-5b51-4f15-b7ad-77b13ef35035] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: '{"url": "https://graph.windows.net/00000000-0000-0000-0000-000000000000/directoryObjects/e7e158d3-7cdc-47cd-8825-5859d7ab2b55"}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner add] + Connection: [keep-alive] + Content-Length: ['127'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: POST + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications/2537562f-3f2a-40b2-ba3a-f05ed017bd12/$links/owners?api-version=1.6 + response: + body: {string: ''} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + dataserviceversion: [1.0;] + date: ['Tue, 16 Oct 2018 00:28:27 GMT'] + duration: ['2050359'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [DAEEhUUzhQ8pu+4OxvItbpuvqegmLWoSgzWL1kkCnyk=] + ocp-aad-session-key: [OM6HF1QhePLfEH2ggIHKKe7MWLgny-JSAefuUl5oMIpeuga3WbKMTuih7tY0ol_lRfTMhMFHyRIGm_7M04L0x1SKa60Vp3AubK6bNCWZQKF0l62Boxa3Ar2YaVNDN8gU6THaH7sZwpj-kb_4rJlm5g.57LFOHO7eiINC42Fr9eM3AQA_YlOegaVzZY6rPRKR0g] + pragma: [no-cache] + request-id: [0a1bd67f-3662-483e-81d2-1853de7c21b8] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 204, message: No Content} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=identifierUris%2Fany%28s%3As%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['121'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:27 GMT'] + duration: ['275905'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [eHUy9xL/t2YPMeNAb8K3eJdZ70TbtfpQN57mnPQmQKs=] + ocp-aad-session-key: [Vy3hteFsvqouu3tooQBoYAOsS6Q7BhIUwxZp_oWaeSkMk4vRNlIOwA5UhG9MD_Jq9nf1g8MNEqVX2pVUDQwBecaExxxR073Img3XoKcBxF6CQCxIcGOqNwS_bQcwCC_00iHGq4oAHOPoyMLnCepr1g.qRoA_snR7D1_9ShorQFWszGEe0UhG1rpFRBUHvz2Wpg] + pragma: [no-cache] + request-id: [2bf6cc67-5470-4dbf-9723-f086f03289fa] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=appId%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/logo","logoUrl":null,"mainLogo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/mainLogo","oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2228'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:28 GMT'] + duration: ['377837'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [TF7V9cFPmZmQJjy/0crfkRiCbrtTUG3VKT/zd0mx1Gc=] + ocp-aad-session-key: [FdRxcE6MrQ0A6Ec8x83_3LZ1FM3vcPxjOZM5vbWPZqG0WXUTGGgdWTQqmm8xhzbZhstUYthtG6cx8FlNp-VwO2GuBDrqhlzYQxYFdLOlylci9sdqfe47zmC8xq_SlRgBFBUOWKjLhHgvbJFmwRAqkQ.cQag8wRes__hbYUbkcCPinpaOZi6EtwqV29xuRO5ffA] + pragma: [no-cache] + request-id: [88dbbe57-7119-46b2-9680-0fc9d73f84dd] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications/2537562f-3f2a-40b2-ba3a-f05ed017bd12/owners?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"e7e158d3-7cdc-47cd-8825-5859d7ab2b55","deletionTimestamp":null,"accountEnabled":true,"ageGroup":null,"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"consentProvidedForMinor":null,"country":null,"createdDateTime":"2016-01-21T22:10:16Z","creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"admin3","employeeId":null,"facsimileTelephoneNumber":null,"givenName":"admin3","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"legalAgeGroupClassification":null,"mail":null,"mailNickname":"admin3","mobile":null,"onPremisesDistinguishedName":null,"onPremisesSecurityIdentifier":null,"otherMails":["yugangw@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":"en-US","provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2018-09-11T22:32:04Z","showInAddressList":null,"signInNames":[],"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"sdk","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/e7e158d3-7cdc-47cd-8825-5859d7ab2b55/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userIdentities":[],"userPrincipalName":"example@example.com","userState":null,"userStateChangedOn":null,"userType":"Member"}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1582'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:29 GMT'] + duration: ['337992'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [PJW6A+9+3YfylcLR1ajT1cnYjGDNUw+aeQtcF3NJNzY=] + ocp-aad-session-key: [tuES1YNhJWEvt_V_3wsqpPkAIYTOkyJ6sr_5XdoohtQnuXEzaZTYEeC8Fqa7R9pZl_ltcQac3rbYOecIGMqadvTL1O5h2ClsqoxB3sw58o8Op6Fketx9DQwEWSkFJaBbvoBoQM513ZP_SIZpd2rXrw.Kkabbd13345y0WvKDLVRL1Q52JGdCvIVYkKGVqtCYLI] + pragma: [no-cache] + request-id: [4e15f3a2-ffc4-49f0-87bd-433c53be59f3] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner remove] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=identifierUris%2Fany%28s%3As%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['121'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:30 GMT'] + duration: ['367265'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [zPeOuJeNLZ5N5CAKU8XN6jsJ5sC6cSv6Gh6WpNy3E8g=] + ocp-aad-session-key: [ydyoPN_KdHgAf3pGY-NdlbOjk6tnEXewf0-I-ANUNESwLGnmm1uGnvpYrARNVuaOCwuGk_JKHPZPcgSM4jXWokoAj6jffXjrKQrfknWTcJHsOQLwykljVshpnW68x0YiSWpwKRHaJxivNW-VZTk3sg.NwegNMai8XaXZdNj27sIkS04N-qPnmJsdrfWTImBdHQ] + pragma: [no-cache] + request-id: [d61320f9-69dc-4b3f-b3f2-4135a2ffa5a5] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner remove] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=appId%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/logo","logoUrl":null,"mainLogo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/mainLogo","oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2228'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:30 GMT'] + duration: ['379321'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [hwn6uEtjHiiLa1+/G29HvIs5WOJFHYFOq64UHyjuGvY=] + ocp-aad-session-key: [4Q-m3vLf6U2jnsplapsUZBhet4CGOc0plJN28cjtMWtCAnF7Vvd3EICyXAGi3-RboGyYY57OGv2F61x3mo1bU_2X3A11hpqe71e_AYdJCY1K2ruQyRdsPee-JBOsyDmZY8xOn8D0b5bpDPpJUsQFFw.vY_uMpeCNSFipUjy-XzZaZQZGIAoL3AJ4n37dbiT-Oc] + pragma: [no-cache] + request-id: [cb906595-37fa-4f76-9bd0-2abce140cde6] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner remove] + Connection: [keep-alive] + Content-Length: ['0'] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: DELETE + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications/2537562f-3f2a-40b2-ba3a-f05ed017bd12/$links/owners/e7e158d3-7cdc-47cd-8825-5859d7ab2b55?api-version=1.6 + response: + body: {string: ''} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + dataserviceversion: [1.0;] + date: ['Tue, 16 Oct 2018 00:28:31 GMT'] + duration: ['2111357'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [HEPAm0tyongGpYycSw509UTFJ4dZAtir7lD0xyk+LYQ=] + ocp-aad-session-key: [zlCO9t05R72Rf-5IO3ayxvmIAUByF6NuX9WU8qjSB0H_9yicoBQhMFW8geXYKcxd3qq4qzq4KhO0RZ9aifPLcrQIpEJvsw0o6WBxG0F6GN4NQeJz1GYcV19Bh-vPhyFi2Tf7xBdBZbGAJueWhK2Osg.eEmfa2p01DV-P0O7coEQxXPvp9EGwRHEdPam08KmT7w] + pragma: [no-cache] + request-id: [d163f307-a0f3-49e9-a094-08ebf746030b] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 204, message: No Content} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=identifierUris%2Fany%28s%3As%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['121'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:33 GMT'] + duration: ['250890'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [hwn6uEtjHiiLa1+/G29HvIs5WOJFHYFOq64UHyjuGvY=] + ocp-aad-session-key: [aCDtt3oM36PgWZGjmnoNOazILwd2vQg6eMRKGOkq6Fg1Mydgbxl49vp_7hPnHwEhSokBbSuv673TMOUAThEKPnYw3YAk4VqPYd9IRWMeA6ZDh4psSDjAEfnulS6uJQFAr0-kVO7LuTzubDgJJVz0JQ.pCZibRYZ8ZwLTVOKIPBHZJ75-IzMCOJlshcvMMi6DSY] + pragma: [no-cache] + request-id: [8c7e6544-b8ee-49d1-a1d1-5459379e9dd4] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=appId%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/logo","logoUrl":null,"mainLogo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/mainLogo","oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2228'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:32 GMT'] + duration: ['317450'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [zoXa5OztcZwC9NCZAVZj5EM6pVPNXpVwNUsgvVT3hYg=] + ocp-aad-session-key: [M6L09bT38KtOW7KN8pdM0Wm8VGUBJZAnhfJyZ0biUxTYDnDO0oUQ-pIzomF4qd9uN96VW-f_Ro9MfK2mbj_wRdGlfqJTulGIZ8sEZUUBJ_5p-EAgp2yk3zDJKhRXgBPwyE1gEIIIptjBNqXLl63ktA.xvaoHu22Fq2BchfZ7vK3MNZKxAUDRmkKDsxUQoKxpFg] + pragma: [no-cache] + request-id: [f81172a6-483a-4124-93c6-fc28afd6b1cc] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad app owner list] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications/2537562f-3f2a-40b2-ba3a-f05ed017bd12/owners?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['121'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:33 GMT'] + duration: ['330814'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [K6rldxMxky7aVh9vRPlXWYskRYxAISeuZjxkHfljrVA=] + ocp-aad-session-key: [y5_YCEyjLbxNyLEevleOTu_Fwv7c4eMB2dueOjpKpEh-WMwuC4mjoskNKWB3ZMUokcZxmgzfaW6g-6wMkkuohhBBGg2-LjwpFbK1gvrsvBsI-3lEnIdMSaCU7HeTGKy-ifSvazB6CGDder6c0aXi0w.MoloVMFj0zhC7CDFx_c3A2oUY5iQN0yEZGT2jUYJk1A] + pragma: [no-cache] + request-id: [c4640c45-e99b-43ba-b8d9-257e8268f18a] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/servicePrincipals?$filter=servicePrincipalNames%2Fany%28c%3Ac%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.ServicePrincipal","objectType":"ServicePrincipal","objectId":"3435b2ef-82ac-493c-b8c8-297cbc5435e8","deletionTimestamp":null,"accountEnabled":true,"addIns":[],"alternativeNames":[],"appDisplayName":"azure-cli-2018-10-16-00-28-22","appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appOwnerTenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","appRoleAssignmentRequired":false,"appRoles":[],"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","keyCredentials":[],"logoutUrl":null,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"passwordCredentials":[],"preferredTokenSigningKeyThumbprint":null,"publisherName":"AzureSDKTeam","replyUrls":[],"samlMetadataUrl":null,"servicePrincipalNames":["http://azure-cli-2018-10-16-00-28-22","1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c"],"servicePrincipalType":"Application","signInAudience":"AzureADMyOrg","tags":[],"tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1529'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:35 GMT'] + duration: ['337983'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [/lC86iJ3cwwJGyTWjAKYWDPkB/lyglon9hmrn0nLUXM=] + ocp-aad-session-key: [rkfEtGVJi2N2tsiSdOWNXTUBsKjtes8YrIbq4Ec1YJjMc2OZJ6toqrA5nXo6C_rBTMIeALyKIx1OU9prXH0b-k9IiiuTViplSvzWsij73WjfXiB5u_w_sNBpsJgnNzHQX9WWfX_KJlGu0eH_w0EdjA.Mgcvyovo9tnnr-KTb5bolWWqyiYZGSbySL2SI8rrYys] + pragma: [no-cache] + request-id: [c00df5a5-234d-4fff-8002-b8c453803e64] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/servicePrincipals/3435b2ef-82ac-493c-b8c8-297cbc5435e8?api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.ServicePrincipal","objectType":"ServicePrincipal","objectId":"3435b2ef-82ac-493c-b8c8-297cbc5435e8","deletionTimestamp":null,"accountEnabled":true,"addIns":[],"alternativeNames":[],"appDisplayName":"azure-cli-2018-10-16-00-28-22","appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appOwnerTenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","appRoleAssignmentRequired":false,"appRoles":[],"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","keyCredentials":[],"logoutUrl":null,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"passwordCredentials":[],"preferredTokenSigningKeyThumbprint":null,"publisherName":"AzureSDKTeam","replyUrls":[],"samlMetadataUrl":null,"servicePrincipalNames":["http://azure-cli-2018-10-16-00-28-22","1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c"],"servicePrincipalType":"Application","signInAudience":"AzureADMyOrg","tags":[],"tokenEncryptionKeyId":null}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1526'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:35 GMT'] + duration: ['332127'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [IVoo8J8Kwo97hZRmPKSXFMOLbXJ4bYdeLcbvUm0th84=] + ocp-aad-session-key: [4EzZUOYG8ud88n-WvIerZFg0So_Km3lmhUcWoEKTHWinhjqVUmzAN4mQphRKnr2YwInWqmBBqKaqYLod4m5vw8eS7Heg3HAldWACIc6u47_9Ru_G9T8vFMOFxNgqgEPFb_9c3lX3fx-20o85NeJdJg.6ZBXjF3qPrMe7efFOX0rvsMbji_21uNWKsLODswXwfg] + pragma: [no-cache] + request-id: [ddd56c21-1322-43e0-86b5-7e09e469fd9a] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications?$filter=identifierUris%2Fany%28s%3As%20eq%20%27http%3A%2F%2Fazure-cli-2018-10-16-00-28-22%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.Application","objectType":"Application","objectId":"2537562f-3f2a-40b2-ba3a-f05ed017bd12","deletionTimestamp":null,"acceptMappedClaims":null,"addIns":[],"appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appRoles":[],"availableToOtherTenants":false,"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"groupMembershipClaims":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","identifierUris":["http://azure-cli-2018-10-16-00-28-22"],"informationalUrls":{"termsOfService":null,"support":null,"privacy":null,"marketing":null},"isDeviceOnlyAuthSupported":null,"keyCredentials":[],"knownClientApplications":[],"logoutUrl":null,"logo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/logo","logoUrl":null,"mainLogo@odata.mediaEditLink":"directoryObjects/2537562f-3f2a-40b2-ba3a-f05ed017bd12/Microsoft.DirectoryServices.Application/mainLogo","oauth2AllowIdTokenImplicitFlow":true,"oauth2AllowImplicitFlow":false,"oauth2AllowUrlPathMatching":false,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"oauth2RequirePostResponse":false,"optionalClaims":null,"orgRestrictions":[],"parentalControlSettings":{"countriesBlockedForMinors":[],"legalAgeGroupRule":"Allow"},"passwordCredentials":[{"customKeyIdentifier":null,"endDate":"2019-10-16T00:28:22.791385Z","keyId":"221ca85d-ad52-4634-9431-98ccb1812b22","startDate":"2018-10-16T00:28:22.791385Z","value":null}],"publicClient":null,"publisherDomain":null,"recordConsentConditions":null,"replyUrls":[],"requiredResourceAccess":[],"samlMetadataUrl":null,"signInAudience":"AzureADMyOrg","tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['2228'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:36 GMT'] + duration: ['409906'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [USO0vXsiH/WugU0+xVoguNv4Wxgbvvn8Zb8qUwfOkVw=] + ocp-aad-session-key: [BwHV8BJO6fk5g1H0XL-jQF6ryU6bUHybjltQq-tu1YSUBa0W7r-jeB9zuDhLNfkrN5JiLTCobeRKwFC45tBlPFtMxSsiV5g2DuEuVFSoqkK5LHGMk8R3F7ImMn7dMGpNMuJU2pOt4Q0L7ctvfvANuw.hS3YbjoWu24FvjifDNQYeU-bDB8K2q4YhP0byuh-vP4] + pragma: [no-cache] + request-id: [25cd473f-36f2-4b52-9746-4830c720d0f1] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/servicePrincipals?$filter=servicePrincipalNames%2Fany%28c%3Ac%20eq%20%271b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c%27%29&api-version=1.6 + response: + body: {string: '{"odata.metadata":"https://graph.windows.net/00000000-0000-0000-0000-000000000000/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.ServicePrincipal","objectType":"ServicePrincipal","objectId":"3435b2ef-82ac-493c-b8c8-297cbc5435e8","deletionTimestamp":null,"accountEnabled":true,"addIns":[],"alternativeNames":[],"appDisplayName":"azure-cli-2018-10-16-00-28-22","appId":"1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c","appOwnerTenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","appRoleAssignmentRequired":false,"appRoles":[],"displayName":"azure-cli-2018-10-16-00-28-22","errorUrl":null,"homepage":"https://azure-cli-2018-10-16-00-28-22","keyCredentials":[],"logoutUrl":null,"oauth2Permissions":[{"adminConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on behalf of the signed-in + user.","adminConsentDisplayName":"Access azure-cli-2018-10-16-00-28-22","id":"62fd8d99-6626-490b-80d0-20ee17ae9bb3","isEnabled":true,"type":"User","userConsentDescription":"Allow + the application to access azure-cli-2018-10-16-00-28-22 on your behalf.","userConsentDisplayName":"Access + azure-cli-2018-10-16-00-28-22","value":"user_impersonation"}],"passwordCredentials":[],"preferredTokenSigningKeyThumbprint":null,"publisherName":"AzureSDKTeam","replyUrls":[],"samlMetadataUrl":null,"servicePrincipalNames":["http://azure-cli-2018-10-16-00-28-22","1b4dbba3-a2f5-49e8-8e40-c2ce583b8e2c"],"servicePrincipalType":"Application","signInAudience":"AzureADMyOrg","tags":[],"tokenEncryptionKeyId":null}]}'} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + content-length: ['1529'] + content-type: [application/json; odata=minimalmetadata; streaming=true; charset=utf-8] + dataserviceversion: [3.0;] + date: ['Tue, 16 Oct 2018 00:28:36 GMT'] + duration: ['358025'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [uCCQbpgVHNC8rue1lL9wVVx/oAWeG8jNKc51+E8x6H4=] + ocp-aad-session-key: [zWfC2GwKwRZECG6zrGADOZ2JmH6J5fhh2-VvWMhjZV7qASQ7qJH40OqRXmGIcRdgkSe7W2kHkTn9MCH8W6MeA05gVixKVyJB87jUq2hn91_6Gpq_-1SpPm6KxsOEk4a8p5-thUqQgy6BlbJYrH0QgA.yczNE3zvIqWEBlxOv_qIJWPHi7kfgQXKW7YePOWAAtI] + pragma: [no-cache] + request-id: [61a57d75-66ce-4066-8d82-34e7da9748d1] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-mgmt-authorization/0.50.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleAssignments?$filter=principalId%20eq%20%273435b2ef-82ac-493c-b8c8-297cbc5435e8%27&api-version=2018-01-01-preview + response: + body: {string: '{"value":[]}'} + headers: + cache-control: [no-cache] + content-length: ['12'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 16 Oct 2018 00:28:39 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-IIS/10.0] + set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-request-charge: ['1'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [ad sp delete] + Connection: [keep-alive] + Content-Length: ['0'] + User-Agent: [python/3.5.4 (Windows-10-10.0.17763-SP0) msrest/0.6.0 msrest_azure/0.4.34 + azure-graphrbac/0.51.0 Azure-SDK-For-Python AZURECLI/2.0.48] + accept-language: [en-US] + method: DELETE + uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/applications/2537562f-3f2a-40b2-ba3a-f05ed017bd12?api-version=1.6 + response: + body: {string: ''} + headers: + access-control-allow-origin: ['*'] + cache-control: [no-cache] + dataserviceversion: [1.0;] + date: ['Tue, 16 Oct 2018 00:28:39 GMT'] + duration: ['3478321'] + expires: ['-1'] + ocp-aad-diagnostics-server-name: [qxvg+LgKyuIFTpm0XjmicPMsnZzmR6m/OWBxHpYTkp8=] + ocp-aad-session-key: [UnSN0VQZiwfEwl0ssUW1WTxb7fvYZc5ozMjVk09xwdCf64E2m8imsYajaiwB6ovDCGiYmCGZcS5PqChFN4Ho4ovoIXyJjfC21BgsSVdxzICQ1r4XM2Ne-foe5G1BuLfRnDfDYlOfgL7Jb01E5PaEjg.UbUVnmA0dBv2CcsrOxsXT0JJzY0l3xMCNXtan8SK-3s] + pragma: [no-cache] + request-id: [c5b98ff4-4fe9-4409-9f9e-1d0c892ac50c] + server: [Microsoft-IIS/10.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-aspnet-version: [4.0.30319] + x-content-type-options: [nosniff] + x-ms-dirapi-data-contract-version: ['1.6'] + x-powered-by: [ASP.NET] + status: {code: 204, message: No Content} +version: 1 diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_graph.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_graph.py index df5e59fde2c..75facdd6349 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_graph.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_graph.py @@ -5,7 +5,7 @@ import json import mock from azure_devtools.scenario_tests import AllowLargeResponse -from azure.cli.testsdk import ScenarioTest, LiveScenarioTest +from azure.cli.testsdk import ScenarioTest, LiveScenarioTest, AADGraphUserReplacer, MOCKED_USER_NAME class ServicePrincipalExpressCreateScenarioTest(ScenarioTest): @@ -225,3 +225,30 @@ def test_graph_group_scenario(self): self.cmd('ad group delete -g {group}') except Exception: pass + + +class GraphOwnerScenarioTest(ScenarioTest): + def test_graph_ownership(self): + playback = not (self.is_live or self.in_recording) + if playback: + owner = MOCKED_USER_NAME + else: + account_info = self.cmd('account show').get_output_in_json() + if account_info['user']['type'] == 'servicePrincipal': + return # this test delete users which are beyond a SP's capacity, so quit... + owner = account_info['user']['name'] + + self.kwargs = { + 'owner': owner + } + self.recording_processors.append(AADGraphUserReplacer(owner, 'example@example.com')) + try: + self.kwargs['owner_object_id'] = self.cmd('ad user show --upn-or-object-id {owner}').get_output_in_json()['objectId'] + self.kwargs['app_id'] = self.cmd('ad sp create-for-rbac --skip-assignment').get_output_in_json()['appId'] + self.cmd('ad app owner add --owner-object-id {owner_object_id} --id {app_id}') + self.cmd('ad app owner list --id {app_id}', checks=self.check('[0].userPrincipalName', owner)) + self.cmd('ad app owner remove --owner-object-id {owner_object_id} --id {app_id}') + self.cmd('ad app owner list --id {app_id}', checks=self.check('length([*])', 0)) + finally: + if self.kwargs['app_id']: + self.cmd('ad sp delete --id {app_id}') diff --git a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_role_commands_thru_mock.py b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_role_commands_thru_mock.py index bb4fb031035..7330f93a24e 100644 --- a/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_role_commands_thru_mock.py +++ b/src/command_modules/azure-cli-role/azure/cli/command_modules/role/tests/latest/test_role_commands_thru_mock.py @@ -136,6 +136,7 @@ def test_create_for_rbac_password_plumbed_through(self, graph_client_mock, auth_ # assert self.assertEqual(result['password'], test_pwd) self.assertEqual(result['name'], 'http://' + name) + self.assertEqual(result['displayName'], name) self.assertEqual(result['appId'], test_app_id) @mock.patch('azure.cli.command_modules.role.custom._auth_client_factory', autospec=True) diff --git a/src/command_modules/azure-cli-role/setup.py b/src/command_modules/azure-cli-role/setup.py index a9d6a4e4824..6d138f15c84 100644 --- a/src/command_modules/azure-cli-role/setup.py +++ b/src/command_modules/azure-cli-role/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.1.7" +VERSION = "2.1.9" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', @@ -34,7 +34,7 @@ 'azure-cli-core', 'azure-mgmt-authorization==0.50.0', 'azure-mgmt-monitor==0.5.2', - 'azure-graphrbac==0.40.0', + 'azure-graphrbac==0.51.1', 'azure-keyvault==1.1.0', 'pytz' ] diff --git a/src/command_modules/azure-cli-servicefabric/HISTORY.rst b/src/command_modules/azure-cli-servicefabric/HISTORY.rst index 36c02ebb073..9aab7735b63 100644 --- a/src/command_modules/azure-cli-servicefabric/HISTORY.rst +++ b/src/command_modules/azure-cli-servicefabric/HISTORY.rst @@ -2,6 +2,14 @@ Release History =============== +0.1.6 ++++++ +* Minor fixes + +0.1.5 ++++++ +* Minor fixes + 0.1.4 +++++ * Minor fixes diff --git a/src/command_modules/azure-cli-servicefabric/setup.py b/src/command_modules/azure-cli-servicefabric/setup.py index 1e1425397bd..a624ccd4d65 100644 --- a/src/command_modules/azure-cli-servicefabric/setup.py +++ b/src/command_modules/azure-cli-servicefabric/setup.py @@ -16,7 +16,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.1.4" +VERSION = "0.1.6" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -35,10 +35,10 @@ ] DEPENDENCIES = [ - 'azure-graphrbac==0.40.0', + 'azure-graphrbac==0.51.1', 'azure-keyvault==1.1.0', 'azure-mgmt-network==2.2.1', - 'azure-mgmt-compute==4.3.0', + 'azure-mgmt-compute==4.3.1', 'azure-mgmt-storage==2.0.0rc4', 'azure-mgmt-servicefabric==0.2.0', 'azure-mgmt-keyvault==1.1.0', diff --git a/src/command_modules/azure-cli-storage/HISTORY.rst b/src/command_modules/azure-cli-storage/HISTORY.rst index 5b0bb45a122..84c1e34e902 100644 --- a/src/command_modules/azure-cli-storage/HISTORY.rst +++ b/src/command_modules/azure-cli-storage/HISTORY.rst @@ -6,6 +6,7 @@ Release History 2.2.3 +++++ * Fix `az storage cors list` output formatting, all items show correct "Service" key +* `--bypass-immutability-policy` parameter for immutability-policy blocked container deletion 2.2.2 +++++ diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_help.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_help.py index 45fd830e682..bf5bc075981 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_help.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_help.py @@ -100,6 +100,13 @@ text: az storage container create -n MyStorageContainer --fail-on-exist """ +helps['storage container delete'] = """ + type: command + short-summary: Marks the specified container for deletion. + long-summary: > + The container and any blobs contained within it are later deleted during garbage collection. +""" + helps['storage account list'] = """ type: command short-summary: List storage accounts. diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py index b3ca35adc7e..ba1c1dd05e0 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py @@ -370,6 +370,14 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem with self.argument_context('storage container delete') as c: c.argument('fail_not_exist', help='Throw an exception if the container does not exist.') + c.argument('bypass_immutability_policy', action='store_true', help='Bypasses upcoming service behavior that ' + 'will block a container from being deleted if it has a immutability-policy. Specifying this will ' + 'ignore arguments aside from those used to identify the container ("--name", "--account-name").') + c.argument('lease_id', help="If specified, delete_container only succeeds if the container's lease is active " + "and matches this ID. Required if the container has an active lease.") + c.ignore('processed_resource_group') + c.ignore('processed_account_name') + c.ignore('mgmt_client') with self.argument_context('storage container exists') as c: c.ignore('blob_name', 'snapshot') diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py index ba621316d87..37602381327 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py @@ -713,6 +713,20 @@ def _update_progress(current, total): del namespace.no_progress +def process_container_delete_parameters(cmd, namespace): + """Process the parameters for storage container delete command""" + # check whether to use mgmt or data-plane + if namespace.bypass_immutability_policy: + # use management-plane + namespace.processed_account_name = namespace.account_name + namespace.processed_resource_group, namespace.mgmt_client = _query_account_rg( + cmd.cli_ctx, namespace.account_name) + del namespace.auth_mode + else: + # use data-plane, like before + validate_client_parameters(cmd, namespace) + + def process_blob_download_batch_parameters(cmd, namespace): """Process the parameters for storage blob download command""" import os diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py index 8a73521abf5..0195959a356 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py @@ -165,18 +165,19 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DAT g.storage_command_oauth('show', 'get_blob_service_properties', exception_handler=show_exception_handler) with self.command_group('storage container', command_type=block_blob_sdk, - custom_command_type=get_custom_sdk('acl', blob_data_service_factory)) as g: + custom_command_type=get_custom_sdk('blob', blob_data_service_factory)) as g: from azure.cli.command_modules.storage._transformers import (transform_storage_list_output, transform_container_permission_output, transform_acl_list_output) from azure.cli.command_modules.storage._format import (transform_container_list, transform_boolean_for_table, transform_container_show) + from ._validators import process_container_delete_parameters g.storage_command_oauth('list', 'list_containers', transform=transform_storage_list_output, table_transformer=transform_container_list) - g.storage_command_oauth('delete', 'delete_container', - transform=create_boolean_result_output_transformer('deleted'), - table_transformer=transform_boolean_for_table) + g.storage_custom_command_oauth('delete', 'delete_container', validator=process_container_delete_parameters, + transform=create_boolean_result_output_transformer('deleted'), + table_transformer=transform_boolean_for_table) g.storage_command_oauth('show', 'get_container_properties', table_transformer=transform_container_show, exception_handler=show_exception_handler) g.storage_command_oauth('create', 'create_container', @@ -196,6 +197,8 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DAT g.storage_command_oauth('lease change', 'change_container_lease') g.storage_command_oauth('lease break', 'break_container_lease') + with self.command_group('storage container', command_type=block_blob_sdk, + custom_command_type=get_custom_sdk('acl', blob_data_service_factory)) as g: g.storage_custom_command_oauth('policy create', 'create_acl_policy') g.storage_custom_command_oauth('policy delete', 'delete_acl_policy') g.storage_custom_command_oauth('policy update', 'set_acl_policy', min_api='2017-04-17') diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/operations/blob.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/operations/blob.py index ab4950cc41d..e23c08cca36 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/operations/blob.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/operations/blob.py @@ -8,6 +8,7 @@ import os from knack.log import get_logger + from azure.cli.command_modules.storage.util import (create_blob_service_from_storage_client, create_file_share_from_storage_client, create_short_lived_share_sas, @@ -18,6 +19,16 @@ from azure.cli.command_modules.storage.url_quote_util import encode_for_url, make_encoded_file_url_and_params +def delete_container(client, container_name, fail_not_exist=False, lease_id=None, if_modified_since=None, + if_unmodified_since=None, timeout=None, bypass_immutability_policy=False, + processed_resource_group=None, processed_account_name=None, mgmt_client=None): + if bypass_immutability_policy: + return mgmt_client.blob_containers.delete(processed_resource_group, processed_account_name, container_name) + return client.delete_container( + container_name, fail_not_exist=fail_not_exist, lease_id=lease_id, if_modified_since=if_modified_since, + if_unmodified_since=if_unmodified_since, timeout=timeout) + + def set_blob_tier(client, container_name, blob_name, tier, blob_type='block', timeout=None): if blob_type == 'block': return client.set_standard_blob_tier(container_name=container_name, blob_name=blob_name, diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/recordings/test_immutability_policy.yaml b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/recordings/test_immutability_policy.yaml index 77e6064be55..01178f97aa3 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/recordings/test_immutability_policy.yaml +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/recordings/test_immutability_policy.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-08-22T17:36:51Z"}}' + "date": "2018-10-17T04:55:16Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,19 +9,19 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-08-22T17:36:51Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-17T04:55:16Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Wed, 22 Aug 2018 17:36:53 GMT'] + date: ['Wed, 17 Oct 2018 04:55:23 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -36,19 +36,19 @@ interactions: CommandName: [storage account create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-08-22T17:36:51Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-17T04:55:16Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Wed, 22 Aug 2018 17:36:53 GMT'] + date: ['Wed, 17 Oct 2018 04:55:25 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -57,16 +57,17 @@ interactions: status: {code: 200, message: OK} - request: body: '{"sku": {"name": "Standard_RAGRS"}, "kind": "StorageV2", "location": "westus", - "properties": {"supportsHttpsTrafficOnly": false, "isHnsEnabled": false}}' + "properties": {"supportsHttpsTrafficOnly": false}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] CommandName: [storage account create] Connection: [keep-alive] - Content-Length: ['152'] + Content-Length: ['129'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002?api-version=2018-03-01-preview @@ -76,9 +77,9 @@ interactions: cache-control: [no-cache] content-length: ['0'] content-type: [text/plain; charset=utf-8] - date: ['Wed, 22 Aug 2018 17:36:54 GMT'] + date: ['Wed, 17 Oct 2018 04:55:25 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/a0e30f13-8ecc-4417-8d46-abe990814577?monitor=true&api-version=2018-03-01-preview'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/7ba866ee-6c63-475a-9354-02f01e1447f8?monitor=true&api-version=2018-03-01-preview'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0'] @@ -93,17 +94,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [storage account create] Connection: [keep-alive] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/a0e30f13-8ecc-4417-8d46-abe990814577?monitor=true&api-version=2018-03-01-preview + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/7ba866ee-6c63-475a-9354-02f01e1447f8?monitor=true&api-version=2018-03-01-preview response: - body: {string: '{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002","name":"clistorage000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-22T17:36:54.9267813Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-22T17:36:54.9267813Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-22T17:36:54.7702516Z","primaryEndpoints":{"web":"https://clistorage000002.z22.web.core.windows.net/","blob":"https://clistorage000002.blob.core.windows.net/","queue":"https://clistorage000002.queue.core.windows.net/","table":"https://clistorage000002.table.core.windows.net/","file":"https://clistorage000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage000002-secondary.z22.web.core.windows.net/","blob":"https://clistorage000002-secondary.blob.core.windows.net/","queue":"https://clistorage000002-secondary.queue.core.windows.net/","table":"https://clistorage000002-secondary.table.core.windows.net/"}}}'} + body: {string: '{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002","name":"clistorage000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-17T04:55:25.9609573Z","primaryEndpoints":{"dfs":"https://clistorage000002.dfs.core.windows.net/","web":"https://clistorage000002.z22.web.core.windows.net/","blob":"https://clistorage000002.blob.core.windows.net/","queue":"https://clistorage000002.queue.core.windows.net/","table":"https://clistorage000002.table.core.windows.net/","file":"https://clistorage000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorage000002-secondary.dfs.core.windows.net/","web":"https://clistorage000002-secondary.z22.web.core.windows.net/","blob":"https://clistorage000002-secondary.blob.core.windows.net/","queue":"https://clistorage000002-secondary.queue.core.windows.net/","table":"https://clistorage000002-secondary.table.core.windows.net/"}}}'} headers: cache-control: [no-cache] - content-length: ['1688'] + content-length: ['1733'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:11 GMT'] + date: ['Wed, 17 Oct 2018 04:55:43 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -121,26 +123,27 @@ interactions: CommandName: [storage container create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2018-03-01-preview response: - body: {string: '{"value":[{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/amardiag596","name":"amardiag596","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-08T16:10:28.8562508Z","primaryEndpoints":{"blob":"https://amardiag596.blob.core.windows.net/","queue":"https://amardiag596.queue.core.windows.net/","table":"https://amardiag596.table.core.windows.net/","file":"https://amardiag596.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_GRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/nodetest12","name":"nodetest12","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-11T22:34:54.6358258Z","primaryEndpoints":{"web":"https://nodetest12.z13.web.core.windows.net/","blob":"https://nodetest12.blob.core.windows.net/","queue":"https://nodetest12.queue.core.windows.net/","table":"https://nodetest12.table.core.windows.net/","file":"https://nodetest12.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available","secondaryLocation":"westus","statusOfSecondary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgvazkuv27uljwvz2tmnmecw5nuqramhayk7uqkl67gjxfsjfpxhfyxg45cxg2lqz6u/providers/Microsoft.Storage/storageAccounts/clistoragevi5fudbnsq","name":"clistoragevi5fudbnsq","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-14T21:27:33.4336328Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-14T21:27:33.4336328Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-14T21:27:33.3241912Z","primaryEndpoints":{"web":"https://clistoragevi5fudbnsq.z22.web.core.windows.net/","blob":"https://clistoragevi5fudbnsq.blob.core.windows.net/","queue":"https://clistoragevi5fudbnsq.queue.core.windows.net/","table":"https://clistoragevi5fudbnsq.table.core.windows.net/","file":"https://clistoragevi5fudbnsq.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragevi5fudbnsq-secondary.z22.web.core.windows.net/","blob":"https://clistoragevi5fudbnsq-secondary.blob.core.windows.net/","queue":"https://clistoragevi5fudbnsq-secondary.queue.core.windows.net/","table":"https://clistoragevi5fudbnsq-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002","name":"clistorage000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-22T17:36:54.9267813Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-22T17:36:54.9267813Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-22T17:36:54.7702516Z","primaryEndpoints":{"web":"https://clistorage000002.z22.web.core.windows.net/","blob":"https://clistorage000002.blob.core.windows.net/","queue":"https://clistorage000002.queue.core.windows.net/","table":"https://clistorage000002.table.core.windows.net/","file":"https://clistorage000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage000002-secondary.z22.web.core.windows.net/","blob":"https://clistorage000002-secondary.blob.core.windows.net/","queue":"https://clistorage000002-secondary.queue.core.windows.net/","table":"https://clistorage000002-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg6lcblrcfuy56nybdtlwez5kpklvczltjbt5u6yqiamvlkisyw53gbzepfvipm6opr/providers/Microsoft.Storage/storageAccounts/clistoragenwbh6jsk37","name":"clistoragenwbh6jsk37","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-16T00:11:59.1916112Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-16T00:11:59.1916112Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-16T00:11:59.0978516Z","primaryEndpoints":{"web":"https://clistoragenwbh6jsk37.z22.web.core.windows.net/","blob":"https://clistoragenwbh6jsk37.blob.core.windows.net/","queue":"https://clistoragenwbh6jsk37.queue.core.windows.net/","table":"https://clistoragenwbh6jsk37.table.core.windows.net/","file":"https://clistoragenwbh6jsk37.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragenwbh6jsk37-secondary.z22.web.core.windows.net/","blob":"https://clistoragenwbh6jsk37-secondary.blob.core.windows.net/","queue":"https://clistoragenwbh6jsk37-secondary.queue.core.windows.net/","table":"https://clistoragenwbh6jsk37-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_storage_oauthkwfhb7pnnddt3ycm727pz4nhm4metnfwsbresj4lzhn3ehqxlwuzy/providers/Microsoft.Storage/storageAccounts/wilxstorage","name":"wilxstorage","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-21T17:24:01.7728454Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-21T17:24:01.7728454Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-21T17:24:01.5540936Z","primaryEndpoints":{"blob":"https://wilxstorage.blob.core.windows.net/","queue":"https://wilxstorage.queue.core.windows.net/","table":"https://wilxstorage.table.core.windows.net/","file":"https://wilxstorage.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxstorage-secondary.blob.core.windows.net/","queue":"https://wilxstorage-secondary.queue.core.windows.net/","table":"https://wilxstorage-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgxjfd2y6zx7tea3hqe3tqomekc5vxp3tgo6gpuoledm6wo3a2ugtowyy4waukv5rjy/providers/Microsoft.Storage/storageAccounts/clistoragevkmaf7jdkq","name":"clistoragevkmaf7jdkq","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-14T01:00:09.5288450Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-14T01:00:09.5288450Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-14T01:00:09.4192315Z","primaryEndpoints":{"web":"https://clistoragevkmaf7jdkq.z22.web.core.windows.net/","blob":"https://clistoragevkmaf7jdkq.blob.core.windows.net/","queue":"https://clistoragevkmaf7jdkq.queue.core.windows.net/","table":"https://clistoragevkmaf7jdkq.table.core.windows.net/","file":"https://clistoragevkmaf7jdkq.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragevkmaf7jdkq-secondary.z22.web.core.windows.net/","blob":"https://clistoragevkmaf7jdkq-secondary.blob.core.windows.net/","queue":"https://clistoragevkmaf7jdkq-secondary.queue.core.windows.net/","table":"https://clistoragevkmaf7jdkq-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgck524lxhki2ki4rxnew5gl7cjisgc3nch5mdttubhuzu6qbdipbf2uhoe73wtyzhn/providers/Microsoft.Storage/storageAccounts/clistoragehda7raqo3s","name":"clistoragehda7raqo3s","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-16T17:49:00.7139157Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-16T17:49:00.7139157Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-16T17:49:00.4482840Z","primaryEndpoints":{"web":"https://clistoragehda7raqo3s.z22.web.core.windows.net/","blob":"https://clistoragehda7raqo3s.blob.core.windows.net/","queue":"https://clistoragehda7raqo3s.queue.core.windows.net/","table":"https://clistoragehda7raqo3s.table.core.windows.net/","file":"https://clistoragehda7raqo3s.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragehda7raqo3s-secondary.z22.web.core.windows.net/","blob":"https://clistoragehda7raqo3s-secondary.blob.core.windows.net/","queue":"https://clistoragehda7raqo3s-secondary.queue.core.windows.net/","table":"https://clistoragehda7raqo3s-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgmtgeyhv55fxzhqjkb3ynjqw5ljlhjp3btqdavs7hcmx33z7vu6ytan6ere7n5c4x5/providers/Microsoft.Storage/storageAccounts/clistoragejqhqxuct23","name":"clistoragejqhqxuct23","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-10T22:36:17.3820701Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-10T22:36:17.3820701Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-10T22:36:17.2883235Z","primaryEndpoints":{"web":"https://clistoragejqhqxuct23.z22.web.core.windows.net/","blob":"https://clistoragejqhqxuct23.blob.core.windows.net/","queue":"https://clistoragejqhqxuct23.queue.core.windows.net/","table":"https://clistoragejqhqxuct23.table.core.windows.net/","file":"https://clistoragejqhqxuct23.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragejqhqxuct23-secondary.z22.web.core.windows.net/","blob":"https://clistoragejqhqxuct23-secondary.blob.core.windows.net/","queue":"https://clistoragejqhqxuct23-secondary.queue.core.windows.net/","table":"https://clistoragejqhqxuct23-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_storage_oauth6ztipltlhll2u6wjfni5prr6yjzjwrkonduuqjlqoupcxawaglegd/providers/Microsoft.Storage/storageAccounts/clitestsud36sok5pmewtjkz","name":"clitestsud36sok5pmewtjkz","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-21T19:09:31.5624602Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-21T19:09:31.5624602Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-21T19:09:31.4062238Z","primaryEndpoints":{"blob":"https://clitestsud36sok5pmewtjkz.blob.core.windows.net/","queue":"https://clitestsud36sok5pmewtjkz.queue.core.windows.net/","table":"https://clitestsud36sok5pmewtjkz.table.core.windows.net/","file":"https://clitestsud36sok5pmewtjkz.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgpamvtezmteh7zp2bdt3y4idc7mmbzvf6sdzjynqmht26jisd4amljydqqa32zckbx/providers/Microsoft.Storage/storageAccounts/clistoragewr2qjfjhzb","name":"clistoragewr2qjfjhzb","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-16T00:13:04.0707837Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-16T00:13:04.0707837Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-16T00:13:03.9614281Z","primaryEndpoints":{"web":"https://clistoragewr2qjfjhzb.z22.web.core.windows.net/","blob":"https://clistoragewr2qjfjhzb.blob.core.windows.net/","queue":"https://clistoragewr2qjfjhzb.queue.core.windows.net/","table":"https://clistoragewr2qjfjhzb.table.core.windows.net/","file":"https://clistoragewr2qjfjhzb.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragewr2qjfjhzb-secondary.z22.web.core.windows.net/","blob":"https://clistoragewr2qjfjhzb-secondary.blob.core.windows.net/","queue":"https://clistoragewr2qjfjhzb-secondary.queue.core.windows.net/","table":"https://clistoragewr2qjfjhzb-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_storage_oauthkwfhb7pnnddt3ycm727pz4nhm4metnfwsbresj4lzhn3ehqxlwuzy/providers/Microsoft.Storage/storageAccounts/clitestzocjyorjhbmmn7dtg","name":"clitestzocjyorjhbmmn7dtg","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-21T17:23:40.7165925Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-21T17:23:40.7165925Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-21T17:23:40.5915896Z","primaryEndpoints":{"blob":"https://clitestzocjyorjhbmmn7dtg.blob.core.windows.net/","queue":"https://clitestzocjyorjhbmmn7dtg.queue.core.windows.net/","table":"https://clitestzocjyorjhbmmn7dtg.table.core.windows.net/","file":"https://clitestzocjyorjhbmmn7dtg.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgooetcw3locipbmar4742ebvhztivldtfcwdo5kmhnouyr44vufpxzhgplrrvk56gs/providers/Microsoft.Storage/storageAccounts/clistorage5uh2sd5di6","name":"clistorage5uh2sd5di6","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-10T21:53:58.5156654Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-10T21:53:58.5156654Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-10T21:53:58.4219023Z","primaryEndpoints":{"web":"https://clistorage5uh2sd5di6.z22.web.core.windows.net/","blob":"https://clistorage5uh2sd5di6.blob.core.windows.net/","queue":"https://clistorage5uh2sd5di6.queue.core.windows.net/","table":"https://clistorage5uh2sd5di6.table.core.windows.net/","file":"https://clistorage5uh2sd5di6.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage5uh2sd5di6-secondary.z22.web.core.windows.net/","blob":"https://clistorage5uh2sd5di6-secondary.blob.core.windows.net/","queue":"https://clistorage5uh2sd5di6-secondary.queue.core.windows.net/","table":"https://clistorage5uh2sd5di6-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgypr6blmisj5pyxrjphnwbifkmsdyk3igstozydzondjnuhgq2e5zirlvz5rl3n6gk/providers/Microsoft.Storage/storageAccounts/clistorage7de3dm4xlr","name":"clistorage7de3dm4xlr","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-14T20:49:50.7380783Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-14T20:49:50.7380783Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-14T20:49:50.6443644Z","primaryEndpoints":{"web":"https://clistorage7de3dm4xlr.z22.web.core.windows.net/","blob":"https://clistorage7de3dm4xlr.blob.core.windows.net/","queue":"https://clistorage7de3dm4xlr.queue.core.windows.net/","table":"https://clistorage7de3dm4xlr.table.core.windows.net/","file":"https://clistorage7de3dm4xlr.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage7de3dm4xlr-secondary.z22.web.core.windows.net/","blob":"https://clistorage7de3dm4xlr-secondary.blob.core.windows.net/","queue":"https://clistorage7de3dm4xlr-secondary.queue.core.windows.net/","table":"https://clistorage7de3dm4xlr-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgi2biwne2krt426d7syiwaouiedbqykuhgys7oag2c3twjzz4c7pup26vc226txaua/providers/Microsoft.Storage/storageAccounts/clistorageayl5jkq6ty","name":"clistorageayl5jkq6ty","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-14T16:54:41.5707757Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-14T16:54:41.5707757Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-08-14T16:54:41.4614062Z","primaryEndpoints":{"web":"https://clistorageayl5jkq6ty.z22.web.core.windows.net/","blob":"https://clistorageayl5jkq6ty.blob.core.windows.net/","queue":"https://clistorageayl5jkq6ty.queue.core.windows.net/","table":"https://clistorageayl5jkq6ty.table.core.windows.net/","file":"https://clistorageayl5jkq6ty.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorageayl5jkq6ty-secondary.z22.web.core.windows.net/","blob":"https://clistorageayl5jkq6ty-secondary.blob.core.windows.net/","queue":"https://clistorageayl5jkq6ty-secondary.queue.core.windows.net/","table":"https://clistorageayl5jkq6ty-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgwrwfwfeym72qee3nah2tasiw4z3ccr3lo6xnpbdlmiuzm4hs574o7lgzayesgwffv/providers/Microsoft.Storage/storageAccounts/clistoragehhbuuxg3tu","name":"clistoragehhbuuxg3tu","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-27T00:17:56.7015542Z","primaryEndpoints":{"web":"https://clistoragehhbuuxg3tu.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu.table.core.windows.net/","file":"https://clistoragehhbuuxg3tu.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragehhbuuxg3tu-secondary.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu-secondary.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu-secondary.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitestlab1/providers/Microsoft.Storage/storageAccounts/acliautomationlab8902","name":"acliautomationlab8902","type":"Microsoft.Storage/storageAccounts","location":"southcentralus","tags":{"hidden-DevTestLabs-LabUId":"ca9ec547-32c5-422d-b3d2-25906ed71959"},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T16:51:47.2194106Z","primaryEndpoints":{"blob":"https://acliautomationlab8902.blob.core.windows.net/","queue":"https://acliautomationlab8902.queue.core.windows.net/","table":"https://acliautomationlab8902.table.core.windows.net/","file":"https://acliautomationlab8902.file.core.windows.net/"},"primaryLocation":"southcentralus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-eventgridtesting/providers/Microsoft.Storage/storageAccounts/eventgridtestin9c1e","name":"eventgridtestin9c1e","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-30T22:57:10.9915110Z","primaryEndpoints":{"blob":"https://eventgridtestin9c1e.blob.core.windows.net/","queue":"https://eventgridtestin9c1e.queue.core.windows.net/","table":"https://eventgridtestin9c1e.table.core.windows.net/","file":"https://eventgridtestin9c1e.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}},{"sku":{"name":"Premium_LRS","tier":"Premium"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-testcapture/providers/Microsoft.Storage/storageAccounts/lmazueltestcapture451","name":"lmazueltestcapture451","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-06-06T16:46:02.4527298Z","primaryEndpoints":{"blob":"https://lmazueltestcapture451.blob.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxgroup2/providers/Microsoft.Storage/storageAccounts/wilxstorage0","name":"wilxstorage0","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-13T01:05:28.4648959Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-13T01:05:28.4648959Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-04-13T01:05:28.4023820Z","primaryEndpoints":{"dfs":"https://wilxstorage0.dfs.core.windows.net/","web":"https://wilxstorage0.z5.web.core.windows.net/","blob":"https://wilxstorage0.blob.core.windows.net/","queue":"https://wilxstorage0.queue.core.windows.net/","table":"https://wilxstorage0.table.core.windows.net/","file":"https://wilxstorage0.file.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgmr6jo34yofyafj3n6gjbhrgmrd6pwgguthc2u235qfle6y6ztyzrlkuqn544s7cop/providers/Microsoft.Storage/storageAccounts/clitestnlmd52jlcmr4ce7b4","name":"clitestnlmd52jlcmr4ce7b4","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:14:07.3188286Z","primaryEndpoints":{"blob":"https://clitestnlmd52jlcmr4ce7b4.blob.core.windows.net/","queue":"https://clitestnlmd52jlcmr4ce7b4.queue.core.windows.net/","table":"https://clitestnlmd52jlcmr4ce7b4.table.core.windows.net/","file":"https://clitestnlmd52jlcmr4ce7b4.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgpfhep77mmcmcn3afvnvskjk3g27ybc7gq6kh5c6vu7ugy7e3ykawkib6u7st25kbi/providers/Microsoft.Storage/storageAccounts/clitest5o5upfigqe5aenkc3","name":"clitest5o5upfigqe5aenkc3","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-25T01:22:12.5013507Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-25T01:22:12.5013507Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-25T01:22:12.4388487Z","primaryEndpoints":{"blob":"https://clitest5o5upfigqe5aenkc3.blob.core.windows.net/","queue":"https://clitest5o5upfigqe5aenkc3.queue.core.windows.net/","table":"https://clitest5o5upfigqe5aenkc3.table.core.windows.net/","file":"https://clitest5o5upfigqe5aenkc3.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxgroup3/providers/Microsoft.Storage/storageAccounts/wilxstorageworm","name":"wilxstorageworm","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-13T22:36:53.0909769Z","primaryEndpoints":{"blob":"https://wilxstorageworm.blob.core.windows.net/","queue":"https://wilxstorageworm.queue.core.windows.net/","table":"https://wilxstorageworm.table.core.windows.net/","file":"https://wilxstorageworm.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available","secondaryLocation":"centraluseuap","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxstorageworm-secondary.blob.core.windows.net/","queue":"https://wilxstorageworm-secondary.queue.core.windows.net/","table":"https://wilxstorageworm-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgnipcxreywyorqhptpg4lmvsb6sqsef3mezozbrenqq6ufmd3hrh7plmdnorjt5y5x/providers/Microsoft.Storage/storageAccounts/clitestshv4qcdkeictveped","name":"clitestshv4qcdkeictveped","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-14T19:04:11.4311113Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-14T19:04:11.4311113Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-14T19:04:11.3686065Z","primaryEndpoints":{"blob":"https://clitestshv4qcdkeictveped.blob.core.windows.net/","queue":"https://clitestshv4qcdkeictveped.queue.core.windows.net/","table":"https://clitestshv4qcdkeictveped.table.core.windows.net/","file":"https://clitestshv4qcdkeictveped.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgv6extdlzddtno2qf5o37e5g2n2d2x5ah4gq2olmpqezmxibj4h36focak4y6dose7/providers/Microsoft.Storage/storageAccounts/clitestcushmpfbtkste2a2a","name":"clitestcushmpfbtkste2a2a","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-25T01:20:25.1414518Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-25T01:20:25.1414518Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-25T01:20:25.0780033Z","primaryEndpoints":{"blob":"https://clitestcushmpfbtkste2a2a.blob.core.windows.net/","queue":"https://clitestcushmpfbtkste2a2a.queue.core.windows.net/","table":"https://clitestcushmpfbtkste2a2a.table.core.windows.net/","file":"https://clitestcushmpfbtkste2a2a.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg326oxnqqn33y3n42vz6x5xol5rvvw3z4o6tladwwtkmcntnsxhhxxtddtrxwm2edj/providers/Microsoft.Storage/storageAccounts/clitestjwzkdsfuou3niutbd","name":"clitestjwzkdsfuou3niutbd","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:07:33.0552270Z","primaryEndpoints":{"blob":"https://clitestjwzkdsfuou3niutbd.blob.core.windows.net/","queue":"https://clitestjwzkdsfuou3niutbd.queue.core.windows.net/","table":"https://clitestjwzkdsfuou3niutbd.table.core.windows.net/","file":"https://clitestjwzkdsfuou3niutbd.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgldagdmcl4pklmwzmr3wftx2kidhw7johz6d7tl6m7raetzzfhpqhrfffu5vwqtfxo/providers/Microsoft.Storage/storageAccounts/clitestt6pqb7xneswrh2sp6","name":"clitestt6pqb7xneswrh2sp6","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T17:51:14.8730435Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T17:51:14.8730435Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T17:51:14.8105336Z","primaryEndpoints":{"blob":"https://clitestt6pqb7xneswrh2sp6.blob.core.windows.net/","queue":"https://clitestt6pqb7xneswrh2sp6.queue.core.windows.net/","table":"https://clitestt6pqb7xneswrh2sp6.table.core.windows.net/","file":"https://clitestt6pqb7xneswrh2sp6.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgf3er5m4irbxsxhyil42jxq3t5ehzphmdzn2gortdlrzyw4i6tlgswx2xrcgldp6oh/providers/Microsoft.Storage/storageAccounts/clitestpabilv4yd6qxvguml","name":"clitestpabilv4yd6qxvguml","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T19:20:22.2758006Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T19:20:22.2758006Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T19:20:22.2445526Z","primaryEndpoints":{"blob":"https://clitestpabilv4yd6qxvguml.blob.core.windows.net/","queue":"https://clitestpabilv4yd6qxvguml.queue.core.windows.net/","table":"https://clitestpabilv4yd6qxvguml.table.core.windows.net/","file":"https://clitestpabilv4yd6qxvguml.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgjzhnckmw5ftoqmm2b5gezwgslvfm2dqg7ldpwvuukicy7ca4unquohsptfrbddr2a/providers/Microsoft.Storage/storageAccounts/clitestvjlqxa4ctzkwwpg4b","name":"clitestvjlqxa4ctzkwwpg4b","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-29T19:38:19.5634738Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-29T19:38:19.5634738Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-29T19:38:19.5165939Z","primaryEndpoints":{"blob":"https://clitestvjlqxa4ctzkwwpg4b.blob.core.windows.net/","queue":"https://clitestvjlqxa4ctzkwwpg4b.queue.core.windows.net/","table":"https://clitestvjlqxa4ctzkwwpg4b.table.core.windows.net/","file":"https://clitestvjlqxa4ctzkwwpg4b.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgwxiadyatfxsixayqfinia7ybjwo5cfoyw65qpuna3alx3x2diwukx4tkcpwir2mbq/providers/Microsoft.Storage/storageAccounts/clitesta2lvllqz23rgasyf7","name":"clitesta2lvllqz23rgasyf7","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T17:57:25.6818153Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T17:57:25.6818153Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T17:57:25.6193002Z","primaryEndpoints":{"blob":"https://clitesta2lvllqz23rgasyf7.blob.core.windows.net/","queue":"https://clitesta2lvllqz23rgasyf7.queue.core.windows.net/","table":"https://clitesta2lvllqz23rgasyf7.table.core.windows.net/","file":"https://clitesta2lvllqz23rgasyf7.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgoo2qxqtbb56w7uujqzhodrozdh7fxg5wxscql4ndybxkardgqzqvheltadic2zoxf/providers/Microsoft.Storage/storageAccounts/clitestfyixx74gs3loj3isf","name":"clitestfyixx74gs3loj3isf","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:34:26.6293927Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:34:26.6293927Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:34:26.5668681Z","primaryEndpoints":{"blob":"https://clitestfyixx74gs3loj3isf.blob.core.windows.net/","queue":"https://clitestfyixx74gs3loj3isf.queue.core.windows.net/","table":"https://clitestfyixx74gs3loj3isf.table.core.windows.net/","file":"https://clitestfyixx74gs3loj3isf.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg6xf4idvnxclgamrcp2ezv54qhk3doyffriwiegbm7ouxjbfmd2cj7izni3bhdv4wf/providers/Microsoft.Storage/storageAccounts/clitestoj23vdhimampujgji","name":"clitestoj23vdhimampujgji","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-15T02:09:49.4622185Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-15T02:09:49.4622185Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-15T02:09:49.3684695Z","primaryEndpoints":{"blob":"https://clitestoj23vdhimampujgji.blob.core.windows.net/","queue":"https://clitestoj23vdhimampujgji.queue.core.windows.net/","table":"https://clitestoj23vdhimampujgji.table.core.windows.net/","file":"https://clitestoj23vdhimampujgji.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgd5ygu6mbq43qw57ncgznekmhwaqlrowjc6dggyk2h6cfwioigvtt3bg7ayqckcwvk/providers/Microsoft.Storage/storageAccounts/clitestixsogcl5p5af5w2p3","name":"clitestixsogcl5p5af5w2p3","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T18:00:02.2397791Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T18:00:02.2397791Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T18:00:02.2087326Z","primaryEndpoints":{"blob":"https://clitestixsogcl5p5af5w2p3.blob.core.windows.net/","queue":"https://clitestixsogcl5p5af5w2p3.queue.core.windows.net/","table":"https://clitestixsogcl5p5af5w2p3.table.core.windows.net/","file":"https://clitestixsogcl5p5af5w2p3.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgeyg7p46zydk24opv23uowejjybhvp2nqcyqpnmknbs7o3w5c3tocuuygkogbvxz5f/providers/Microsoft.Storage/storageAccounts/clitestcrdofae6jvibomf2w","name":"clitestcrdofae6jvibomf2w","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-20T01:19:55.8214506Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-20T01:19:55.8214506Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-20T01:19:55.7120798Z","primaryEndpoints":{"blob":"https://clitestcrdofae6jvibomf2w.blob.core.windows.net/","queue":"https://clitestcrdofae6jvibomf2w.queue.core.windows.net/","table":"https://clitestcrdofae6jvibomf2w.table.core.windows.net/","file":"https://clitestcrdofae6jvibomf2w.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgeblmtd6pv6car44ga6qwvicwjyuxydhhkaharam4nad6uekgqgm2uiisw7v4a3czx/providers/Microsoft.Storage/storageAccounts/clitestcdx4bwlcvgviotc2p","name":"clitestcdx4bwlcvgviotc2p","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T22:26:49.0369320Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T22:26:49.0369320Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T22:26:48.9744081Z","primaryEndpoints":{"blob":"https://clitestcdx4bwlcvgviotc2p.blob.core.windows.net/","queue":"https://clitestcdx4bwlcvgviotc2p.queue.core.windows.net/","table":"https://clitestcdx4bwlcvgviotc2p.table.core.windows.net/","file":"https://clitestcdx4bwlcvgviotc2p.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}}]}'} + body: {string: '{"value":[{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/amardiag596","name":"amardiag596","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-08T16:10:28.8562508Z","primaryEndpoints":{"blob":"https://amardiag596.blob.core.windows.net/","queue":"https://amardiag596.queue.core.windows.net/","table":"https://amardiag596.table.core.windows.net/","file":"https://amardiag596.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_GRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/nodetest12","name":"nodetest12","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-11T22:34:54.6358258Z","primaryEndpoints":{"dfs":"https://nodetest12.dfs.core.windows.net/","web":"https://nodetest12.z13.web.core.windows.net/","blob":"https://nodetest12.blob.core.windows.net/","queue":"https://nodetest12.queue.core.windows.net/","table":"https://nodetest12.table.core.windows.net/","file":"https://nodetest12.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available","secondaryLocation":"westus","statusOfSecondary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgneuacqttufmkpgch7zg7xge3ci3pvsexkawxdv4xcjzuw5bwjjlz6uplznillxgwb/providers/Microsoft.Storage/storageAccounts/clistorageuxtcmjfo3r","name":"clistorageuxtcmjfo3r","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:30:43.8588701Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:30:43.8588701Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T00:30:43.7488876Z","primaryEndpoints":{"dfs":"https://clistorageuxtcmjfo3r.dfs.core.windows.net/","web":"https://clistorageuxtcmjfo3r.z22.web.core.windows.net/","blob":"https://clistorageuxtcmjfo3r.blob.core.windows.net/","queue":"https://clistorageuxtcmjfo3r.queue.core.windows.net/","table":"https://clistorageuxtcmjfo3r.table.core.windows.net/","file":"https://clistorageuxtcmjfo3r.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorageuxtcmjfo3r-secondary.dfs.core.windows.net/","web":"https://clistorageuxtcmjfo3r-secondary.z22.web.core.windows.net/","blob":"https://clistorageuxtcmjfo3r-secondary.blob.core.windows.net/","queue":"https://clistorageuxtcmjfo3r-secondary.queue.core.windows.net/","table":"https://clistorageuxtcmjfo3r-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rggcbozcaoqcvyxyhsax7bevei6phf6m6yk2u4m3m2wjn7qqhph2c5dqyz2vrar2fz6/providers/Microsoft.Storage/storageAccounts/clistoragetif6h64z3n","name":"clistoragetif6h64z3n","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:22:59.7063780Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:22:59.7063780Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T00:22:59.6125763Z","primaryEndpoints":{"dfs":"https://clistoragetif6h64z3n.dfs.core.windows.net/","web":"https://clistoragetif6h64z3n.z22.web.core.windows.net/","blob":"https://clistoragetif6h64z3n.blob.core.windows.net/","queue":"https://clistoragetif6h64z3n.queue.core.windows.net/","table":"https://clistoragetif6h64z3n.table.core.windows.net/","file":"https://clistoragetif6h64z3n.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistoragetif6h64z3n-secondary.dfs.core.windows.net/","web":"https://clistoragetif6h64z3n-secondary.z22.web.core.windows.net/","blob":"https://clistoragetif6h64z3n-secondary.blob.core.windows.net/","queue":"https://clistoragetif6h64z3n-secondary.queue.core.windows.net/","table":"https://clistoragetif6h64z3n-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxtest/providers/Microsoft.Storage/storageAccounts/wilxtesting","name":"wilxtesting","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-28T17:41:10.2771663Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-28T17:41:10.2771663Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-28T17:41:10.1061835Z","primaryEndpoints":{"blob":"https://wilxtesting.blob.core.windows.net/","queue":"https://wilxtesting.queue.core.windows.net/","table":"https://wilxtesting.table.core.windows.net/","file":"https://wilxtesting.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxtesting-secondary.blob.core.windows.net/","queue":"https://wilxtesting-secondary.queue.core.windows.net/","table":"https://wilxtesting-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg7f5jjgz2vniqujmnobv3ud4j3fhjsoao7bcimizgbjspg5nwlr72qugdtfgo7ovn6/providers/Microsoft.Storage/storageAccounts/clistorageqjqpu42bh7","name":"clistorageqjqpu42bh7","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T17:18:13.9931194Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T17:18:13.9931194Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T17:18:13.8993652Z","primaryEndpoints":{"dfs":"https://clistorageqjqpu42bh7.dfs.core.windows.net/","web":"https://clistorageqjqpu42bh7.z22.web.core.windows.net/","blob":"https://clistorageqjqpu42bh7.blob.core.windows.net/","queue":"https://clistorageqjqpu42bh7.queue.core.windows.net/","table":"https://clistorageqjqpu42bh7.table.core.windows.net/","file":"https://clistorageqjqpu42bh7.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorageqjqpu42bh7-secondary.dfs.core.windows.net/","web":"https://clistorageqjqpu42bh7-secondary.z22.web.core.windows.net/","blob":"https://clistorageqjqpu42bh7-secondary.blob.core.windows.net/","queue":"https://clistorageqjqpu42bh7-secondary.queue.core.windows.net/","table":"https://clistorageqjqpu42bh7-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rglwtxxxotabpblyephsiknmarmfjl325ixoojyprquq6ehxx5b2wokoysglc4meehl/providers/Microsoft.Storage/storageAccounts/clistorage2jbmemj6cj","name":"clistorage2jbmemj6cj","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-09-12T19:25:59.1461511Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-09-12T19:25:59.1461511Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-09-12T19:25:58.8961261Z","primaryEndpoints":{"web":"https://clistorage2jbmemj6cj.z22.web.core.windows.net/","blob":"https://clistorage2jbmemj6cj.blob.core.windows.net/","queue":"https://clistorage2jbmemj6cj.queue.core.windows.net/","table":"https://clistorage2jbmemj6cj.table.core.windows.net/","file":"https://clistorage2jbmemj6cj.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage2jbmemj6cj-secondary.z22.web.core.windows.net/","blob":"https://clistorage2jbmemj6cj-secondary.blob.core.windows.net/","queue":"https://clistorage2jbmemj6cj-secondary.queue.core.windows.net/","table":"https://clistorage2jbmemj6cj-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002","name":"clistorage000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-17T04:55:25.9609573Z","primaryEndpoints":{"dfs":"https://clistorage000002.dfs.core.windows.net/","web":"https://clistorage000002.z22.web.core.windows.net/","blob":"https://clistorage000002.blob.core.windows.net/","queue":"https://clistorage000002.queue.core.windows.net/","table":"https://clistorage000002.table.core.windows.net/","file":"https://clistorage000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorage000002-secondary.dfs.core.windows.net/","web":"https://clistorage000002-secondary.z22.web.core.windows.net/","blob":"https://clistorage000002-secondary.blob.core.windows.net/","queue":"https://clistorage000002-secondary.queue.core.windows.net/","table":"https://clistorage000002-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgwrwfwfeym72qee3nah2tasiw4z3ccr3lo6xnpbdlmiuzm4hs574o7lgzayesgwffv/providers/Microsoft.Storage/storageAccounts/clistoragehhbuuxg3tu","name":"clistoragehhbuuxg3tu","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-27T00:17:56.7015542Z","primaryEndpoints":{"web":"https://clistoragehhbuuxg3tu.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu.table.core.windows.net/","file":"https://clistoragehhbuuxg3tu.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragehhbuuxg3tu-secondary.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu-secondary.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu-secondary.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitestlab1/providers/Microsoft.Storage/storageAccounts/acliautomationlab8902","name":"acliautomationlab8902","type":"Microsoft.Storage/storageAccounts","location":"southcentralus","tags":{"hidden-DevTestLabs-LabUId":"ca9ec547-32c5-422d-b3d2-25906ed71959"},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T16:51:47.2194106Z","primaryEndpoints":{"blob":"https://acliautomationlab8902.blob.core.windows.net/","queue":"https://acliautomationlab8902.queue.core.windows.net/","table":"https://acliautomationlab8902.table.core.windows.net/","file":"https://acliautomationlab8902.file.core.windows.net/"},"primaryLocation":"southcentralus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-eventgridtesting/providers/Microsoft.Storage/storageAccounts/eventgridtestin9c1e","name":"eventgridtestin9c1e","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-30T22:57:10.9915110Z","primaryEndpoints":{"blob":"https://eventgridtestin9c1e.blob.core.windows.net/","queue":"https://eventgridtestin9c1e.queue.core.windows.net/","table":"https://eventgridtestin9c1e.table.core.windows.net/","file":"https://eventgridtestin9c1e.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}},{"sku":{"name":"Premium_LRS","tier":"Premium"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-testcapture/providers/Microsoft.Storage/storageAccounts/lmazueltestcapture451","name":"lmazueltestcapture451","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-06-06T16:46:02.4527298Z","primaryEndpoints":{"blob":"https://lmazueltestcapture451.blob.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxrem/providers/Microsoft.Storage/storageAccounts/wilxremove","name":"wilxremove","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:14:24.6500957Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:14:24.6500957Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-16T00:14:24.5719341Z","primaryEndpoints":{"blob":"https://wilxremove.blob.core.windows.net/","queue":"https://wilxremove.queue.core.windows.net/","table":"https://wilxremove.table.core.windows.net/","file":"https://wilxremove.file.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available","secondaryLocation":"westcentralus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxremove-secondary.blob.core.windows.net/","queue":"https://wilxremove-secondary.queue.core.windows.net/","table":"https://wilxremove-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxgroup3/providers/Microsoft.Storage/storageAccounts/wilxstorageworm","name":"wilxstorageworm","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-04-13T22:36:53.0909769Z","primaryEndpoints":{"web":"https://wilxstorageworm.z3.web.core.windows.net/","blob":"https://wilxstorageworm.blob.core.windows.net/","queue":"https://wilxstorageworm.queue.core.windows.net/","table":"https://wilxstorageworm.table.core.windows.net/","file":"https://wilxstorageworm.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available","secondaryLocation":"centraluseuap","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://wilxstorageworm-secondary.z3.web.core.windows.net/","blob":"https://wilxstorageworm-secondary.blob.core.windows.net/","queue":"https://wilxstorageworm-secondary.queue.core.windows.net/","table":"https://wilxstorageworm-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg326oxnqqn33y3n42vz6x5xol5rvvw3z4o6tladwwtkmcntnsxhhxxtddtrxwm2edj/providers/Microsoft.Storage/storageAccounts/clitestjwzkdsfuou3niutbd","name":"clitestjwzkdsfuou3niutbd","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:07:33.0552270Z","primaryEndpoints":{"blob":"https://clitestjwzkdsfuou3niutbd.blob.core.windows.net/","queue":"https://clitestjwzkdsfuou3niutbd.queue.core.windows.net/","table":"https://clitestjwzkdsfuou3niutbd.table.core.windows.net/","file":"https://clitestjwzkdsfuou3niutbd.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgmr6jo34yofyafj3n6gjbhrgmrd6pwgguthc2u235qfle6y6ztyzrlkuqn544s7cop/providers/Microsoft.Storage/storageAccounts/clitestnlmd52jlcmr4ce7b4","name":"clitestnlmd52jlcmr4ce7b4","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:14:07.3188286Z","primaryEndpoints":{"blob":"https://clitestnlmd52jlcmr4ce7b4.blob.core.windows.net/","queue":"https://clitestnlmd52jlcmr4ce7b4.queue.core.windows.net/","table":"https://clitestnlmd52jlcmr4ce7b4.table.core.windows.net/","file":"https://clitestnlmd52jlcmr4ce7b4.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}}]}'} headers: cache-control: [no-cache] - content-length: ['48228'] + content-length: ['22054'] content-type: [application/json; charset=utf-8] - date: ['Wed, 22 Aug 2018 17:37:13 GMT'] + date: ['Wed, 17 Oct 2018 04:55:45 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-original-request-ids: [45defc3f-fc99-4844-908d-e7f88a72e104, 9df7f503-7e95-494b-8826-ed9c1a9e3e19, - a1ab59a2-fbbf-4988-b685-546b44e52768, 3f9223bf-a8c0-430c-af1c-5816290faa35, - 36771790-3046-4616-8164-9ddcc6f19182, 8a0a00ee-eb2c-4190-aeda-f64fe19cd9dc] + x-ms-original-request-ids: [4b49a60c-bad5-4995-804b-439fb0dafbb6, f5902ef4-ca9c-4ee7-b4c9-cd61c24acb93, + 1d63acd5-8e4f-46f3-804a-70782bd866ab, 2947d1f8-a00b-4c92-b281-e88ab1bb9d82, + 2dcf76dc-3c4a-4e41-b8e3-6730d57ff5e1, b9e4f17e-7e14-4db3-be21-28df49147457] status: {code: 200, message: OK} - request: body: null @@ -151,18 +154,21 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/listKeys?api-version=2018-03-01-preview response: - body: {string: '{"keys":[{"keyName":"key1","value":"IUj+354ZI9CmQAxG+1Guflleq2dYe6VSjc5Ouwhj2bhAsnjvuX3W98jEDlZ060VQiH2kePHKY4d50GNrgP0XNw==","permissions":"FULL"},{"keyName":"key2","value":"EPb5k41e2M88aSEv79aKuhWc/XqJRK1kCeLqMl+mLk8Ab53qn7LNq68XKeQ2GCJ7D7inG08yDkIGWbkshHRbBQ==","permissions":"FULL"}]}'} + body: {string: '{"keys": [{"keyName": "key1", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}, {"keyName": "key2", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}]}'} headers: cache-control: [no-cache] content-length: ['288'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:14 GMT'] + date: ['Wed, 17 Oct 2018 04:55:45 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -178,17 +184,18 @@ interactions: headers: Connection: [keep-alive] Content-Length: ['0'] - User-Agent: [Azure-Storage/1.3.0-1.3.1 (Python CPython 3.6.5; Windows 10) AZURECLI/2.0.45] - x-ms-date: ['Wed, 22 Aug 2018 17:37:14 GMT'] + User-Agent: [Azure-Storage/1.3.0-1.3.1 (Python CPython 3.6.2; Darwin 16.7.0) + AZURECLI/2.0.49] + x-ms-date: ['Wed, 17 Oct 2018 04:55:41 GMT'] x-ms-version: ['2018-03-28'] method: PUT uri: https://clistorage000002.blob.core.windows.net/container1?restype=container response: body: {string: ''} headers: - date: ['Wed, 22 Aug 2018 17:37:14 GMT'] - etag: ['"0x8D60855E67D7C70"'] - last-modified: ['Wed, 22 Aug 2018 17:37:15 GMT'] + date: ['Wed, 17 Oct 2018 04:55:46 GMT'] + etag: ['"0x8D633ECCD060826"'] + last-modified: ['Wed, 17 Oct 2018 04:55:46 GMT'] server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0] transfer-encoding: [chunked] x-ms-version: ['2018-03-28'] @@ -202,19 +209,20 @@ interactions: Connection: [keep-alive] Content-Length: ['60'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855e73a600c\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633eccde97820\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} headers: cache-control: [no-cache] content-length: ['498'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:16 GMT'] - etag: ['"8d60855e73a600c"'] + date: ['Wed, 17 Oct 2018 04:55:47 GMT'] + etag: ['"8d633eccde97820"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -233,19 +241,20 @@ interactions: CommandName: [storage container immutability-policy show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855e73a600c\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633eccde97820\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} headers: cache-control: [no-cache] content-length: ['498'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:16 GMT'] - etag: ['"8d60855e73a600c"'] + date: ['Wed, 17 Oct 2018 04:55:48 GMT'] + etag: ['"8d633eccde97820"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -264,20 +273,21 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - If-Match: ['"8d60855e73a600c"'] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + If-Match: ['"8d633eccde97820"'] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855e85adec8\"","properties":{"immutabilityPeriodSinceCreationInDays":0,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633eccf16de92\"","properties":{"immutabilityPeriodSinceCreationInDays":0,"state":"Deleted"}}'} headers: cache-control: [no-cache] - content-length: ['498'] + content-length: ['497'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:18 GMT'] - etag: ['"8d60855e85adec8"'] + date: ['Wed, 17 Oct 2018 04:55:49 GMT'] + etag: ['"8d633eccf16de92"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -296,18 +306,19 @@ interactions: CommandName: [storage container immutability-policy show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"","properties":{"immutabilityPeriodSinceCreationInDays":0,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"","properties":{"immutabilityPeriodSinceCreationInDays":0,"state":"Deleted"}}'} headers: cache-control: [no-cache] - content-length: ['479'] + content-length: ['478'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:18 GMT'] + date: ['Wed, 17 Oct 2018 04:55:50 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -326,19 +337,20 @@ interactions: Connection: [keep-alive] Content-Length: ['60'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855e952d37c\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633ecd00ed471\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} headers: cache-control: [no-cache] content-length: ['498'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:19 GMT'] - etag: ['"8d60855e952d37c"'] + date: ['Wed, 17 Oct 2018 04:55:51 GMT'] + etag: ['"8d633ecd00ed471"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -357,19 +369,20 @@ interactions: CommandName: [storage container immutability-policy show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855e952d37c\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633ecd00ed471\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Unlocked"}}'} headers: cache-control: [no-cache] content-length: ['498'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:20 GMT'] - etag: ['"8d60855e952d37c"'] + date: ['Wed, 17 Oct 2018 04:55:51 GMT'] + etag: ['"8d633ecd00ed471"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -388,20 +401,21 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - If-Match: ['"8d60855e952d37c"'] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + If-Match: ['"8d633ecd00ed471"'] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default/lock?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855ea24a2a0\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Locked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633ecd0e56624\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Locked"}}'} headers: cache-control: [no-cache] content-length: ['496'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:21 GMT'] - etag: ['"8d60855ea24a2a0"'] + date: ['Wed, 17 Oct 2018 04:55:52 GMT'] + etag: ['"8d633ecd0e56624"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -420,19 +434,20 @@ interactions: CommandName: [storage container immutability-policy show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855ea24a2a0\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Locked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633ecd0e56624\"","properties":{"immutabilityPeriodSinceCreationInDays":1,"state":"Locked"}}'} headers: cache-control: [no-cache] content-length: ['496'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:21 GMT'] - etag: ['"8d60855ea24a2a0"'] + date: ['Wed, 17 Oct 2018 04:55:52 GMT'] + etag: ['"8d633ecd0e56624"'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -451,9 +466,10 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - If-Match: ['"8d60855ea24a2a0"'] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + If-Match: ['"8d633ecd0e56624"'] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default?api-version=2018-03-01-preview @@ -464,7 +480,7 @@ interactions: cache-control: [no-cache] content-length: ['132'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:23 GMT'] + date: ['Wed, 17 Oct 2018 04:55:54 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -482,20 +498,85 @@ interactions: Connection: [keep-alive] Content-Length: ['60'] Content-Type: [application/json; charset=utf-8] - If-Match: ['"8d60855ea24a2a0"'] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python AZURECLI/2.0.45] + If-Match: ['"8d633ecd0e56624"'] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default/extend?api-version=2018-03-01-preview response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d60855ebff17c8\"","properties":{"immutabilityPeriodSinceCreationInDays":2,"state":"Locked"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/blobServices/default/containers/container1/immutabilityPolicies/default","name":"default","type":"Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies","etag":"\"8d633ecd265873c\"","properties":{"immutabilityPeriodSinceCreationInDays":2,"state":"Locked"}}'} headers: cache-control: [no-cache] content-length: ['496'] content-type: [application/json] - date: ['Wed, 22 Aug 2018 17:37:23 GMT'] - etag: ['"8d60855ebff17c8"'] + date: ['Wed, 17 Oct 2018 04:55:55 GMT'] + etag: ['"8d633ecd265873c"'] + expires: ['-1'] + pragma: [no-cache] + server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 + Microsoft-HTTPAPI/2.0'] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage container delete] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2018-03-01-preview + response: + body: {string: '{"value":[{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/amardiag596","name":"amardiag596","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-08T16:10:29.0593763Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-08T16:10:28.8562508Z","primaryEndpoints":{"blob":"https://amardiag596.blob.core.windows.net/","queue":"https://amardiag596.queue.core.windows.net/","table":"https://amardiag596.table.core.windows.net/","file":"https://amardiag596.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_GRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/amar/providers/Microsoft.Storage/storageAccounts/nodetest12","name":"nodetest12","type":"Microsoft.Storage/storageAccounts","location":"eastus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-11T22:34:54.8545695Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-11T22:34:54.6358258Z","primaryEndpoints":{"dfs":"https://nodetest12.dfs.core.windows.net/","web":"https://nodetest12.z13.web.core.windows.net/","blob":"https://nodetest12.blob.core.windows.net/","queue":"https://nodetest12.queue.core.windows.net/","table":"https://nodetest12.table.core.windows.net/","file":"https://nodetest12.file.core.windows.net/"},"primaryLocation":"eastus","statusOfPrimary":"available","secondaryLocation":"westus","statusOfSecondary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgneuacqttufmkpgch7zg7xge3ci3pvsexkawxdv4xcjzuw5bwjjlz6uplznillxgwb/providers/Microsoft.Storage/storageAccounts/clistorageuxtcmjfo3r","name":"clistorageuxtcmjfo3r","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:30:43.8588701Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:30:43.8588701Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T00:30:43.7488876Z","primaryEndpoints":{"dfs":"https://clistorageuxtcmjfo3r.dfs.core.windows.net/","web":"https://clistorageuxtcmjfo3r.z22.web.core.windows.net/","blob":"https://clistorageuxtcmjfo3r.blob.core.windows.net/","queue":"https://clistorageuxtcmjfo3r.queue.core.windows.net/","table":"https://clistorageuxtcmjfo3r.table.core.windows.net/","file":"https://clistorageuxtcmjfo3r.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorageuxtcmjfo3r-secondary.dfs.core.windows.net/","web":"https://clistorageuxtcmjfo3r-secondary.z22.web.core.windows.net/","blob":"https://clistorageuxtcmjfo3r-secondary.blob.core.windows.net/","queue":"https://clistorageuxtcmjfo3r-secondary.queue.core.windows.net/","table":"https://clistorageuxtcmjfo3r-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rggcbozcaoqcvyxyhsax7bevei6phf6m6yk2u4m3m2wjn7qqhph2c5dqyz2vrar2fz6/providers/Microsoft.Storage/storageAccounts/clistoragetif6h64z3n","name":"clistoragetif6h64z3n","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:22:59.7063780Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:22:59.7063780Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T00:22:59.6125763Z","primaryEndpoints":{"dfs":"https://clistoragetif6h64z3n.dfs.core.windows.net/","web":"https://clistoragetif6h64z3n.z22.web.core.windows.net/","blob":"https://clistoragetif6h64z3n.blob.core.windows.net/","queue":"https://clistoragetif6h64z3n.queue.core.windows.net/","table":"https://clistoragetif6h64z3n.table.core.windows.net/","file":"https://clistoragetif6h64z3n.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistoragetif6h64z3n-secondary.dfs.core.windows.net/","web":"https://clistoragetif6h64z3n-secondary.z22.web.core.windows.net/","blob":"https://clistoragetif6h64z3n-secondary.blob.core.windows.net/","queue":"https://clistoragetif6h64z3n-secondary.queue.core.windows.net/","table":"https://clistoragetif6h64z3n-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxtest/providers/Microsoft.Storage/storageAccounts/wilxtesting","name":"wilxtesting","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-08-28T17:41:10.2771663Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-08-28T17:41:10.2771663Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-08-28T17:41:10.1061835Z","primaryEndpoints":{"blob":"https://wilxtesting.blob.core.windows.net/","queue":"https://wilxtesting.queue.core.windows.net/","table":"https://wilxtesting.table.core.windows.net/","file":"https://wilxtesting.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxtesting-secondary.blob.core.windows.net/","queue":"https://wilxtesting-secondary.queue.core.windows.net/","table":"https://wilxtesting-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg7f5jjgz2vniqujmnobv3ud4j3fhjsoao7bcimizgbjspg5nwlr72qugdtfgo7ovn6/providers/Microsoft.Storage/storageAccounts/clistorageqjqpu42bh7","name":"clistorageqjqpu42bh7","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T17:18:13.9931194Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T17:18:13.9931194Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-16T17:18:13.8993652Z","primaryEndpoints":{"dfs":"https://clistorageqjqpu42bh7.dfs.core.windows.net/","web":"https://clistorageqjqpu42bh7.z22.web.core.windows.net/","blob":"https://clistorageqjqpu42bh7.blob.core.windows.net/","queue":"https://clistorageqjqpu42bh7.queue.core.windows.net/","table":"https://clistorageqjqpu42bh7.table.core.windows.net/","file":"https://clistorageqjqpu42bh7.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorageqjqpu42bh7-secondary.dfs.core.windows.net/","web":"https://clistorageqjqpu42bh7-secondary.z22.web.core.windows.net/","blob":"https://clistorageqjqpu42bh7-secondary.blob.core.windows.net/","queue":"https://clistorageqjqpu42bh7-secondary.queue.core.windows.net/","table":"https://clistorageqjqpu42bh7-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rglwtxxxotabpblyephsiknmarmfjl325ixoojyprquq6ehxx5b2wokoysglc4meehl/providers/Microsoft.Storage/storageAccounts/clistorage2jbmemj6cj","name":"clistorage2jbmemj6cj","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-09-12T19:25:59.1461511Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-09-12T19:25:59.1461511Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-09-12T19:25:58.8961261Z","primaryEndpoints":{"web":"https://clistorage2jbmemj6cj.z22.web.core.windows.net/","blob":"https://clistorage2jbmemj6cj.blob.core.windows.net/","queue":"https://clistorage2jbmemj6cj.queue.core.windows.net/","table":"https://clistorage2jbmemj6cj.table.core.windows.net/","file":"https://clistorage2jbmemj6cj.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistorage2jbmemj6cj-secondary.z22.web.core.windows.net/","blob":"https://clistorage2jbmemj6cj-secondary.blob.core.windows.net/","queue":"https://clistorage2jbmemj6cj-secondary.queue.core.windows.net/","table":"https://clistorage2jbmemj6cj-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002","name":"clistorage000002","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-17T04:55:26.0551771Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-10-17T04:55:25.9609573Z","primaryEndpoints":{"dfs":"https://clistorage000002.dfs.core.windows.net/","web":"https://clistorage000002.z22.web.core.windows.net/","blob":"https://clistorage000002.blob.core.windows.net/","queue":"https://clistorage000002.queue.core.windows.net/","table":"https://clistorage000002.table.core.windows.net/","file":"https://clistorage000002.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"dfs":"https://clistorage000002-secondary.dfs.core.windows.net/","web":"https://clistorage000002-secondary.z22.web.core.windows.net/","blob":"https://clistorage000002-secondary.blob.core.windows.net/","queue":"https://clistorage000002-secondary.queue.core.windows.net/","table":"https://clistorage000002-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgwrwfwfeym72qee3nah2tasiw4z3ccr3lo6xnpbdlmiuzm4hs574o7lgzayesgwffv/providers/Microsoft.Storage/storageAccounts/clistoragehhbuuxg3tu","name":"clistoragehhbuuxg3tu","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-27T00:17:56.8422453Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-06-27T00:17:56.7015542Z","primaryEndpoints":{"web":"https://clistoragehhbuuxg3tu.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu.table.core.windows.net/","file":"https://clistoragehhbuuxg3tu.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available","secondaryLocation":"eastus","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://clistoragehhbuuxg3tu-secondary.z22.web.core.windows.net/","blob":"https://clistoragehhbuuxg3tu-secondary.blob.core.windows.net/","queue":"https://clistoragehhbuuxg3tu-secondary.queue.core.windows.net/","table":"https://clistoragehhbuuxg3tu-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitestlab1/providers/Microsoft.Storage/storageAccounts/acliautomationlab8902","name":"acliautomationlab8902","type":"Microsoft.Storage/storageAccounts","location":"southcentralus","tags":{"hidden-DevTestLabs-LabUId":"ca9ec547-32c5-422d-b3d2-25906ed71959"},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T16:51:47.2662871Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T16:51:47.2194106Z","primaryEndpoints":{"blob":"https://acliautomationlab8902.blob.core.windows.net/","queue":"https://acliautomationlab8902.queue.core.windows.net/","table":"https://acliautomationlab8902.table.core.windows.net/","file":"https://acliautomationlab8902.file.core.windows.net/"},"primaryLocation":"southcentralus","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-eventgridtesting/providers/Microsoft.Storage/storageAccounts/eventgridtestin9c1e","name":"eventgridtestin9c1e","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-05-30T22:57:11.1008680Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-05-30T22:57:10.9915110Z","primaryEndpoints":{"blob":"https://eventgridtestin9c1e.blob.core.windows.net/","queue":"https://eventgridtestin9c1e.queue.core.windows.net/","table":"https://eventgridtestin9c1e.table.core.windows.net/","file":"https://eventgridtestin9c1e.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}},{"sku":{"name":"Premium_LRS","tier":"Premium"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/lmazuel-testcapture/providers/Microsoft.Storage/storageAccounts/lmazueltestcapture451","name":"lmazueltestcapture451","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-06-06T16:46:02.5308824Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-06-06T16:46:02.4527298Z","primaryEndpoints":{"blob":"https://lmazueltestcapture451.blob.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available"}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxrem/providers/Microsoft.Storage/storageAccounts/wilxremove","name":"wilxremove","type":"Microsoft.Storage/storageAccounts","location":"westus2","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-10-16T00:14:24.6500957Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-10-16T00:14:24.6500957Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-10-16T00:14:24.5719341Z","primaryEndpoints":{"blob":"https://wilxremove.blob.core.windows.net/","queue":"https://wilxremove.queue.core.windows.net/","table":"https://wilxremove.table.core.windows.net/","file":"https://wilxremove.file.core.windows.net/"},"primaryLocation":"westus2","statusOfPrimary":"available","secondaryLocation":"westcentralus","statusOfSecondary":"available","secondaryEndpoints":{"blob":"https://wilxremove-secondary.blob.core.windows.net/","queue":"https://wilxremove-secondary.queue.core.windows.net/","table":"https://wilxremove-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_RAGRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/wilxgroup3/providers/Microsoft.Storage/storageAccounts/wilxstorageworm","name":"wilxstorageworm","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-13T22:36:53.1534839Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2018-04-13T22:36:53.0909769Z","primaryEndpoints":{"web":"https://wilxstorageworm.z3.web.core.windows.net/","blob":"https://wilxstorageworm.blob.core.windows.net/","queue":"https://wilxstorageworm.queue.core.windows.net/","table":"https://wilxstorageworm.table.core.windows.net/","file":"https://wilxstorageworm.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available","secondaryLocation":"centraluseuap","statusOfSecondary":"available","secondaryEndpoints":{"web":"https://wilxstorageworm-secondary.z3.web.core.windows.net/","blob":"https://wilxstorageworm-secondary.blob.core.windows.net/","queue":"https://wilxstorageworm-secondary.queue.core.windows.net/","table":"https://wilxstorageworm-secondary.table.core.windows.net/"}}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg326oxnqqn33y3n42vz6x5xol5rvvw3z4o6tladwwtkmcntnsxhhxxtddtrxwm2edj/providers/Microsoft.Storage/storageAccounts/clitestjwzkdsfuou3niutbd","name":"clitestjwzkdsfuou3niutbd","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:07:33.1021018Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:07:33.0552270Z","primaryEndpoints":{"blob":"https://clitestjwzkdsfuou3niutbd.blob.core.windows.net/","queue":"https://clitestjwzkdsfuou3niutbd.queue.core.windows.net/","table":"https://clitestjwzkdsfuou3niutbd.table.core.windows.net/","file":"https://clitestjwzkdsfuou3niutbd.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}},{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgmr6jo34yofyafj3n6gjbhrgmrd6pwgguthc2u235qfle6y6ztyzrlkuqn544s7cop/providers/Microsoft.Storage/storageAccounts/clitestnlmd52jlcmr4ce7b4","name":"clitestnlmd52jlcmr4ce7b4","type":"Microsoft.Storage/storageAccounts","location":"eastus2euap","tags":{},"properties":{"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-04-19T20:14:07.3500611Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-04-19T20:14:07.3188286Z","primaryEndpoints":{"blob":"https://clitestnlmd52jlcmr4ce7b4.blob.core.windows.net/","queue":"https://clitestnlmd52jlcmr4ce7b4.queue.core.windows.net/","table":"https://clitestnlmd52jlcmr4ce7b4.table.core.windows.net/","file":"https://clitestnlmd52jlcmr4ce7b4.file.core.windows.net/"},"primaryLocation":"eastus2euap","statusOfPrimary":"available"}}]}'} + headers: + cache-control: [no-cache] + content-length: ['22054'] + content-type: [application/json; charset=utf-8] + date: ['Wed, 17 Oct 2018 04:55:56 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-original-request-ids: [482c9b0e-b83a-497f-ac2a-54a6fa69d706, 26809d02-d350-4aa2-8fb9-635025f37524, + 964a5485-2ba4-4ce3-8d75-226a862041e2, 7e2308ef-9767-4cdd-b5f1-a2d971f20519, + 76285ae8-314c-43a7-994f-9a48eb0121d0, e27064c3-3731-4f36-b2d3-e67d0b949002] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [storage container delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python + AZURECLI/2.0.49] + accept-language: [en-US] + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clistorage000002/listKeys?api-version=2018-03-01-preview + response: + body: {string: '{"keys": [{"keyName": "key1", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}, {"keyName": "key2", "value": "veryFakedStorageAccountKey==", + "permissions": "FULL"}]}'} + headers: + cache-control: [no-cache] + content-length: ['288'] + content-type: [application/json] + date: ['Wed, 17 Oct 2018 04:55:56 GMT'] expires: ['-1'] pragma: [no-cache] server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 @@ -506,6 +587,25 @@ interactions: x-content-type-options: [nosniff] x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 200, message: OK} +- request: + body: null + headers: + Connection: [keep-alive] + Content-Length: ['0'] + User-Agent: [Azure-Storage/1.3.0-1.3.1 (Python CPython 3.6.2; Darwin 16.7.0) + AZURECLI/2.0.49] + x-ms-date: ['Wed, 17 Oct 2018 04:55:51 GMT'] + x-ms-version: ['2018-03-28'] + method: DELETE + uri: https://clistorage000002.blob.core.windows.net/container1?restype=container + response: + body: {string: ''} + headers: + date: ['Wed, 17 Oct 2018 04:55:56 GMT'] + server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0] + transfer-encoding: [chunked] + x-ms-version: ['2018-03-28'] + status: {code: 202, message: Accepted} - request: body: null headers: @@ -515,9 +615,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.5 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4 - msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.45] + User-Agent: [python/3.6.2 (Darwin-16.7.0-x86_64-i386-64bit) requests/2.18.4 + msrest/0.5.5 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python + AZURECLI/2.0.49] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -526,9 +626,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Wed, 22 Aug 2018 17:37:24 GMT'] + date: ['Wed, 17 Oct 2018 04:55:57 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdFTFZZUENFQklFNzVDQVNTSEpDREZPM0dYWUJNUzdYTjZaUHxGNTE2NUJEQzdBRTU4MzBFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdEWEdRR09TU1hKUVZHM0tOQzRQTzROSFBFWlNDVEhTTFFKNXxGMTk4RkM3OTAwQTQwOTY5LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/test_storage_container_immutability_policy.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/test_storage_container_immutability_policy.py index 96d6e6f5a5b..5f6ad91f334 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/test_storage_container_immutability_policy.py +++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/latest/test_storage_container_immutability_policy.py @@ -54,3 +54,5 @@ def test_immutability_policy(self, resource_group): '--account-name {} -c {} -g {} --if-match {}'.format( storage_account, container_name, resource_group, repr(policy_etag)), checks=[ JMESPathCheck('immutabilityPeriodSinceCreationInDays', 2)]) + + self.cmd('az storage container delete --account-name {} -n {}'.format(storage_account, container_name)) diff --git a/src/command_modules/azure-cli-vm/HISTORY.rst b/src/command_modules/azure-cli-vm/HISTORY.rst index dcdc58cd015..a7071df18ee 100644 --- a/src/command_modules/azure-cli-vm/HISTORY.rst +++ b/src/command_modules/azure-cli-vm/HISTORY.rst @@ -2,12 +2,22 @@ Release History =============== -2.2.5 + +2.2.7 +++++++ +* `image create`: expose storage-sku argument for setting the image's default storage account type +* `vm resize`: fix bug where `--no-wait` option causes command to crash + +2.2.6 ++++++ * `vm/vmss create`: enforce disk caching mode be `None` for Lv/Lv2 series of machines * `vm create`: update supported size list supporting networking accelerator * `disk update`: expose strong typed arguments for ultrassd iops and mbps configs +2.2.5 +++++++ +* Fix SDK issue that caused Homebrew instllation to fail. + 2.2.4 ++++++ * `az disk grant-access`: fix the empty "accessSas" field diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py index 7a4ae64a522..9b2a42dff9c 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py @@ -1395,8 +1395,7 @@ - name: Create an image from an existing disk. text: | az image create -g MyResourceGroup -n image1 --os-type Linux \\ - --source /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/rg1/providers/Microsoft.Compute/snapshots/s1 \\ - --data-snapshot /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/rg/providers/Microsoft.Compute/snapshots/s2 + --source /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/rg1/providers/Microsoft.Compute/snapshots/s1 - name: Create an image by capturing an existing generalized virtual machine in the same resource group. text: az image create -g MyResourceGroup -n image1 --source MyVm1 """ diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py index dd7c1ce0b8f..f77ee466dd8 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py @@ -24,7 +24,7 @@ # pylint: disable=too-many-statements, too-many-branches def load_arguments(self, _): - from azure.mgmt.compute.models import CachingTypes, UpgradeMode + StorageAccountTypes, UpgradeMode, CachingTypes = self.get_models('StorageAccountTypes', 'UpgradeMode', 'CachingTypes') # REUSABLE ARGUMENT DEFINITIONS name_arg_type = CLIArgumentType(options_list=['--name', '-n'], metavar='NAME') @@ -40,11 +40,12 @@ def load_arguments(self, _): completer=get_resource_name_completion_list('Microsoft.Compute/virtualMachineScaleSets'), help="Scale set name. You can configure the default using `az configure --defaults vmss=`", id_part='name') - if self.supported_api_version(min_api='2018-06-01', operation_group='disks') or self.supported_api_version(min_api='2018-06-01', operation_group='virtual_machines'): - disk_sku = CLIArgumentType(arg_type=get_enum_type(['Premium_LRS', 'Standard_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'])) - elif self.supported_api_version(min_api='2018-04-01', operation_group='disks') or self.supported_api_version(min_api='2018-06-01', operation_group='virtual_machines'): - disk_sku = CLIArgumentType(arg_type=get_enum_type(['Premium_LRS', 'Standard_LRS', 'StandardSSD_LRS'])) + + if StorageAccountTypes: + disk_sku = CLIArgumentType(arg_type=get_enum_type(StorageAccountTypes)) else: + # StorageAccountTypes introduced in api version 2016_04_30_preview of Resource.MGMT.Compute package.. + # However, 2017-03-09-profile targets version 2016-03-30 of compute package. disk_sku = CLIArgumentType(arg_type=get_enum_type(['Premium_LRS', 'Standard_LRS'])) # special case for `network nic scale-set list` command alias @@ -110,6 +111,7 @@ def load_arguments(self, _): c.argument('data_disk_sources', nargs='+', help='Space-separated list of data disk sources, including unmanaged blob URI, managed disk ID or name, or snapshot ID or name') c.argument('zone_resilient', min_api='2017-12-01', arg_type=get_three_state_flag(), help='Specifies whether an image is zone resilient or not. ' 'Default is false. Zone resilient images can be created only in regions that provide Zone Redundant Storage') + c.argument('storage_sku', arg_type=disk_sku, help='The SKU of the storage account with which to create the VM image. Unused if source VM is specified.') c.ignore('source_virtual_machine', 'os_blob_uri', 'os_disk', 'os_snapshot', 'data_blob_uris', 'data_disks', 'data_snapshots') # endregion diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py index a1c4b093cc4..f60591d3728 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py @@ -313,7 +313,7 @@ def update_managed_disk(cmd, instance, size_gb=None, sku=None, disk_iops_read_wr # region Images (Managed) def create_image(cmd, resource_group_name, name, source, os_type=None, data_disk_sources=None, location=None, # pylint: disable=too-many-locals,unused-argument # below are generated internally from 'source' and 'data_disk_sources' - source_virtual_machine=None, + source_virtual_machine=None, storage_sku=None, os_blob_uri=None, data_blob_uris=None, os_snapshot=None, data_snapshots=None, os_disk=None, data_disks=None, tags=None, zone_resilient=None): @@ -330,7 +330,8 @@ def create_image(cmd, resource_group_name, name, source, os_type=None, data_disk os_state=OperatingSystemStateTypes.generalized, snapshot=SubResource(id=os_snapshot) if os_snapshot else None, managed_disk=SubResource(id=os_disk) if os_disk else None, - blob_uri=os_blob_uri) + blob_uri=os_blob_uri, + storage_account_type=storage_sku) all_data_disks = [] lun = 0 if data_blob_uris: @@ -882,7 +883,7 @@ def resize_vm(cmd, resource_group_name, vm_name, size, no_wait=False): return None vm.hardware_profile.vm_size = size # pylint: disable=no-member - return set_vm(cmd, vm, no_wait) + return set_vm(cmd, vm, no_wait=no_wait) def set_vm(cmd, instance, lro_operation=None, no_wait=False): @@ -1960,7 +1961,7 @@ def _get_public_ip_address_allocation(value, sku): master_template.add_resource(ag_resource) # create storage accounts if needed for unmanaged disk storage - if storage_profile in [StorageProfile.SACustomImage, StorageProfile.SAPirImage]: + if storage_profile == StorageProfile.SAPirImage: master_template.add_resource(build_vmss_storage_account_pool_resource( cmd, 'storageLoop', location, tags, storage_sku)) master_template.add_variable('storageAccountNames', [ diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_managed_disk.yaml b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_managed_disk.yaml index 2c873dd0cbc..8bd89932310 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_managed_disk.yaml +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_managed_disk.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-09-28T22:28:18Z"}}' + "date": "2018-10-23T19:19:08Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,24 +9,23 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:28:21 GMT'] + date: ['Tue, 23 Oct 2018 19:19:12 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1197'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 201, message: Created} - request: body: null @@ -36,19 +35,18 @@ interactions: CommandName: [disk create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:28:22 GMT'] + date: ['Tue, 23 Oct 2018 19:19:14 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -65,9 +63,8 @@ interactions: Connection: [keep-alive] Content-Length: ['154'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 @@ -79,19 +76,19 @@ interactions: \ \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"name\"\ : \"d1\"\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a9221031-8114-4195-a0d1-662acafbe5cc?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd023cf2-63e4-457a-ad4f-66ea2436c4d0?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['301'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:28:23 GMT'] + date: ['Tue, 23 Oct 2018 19:19:15 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a9221031-8114-4195-a0d1-662acafbe5cc?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd023cf2-63e4-457a-ad4f-66ea2436c4d0?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3979'] - x-ms-ratelimit-remaining-subscription-writes: ['1196'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;999,Microsoft.Compute/CreateUpdateDisks30Min;3996'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -100,27 +97,26 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a9221031-8114-4195-a0d1-662acafbe5cc?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd023cf2-63e4-457a-ad4f-66ea2436c4d0?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:28:24.2478925+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:28:24.388465+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:19:15.4795231+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:19:15.620145+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Premium_LRS\",\"tier\":\"Premium\"},\"properties\":{\"creationData\":{\"\ - createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-09-28T22:28:24.2478925+00:00\"\ + createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-10-23T19:19:15.4795231+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"tags\":{\"tag1\":\"\ d1\"},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - ,\"name\":\"d1\"}\r\n },\r\n \"name\": \"a9221031-8114-4195-a0d1-662acafbe5cc\"\ + ,\"name\":\"d1\"}\r\n },\r\n \"name\": \"fd023cf2-63e4-457a-ad4f-66ea2436c4d0\"\ \r\n}"} headers: cache-control: [no-cache] content-length: ['721'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:29:46 GMT'] + date: ['Tue, 23 Oct 2018 19:19:45 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -128,7 +124,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49996,Microsoft.Compute/GetOperation30Min;249954'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49988,Microsoft.Compute/GetOperation30Min;249969'] status: {code: 200, message: OK} - request: body: null @@ -137,16 +133,15 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 response: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Premium_LRS\",\r\n \"\ tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:28:24.2478925+00:00\",\r\n \ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ @@ -156,7 +151,7 @@ interactions: cache-control: [no-cache] content-length: ['617'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:29:49 GMT'] + date: ['Tue, 23 Oct 2018 19:19:45 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -164,7 +159,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4993,Microsoft.Compute/LowCostGet30Min;19940'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4998,Microsoft.Compute/LowCostGet30Min;19962'] status: {code: 200, message: OK} - request: body: null @@ -173,9 +168,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 @@ -183,7 +177,7 @@ interactions: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Premium_LRS\",\r\n \"\ tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:28:24.2478925+00:00\",\r\n \ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ @@ -193,7 +187,7 @@ interactions: cache-control: [no-cache] content-length: ['617'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:29:52 GMT'] + date: ['Tue, 23 Oct 2018 19:19:47 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -201,7 +195,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4992,Microsoft.Compute/LowCostGet30Min;19939'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4996,Microsoft.Compute/LowCostGet30Min;19960'] status: {code: 200, message: OK} - request: body: '{"location": "westus", "tags": {"tag1": "d1"}, "sku": {"name": "Standard_LRS"}, @@ -213,9 +207,8 @@ interactions: Connection: [keep-alive] Content-Length: ['156'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 @@ -227,19 +220,19 @@ interactions: \ \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"name\"\ : \"d1\"\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd319fc2-7bb6-4df3-84c3-e7f96306fa06?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/406b4b39-8095-41b7-9bf6-385d51c810bf?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['303'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:29:53 GMT'] + date: ['Tue, 23 Oct 2018 19:19:48 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd319fc2-7bb6-4df3-84c3-e7f96306fa06?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/406b4b39-8095-41b7-9bf6-385d51c810bf?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3978'] - x-ms-ratelimit-remaining-subscription-writes: ['1196'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3995'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -248,27 +241,26 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fd319fc2-7bb6-4df3-84c3-e7f96306fa06?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/406b4b39-8095-41b7-9bf6-385d51c810bf?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:29:54.6402576+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:29:54.7964851+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:19:48.1556513+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:19:48.3275421+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\ - :{\"createOption\":\"Empty\"},\"diskSizeGB\":10,\"timeCreated\":\"2018-09-28T22:28:24.2478925+00:00\"\ + :{\"createOption\":\"Empty\"},\"diskSizeGB\":10,\"timeCreated\":\"2018-10-23T19:19:15.4795231+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"tags\":{\"tag1\":\"\ d1\"},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - ,\"name\":\"d1\"}\r\n },\r\n \"name\": \"fd319fc2-7bb6-4df3-84c3-e7f96306fa06\"\ + ,\"name\":\"d1\"}\r\n },\r\n \"name\": \"406b4b39-8095-41b7-9bf6-385d51c810bf\"\ \r\n}"} headers: cache-control: [no-cache] content-length: ['725'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:24 GMT'] + date: ['Tue, 23 Oct 2018 19:20:18 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -276,7 +268,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49992,Microsoft.Compute/GetOperation30Min;249958'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49986,Microsoft.Compute/GetOperation30Min;249967'] status: {code: 200, message: OK} - request: body: null @@ -285,16 +277,15 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 response: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 10,\r\n \"timeCreated\": \"2018-09-28T22:28:24.2478925+00:00\",\r\n \ + \ 10,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ @@ -304,7 +295,7 @@ interactions: cache-control: [no-cache] content-length: ['620'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:24 GMT'] + date: ['Tue, 23 Oct 2018 19:20:18 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -312,7 +303,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4989,Microsoft.Compute/LowCostGet30Min;19943'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4993,Microsoft.Compute/LowCostGet30Min;19958'] status: {code: 200, message: OK} - request: body: '{"access": "Read", "durationInSeconds": 10}' @@ -323,27 +314,26 @@ interactions: Connection: [keep-alive] Content-Length: ['43'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1/beginGetAccess?api-version=2018-06-01 response: body: {string: ''} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0a861a33-566a-43c5-ba75-000e321dd353?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/c83af0a4-4214-4f53-94e4-ed6110ba5143?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 28 Sep 2018 22:30:26 GMT'] + date: ['Tue, 23 Oct 2018 19:20:20 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0a861a33-566a-43c5-ba75-000e321dd353?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/c83af0a4-4214-4f53-94e4-ed6110ba5143?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostDiskHydrate3Min;999,Microsoft.Compute/HighCostDiskHydrate30Min;4999'] - x-ms-ratelimit-remaining-subscription-writes: ['1197'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostDiskHydrate3Min;999,Microsoft.Compute/HighCostDiskHydrate30Min;4998'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -352,22 +342,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk grant-access] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0a861a33-566a-43c5-ba75-000e321dd353?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/c83af0a4-4214-4f53-94e4-ed6110ba5143?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:30:27.0037165+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:30:27.2693413+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:20:20.2315035+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:20:20.5752661+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\"\ - : \"https://md-cth2dbz1nstz.blob.core.windows.net/phkpsxgrzfkk/abcd?sv=2017-04-17&sr=b&si=5344f199-db16-4b41-bc2f-895c69de4078&sig=uUiYvtiDiNkecKoL%2BSbB9TqfzX5%2B%2FD6NMzhRHy0nX5o%3D\"\ - \r\n}\r\n },\r\n \"name\": \"0a861a33-566a-43c5-ba75-000e321dd353\"\r\n}"} + : \"https://md-gm4v5p1x5v3l.blob.core.windows.net/lgx4p25l5hnf/abcd?sv=2017-04-17&sr=b&si=85259428-773a-44d9-b400-f1349e63680a&sig=cX67cFJRAXyehULVQ1speTANDIuLIfOQIweBo5KwLsk%3D\"\ + \r\n}\r\n },\r\n \"name\": \"c83af0a4-4214-4f53-94e4-ed6110ba5143\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['427'] + content-length: ['421'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:56 GMT'] + date: ['Tue, 23 Oct 2018 19:20:50 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -375,7 +364,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49982,Microsoft.Compute/GetOperation30Min;249948'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49988,Microsoft.Compute/GetOperation30Min;249965'] status: {code: 200, message: OK} - request: body: null @@ -384,19 +373,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk grant-access] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0a861a33-566a-43c5-ba75-000e321dd353?monitor=true&api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/c83af0a4-4214-4f53-94e4-ed6110ba5143?monitor=true&api-version=2018-06-01 response: - body: {string: "{\r\n \"accessSAS\": \"https://md-cth2dbz1nstz.blob.core.windows.net/phkpsxgrzfkk/abcd?sv=2017-04-17&sr=b&si=5344f199-db16-4b41-bc2f-895c69de4078&sig=uUiYvtiDiNkecKoL%2BSbB9TqfzX5%2B%2FD6NMzhRHy0nX5o%3D\"\ + body: {string: "{\r\n \"accessSAS\": \"https://md-gm4v5p1x5v3l.blob.core.windows.net/lgx4p25l5hnf/abcd?sv=2017-04-17&sr=b&si=85259428-773a-44d9-b400-f1349e63680a&sig=cX67cFJRAXyehULVQ1speTANDIuLIfOQIweBo5KwLsk%3D\"\ \r\n}"} headers: cache-control: [no-cache] - content-length: ['202'] + content-length: ['196'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:57 GMT'] + date: ['Tue, 23 Oct 2018 19:20:52 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -404,7 +392,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49981,Microsoft.Compute/GetOperation30Min;249947'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49987,Microsoft.Compute/GetOperation30Min;249964'] status: {code: 200, message: OK} - request: body: null @@ -414,19 +402,18 @@ interactions: CommandName: [disk create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:58 GMT'] + date: ['Tue, 23 Oct 2018 19:20:53 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -443,9 +430,8 @@ interactions: Connection: [keep-alive] Content-Length: ['327'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2?api-version=2018-06-01 @@ -457,19 +443,19 @@ interactions: : true\r\n },\r\n \"location\": \"westus\",\r\n \"tags\": {},\r\n \"name\"\ : \"d2\"\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7bd2cf99-70ba-472f-8325-d7d8ac5e579a?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/078efc03-08da-4ff7-b0eb-14381b3ba79a?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['466'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:30:59 GMT'] + date: ['Tue, 23 Oct 2018 19:20:54 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7bd2cf99-70ba-472f-8325-d7d8ac5e579a?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/078efc03-08da-4ff7-b0eb-14381b3ba79a?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;996,Microsoft.Compute/CreateUpdateDisks30Min;3978'] - x-ms-ratelimit-remaining-subscription-writes: ['1194'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;997,Microsoft.Compute/CreateUpdateDisks30Min;3994'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -478,28 +464,27 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7bd2cf99-70ba-472f-8325-d7d8ac5e579a?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/078efc03-08da-4ff7-b0eb-14381b3ba79a?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:30:59.7656317+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:31:00.3281695+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:20:54.9183705+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:20:55.6995937+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Premium_LRS\",\"tier\":\"Premium\"},\"properties\":{\"creationData\":{\"\ createOption\":\"Copy\",\"sourceResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - },\"diskSizeGB\":10,\"timeCreated\":\"2018-09-28T22:30:59.7656317+00:00\"\ + },\"diskSizeGB\":10,\"timeCreated\":\"2018-10-23T19:20:54.9183705+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"tags\":{},\"id\":\"\ /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ - ,\"name\":\"d2\"}\r\n },\r\n \"name\": \"7bd2cf99-70ba-472f-8325-d7d8ac5e579a\"\ + ,\"name\":\"d2\"}\r\n },\r\n \"name\": \"078efc03-08da-4ff7-b0eb-14381b3ba79a\"\ \r\n}"} headers: cache-control: [no-cache] content-length: ['912'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:31:30 GMT'] + date: ['Tue, 23 Oct 2018 19:21:24 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -507,7 +492,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49979,Microsoft.Compute/GetOperation30Min;249944'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49988,Microsoft.Compute/GetOperation30Min;249962'] status: {code: 200, message: OK} - request: body: null @@ -516,9 +501,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [disk create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2?api-version=2018-06-01 response: @@ -526,7 +510,7 @@ interactions: tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Copy\",\r\n \"sourceResourceId\": \"\ /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - \r\n },\r\n \"diskSizeGB\": 10,\r\n \"timeCreated\": \"2018-09-28T22:30:59.7656317+00:00\"\ + \r\n },\r\n \"diskSizeGB\": 10,\r\n \"timeCreated\": \"2018-10-23T19:20:54.9183705+00:00\"\ ,\r\n \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {},\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ @@ -535,7 +519,7 @@ interactions: cache-control: [no-cache] content-length: ['805'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:31:30 GMT'] + date: ['Tue, 23 Oct 2018 19:21:25 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -543,7 +527,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4991,Microsoft.Compute/LowCostGet30Min;19939'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;19955'] status: {code: 200, message: OK} - request: body: null @@ -553,19 +537,18 @@ interactions: CommandName: [snapshot create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:31:32 GMT'] + date: ['Tue, 23 Oct 2018 19:21:27 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -582,9 +565,8 @@ interactions: Connection: [keep-alive] Content-Length: ['154'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 @@ -595,19 +577,19 @@ interactions: : \"Updating\",\r\n \"isArmResource\": true\r\n },\r\n \"location\":\ \ \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n }\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/db0c0c57-922a-41a6-b0bc-e77c6d3c11d4?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/56b5646e-dc03-4dc5-9a8f-8a06759e8ec0?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['284'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:31:33 GMT'] + date: ['Tue, 23 Oct 2018 19:21:28 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/db0c0c57-922a-41a6-b0bc-e77c6d3c11d4?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/56b5646e-dc03-4dc5-9a8f-8a06759e8ec0?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;239,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1199'] - x-ms-ratelimit-remaining-subscription-writes: ['1196'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;239,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1196'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -616,27 +598,26 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/db0c0c57-922a-41a6-b0bc-e77c6d3c11d4?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/56b5646e-dc03-4dc5-9a8f-8a06759e8ec0?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:31:33.9149839+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:31:34.1805688+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:21:28.7631142+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:21:28.9349589+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Premium_LRS\",\"tier\":\"Premium\"},\"properties\":{\"creationData\":{\"\ - createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-09-28T22:31:33.930573+00:00\"\ + createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-10-23T19:21:28.7631142+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/snapshots\",\"location\":\"westus\",\"tags\":{\"tag1\"\ :\"s1\"},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ - ,\"name\":\"s1\"}\r\n },\r\n \"name\": \"db0c0c57-922a-41a6-b0bc-e77c6d3c11d4\"\ + ,\"name\":\"s1\"}\r\n },\r\n \"name\": \"56b5646e-dc03-4dc5-9a8f-8a06759e8ec0\"\ \r\n}"} headers: cache-control: [no-cache] - content-length: ['729'] + content-length: ['730'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:04 GMT'] + date: ['Tue, 23 Oct 2018 19:21:58 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -644,7 +625,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49978,Microsoft.Compute/GetOperation30Min;249942'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49989,Microsoft.Compute/GetOperation30Min;249960'] status: {code: 200, message: OK} - request: body: null @@ -653,26 +634,25 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 response: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Premium_LRS\",\r\n \"\ tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:31:33.930573+00:00\",\r\n \ - \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ ,\r\n \"name\": \"s1\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['624'] + content-length: ['625'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:04 GMT'] + date: ['Tue, 23 Oct 2018 19:22:00 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -680,7 +660,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4986,Microsoft.Compute/LowCostGet30Min;19934'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4987,Microsoft.Compute/LowCostGet30Min;19952'] status: {code: 200, message: OK} - request: body: null @@ -689,9 +669,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 @@ -699,17 +678,17 @@ interactions: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Premium_LRS\",\r\n \"\ tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:31:33.930573+00:00\",\r\n \ - \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ ,\r\n \"name\": \"s1\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['624'] + content-length: ['625'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:05 GMT'] + date: ['Tue, 23 Oct 2018 19:22:01 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -717,7 +696,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4985,Microsoft.Compute/LowCostGet30Min;19933'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4986,Microsoft.Compute/LowCostGet30Min;19951'] status: {code: 200, message: OK} - request: body: '{"location": "westus", "tags": {"tag1": "s1"}, "sku": {"name": "Standard_LRS"}, @@ -729,9 +708,8 @@ interactions: Connection: [keep-alive] Content-Length: ['155'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 @@ -743,19 +721,19 @@ interactions: \n },\r\n \"location\": \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"\ s1\"\r\n }\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dfe5b0d8-2b37-41fa-b93b-e07227f51501?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/bac3fd16-9478-4812-9a53-2291cf15f865?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['308'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:06 GMT'] + date: ['Tue, 23 Oct 2018 19:22:02 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dfe5b0d8-2b37-41fa-b93b-e07227f51501?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/bac3fd16-9478-4812-9a53-2291cf15f865?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;238,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1198'] - x-ms-ratelimit-remaining-subscription-writes: ['1193'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;238,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1195'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 202, message: Accepted} - request: body: null @@ -764,27 +742,26 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dfe5b0d8-2b37-41fa-b93b-e07227f51501?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/bac3fd16-9478-4812-9a53-2291cf15f865?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:32:06.8283768+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:32:07.3752676+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:22:02.7064874+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:22:03.378325+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\ - :{\"createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-09-28T22:31:33.930573+00:00\"\ + :{\"createOption\":\"Empty\"},\"diskSizeGB\":1,\"timeCreated\":\"2018-10-23T19:21:28.7631142+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/snapshots\",\"location\":\"westus\",\"tags\":{\"tag1\"\ :\"s1\"},\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ - ,\"name\":\"s1\"}\r\n },\r\n \"name\": \"dfe5b0d8-2b37-41fa-b93b-e07227f51501\"\ + ,\"name\":\"s1\"}\r\n },\r\n \"name\": \"bac3fd16-9478-4812-9a53-2291cf15f865\"\ \r\n}"} headers: cache-control: [no-cache] content-length: ['731'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:37 GMT'] + date: ['Tue, 23 Oct 2018 19:22:32 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -792,7 +769,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49973,Microsoft.Compute/GetOperation30Min;249935'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49989,Microsoft.Compute/GetOperation30Min;249958'] status: {code: 200, message: OK} - request: body: null @@ -801,26 +778,25 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot update] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 response: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:31:33.930573+00:00\",\r\n \ - \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ ,\r\n \"name\": \"s1\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['626'] + content-length: ['627'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:37 GMT'] + date: ['Tue, 23 Oct 2018 19:22:33 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -828,7 +804,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4983,Microsoft.Compute/LowCostGet30Min;19929'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4987,Microsoft.Compute/LowCostGet30Min;19948'] status: {code: 200, message: OK} - request: body: null @@ -837,9 +813,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/d1?api-version=2018-06-01 @@ -850,7 +825,7 @@ interactions: cache-control: [no-cache] content-length: ['209'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:38 GMT'] + date: ['Tue, 23 Oct 2018 19:22:34 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -864,9 +839,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 @@ -874,7 +848,7 @@ interactions: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 10,\r\n \"timeCreated\": \"2018-09-28T22:28:24.2478925+00:00\",\r\n \ + \ 10,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"ActiveSAS\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ @@ -884,7 +858,7 @@ interactions: cache-control: [no-cache] content-length: ['619'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:38 GMT'] + date: ['Tue, 23 Oct 2018 19:22:35 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -892,7 +866,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4982,Microsoft.Compute/LowCostGet30Min;19928'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4986,Microsoft.Compute/LowCostGet30Min;19947'] status: {code: 200, message: OK} - request: body: null @@ -902,19 +876,18 @@ interactions: CommandName: [snapshot create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:39 GMT'] + date: ['Tue, 23 Oct 2018 19:22:36 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -931,9 +904,8 @@ interactions: Connection: [keep-alive] Content-Length: ['327'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2?api-version=2018-06-01 @@ -944,19 +916,19 @@ interactions: \r\n },\r\n \"provisioningState\": \"Updating\",\r\n \"isArmResource\"\ : true\r\n },\r\n \"location\": \"westus\",\r\n \"tags\": {}\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f856f9ea-8306-496b-9d03-56ed4bf9bfd9?api-version=2018-06-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fae80acb-509b-4cc2-829e-0564b36fde99?api-version=2018-06-01'] cache-control: [no-cache] content-length: ['449'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:32:39 GMT'] + date: ['Tue, 23 Oct 2018 19:22:37 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f856f9ea-8306-496b-9d03-56ed4bf9bfd9?monitor=true&api-version=2018-06-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fae80acb-509b-4cc2-829e-0564b36fde99?monitor=true&api-version=2018-06-01'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;237,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1197'] - x-ms-ratelimit-remaining-subscription-writes: ['1198'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostSnapshotCreateHydrate3Min;237,Microsoft.Compute/HighCostSnapshotCreateHydrate30Min;1194'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 202, message: Accepted} - request: body: null @@ -965,28 +937,27 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f856f9ea-8306-496b-9d03-56ed4bf9bfd9?api-version=2018-06-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fae80acb-509b-4cc2-829e-0564b36fde99?api-version=2018-06-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:32:40.8490144+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:32:41.3958847+00:00\",\r\n \"status\": \"\ + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:22:37.3474103+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:22:37.8008434+00:00\",\r\n \"status\": \"\ Succeeded\",\r\n \"properties\": {\r\n \"output\": {\"sku\":{\"name\"\ :\"Premium_LRS\",\"tier\":\"Premium\"},\"properties\":{\"creationData\":{\"\ createOption\":\"Copy\",\"sourceResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - },\"diskSizeGB\":10,\"timeCreated\":\"2018-09-28T22:32:40.8490144+00:00\"\ + },\"diskSizeGB\":10,\"timeCreated\":\"2018-10-23T19:22:37.3474103+00:00\"\ ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\ :\"Microsoft.Compute/snapshots\",\"location\":\"westus\",\"tags\":{},\"id\"\ :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ - ,\"name\":\"s2\"}\r\n },\r\n \"name\": \"f856f9ea-8306-496b-9d03-56ed4bf9bfd9\"\ + ,\"name\":\"s2\"}\r\n },\r\n \"name\": \"fae80acb-509b-4cc2-829e-0564b36fde99\"\ \r\n}"} headers: cache-control: [no-cache] content-length: ['920'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:11 GMT'] + date: ['Tue, 23 Oct 2018 19:23:07 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -994,7 +965,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49972,Microsoft.Compute/GetOperation30Min;249930'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49989,Microsoft.Compute/GetOperation30Min;249956'] status: {code: 200, message: OK} - request: body: null @@ -1003,9 +974,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [snapshot create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2?api-version=2018-06-01 response: @@ -1013,7 +983,7 @@ interactions: tier\": \"Premium\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Copy\",\r\n \"sourceResourceId\": \"\ /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ - \r\n },\r\n \"diskSizeGB\": 10,\r\n \"timeCreated\": \"2018-09-28T22:32:40.8490144+00:00\"\ + \r\n },\r\n \"diskSizeGB\": 10,\r\n \"timeCreated\": \"2018-10-23T19:22:37.3474103+00:00\"\ ,\r\n \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ : \"westus\",\r\n \"tags\": {},\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ @@ -1022,7 +992,7 @@ interactions: cache-control: [no-cache] content-length: ['813'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:11 GMT'] + date: ['Tue, 23 Oct 2018 19:23:08 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -1030,7 +1000,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4983,Microsoft.Compute/LowCostGet30Min;19925'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4984,Microsoft.Compute/LowCostGet30Min;19942'] status: {code: 200, message: OK} - request: body: null @@ -1039,9 +1009,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/virtualMachines/s1?api-version=2018-10-01 @@ -1052,7 +1021,7 @@ interactions: cache-control: [no-cache] content-length: ['215'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:13 GMT'] + date: ['Tue, 23 Oct 2018 19:23:09 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -1066,9 +1035,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 @@ -1076,17 +1044,17 @@ interactions: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 1,\r\n \"timeCreated\": \"2018-09-28T22:31:33.930573+00:00\",\r\n \ - \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ ,\r\n \"name\": \"s1\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['626'] + content-length: ['627'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:13 GMT'] + date: ['Tue, 23 Oct 2018 19:23:09 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -1094,7 +1062,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4982,Microsoft.Compute/LowCostGet30Min;19924'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4983,Microsoft.Compute/LowCostGet30Min;19941'] status: {code: 200, message: OK} - request: body: null @@ -1103,9 +1071,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/d1?api-version=2018-06-01 @@ -1116,7 +1083,7 @@ interactions: cache-control: [no-cache] content-length: ['209'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:14 GMT'] + date: ['Tue, 23 Oct 2018 19:23:10 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -1130,9 +1097,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 @@ -1140,7 +1106,7 @@ interactions: body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ - \ 10,\r\n \"timeCreated\": \"2018-09-28T22:28:24.2478925+00:00\",\r\n \ + \ 10,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"ActiveSAS\"\ \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ @@ -1150,7 +1116,7 @@ interactions: cache-control: [no-cache] content-length: ['619'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:15 GMT'] + date: ['Tue, 23 Oct 2018 19:23:10 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -1158,7 +1124,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4981,Microsoft.Compute/LowCostGet30Min;19923'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4982,Microsoft.Compute/LowCostGet30Min;19940'] status: {code: 200, message: OK} - request: body: null @@ -1168,19 +1134,18 @@ interactions: CommandName: [image create] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-09-28T22:28:18Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:15 GMT'] + date: ['Tue, 23 Oct 2018 19:23:11 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -1201,9 +1166,8 @@ interactions: Connection: [keep-alive] Content-Length: ['1016'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i1?api-version=2018-10-01 @@ -1228,18 +1192,18 @@ interactions: \n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i1\"\ ,\r\n \"name\": \"i1\"\r\n}"} headers: - azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b2897084-be69-4deb-977f-6024352809a5?api-version=2018-10-01'] + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/751d9d40-0403-459b-99eb-83adb0660a0f?api-version=2018-10-01'] cache-control: [no-cache] content-length: ['1939'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:15 GMT'] + date: ['Tue, 23 Oct 2018 19:23:11 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateImages3Min;38,Microsoft.Compute/CreateImages30Min;196'] - x-ms-ratelimit-remaining-subscription-writes: ['1196'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateImages3Min;39,Microsoft.Compute/CreateImages30Min;197'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] status: {code: 201, message: Created} - request: body: null @@ -1248,20 +1212,19 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b2897084-be69-4deb-977f-6024352809a5?api-version=2018-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/751d9d40-0403-459b-99eb-83adb0660a0f?api-version=2018-10-01 response: - body: {string: "{\r\n \"startTime\": \"2018-09-28T22:33:16.5531567+00:00\",\r\ - \n \"endTime\": \"2018-09-28T22:33:21.740598+00:00\",\r\n \"status\": \"\ - Succeeded\",\r\n \"name\": \"b2897084-be69-4deb-977f-6024352809a5\"\r\n}"} + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:23:12.4555224+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:23:17.6636296+00:00\",\r\n \"status\": \"\ + Succeeded\",\r\n \"name\": \"751d9d40-0403-459b-99eb-83adb0660a0f\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['183'] + content-length: ['184'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:46 GMT'] + date: ['Tue, 23 Oct 2018 19:23:43 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -1269,7 +1232,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14966,Microsoft.Compute/GetOperation30Min;29596'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14998,Microsoft.Compute/GetOperation30Min;29990'] status: {code: 200, message: OK} - request: body: null @@ -1278,9 +1241,8 @@ interactions: Accept-Encoding: ['gzip, deflate'] CommandName: [image create] Connection: [keep-alive] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 computemanagementclient/4.3.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i1?api-version=2018-10-01 response: @@ -1310,7 +1272,569 @@ interactions: cache-control: [no-cache] content-length: ['2053'] content-type: [application/json; charset=utf-8] - date: ['Fri, 28 Sep 2018 22:33:47 GMT'] + date: ['Tue, 23 Oct 2018 19:23:43 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetImages3Min;357,Microsoft.Compute/GetImages30Min;1789'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/virtualMachines/s1?api-version=2018-10-01 + response: + body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Compute/virtualMachines/s1'' + under resource group ''cli_test_managed_disk000001'' was not found."}}'} + headers: + cache-control: [no-cache] + content-length: ['215'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:44 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 404, message: Not Found} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 + response: + body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ + tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ + : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ + : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ + : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + ,\r\n \"name\": \"s1\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['627'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:45 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4976,Microsoft.Compute/LowCostGet30Min;19934'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/d1?api-version=2018-06-01 + response: + body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Compute/snapshots/d1'' + under resource group ''cli_test_managed_disk000001'' was not found."}}'} + headers: + cache-control: [no-cache] + content-length: ['209'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:45 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 404, message: Not Found} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 + response: + body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ + tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ + : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ + \ 10,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"ActiveSAS\"\ + \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ + westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ + /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + ,\r\n \"name\": \"d1\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['619'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:45 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4975,Microsoft.Compute/LowCostGet30Min;19933'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:46 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: 'b''{"location": "westus", "tags": {"tag1": "i1"}, "properties": {"storageProfile": + {"osDisk": {"osType": "Linux", "osState": "Generalized", "snapshot": {"id": + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1"}, + "storageAccountType": "Premium_LRS"}, "dataDisks": [{"lun": 0, "snapshot": {"id": + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2"}}, + {"lun": 1, "managedDisk": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1"}}, + {"lun": 2, "managedDisk": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2"}}]}}}''' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + Content-Length: ['1053'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i2?api-version=2018-10-01 + response: + body: {string: "{\r\n \"properties\": {\r\n \"storageProfile\": {\r\n \ + \ \"osDisk\": {\r\n \"osType\": \"Linux\",\r\n \"osState\"\ + : \"Generalized\",\r\n \"snapshot\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Premium_LRS\"\r\n },\r\n \"dataDisks\": [\r\n {\r\n \ + \ \"lun\": 0,\r\n \"snapshot\": {\r\n \"id\":\ + \ \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 1,\r\n\ + \ \"managedDisk\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 2,\r\n\ + \ \"managedDisk\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n }\r\n ]\r\n },\r\n \"provisioningState\"\ + : \"Creating\"\r\n },\r\n \"type\": \"Microsoft.Compute/images\",\r\n \"\ + location\": \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"i1\"\r\n },\r\ + \n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i2\"\ + ,\r\n \"name\": \"i2\"\r\n}"} + headers: + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d993c90f-6cbb-4ca1-975e-3c826c4c2261?api-version=2018-10-01'] + cache-control: [no-cache] + content-length: ['1938'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:23:46 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateImages3Min;38,Microsoft.Compute/CreateImages30Min;196'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d993c90f-6cbb-4ca1-975e-3c826c4c2261?api-version=2018-10-01 + response: + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:23:47.2498329+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:23:52.4380917+00:00\",\r\n \"status\": \"\ + Succeeded\",\r\n \"name\": \"d993c90f-6cbb-4ca1-975e-3c826c4c2261\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['184'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:17 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14996,Microsoft.Compute/GetOperation30Min;29988'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i2?api-version=2018-10-01 + response: + body: {string: "{\r\n \"properties\": {\r\n \"storageProfile\": {\r\n \ + \ \"osDisk\": {\r\n \"osType\": \"Linux\",\r\n \"osState\"\ + : \"Generalized\",\r\n \"diskSizeGB\": 1,\r\n \"snapshot\":\ + \ {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Premium_LRS\"\r\n },\r\n \"dataDisks\": [\r\n {\r\n \ + \ \"lun\": 0,\r\n \"diskSizeGB\": 10,\r\n \"snapshot\"\ + : {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 1,\r\n\ + \ \"diskSizeGB\": 10,\r\n \"managedDisk\": {\r\n \ + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 2,\r\n\ + \ \"diskSizeGB\": 10,\r\n \"managedDisk\": {\r\n \ + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n }\r\n ]\r\n },\r\n \"provisioningState\"\ + : \"Succeeded\"\r\n },\r\n \"type\": \"Microsoft.Compute/images\",\r\n \ + \ \"location\": \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"i1\"\r\n \ + \ },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i2\"\ + ,\r\n \"name\": \"i2\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['2052'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:18 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetImages3Min;352,Microsoft.Compute/GetImages30Min;1784'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/virtualMachines/s1?api-version=2018-10-01 + response: + body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Compute/virtualMachines/s1'' + under resource group ''cli_test_managed_disk000001'' was not found."}}'} + headers: + cache-control: [no-cache] + content-length: ['215'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:20 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 404, message: Not Found} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1?api-version=2018-06-01 + response: + body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ + tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ + : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ + \ 1,\r\n \"timeCreated\": \"2018-10-23T19:21:28.7631142+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"Unattached\"\ + \r\n },\r\n \"type\": \"Microsoft.Compute/snapshots\",\r\n \"location\"\ + : \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"s1\"\r\n },\r\n \"id\"\ + : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + ,\r\n \"name\": \"s1\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['627'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:20 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4972,Microsoft.Compute/LowCostGet30Min;19927'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/d1?api-version=2018-06-01 + response: + body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Compute/snapshots/d1'' + under resource group ''cli_test_managed_disk000001'' was not found."}}'} + headers: + cache-control: [no-cache] + content-length: ['209'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:21 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-failure-cause: [gateway] + status: {code: 404, message: Not Found} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1?api-version=2018-06-01 + response: + body: {string: "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"\ + tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n \"creationData\"\ + : {\r\n \"createOption\": \"Empty\"\r\n },\r\n \"diskSizeGB\":\ + \ 10,\r\n \"timeCreated\": \"2018-10-23T19:19:15.4795231+00:00\",\r\n \ + \ \"provisioningState\": \"Succeeded\",\r\n \"diskState\": \"ActiveSAS\"\ + \r\n },\r\n \"type\": \"Microsoft.Compute/disks\",\r\n \"location\": \"\ + westus\",\r\n \"tags\": {\r\n \"tag1\": \"d1\"\r\n },\r\n \"id\": \"\ + /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + ,\r\n \"name\": \"d1\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['619'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:21 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4971,Microsoft.Compute/LowCostGet30Min;19926'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 + response: + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001","name":"cli_test_managed_disk000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-23T19:19:08Z"},"properties":{"provisioningState":"Succeeded"}}'} + headers: + cache-control: [no-cache] + content-length: ['384'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:21 GMT'] + expires: ['-1'] + pragma: [no-cache] + strict-transport-security: [max-age=31536000; includeSubDomains] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: 'b''{"location": "westus", "tags": {"tag1": "i1"}, "properties": {"storageProfile": + {"osDisk": {"osType": "Linux", "osState": "Generalized", "snapshot": {"id": + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1"}, + "storageAccountType": "Standard_LRS"}, "dataDisks": [{"lun": 0, "snapshot": + {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2"}}, + {"lun": 1, "managedDisk": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1"}}, + {"lun": 2, "managedDisk": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2"}}]}}}''' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + Content-Length: ['1054'] + Content-Type: [application/json; charset=utf-8] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i3?api-version=2018-10-01 + response: + body: {string: "{\r\n \"properties\": {\r\n \"storageProfile\": {\r\n \ + \ \"osDisk\": {\r\n \"osType\": \"Linux\",\r\n \"osState\"\ + : \"Generalized\",\r\n \"snapshot\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n \"dataDisks\": [\r\n {\r\n\ + \ \"lun\": 0,\r\n \"snapshot\": {\r\n \"id\"\ + : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 1,\r\n\ + \ \"managedDisk\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 2,\r\n\ + \ \"managedDisk\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n }\r\n ]\r\n },\r\n \"provisioningState\"\ + : \"Creating\"\r\n },\r\n \"type\": \"Microsoft.Compute/images\",\r\n \"\ + location\": \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"i1\"\r\n },\r\ + \n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i3\"\ + ,\r\n \"name\": \"i3\"\r\n}"} + headers: + azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5b7477dc-5af5-41c8-aecd-652a4e736c89?api-version=2018-10-01'] + cache-control: [no-cache] + content-length: ['1939'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:22 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateImages3Min;37,Microsoft.Compute/CreateImages30Min;195'] + x-ms-ratelimit-remaining-subscription-writes: ['1199'] + status: {code: 201, message: Created} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5b7477dc-5af5-41c8-aecd-652a4e736c89?api-version=2018-10-01 + response: + body: {string: "{\r\n \"startTime\": \"2018-10-23T19:24:22.8685484+00:00\",\r\ + \n \"endTime\": \"2018-10-23T19:24:28.0404548+00:00\",\r\n \"status\": \"\ + Succeeded\",\r\n \"name\": \"5b7477dc-5af5-41c8-aecd-652a4e736c89\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['184'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:53 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + vary: [Accept-Encoding] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29986'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [image create] + Connection: [keep-alive] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + computemanagementclient/4.3.1 Azure-SDK-For-Python AZURECLI/2.0.50] + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i3?api-version=2018-10-01 + response: + body: {string: "{\r\n \"properties\": {\r\n \"storageProfile\": {\r\n \ + \ \"osDisk\": {\r\n \"osType\": \"Linux\",\r\n \"osState\"\ + : \"Generalized\",\r\n \"diskSizeGB\": 1,\r\n \"snapshot\":\ + \ {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n \"dataDisks\": [\r\n {\r\n\ + \ \"lun\": 0,\r\n \"diskSizeGB\": 10,\r\n \"snapshot\"\ + : {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/snapshots/s2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 1,\r\n\ + \ \"diskSizeGB\": 10,\r\n \"managedDisk\": {\r\n \ + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d1\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n },\r\n {\r\n \"lun\": 2,\r\n\ + \ \"diskSizeGB\": 10,\r\n \"managedDisk\": {\r\n \ + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/disks/d2\"\ + \r\n },\r\n \"caching\": \"None\",\r\n \"storageAccountType\"\ + : \"Standard_LRS\"\r\n }\r\n ]\r\n },\r\n \"provisioningState\"\ + : \"Succeeded\"\r\n },\r\n \"type\": \"Microsoft.Compute/images\",\r\n \ + \ \"location\": \"westus\",\r\n \"tags\": {\r\n \"tag1\": \"i1\"\r\n \ + \ },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_managed_disk000001/providers/Microsoft.Compute/images/i3\"\ + ,\r\n \"name\": \"i3\"\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['2053'] + content-type: [application/json; charset=utf-8] + date: ['Tue, 23 Oct 2018 19:24:53 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0] @@ -1318,7 +1842,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetImages3Min;352,Microsoft.Compute/GetImages30Min;1778'] + x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetImages3Min;348,Microsoft.Compute/GetImages30Min;1780'] status: {code: 200, message: OK} - request: body: null @@ -1329,9 +1853,8 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.7.0 (Darwin-17.5.0-x86_64-i386-64bit) requests/2.19.1 - msrest/0.5.4 msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python - AZURECLI/2.0.47] + User-Agent: [python/3.6.5 (Darwin-17.7.0-x86_64-i386-64bit) msrest/0.6.0 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.50] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_managed_disk000001?api-version=2018-05-01 @@ -1340,12 +1863,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Fri, 28 Sep 2018 22:33:48 GMT'] + date: ['Tue, 23 Oct 2018 19:24:55 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGTUFOQUdFRDo1RkRJU0szNkFHM1NQWDM1U0pCNFYzRlFXVnw1RjFFQTY3OTY3ODU0OTI2LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGTUFOQUdFRDo1RkRJU0tVNUY2VFRQRTNWTktXRE9IRzVRUHw4NEI3N0FGOTk1QkYxN0UwLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14997'] + x-ms-ratelimit-remaining-subscription-deletes: ['14999'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/test_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/test_vm_commands.py index 8296893cc7b..02da7b8dcb6 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/test_vm_commands.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/latest/test_vm_commands.py @@ -549,7 +549,9 @@ def test_vm_managed_disk(self, resource_group): 'disk2': 'd2', 'snapshot1': 's1', 'snapshot2': 's2', - 'image': 'i1' + 'image': 'i1', + 'image_2': 'i2', + 'image_3': 'i3' }) # create a disk and update @@ -601,6 +603,23 @@ def test_vm_managed_disk(self, resource_group): self.check('tags.tag1', 'i1') ]) + # test that images can be created with different storage skus + self.cmd('image create -g {rg} -n {image_2} --source {snapshot1} --data-disk-sources {disk1} {snapshot2_id} {disk2_id}' + ' --os-type Linux --tags tag1=i1 --storage-sku Premium_LRS', + checks=[ + self.check('storageProfile.osDisk.storageAccountType', 'Premium_LRS'), + self.check('storageProfile.osDisk.osType', 'Linux'), + self.check('storageProfile.osDisk.snapshot.id', '{snapshot1_id}'), + self.check('length(storageProfile.dataDisks)', 3), + self.check('storageProfile.dataDisks[0].lun', 0), + self.check('storageProfile.dataDisks[1].lun', 1), + self.check('tags.tag1', 'i1') + ]) + + self.cmd('image create -g {rg} -n {image_3} --source {snapshot1} --data-disk-sources {disk1} {snapshot2_id} {disk2_id}' + ' --os-type Linux --tags tag1=i1 --storage-sku Standard_LRS', + checks=self.check('storageProfile.osDisk.storageAccountType', 'Standard_LRS')) + class VMWriteAcceleratorScenarioTest(ScenarioTest): diff --git a/src/command_modules/azure-cli-vm/setup.py b/src/command_modules/azure-cli-vm/setup.py index d3ee0b941f0..c80f5b3d9c3 100644 --- a/src/command_modules/azure-cli-vm/setup.py +++ b/src/command_modules/azure-cli-vm/setup.py @@ -15,7 +15,7 @@ cmdclass = {} -VERSION = "2.2.5" +VERSION = "2.2.7" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', @@ -34,7 +34,7 @@ DEPENDENCIES = [ 'azure-mgmt-msi==0.2.0', 'azure-mgmt-authorization==0.50.0', - 'azure-mgmt-compute==4.3.0', + 'azure-mgmt-compute==4.3.1', 'azure-mgmt-keyvault==1.1.0', 'azure-keyvault==1.1.0', 'azure-mgmt-network==2.2.1', diff --git a/tools/automation/__main__.py b/tools/automation/__main__.py index 44e6463cb48..95ccb7baee2 100644 --- a/tools/automation/__main__.py +++ b/tools/automation/__main__.py @@ -6,6 +6,8 @@ import argparse import sys import automation.verify +import automation.clibuild +import automation.clipublish import automation.style import automation.tests import automation.cli_linter @@ -16,6 +18,8 @@ def main(): sub_parser = parser.add_subparsers(title='sub commands') automation.verify.init_args(sub_parser) + automation.clibuild.init_args(sub_parser) + automation.clipublish.init_args(sub_parser) automation.style.init_args(sub_parser) automation.tests.init_args(sub_parser) automation.cli_linter.init_args(sub_parser) diff --git a/tools/automation/clibuild/__init__.py b/tools/automation/clibuild/__init__.py new file mode 100644 index 00000000000..fe588adccd5 --- /dev/null +++ b/tools/automation/clibuild/__init__.py @@ -0,0 +1,172 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- +import os +import tempfile +import datetime +from subprocess import check_output, CalledProcessError +from concurrent.futures import ThreadPoolExecutor, as_completed + +try: + import xmlrpclib +except ImportError: + import xmlrpc.client as xmlrpclib # pylint: disable=import-error + +from ..utilities.display import print_heading +from ..utilities.path import get_repo_root +from ..utilities.pypi import is_available_on_pypi + +# TODO Add 'msi' once we support it +BUILD_TYPES = ['debian', 'docker', 'rpm', 'pypi', 'homebrew'] + +def build_all_debian(git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + # To only build a certain debian package, comment out the ones you don't want from the list below + dists = [ + ('wheezy', 'debian:wheezy'), + ('jessie', 'debian:jessie'), + ('stretch', 'debian:stretch'), + ('artful', 'ubuntu:artful'), + ('xenial', 'ubuntu:xenial'), + ('trusty', 'ubuntu:trusty'), + ('bionic', 'ubuntu:bionic'), + ] + with ThreadPoolExecutor(max_workers=len(dists)) as executor: + tasks = {executor.submit(build_debian, dist_info, git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) for dist_info + in dists} + for t in as_completed(tasks): + t.result() + print('Finished debian builds for {}. Check each build message above for completion status.'.format(', '.join([d[0] for d in dists]))) + +def build_debian(dist_info, git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + # If you need to release a revision to the package, change this number then reset back to 1 for the next release + revision = 1 + dist_codename = dist_info[0] + docker_image = dist_info[1] + cmd = ['docker', 'run', '-d', '-e', 'CLI_VERSION=' + cli_version, + '-e', 'CLI_VERSION_REVISION={}~{}'.format(revision, dist_codename), '-e', 'BUILD_ARTIFACT_DIR=/artifacts', + '-v', artifact_dir + ':/artifacts', docker_image, '/bin/bash', '-cx', + 'apt-get update && apt-get install -y git wget sudo && git clone --progress --verbose {} --branch {} /repo_clone ' + '&& cd /repo_clone && build_scripts/debian/build.sh /repo_clone'.format(git_url, git_branch)] + container_id = check_output(cmd, universal_newlines=True).strip() + print('Debian {} build running. Use `docker logs -f {}`'.format(dist_info[0], container_id)) + exit_code = check_output(['docker', 'wait', container_id], universal_newlines=True).strip() + print('FINISHED Debian {} build. Exit code {} (0 for success)'.format(dist_info[0], exit_code)) + + +def build_docker(git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + cmd = ['docker', 'build', '--no-cache', '--quiet', '--build-arg', 'BUILD_DATE="`date -u +"%Y-%m-%dT%H:%M:%SZ"`"', + '--build-arg', 'CLI_VERSION=' + cli_version, get_repo_root()] + print('Docker build started. The git url and branch parameters are ignored. We use the current repository.') + image_id = check_output(cmd, universal_newlines=True).strip() + image_id = image_id.split(':')[1] + image_file_location = os.path.join(artifact_dir, 'docker-azure-cli-{}.tar'.format(cli_version)) + cmd = ['docker', 'save', '-o', image_file_location, image_id] + image_id = check_output(cmd, universal_newlines=True).strip() + print('COMPLETED Docker build. image id: {}, saved to {}'.format(image_id, image_file_location)) + + +def build_rpm(git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + cmd = ['docker', 'run', '-d', '-e', 'CLI_VERSION=' + cli_version, '-e', 'REPO_PATH=/repo_clone', + '-v', artifact_dir + ':/artifacts', 'centos:7', '/bin/bash', '-cx', + 'yum check-update; yum install -y gcc git rpm-build rpm-devel rpmlint make bash coreutils diffutils patch ' + 'rpmdevtools python libffi-devel python-devel openssl-devel wget && git clone --progress --verbose {} ' + '--branch {} /repo_clone && cd /repo_clone && rpmbuild -v -bb --clean build_scripts/rpm/azure-cli.spec && ' + 'cp /root/rpmbuild/RPMS/x86_64/* /artifacts/'.format(git_url, git_branch)] + container_id = check_output(cmd, universal_newlines=True).strip() + print('RPM build running. Use `docker logs -f {}` to view logs'.format(container_id)) + exit_code = check_output(['docker', 'wait', container_id], universal_newlines=True).strip() + print('FINISHED RPM build. Exit code {} (0 for success)'.format(exit_code)) + + +def build_pypi(git_url, git_branch, _, artifact_dir, arg_ns=None): + cmd = ['docker', 'run', '-d', '-v', artifact_dir + ':/artifacts', 'python:3.6', '/bin/bash', '-cx', + 'mkdir /artifacts/pypi && git clone --progress --verbose {} --branch {} /repo_clone && cd /repo_clone && ' + 'python build_scripts/pypi/build.py /artifacts/pypi /repo_clone'.format(git_url, git_branch)] + container_id = check_output(cmd, universal_newlines=True).strip() + print('Python pypi build message: The version numbers of packages will be as defined in source code.') + print('Python pypi build running. Use `docker logs -f {}`'.format(container_id)) + exit_code = check_output(['docker', 'wait', container_id], universal_newlines=True).strip() + print('COMPLETED Python pypi build. Exit code {}'.format(exit_code)) + + +def build_msi(git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + # TODO + print('SKIPPED MSI build. Not Yet Implemented. Please build manually.') + + +def build_homebrew(git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + if not is_available_on_pypi('azure-cli', cli_version): + print('Homebrew message : The Homebrew formula requires CLI packages to be available on public PyPI. ' + 'Version {} of the CLI does not appear to be on PyPI. ' + 'If it was just updated, this message can be safely ignored.'.format(cli_version)) + + upstream_url = arg_ns.homebrew_upstream_url or 'https://github.com/Azure/azure-cli/archive/azure-cli-{cli_version}.tar.gz'.format( + cli_version=cli_version) + print('Homebrew message: The generated formula uses the latest public packages that are available on PyPI, ' + 'not the code in your Git repo.') + cmd = ['docker', 'run', '-d', '-e', 'CLI_VERSION=' + cli_version, '-e', 'BUILD_ARTIFACT_DIR=/artifacts', + '-e', 'UPSTREAM_URL=' + upstream_url, + '-v', artifact_dir + ':/artifacts', 'python:3.6', '/bin/bash', '-cx', + 'pip install sh && git clone --progress --verbose {} --branch {} /repo_clone && cd /repo_clone && ' + 'python build_scripts/homebrew/formula-generate.py'.format(git_url, git_branch)] + container_id = check_output(cmd, universal_newlines=True).strip() + print('Homebrew formula generation running. Use `docker logs -f {}`'.format(container_id)) + exit_code = check_output(['docker', 'wait', container_id], universal_newlines=True).strip() + print('COMPLETED Homebrew formula generation. Exit code {}'.format(exit_code)) + + +def build_dispatch(build_type, git_url, git_branch, cli_version, artifact_dir, arg_ns=None): + if build_type == 'debian': + build_all_debian(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + elif build_type == 'docker': + build_docker(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + elif build_type == 'rpm': + build_rpm(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + elif build_type == 'pypi': + build_pypi(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + elif build_type == 'msi': + build_msi(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + elif build_type == 'homebrew': + build_homebrew(git_url, git_branch, cli_version, artifact_dir, arg_ns=arg_ns) + + +def cli_build(args): + assert check_output(['docker', 'ps']), "Docker required." + build_types = args.build_types + git_url = args.git_clone_url + git_branch = args.git_clone_branch + cli_version = args.cli_version + artifact_dir = tempfile.mkdtemp( + prefix='cli-build-{}-'.format(datetime.datetime.now().strftime('%Y-%m-%d-%H-%M-%S')), dir=os.getcwd()) + if len(build_types) == 1 and build_types[0] == '*': + build_types = BUILD_TYPES + print_heading('Building for {} from branch {} of {} ' + 'and version number will be {}\n' + 'Build artifacts will be in {}'.format(', '.join(build_types), git_branch, git_url, cli_version, + artifact_dir)) + with ThreadPoolExecutor(max_workers=len(build_types)) as executor: + tasks = {executor.submit(build_dispatch, bt, git_url, git_branch, cli_version, artifact_dir, arg_ns=args) for bt + in build_types} + for t in as_completed(tasks): + t.result() + print('Done.') + + +def init_args(root): + cli_build_parser = root.add_parser('build', help='Build the CLI. Docker is required.') + cli_build_parser.set_defaults(func=cli_build) + git_args = cli_build_parser.add_argument_group('Git Clone Arguments') + git_args.add_argument('-b', '--git-clone-branch', dest='git_clone_branch', + help='Branch name that should be checked out. (default: %(default)s)', default='master') + git_args.add_argument('-u', '--git-clone-url', dest='git_clone_url', + help='The url to clone. This will be passed to `git clone`. (default: %(default)s)', + default='https://github.com/Azure/azure-cli.git') + cli_build_parser.add_argument('-t', '--type', dest='build_types', required=True, nargs='+', + choices=BUILD_TYPES + ['*'], + help="Space-separated list of the artifacts to build. Use '*' for all.") + cli_build_parser.add_argument('-c', '--cli-version', dest='cli_version', required=True, + help="The version of the build. (ignored for 'pypi' type)") + homebrew_args = cli_build_parser.add_argument_group('Homebrew Specific Arguments') + homebrew_args.add_argument('--homebrew-upstream-url', dest='homebrew_upstream_url', + help='The upstream URL to specify in the formula.') diff --git a/tools/automation/clipublish/__init__.py b/tools/automation/clipublish/__init__.py new file mode 100644 index 00000000000..320381f6efd --- /dev/null +++ b/tools/automation/clipublish/__init__.py @@ -0,0 +1,83 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- + +import os +import sys +import requests + +PUBLISH_TYPES = ['debian', 'rpm'] + + +def get_debian_payload(cli_version, repo_id, distro, source_url): + return {'name': 'azure-cli', 'version': cli_version + '-1~' + distro, 'repositoryId': repo_id, 'sourceUrl': source_url} + + +def get_yum_payload(cli_version, repo_id, source_url): + return {'name': 'azure-cli', 'version': cli_version, 'repositoryId': repo_id, 'sourceUrl': source_url} + + +def publish_payload(endpoint, payload): + assert 'REPO_PASSWORD' in os.environ, "Set REPO_PASSWORD environment variable" + repo_password = os.environ['REPO_PASSWORD'] + repo_username = 'azure-cli' + print('Publishing - {}'.format(payload)) + r = requests.post(endpoint + '/v1/packages', verify=False, auth=(repo_username, repo_password), json=payload) + print('Status Code {}'.format(r.status_code)) + # Query with a GET to the following (creds. required) + if r.status_code == 202: + print(endpoint + r.headers['Location']) + else: + print('Possible error. Server didn\'t return 202 Accepted.') + + +def cli_publish(args): + publish_type = args.publish_type + cli_version = args.cli_version + endpoint = args.endpoint + if publish_type == 'debian': + debs = args.debs + assert debs, "No debs provided. Nothing to do." + payloads = [get_debian_payload(cli_version, repo_id, distro, source_url) for repo_id, distro, source_url in debs] + print('Payloads') + print('\n'.join(str(p) for p in payloads)) + input('Please enter to confirm the payloads to make requests to publish the DEBIAN packages: ') + for p in payloads: + publish_payload(endpoint, p) + elif publish_type == 'rpm': + repo_id = args.rpm_repo_id + source_url = args.rpm_source_url + assert repo_id, "Missing --repo-id" + assert source_url, "Missing --source-url" + payload = get_yum_payload(cli_version, repo_id, source_url) + print('Payload') + print(payload) + input('Please enter to confirm the payload to make requests to publish the RPM package: ') + publish_payload(endpoint, payload) + else: + raise ValueError("Unknown publish type {}".format(publish_type)) + + +def type_debs(val): + repo_id, distro, source_url = val.split('/', 2) + return repo_id, distro, source_url + + +def init_args(root): + parser = root.add_parser('publish', help='Publish the CLI.') + parser.set_defaults(func=cli_publish) + git_args = parser.add_argument_group('Git Clone Arguments') + parser.add_argument('-t', '--type', dest='publish_type', required=True, + choices=PUBLISH_TYPES, + help="Space separated list of the artifacts to build. Use '*' for all.") + parser.add_argument('-c', '--cli-version', dest='cli_version', required=True, + help="The version of the publish.") + parser.add_argument('-e', '--repo-endpoint', dest='endpoint', required=True, + help="The endpoint to publish the debian or yum package.") + deb_args = parser.add_argument_group('Debian Publish Arguments') + deb_args.add_argument('--debs', dest='debs', nargs='+', type=type_debs, default=[], + help='A space separated list of repoid/distro/source_url for each package to publish.') + rpm_args = parser.add_argument_group('RPM Publish Arguments') + rpm_args.add_argument('-r', '--rpm-repo-id', dest='rpm_repo_id', help='Repo ID for RPM Repo') + rpm_args.add_argument('-s', '--rpm-source-url', dest='rpm_source_url', help='URL to the RPM package') diff --git a/tools/automation/style/pep8.py b/tools/automation/style/pep8.py deleted file mode 100644 index 6a5f20b3ad4..00000000000 --- a/tools/automation/style/pep8.py +++ /dev/null @@ -1,30 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- - -import sys - - -def fix_p2p8(directory): - import autopep8 - import multiprocessing - - # pylint: disable=protected-access - autopep8.fix_multiple_files([directory], - options=autopep8._get_options( - { - 'jobs': multiprocessing.cpu_count(), - 'verbose': True, - 'recursive': True, - 'in_place': True, - 'max_line_length': 100 - }, False)) - - -if __name__ == '__main__': - if len(sys.argv) < 2: - print('usage: python automation.style.pep8 ') - sys.exit(1) - - fix_p2p8(sys.argv[1]) diff --git a/tools/automation/tests/__init__.py b/tools/automation/tests/__init__.py index bd31dcc741c..8b174b06d6d 100644 --- a/tools/automation/tests/__init__.py +++ b/tools/automation/tests/__init__.py @@ -148,7 +148,7 @@ def get_test_index(args): def get_extension_modules(): from importlib import import_module import pkgutil - from azure.cli.core.extension import get_extensions, get_extension_path, get_extension_modname + from azure.cli.core.extensions import get_extensions, get_extension_path, get_extension_modname extension_whls = get_extensions() ext_modules = [] if extension_whls: diff --git a/tools/setup.py b/tools/setup.py index 307d5b935c9..e38286486c0 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -23,7 +23,6 @@ # Until https://gitlab.com/pycqa/flake8/issues/415 is resolved, pin version of pycodestyle DEPENDENCIES = [ - 'autopep8>=1.2.4', 'pylint==1.9.2', 'coverage>=4.2', 'flake8==3.5.0',