Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
00b9235
{Docs} Remove stale reference in README to closed issue about extensi…
dkmiller Apr 27, 2020
ab16df0
Merge remote-tracking branch 'upstream/release'
azclibot Apr 28, 2020
03436bc
Merge remote-tracking branch 'upstream/release'
azclibot Apr 30, 2020
7d98b1f
Merge remote-tracking branch 'upstream/release'
azclibot May 19, 2020
06f6ec5
Merge remote-tracking branch 'upstream/release'
azclibot Jun 2, 2020
125406f
Merge branch 'master' of git://github.com/Azure/azure-cli into dev
Jun 16, 2020
a497390
Preliminary changes made to add support for template-specs
Jun 22, 2020
e43a151
Reconfiguration
Jun 22, 2020
adab2d2
Merge remote-tracking branch 'upstream/release'
azclibot Jun 23, 2020
37c8522
Merge branch 'master' of git://github.com/Azure/azure-cli into dev
Jun 23, 2020
ef1e3f2
Merge remote-tracking branch 'upstream/dev' into dev
Jun 26, 2020
50e7c9c
validate function error rectified
Jun 27, 2020
68f47fd
validate command works for template-uri
Jun 29, 2020
7f184f8
Merge branch 'dev' of git://github.com/Azure/azure-cli into dev
Jun 29, 2020
bf962b1
Template-specs deployment works at resource-group level
Jun 29, 2020
4b90edd
Group deployment updated to function with 2020 SDK
Jun 30, 2020
4f39504
validate with template specs added
Jun 30, 2020
2e04882
Management scope and tenant scope errors fixed
Jul 1, 2020
7be894f
Testing Complete
Jul 2, 2020
87ccc2e
Merge branch 'dev' of git://github.com/Azure/azure-cli into dev
Jul 6, 2020
4f1348c
Template-Specs Deployment Added
Jul 6, 2020
9eb09f2
Template-Specs Deployment Added
Jul 6, 2020
44362eb
Merge branch 'dev' of git://github.com/Azure/azure-cli into dev
Jul 6, 2020
cf7b97a
Updated test cases and removed unnecessary comments
Jul 6, 2020
fb78986
Removed test cases from launch.json
Jul 6, 2020
504fda7
Uncommented test case
Jul 6, 2020
8f21f7c
Cleaned up repo
Jul 6, 2020
e73132c
Cleaned up repo
Jul 6, 2020
e8153f8
Merge branch 'dev' of git://github.com/Azure/azure-cli into dev
Jul 7, 2020
eac8414
Style checks complete, template_spec parameter placed at the end, tim…
Jul 8, 2020
74666fe
Merged with /dev
Jul 8, 2020
0e28ed8
Fixed failing CLI Check Test
Jul 8, 2020
583352f
Added fixes for deployment create_or_update and validate usage
Jul 9, 2020
a6344b8
Merge branch 'dev' of git://github.com/Azure/azure-cli into dev
Jul 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/azure-cli-core/azure/cli/core/profiles/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class ResourceType(Enum): # pylint: disable=too-few-public-methods
MGMT_RESOURCE_RESOURCES = ('azure.mgmt.resource.resources', 'ResourceManagementClient')
MGMT_RESOURCE_SUBSCRIPTIONS = ('azure.mgmt.resource.subscriptions', 'SubscriptionClient')
MGMT_RESOURCE_DEPLOYMENTSCRIPTS = ('azure.mgmt.resource.deploymentscripts', 'DeploymentScriptsClient')
MGMT_RESOURCE_TEMPLATESPECS = ('azure.mgmt.resource.templatespecs', 'TemplateSpecsClient')
MGMT_MONITOR = ('azure.mgmt.monitor', 'MonitorManagementClient')
DATA_KEYVAULT = ('azure.keyvault', 'KeyVaultClient')
MGMT_EVENTHUB = ('azure.mgmt.eventhub', 'EventHubManagementClient')
Expand Down Expand Up @@ -146,9 +147,10 @@ def default_api_version(self):
ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_LOCKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_POLICY: '2019-09-01',
ResourceType.MGMT_RESOURCE_RESOURCES: '2019-07-01',
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2019-11-01',
ResourceType.MGMT_RESOURCE_RESOURCES: '2020-06-01',
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2019-06-01',
ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2019-10-01-preview',
ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2019-06-01-preview',
ResourceType.MGMT_NETWORK_DNS: '2018-05-01',
ResourceType.MGMT_KEYVAULT: '2019-09-01',
ResourceType.MGMT_AUTHORIZATION: SDKProfile('2018-09-01-preview', {
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
'requests~=2.22',
'six~=1.12',
'pkginfo>=1.5.0.1',
'azure-mgmt-resource==10.0.0',
'azure-mgmt-resource==10.1.0',
'azure-mgmt-core==1.0.0'
]

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-resource/8.0.1
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-resource/10.0.0
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2019-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2020-06-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-02-28T03:50:25Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-07-06T00:30:28Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -30,7 +30,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 28 Feb 2020 03:50:26 GMT
- Mon, 06 Jul 2020 00:30:32 GMT
expires:
- '-1'
pragma:
Expand All @@ -46,7 +46,7 @@ interactions:
message: OK
- request:
body: '{"location": "westus", "properties": {"sku": {"name": "PerGB2018"}, "retentionInDays":
30}}'
30, "workspaceCapping": {}}}'
headers:
Accept:
- application/json
Expand All @@ -57,40 +57,43 @@ interactions:
Connection:
- keep-alive
Content-Length:
- '91'
- '115'
Content-Type:
- application/json; charset=utf-8
ParameterSetName:
- -g -n
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-loganalytics/0.2.0
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-loganalytics/0.6.0
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-03-01-preview
response:
body:
string: "{\r\n \"properties\": {\r\n \"source\": \"Azure\",\r\n \"customerId\":
\"c92555c0-19dc-4e95-be15-f8146840d053\",\r\n \"provisioningState\": \"Creating\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"lastSkuUpdate\":
\"Fri, 28 Feb 2020 03:50:28 GMT\"\r\n },\r\n \"retentionInDays\": 30,\r\n
\ \"features\": {\r\n \"legacy\": 0,\r\n \"searchVersion\": 1,\r\n
\ \"enableLogAccessUsingOnlyResourcePermissions\": true\r\n },\r\n
\ \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n \"quotaNextResetTime\":
\"Fri, 28 Feb 2020 13:00:00 GMT\",\r\n \"dataIngestionStatus\": \"RespectQuota\"\r\n
\ }\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\"358c565a-ee14-49e7-b004-4c9eb8094f71\",\r\n \"provisioningState\": \"Creating\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"maxCapacityReservationLevel\":
3000,\r\n \"lastSkuUpdate\": \"Mon, 06 Jul 2020 00:30:35 GMT\"\r\n },\r\n
\ \"retentionInDays\": 30,\r\n \"features\": {\r\n \"legacy\": 0,\r\n
\ \"searchVersion\": 1,\r\n \"enableLogAccessUsingOnlyResourcePermissions\":
true\r\n },\r\n \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n
\ \"quotaNextResetTime\": \"Mon, 06 Jul 2020 04:00:00 GMT\",\r\n \"dataIngestionStatus\":
\"RespectQuota\"\r\n },\r\n \"publicNetworkAccessForIngestion\": \"Enabled\",\r\n
\ \"publicNetworkAccessForQuery\": \"Enabled\",\r\n \"createdDate\":
\"Mon, 06 Jul 2020 00:30:35 GMT\",\r\n \"modifiedDate\": \"Mon, 06 Jul
2020 00:30:35 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\ \"name\": \"wprkspace000003\",\r\n \"type\": \"Microsoft.OperationalInsights/workspaces\",\r\n
\ \"location\": \"westus\"\r\n}"
headers:
cache-control:
- no-cache
content-length:
- '928'
- '1177'
content-type:
- application/json
date:
- Fri, 28 Feb 2020 03:50:27 GMT
- Mon, 06 Jul 2020 00:30:35 GMT
pragma:
- no-cache
server:
Expand All @@ -101,7 +104,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-ratelimit-remaining-subscription-writes:
- '1199'
- '1198'
x-powered-by:
- ASP.NET
- ASP.NET
Expand All @@ -122,32 +125,35 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-loganalytics/0.2.0
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-loganalytics/0.6.0
Azure-SDK-For-Python AZURECLI/2.8.0
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-03-01-preview
response:
body:
string: "{\r\n \"properties\": {\r\n \"source\": \"Azure\",\r\n \"customerId\":
\"c92555c0-19dc-4e95-be15-f8146840d053\",\r\n \"provisioningState\": \"Succeeded\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"lastSkuUpdate\":
\"Fri, 28 Feb 2020 03:50:28 GMT\"\r\n },\r\n \"retentionInDays\": 30,\r\n
\ \"features\": {\r\n \"legacy\": 0,\r\n \"searchVersion\": 1,\r\n
\ \"enableLogAccessUsingOnlyResourcePermissions\": true\r\n },\r\n
\ \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n \"quotaNextResetTime\":
\"Fri, 28 Feb 2020 13:00:00 GMT\",\r\n \"dataIngestionStatus\": \"RespectQuota\"\r\n
\ }\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\"358c565a-ee14-49e7-b004-4c9eb8094f71\",\r\n \"provisioningState\": \"Succeeded\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"maxCapacityReservationLevel\":
3000,\r\n \"lastSkuUpdate\": \"Mon, 06 Jul 2020 00:30:35 GMT\"\r\n },\r\n
\ \"retentionInDays\": 30,\r\n \"features\": {\r\n \"legacy\": 0,\r\n
\ \"searchVersion\": 1,\r\n \"enableLogAccessUsingOnlyResourcePermissions\":
true\r\n },\r\n \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n
\ \"quotaNextResetTime\": \"Mon, 06 Jul 2020 04:00:00 GMT\",\r\n \"dataIngestionStatus\":
\"RespectQuota\"\r\n },\r\n \"publicNetworkAccessForIngestion\": \"Enabled\",\r\n
\ \"publicNetworkAccessForQuery\": \"Enabled\",\r\n \"createdDate\":
\"Mon, 06 Jul 2020 00:30:35 GMT\",\r\n \"modifiedDate\": \"Mon, 06 Jul
2020 00:30:36 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\ \"name\": \"wprkspace000003\",\r\n \"type\": \"Microsoft.OperationalInsights/workspaces\",\r\n
\ \"location\": \"westus\"\r\n}"
headers:
cache-control:
- no-cache
content-length:
- '929'
- '1178'
content-type:
- application/json
date:
- Fri, 28 Feb 2020 03:50:58 GMT
- Mon, 06 Jul 2020 00:31:05 GMT
pragma:
- no-cache
server:
Expand Down Expand Up @@ -181,15 +187,15 @@ interactions:
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-resource/8.0.1
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-resource/10.0.0
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2019-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2020-06-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-02-28T03:50:25Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-07-06T00:30:28Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -198,7 +204,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 28 Feb 2020 03:50:59 GMT
- Mon, 06 Jul 2020 00:31:07 GMT
expires:
- '-1'
pragma:
Expand All @@ -214,7 +220,7 @@ interactions:
message: OK
- request:
body: '{"location": "westus", "sku": {"name": "Basic"}, "properties": {"adminUserEnabled":
false}}'
false, "publicNetworkAccess": "Enabled"}}'
headers:
Accept:
- application/json
Expand All @@ -225,30 +231,30 @@ interactions:
Connection:
- keep-alive
Content-Length:
- '91'
- '125'
Content-Type:
- application/json; charset=utf-8
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-containerregistry/3.0.0rc10
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-containerregistry/3.0.0rc14
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002?api-version=2019-12-01-preview
response:
body:
string: '{"sku":{"name":"Basic","tier":"Basic"},"type":"Microsoft.ContainerRegistry/registries","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002","name":"clireg000002","location":"westus","tags":{},"properties":{"loginServer":"clireg000002.azurecr.io","creationDate":"2020-02-28T03:51:00.6373739Z","provisioningState":"Succeeded","adminUserEnabled":false,"policies":{"quarantinePolicy":{"status":"disabled"},"trustPolicy":{"type":"Notary","status":"disabled"},"retentionPolicy":{"days":7,"lastUpdatedTime":"2020-02-28T03:51:01.6696433+00:00","status":"disabled"}},"encryption":{"status":"disabled"}}}'
string: '{"sku":{"name":"Basic","tier":"Basic"},"type":"Microsoft.ContainerRegistry/registries","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002","name":"clireg000002","location":"westus","tags":{},"properties":{"loginServer":"clireg000002.azurecr.io","creationDate":"2020-07-06T00:31:09.2604271Z","provisioningState":"Succeeded","adminUserEnabled":false,"policies":{"quarantinePolicy":{"status":"disabled"},"trustPolicy":{"type":"Notary","status":"disabled"},"retentionPolicy":{"days":7,"lastUpdatedTime":"2020-07-06T00:31:35.4568383+00:00","status":"disabled"}},"encryption":{"status":"disabled"},"dataEndpointEnabled":false,"dataEndpointHostNames":[],"privateEndpointConnections":[],"publicNetworkAccess":"Enabled"}}'
headers:
cache-control:
- no-cache
content-length:
- '777'
- '896'
content-type:
- application/json; charset=utf-8
date:
- Fri, 28 Feb 2020 03:51:01 GMT
- Mon, 06 Jul 2020 00:31:35 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -290,8 +296,8 @@ interactions:
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-monitor/0.7.0
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-monitor/0.9.0
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: PUT
Expand All @@ -307,7 +313,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 28 Feb 2020 03:51:03 GMT
- Mon, 06 Jul 2020 00:31:42 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -341,8 +347,8 @@ interactions:
ParameterSetName:
- -g --resource -n
User-Agent:
- python/3.6.6 (Windows-10-10.0.18362-SP0) msrest/0.6.9 msrest_azure/0.6.2 azure-mgmt-monitor/0.7.0
Azure-SDK-For-Python AZURECLI/2.1.0
- python/3.8.3 (Windows-10-10.0.19041-SP0) msrest/0.6.9 msrest_azure/0.6.3 azure-mgmt-monitor/0.9.0
Azure-SDK-For-Python AZURECLI/2.8.0
accept-language:
- en-US
method: GET
Expand All @@ -358,7 +364,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 28 Feb 2020 03:51:03 GMT
- Mon, 06 Jul 2020 00:31:42 GMT
expires:
- '-1'
pragma:
Expand Down
Loading