Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Harini Pandari authored and Harini Pandari committed Oct 14, 2019
2 parents 719fbd8 + c88d4cc commit f7a8532
Show file tree
Hide file tree
Showing 47 changed files with 6,779 additions and 69 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/specification/billing/ @wilcobmsft
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
/specification/cognitiveservices/ @davidlicig @felixwa @yangyuan
/specification/compute/ @huangpf @hyonholee @mabhard @danielli90
/specification/compute/ @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
/specification/consumption/ @kjeur @panda-wang
/specification/containerinstance/ @samkreter
/specification/containerregistry/ @djyou
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6942,6 +6942,10 @@
"allowExtensionOperations": {
"type": "boolean",
"description": "Specifies whether extension operations should be allowed on the virtual machine. <br><br>This may only be set to False when no extensions are present on the virtual machine."
},
"requireGuestProvisionSignal": {
"type": "boolean",
"description": "Specifies whether the guest provision signal is required from the virtual machine."
}
},
"description": "Specifies the operating system settings for the virtual machine."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@
"type": "object",
"properties": {
"packagePassword": {
"$ref": "../datafactory.json#/definitions/SecureString",
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "Password of the package."
},
"accessCredential": {
Expand Down Expand Up @@ -4281,7 +4281,7 @@
"description": "UseName for windows authentication."
},
"password": {
"$ref": "../datafactory.json#/definitions/SecureString",
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "Password for windows authentication."
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@
"body": {
"value": [
{
"name": "Microsoft.ResourceGraph/resources/action",
"name": "Microsoft.ResourceGraph/operations/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Operation",
"operation": "Get Operations",
"description": "Gets the list of supported operations"
}
},
{
"name": "Microsoft.ResourceGraph/resources/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resources",
Expand All @@ -16,12 +25,48 @@
}
},
{
"name": "Microsoft.ResourceGraph/queries/action",
"name": "Microsoft.ResourceGraph/resourceChanges/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resource Changes",
"operation": "Query resource changes",
"description": "Lists changes to a resource for a given time interval"
}
},
{
"name": "Microsoft.ResourceGraph/resourceChangeDetails/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resource Change Details",
"operation": "Query resource change details",
"description": "Gets the details of the specified resource change"
}
},
{
"name": "Microsoft.ResourceGraph/queries/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resource Graph Queries",
"operation": "Read resource graph queries",
"description": "Gets the specified graph query"
}
},
{
"name": "Microsoft.ResourceGraph/queries/delete",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resource Graph Queries",
"operation": "Delete resource graph queries",
"description": "Deletes the specified graph query"
}
},
{
"name": "Microsoft.ResourceGraph/queries/write",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Queries",
"operation": "CRUD operations of graph queries",
"description": "Create/Update/Retrieve a query within specified subscription and resource group."
"resource": "Resource Graph Queries",
"operation": "Create/Update resource graph queries",
"description": "Creates/Updates the specified graph query"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@
"body": {
"value": [
{
"name": "Microsoft.ResourceGraph/resources/action",
"name": "Microsoft.ResourceGraph/operations/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Operation",
"operation": "Get Operations",
"description": "Gets the list of supported operations"
}
},
{
"name": "Microsoft.ResourceGraph/resources/read",
"display": {
"provider": "Microsoft Resource Graph",
"resource": "Resources",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"api-version": "2019-06-01",
"parameters": {
"properties": {
"storageAccountResourceId": "/subscriptions/744f4d70-6d17-4921-8970-a765d14f763f/resourceGroups/tminienv59svc/providers/Microsoft.Storage/storageAccounts/tminienv59storage",
"azureFileShareName": "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4",
"storageAccountTenantId": "\"72f988bf-86f1-41af-91ab-2d7cd011db47\"",
"friendlyName": "ankushbsubscriptionmgmtmab"
}
}
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
},
"body": {
"name": "SampleCloudEndpoint_1",
"properties": {
"backupEnabled": "false",
"provisioningState": "Succeeded",
"storageAccountResourceId": "/subscriptions/744f4d70-6d17-4921-8970-a765d14f763f/resourceGroups/tminienv59svc/providers/Microsoft.Storage/storageAccounts/tminienv59storage",
"azureFileShareName": "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4",
"storageAccountTenantId": "\"72f988bf-86f1-41af-91ab-2d7cd011db47\"",
"friendlyName": "ankushbsubscriptionmgmtmab",
"lastWorkflowId": "storageSyncServices/GATest/workflows/24ba0c4a-348e-419b-8f7a-091d0d9f07a4",
"partnershipId": "1|U0VSVkVSQVNTWU5DQ0xJRU5USEZTVjJ8RjhDODcwQTItMkFGNi00NDUyLTgzMDgtRjJCQTZEQjI3RkEwfEdFTkVSSUN8NTJCOERBMkYtNjFFMC00QTFGLThEREUtMzM2OTExRjM2N0ZC",
"lastOperationName": "ICreateCloudEndpointWorkflow"
},
"id": "/subscriptions/52b8da2f-61e0-4a1f-8dde-336911f367fb/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SampleSyncGroup_1/cloudEndpoints/SampleCloudEndpoint_1",
"type": "Microsoft.StorageSync/storageSyncServices/syncGroups/cloudEndpoints"
}
},
"202": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncservice_1/workflows/c1d54be7-4738-4898-8212-cc36774314f8/operations/7ce689b2-0eca-48f5-86f0-0b8d6ceef14a?api-version=2019-06-01",
"Location": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncservice_1/workflows/c1d54be7-4738-4898-8212-cc36774314f8/operationresults/7ce689b2-0eca-48f5-86f0-0b8d6ceef14a?api-version=2019-06-01",
"Retry-After": "10",
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
},
"202": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/workflows/78a71465-77ef-4509-a026-2c0cd8b30208/operations/2d7f573a-7acd-4a3c-9425-fed7d029c69d?api-version=2019-06-01",
"Location": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/workflows/78a71465-77ef-4509-a026-2c0cd8b30208/operationresults/2d7f573a-7acd-4a3c-9425-fed7d029c69d?api-version=2019-06-01",
"Retry-After": "10",
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
},
"body": {
"name": "SampleCloudEndpoint_1",
"properties": {
"provisioningState": "Succeeded",
"storageAccountResourceId": "",
"azureFileShareName": "",
"storageAccountTenantId": "\"a4d1b191-c1af-4cef-a14b-f670e0beea52\"",
"lastWorkflowId": "/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/workflows/a377fdd5-949a-40ab-9629-06cd0e9852f9",
"friendlyName": "SampleAzureFileShareName_1",
"partnershipId": "1|U0VSVkVSQVNTWU5DQ0xJRU5USEZTVjJ8MTkxNjYwQ0QtNkExQS00RjhDLTk3ODctQTZCRUQyMDZBMUREfEdFTkVSSUN8M0EwNDgyODMtMzM4Ri00MDAyLUE5REQtQTUwRkRBRENCMzky",
"lastOperationName": "ICreateCloudEndpointWorkflow"
},
"id": "/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SyncGroup_Restore_08-08_Test112/cloudEndpoints/CEP_Restore_08-08_Test112",
"type": "Microsoft.StorageSync/storageSyncServices/syncGroups/cloudEndpoints"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
},
"body": {
"value": [
{
"name": "CEP_Restore_08-08_Test112",
"properties": {
"provisioningState": "Succeeded",
"storageAccountResourceId": "",
"azureFileShareName": "",
"storageAccountTenantId": "\"a4d1b191-c1af-4cef-a14b-f670e0beea52\"",
"lastWorkflowId": "/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/workflows/a377fdd5-949a-40ab-9629-06cd0e9852f9",
"friendlyName": "SampleAzureFileShareName_1",
"partnershipId": "1|U0VSVkVSQVNTWU5DQ0xJRU5Udfsdfdsfs8MTkxNjYwQ0QtNkExQS00RjhDLTk3ODctQTZCRUQyMDZBMUREfEdFTkVSSUN8M0EwNDgyODMtMzM4Ri00MDAyLUE5REQtQTUwRkRBRENCMzky",
"lastOperationName": "ICreateCloudEndpointWorkflow"
},
"id": "/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SyncGroup_Restore_08-08_Test112/cloudEndpoints/CEP_Restore_08-08_Test112",
"type": "Microsoft.StorageSync/storageSyncServices/syncGroups/cloudEndpoints"
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"parameters": {
"azureFileShare": "https://sampleserver.file.core.test-cint.azure-test.net/sampleFileShare"
},
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
},
"body": {
"backupMetadata": {
"cloudEndpointName": "subscriptions/52b8da2f-61e0-4a1f-8dde-336911f367fb/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SampleSyncGroup_1/cloudEndpoints/SampleCloudEndpoint_1"
}
}
},
"202": {
"headers": {
"x-ms-location": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/HfsMabFS1/syncGroups/HfsMabDS1/cloudEndpoints/HfsMabCE1/operationresults/baa40401-b043-4d1b-a80b-cb4e79fa1398?api-version=2019-06-01&resourcetype=PostBackupResourceType&ifxctx3=1847a938-7638-4d1b-943c-96ff2f8a2ec8",
"Retry-After": "10",
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"parameters": {
"azureFileShareUri": "https://hfsazbackupdevintncus2.file.core.test-cint.azure-test.net/sampleFileShare",
"sourceAzureFileShareUri": "https://hfsazbackupdevintncus2.file.core.test-cint.azure-test.net/sampleFileShare",
"status": "Succeeded",
"restoreFileSpec": [
{
"path": "text1.txt",
"isdir": false
},
{
"path": "MyDir",
"isdir": true
},
{
"path": "MyDir/SubDir",
"isdir": false
},
{
"path": "MyDir/SubDir/File1.pdf",
"isdir": false
}
]
},
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
},
"202": {
"headers": {
"x-ms-location": "https: //management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/HfsMabFS1/syncGroups/HfsMabDS1/cloudEndpoints/HfsMabCE1/operationresults/d67cfb91-1b13-4710-8226-83467bb5b66d?api-version=2019-06-01&resourcetype=preBackupResourceType&ifxctx3=005909ad-d156-4514-a26e-dd1cc566db64",
"Retry-After": "10",
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parameters": {
"subscriptionId": "52b8da2f-61e0-4a1f-8dde-336911f367fb",
"resourceGroupName": "SampleResourceGroup_1",
"storageSyncServiceName": "SampleStorageSyncService_1",
"syncGroupName": "SampleSyncGroup_1",
"cloudEndpointName": "SampleCloudEndpoint_1",
"api-version": "2019-06-01",
"parameters": {
"azureFileShare": "https://sampleserver.file.core.test-cint.azure-test.net/sampleFileShare"
}
},
"responses": {
"200": {
"headers": {
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
},
"202": {
"headers": {
"x-ms-location": "https://management.azure.com/subscriptions/3a048283-338f-4002-a9dd-a50fdadcb392/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/HfsMabFS1/syncGroups/HfsMabDS1/cloudEndpoints/HfsMabCE1/operationresults/d67cfb91-1b13-4710-8226-83467bb5b66d?api-version=2019-06-01&resourcetype=preBackupResourceType&ifxctx3=005909ad-d156-4514-a26e-dd1cc566db64",
"Retry-After": "10",
"x-ms-request-id": "74e55a4d-1c6f-46de-9a8d-278e53a47403",
"x-ms-correlation-request-id": "d166ca76-dad2-49df-b409-d2acfd42d730"
}
}
}
}
Loading

0 comments on commit f7a8532

Please sign in to comment.