Skip to content

Commit

Permalink
Update default arm api version, update ARM package, add test for Cros…
Browse files Browse the repository at this point in the history 
…sRG (Azure#3256)
  • Loading branch information
@vivsriaus @yugangw-msft
vivsriaus authored and yugangw-msft committed May 9, 2017
1 parent b619cec commit 873f3d6
Show file tree
Hide file tree
Showing 132 changed files with 2,143 additions and 1,698 deletions.
2 changes: 2 additions & 0 deletions azure-cli.pyproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,9 @@
<Content Include="command_modules\azure-cli-redis\HISTORY.rst" />
<Content Include="command_modules\azure-cli-resource\HISTORY.rst" />
<Content Include="command_modules\azure-cli-resource\tests\sample_policy_rule.json" />
<Content Include="command_modules\azure-cli-resource\tests\crossrg_deploy.json" />
<Content Include="command_modules\azure-cli-resource\tests\simple_deploy.json" />
<Content Include="command_modules\azure-cli-resource\tests\crossrg_deploy_parameters.json" />
<Content Include="command_modules\azure-cli-resource\tests\simple_deploy_parameters.json" />
<Content Include="command_modules\azure-cli-role\HISTORY.rst" />
<Content Include="command_modules\azure-cli-sql\HISTORY.rst" />
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/profiles/_shared.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(self, import_prefix, client_name):
ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_LOCKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_POLICY: '2016-04-01',
ResourceType.MGMT_RESOURCE_RESOURCES: '2016-09-01',
ResourceType.MGMT_RESOURCE_RESOURCES: '2017-05-10',
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2016-06-01',
ResourceType.DATA_STORAGE: '2016-05-31'
},
Expand Down
24 changes: 12 additions & 12 deletions src/azure-cli-core/tests/recordings/test_rp_auto_register.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
headers:
Expand Down Expand Up @@ -70,7 +70,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: POST
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/register?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/register?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -367,7 +367,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -662,7 +662,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -957,7 +957,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -1252,7 +1252,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -1547,7 +1547,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -1842,7 +1842,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -2137,7 +2137,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -2432,7 +2432,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -2757,7 +2757,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql?api-version=2017-05-10
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql","namespace":"Microsoft.Sql","authorization":{"applicationId":"e4ab13ed-33cb-41b4-9140-6e264582cf85","roleDefinitionId":"ec3ddc95-44dc-47a2-9926-5e9f5ffd44ec"},"resourceTypes":[{"resourceType":"operations","locations":["East
US","West US","South Central US","East US 2","Central US","North Central US","East
Expand Down Expand Up @@ -3053,7 +3053,7 @@ interactions:
AZURECLI/2.0.3+dev]
accept-language: [en-US]
method: DELETE
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2017-05-10
response:
body: {string: ''}
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/command_modules/azure-cli-acr/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

DEPENDENCIES = [
'azure-cli-core',
'azure-mgmt-resource==1.0.0rc3',
'azure-mgmt-resource==1.1.0rc1',
'azure-mgmt-storage==1.0.0rc1',
'azure-mgmt-containerregistry==0.2.1',
]
Expand Down
Loading

0 comments on commit 873f3d6

Please sign in to comment.