Skip to content

Commit 4b11d73

Browse files
sptramertroydai
authored andcommitted
Remove explicit versioning informaton in help and supplementary materials. (Azure#6762)
1 parent ac96026 commit 4b11d73

File tree

10 files changed

+61
-59
lines changed

10 files changed

+61
-59
lines changed

.snapcraft.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: azure-cli
2-
summary: Microsoft Azure CLI 2.0
2+
summary: Microsoft Azure CLI
33
description: |
4-
A great cloud needs great tools; we're excited to introduce Azure CLI 2.0, our
4+
A great cloud needs great tools; we're excited to introduce Azure CLI, our
55
next generation multi-platform command line experience for Azure.
66
version: "release"
77
version-script: |
@@ -39,4 +39,4 @@ parts:
3939
# PEP 394 says you should use python3, but the client uses python.
4040
ln -s python3 $SNAPCRAFT_PART_INSTALL/usr/bin/python
4141
prime:
42-
- -lib/python3.5/site-packages/tabulate-0.7.7.dist-info/.PKG-INFO.swp
42+
- -lib/python3.5/site-packages/tabulate-0.7.7.dist-info/.PKG-INFO.swp

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ ENV JP_VERSION="0.1.3"
1515
LABEL maintainer="Microsoft" \
1616
org.label-schema.schema-version="1.0" \
1717
org.label-schema.vendor="Microsoft" \
18-
org.label-schema.name="Azure CLI 2.0" \
18+
org.label-schema.name="Azure CLI" \
1919
org.label-schema.version=$CLI_VERSION \
2020
org.label-schema.license="MIT" \
21-
org.label-schema.description="The Azure CLI 2.0 is the new Azure CLI and is applicable when you use the Resource Manager deployment model." \
21+
org.label-schema.description="The Azure CLI is used for all Resource Manager deployments in Azure." \
2222
org.label-schema.url="https://docs.microsoft.com/en-us/cli/azure/overview" \
2323
org.label-schema.usage="https://docs.microsoft.com/en-us/cli/azure/install-az-cli2#docker" \
2424
org.label-schema.build-date=$BUILD_DATE \

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Microsoft Azure CLI 2.0
1+
# Microsoft Azure CLI
22

33
[![Python](https://img.shields.io/pypi/pyversions/azure-cli.svg?maxAge=2592000)](https://pypi.python.org/pypi/azure-cli)
44
[![Travis](https://travis-ci.org/Azure/azure-cli.svg?branch=dev)](https://travis-ci.org/Azure/azure-cli)
55
[![Slack](https://azureclislackin.azurewebsites.net/badge.svg)](https://azurecli.slack.com)
66

7-
A great cloud needs great tools; we're excited to introduce *Azure CLI 2.0*, our next generation multi-platform command line experience for Azure.
7+
A great cloud needs great tools; we're excited to introduce *Azure CLI*, our next generation multi-platform command line experience for Azure.
88

99
Take a test run now from Azure Cloud Shell!
1010

@@ -41,9 +41,9 @@ $ az vm create -h
4141

4242
### Highlights
4343

44-
Here are a few features and concepts that can help you get the most out of the Azure CLI 2.0
44+
Here are a few features and concepts that can help you get the most out of the Azure CLI.
4545

46-
![Azure CLI 2.0 Highlight Reel](doc/assets/AzBlogAnimation4.gif)
46+
![Azure CLI Highlight Reel](doc/assets/AzBlogAnimation4.gif)
4747

4848
The following examples are showing using the `--output table` format, you can change your default using the `az configure` command.
4949

build_scripts/debian/dir_creator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Homepage: https://github.com/azure/azure-cli
5959
Package: azure-cli
6060
Architecture: all
6161
Depends: \${shlibs:Depends}, \${misc:Depends}
62-
Description: Azure CLI 2.0
63-
A great cloud needs great tools; we're excited to introduce Azure CLI 2.0,
62+
Description: Azure CLI
63+
A great cloud needs great tools; we're excited to introduce Azure CLI,
6464
our next generation multi-platform command line experience for Azure.
6565
6666
EOM

build_scripts/rpm/azure-cli.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RPM spec file for Azure CLI 2.0
1+
# RPM spec file for Azure CLI
22
# Definition of macros used - https://fedoraproject.org/wiki/Packaging:RPMMacros?rd=Packaging/RPMMacros
33

44
# .el7.centos -> .el7
@@ -14,7 +14,7 @@
1414
%define venv_sha256 70d63fb7e949d07aeb37f6ecc94e8b60671edb15b890aa86dba5dfaf2225dc19
1515
%define cli_lib_dir %{_libdir}/az
1616

17-
Summary: Azure CLI 2.0
17+
Summary: Azure CLI
1818
License: MIT
1919
Name: %{name}
2020
Version: %{version}
@@ -32,7 +32,7 @@ BuildRequires: openssl-devel
3232
%global _python_bytecompile_errors_terminate_build 0
3333

3434
%description
35-
A great cloud needs great tools; we're excited to introduce Azure CLI 2.0,
35+
A great cloud needs great tools; we're excited to introduce Azure CLI,
3636
our next generation multi-platform command line experience for Azure.
3737

3838
%prep

cli_license_terms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**MICROSOFT SOFTWARE LICENSE TERMS**
22

3-
**Microsoft CLI 2.0 for Azure**
3+
**Microsoft CLI for Azure**
44

55
These license terms are an agreement between Microsoft Corporation (or
66
based on where you live, one of its affiliates) and you. They apply to

doc/authoring_command_modules/authoring_commands.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Authoring Commands
3939

4040
## Write the Command Loader
4141

42-
As of version 2.0.24, Azure CLI is based on the Knack framework (https://github.com/Microsoft/knack), which uses the `CLICommandsLoader` class as the mechanism for loading a module. In Azure CLI 2.0, you will create your own loader which will inherit from the `AzCommandsLoader` class. The basic structure is:
42+
As of version 2.0.24, Azure CLI is based on the Knack framework (https://github.com/Microsoft/knack), which uses the `CLICommandsLoader` class as the mechanism for loading a module. In Azure CLI, you will create your own loader which will inherit from the `AzCommandsLoader` class. The basic structure is:
4343

4444
```Python
4545
class MyCommandsLoader(AzCommandsLoader):
@@ -289,9 +289,9 @@ Additional Topics
289289

290290
## Keyword Argument Reference
291291

292-
**Overview of Keyword Arguments in Azure CLI 2.0**
292+
**Overview of Keyword Arguments in the Azure CLI**
293293

294-
When writing commands for Azure CLI 2.0, it is important to understand how keyword arguments (kwargs) are applied. Refer to the following diagram.
294+
When writing commands for the Azure CLI, it is important to understand how keyword arguments (kwargs) are applied. Refer to the following diagram.
295295

296296
![](/doc/assets/annotated-kwarg-structure.gif)
297297

@@ -366,7 +366,7 @@ The following kwargs may be inherited from the command loader:
366366

367367
Most ARM resources can be identified by an ID. In many cases, for example `show` and `delete` commands, it may be more useful to copy and paste an ID to identify the target resource instead of having to specify the names of the resource group, the resource, and the parent resource (if any).
368368

369-
Azure CLI 2.0 supports exposing an `--ids` parameter that will parse a resource ID into its constituent named parts so that this parsing need not be done as part of a client script. Additionally `--ids` will accept a _list_ of space-separated IDs, allowing the client to loop the command over each ID.
369+
Azure CLI supports exposing an `--ids` parameter that will parse a resource ID into its constituent named parts so that this parsing need not be done as part of a client script. Additionally `--ids` will accept a _list_ of space-separated IDs, allowing the client to loop the command over each ID.
370370

371371
Enabling this functionality only requires the command author specify the appropriate values for `id_part` in their calls to `AzArgumentContext.argument`.
372372

doc/azure2az_commands.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
Azure XPlat CLI to Azure CLI 2.0 commands
2+
Azure classic CLI to Azure CLI commands
33
=========================================
4-
Below is a list of common Azure XPlat commands and their Azure CLI 2.0 equivalent.
4+
Below is a list of common Azure classic CLI commands and their Azure CLI equivalent.
55

66
Services included:
77

@@ -11,7 +11,7 @@ Services included:
1111
* VM
1212

1313
========================================================== ==========================================================
14-
Azure XPlat CLI Azure CLI 2.0
14+
Azure classic CLI Azure CLI
1515
========================================================== ==========================================================
1616
azure account clear az account clear
1717
azure account list az account list
Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
# Migrating from Azure XPlat CLI to Azure CLI 2.0
1+
# Migrating from Azure classic CLI to Azure CLI
22

3-
With the introduction of our Azure CLI 2.0 preview, customers now have a
4-
choice of Azure command-line tools. While our Azure CLI 2.0 is built to be
5-
easier to use and automate, please consider the following before starting:
3+
If you still use the original Azure classic CLI for your scripts and deployments,
4+
you should consider switching to the new Azure CLI. Azure CLI is designed
5+
for working with the Resource Manager deployment style, while Azure classic CLI
6+
is recommended for only the classic (Azure Service Manager) deployment.
67

7-
* Both Azure CLI's can be installed and used side-by-side
8-
* The Azure CLI 2.0 will not support ASM/Classic mode services
8+
If you are ready to switch, please consider the following before starting:
9+
10+
* Both Azure CLIs can be installed and used side-by-side
11+
* The Azure CLI will not support ASM/Classic mode services
912
* Scripts are not compatible between both CLIs
1013

11-
## Why consider trying the Azure CLI 2.0?
12-
Regardless of the tool or vendor, it is important to ensure you benefit when
13-
adding a new tool to your toolbox. While the following covers only a small
14-
number of difference between these two products, we expect customers to benefit
15-
from the following:
14+
## Why switch?
15+
16+
The major reason to switch is that Azure classic CLI is currently only planned
17+
to have support through the end of 2018. The new Azure CLI also offers the following
18+
benefits:
1619

1720
* Clean outputs for common workflows
1821
* `--out table` for simplified human output
@@ -26,29 +29,27 @@ from the following:
2629
* Use `[tab][tab]` to lookup parameters, including resource groups and names (only supported in BASH and BASH on Windows)
2730
* Work with either Azure resource ID values (`--ids`) _or_ resource group and name (`-g -n`)
2831
* Built in client-side query engine powered by JMESPath
29-
* Service support
30-
* Our preview meets or exceeds XPlat CLI functionality for Compute, Storage, Network, RBAC, and ARM
31-
* More services coming online soon!
3232

3333
While we believe the above list is compelling, it's important to remember
34-
**the Azure CLI 2.0 only supports ARM mode**. If you are managing ASM/Classic
35-
resources, you must use the Azure XPlat CLI.
34+
**the Azure CLI only supports ARM mode**. If you are managing ASM/Classic
35+
resources, you must use the Azure classic CLI.
3636

37-
## Getting both CLI's setup side-by-side
37+
## Getting both CLIs set up side-by-side
3838

39-
First, you run `azure --version` and ensure you are using `0.10.5` or later, as
39+
First, run `azure --version` and ensure you are using `0.10.5` or later, as
4040
this is required for sharing your credentials between both CLIs. If you installed
4141
using NPM, upgrade with `npm upgrade -g azure-cli`. If you used an installer,
4242
we recommend downloading the latest installer to upgrade.
4343

44-
To install the Azure CLI 2.0, follow the steps for your preferred platform or
45-
environment on our [Installation Guide](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli).
44+
To install the latest Azure CLI, follow the steps for your preferred platform or
45+
environment in our [Installation Guide](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli).
4646

47-
Once installed, you can run `az configure` and follow the steps to setup your default output format.
47+
Once installed, you run `az configure` and follow the steps to setup your default output format.
4848

4949
Then run `az login` to login using device authentication. Once this step is complete you should be authenticated to use both CLIs.
5050

51-
## Important new concepts in the Azure CLI 2.0
51+
## Important new concepts in the Azure CLI
52+
5253
Here is a quick list of some new and changed concepts that can help you understand the new tool.
5354

5455
* Interactive Concepts
@@ -63,9 +64,9 @@ Here is a quick list of some new and changed concepts that can help you understa
6364
* Service Specific Concepts
6465
* VM power state is no longer included in `az vm list`, use `az vm get-instance-view` instead
6566

66-
## Moving scripts from XPlat CLI to Azure CLI 2.0
67+
## Moving scripts from Azure classic CLI to Azure CLI
6768

68-
Generally, converting a script from XPlat to Az follows these steps:
69+
Generally, converting a script from Azure classic CLI to Azure CLI follows these steps:
6970

7071
1. Switch `azure` commands to `az` commands
7172
2. Update commands to use new input values
@@ -76,19 +77,20 @@ Below, we break down each of these steps.
7677

7778
### Finding and switching to `az` commands
7879

79-
While most commands keep the same group and command names between the Azure XPlat CLI and the Azure CLI 2.0, we've built a [azure to az conversion table](https://github.com/Azure/azure-cli/blob/master/doc/azure2az_commands.rst) for common commands.
80+
While most commands keep the same group and command names between the Azure classic CLI and the latest Azure CLI, we've built a
81+
[azure to az conversion table](https://github.com/Azure/azure-cli/blob/master/doc/azure2az_commands.rst) for common commands.
8082

8183
#### Set vs. Update
8284

83-
Mutate operations now use the `update` verb instead of `set`. While the XPlat CLI
85+
Mutate operations now use the `update` verb instead of `set`. While the classic CLI
8486
exposed some common operations as parameters, such as:
8587

8688
```
8789
$ azure vm set -g MyGroup -n MyName --nic-ids $MyNicID
8890
$ azure vm set -g MyGroup -n MyName --tags myTagName=MyTagValue
8991
```
9092

91-
The Azure CLI 2.0 `update` commands work generically against the resource, for example:
93+
The Azure CLI `update` commands work generically against the resource, for example:
9294
```
9395
$ az vm update -g MyGroup -n MyName --add networkProfile.networkInterfaces primary=false id=$MyNicID
9496
$ az vm update -g MyGroup -n MyName --set tags.myTagName=MyTagValue
@@ -106,8 +108,8 @@ An example of this is `azure storage cors set` being replaced by `az storage cor
106108
### Updating input values
107109

108110
Once you have identified the `az` commands required for your script, you immediately
109-
notice changes to how inputs are handled. The Azure CLI 2.0 does not accept
110-
'positional parameters' such as `azure vm show MyRG MyName`, but instead require
111+
notice changes to how inputs are handled. The Azure CLI does not accept
112+
'positional parameters' such as `azure vm show MyRG MyName`, but instead requires
111113
parameter flags: `az vm show -g MyRG -n MyName`.
112114

113115
In addition, when an input value is missing, we will show an error indicating the
@@ -118,7 +120,7 @@ $ az vm show
118120
az vm show: error: (--name --resource-group | --ids) are required
119121
```
120122

121-
In addition to using resource groups and names (`-g -n`), you can also refer to
123+
In addition to using resource groups and names (`-g`, `-n`), you can also refer to
122124
resources directly by ID value using `--ids`:
123125

124126
```
@@ -141,7 +143,7 @@ $ az role create --role-definition @MyOnCallRoleDef.json
141143
142144
### Working with output formats
143145

144-
The Azure CLI 2.0 supports 4 primary output formats:
146+
The Azure CLI supports 4 primary output formats:
145147

146148
1. json - standard JSON formatted object graphs
147149
2. jsonc - colorized JSON
@@ -170,7 +172,7 @@ VM-Data
170172

171173
### Filtering down output values
172174

173-
A common pattern in Azure XPlat CLI scripts is using command-line tools, such as
175+
A common pattern in Azure classic CLI scripts is using command-line tools, such as
174176
AWK, grep, and jq, to extract values from output documents:
175177

176178
```
@@ -184,7 +186,7 @@ $ azure vm list --json \
184186
$ MY_SUBSCRIPTION_ID=$(azure account show --json | jq -r '.[0].id')
185187
```
186188

187-
With the Azure CLI 2.0, you can now use the `--query '[expression]'` parameter and the [JMESPath](http://jmespath.org/)
189+
With the Azure CLI, you can now use the `--query '[expression]'` parameter and the [JMESPath](http://jmespath.org/)
188190
query language to extract values.
189191

190192
```

src/azure-cli/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Microsoft Azure CLI 2.0
2-
=======================
1+
Microsoft Azure CLI
2+
===================
33

4-
A great cloud needs great tools; we're excited to introduce *Azure CLI 2.0*, our next generation multi-platform command line experience for Azure.
4+
A great cloud needs great tools; we're excited to introduce *Azure CLI*, our next generation multi-platform command line experience for Azure.
55

66
Usage
77
=====
@@ -29,7 +29,7 @@ For usage and help content, pass in the ``-h`` parameter, for example:
2929
Highlights
3030
===========
3131

32-
Here are a few features and concepts that can help you get the most out of the Azure CLI 2.0
32+
Here are a few features and concepts that can help you get the most out of the Azure CLI.
3333

3434
The following examples are showing using the ``--output table`` format, you can change your default using the ``$ az configure`` command.
3535

0 commit comments

Comments
 (0)