Skip to content

Commit

Permalink
Fixing completeness from 2022-09-01-preview (Azure#21204)
Browse files Browse the repository at this point in the history
* Adds base for updating Microsoft.DataProtection from version preview/2022-09-01-preview to version 2022-10-01-preview

Updates readme

Updates API version in new specs and examples

* Fixing completeness from 2022-09-01-preview

* reverted readme

* resolved prettier

* fixed model validation issues

Co-authored-by: Himanshu Agarwal <himanshu.123j@gmail.com>
  • Loading branch information
2 people authored and kayousef committed Dec 21, 2022
1 parent 711eca0 commit 408bb20
Show file tree
Hide file tree
Showing 10 changed files with 1,094 additions and 57 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"resourceId": "subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"properties": {
"friendlyName": "testDisk",
"dataSourceInfo": {
"resourceID": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk",
"resourceUri": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk",
"datasourceType": "Microsoft.Compute/disks",
"resourceName": "testDisk",
"resourceType": "Microsoft.Compute/disks",
"resourceLocation": "eastus2euap",
"objectType": "Datasource"
},
"dataSourceSetInfo": {
"resourceID": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk",
"resourceUri": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk",
"datasourceType": "Microsoft.Compute/disks",
"resourceName": "testDisk",
"resourceType": "Microsoft.Compute/disks",
"resourceLocation": "eastus2euap",
"objectType": "DatasourceSet"
},
"policyInfo": {
"policyId": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/policyRG/providers/Microsoft.DataProtection/backupVaults/jeczrsecy/backupPolicies/disk",
"policyVersion": "",
"policyParameters": {
"dataStoreParametersList": [
{
"objectType": "AzureOperationalStoreParameters",
"dataStoreType": "OperationalStore",
"resourceGroupId": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/policyRG"
}
]
}
},
"protectionStatus": {
"status": "ProtectionConfigured"
},
"currentProtectionState": "ProtectionConfigured",
"provisioningState": "Succeeded",
"objectType": "BackupInstance"
},
"id": "/subscriptions/36d32b25-3dc7-41b0-bde1-397500644591/resourceGroups/testRG/providers/Microsoft.Compute/disks/testDisk/providers/Microsoft.DataProtection/backupInstances/testDiskBI1-testDiskBI1-7664c12f-4d0a-440f-a0dc-b64f708b10e3",
"name": "testDiskBI1-testDiskBI1-7664c12f-4d0a-440f-a0dc-b64f708b10e3",
"type": "Microsoft.DataProtection/backupVaults/backupInstances"
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"parameters": {
"subscriptionId": "04cf684a-d41f-4550-9f70-7708a3a2283b",
"resourceGroupName": "000pikumar",
"vaultName": "PratikPrivatePreviewVault1",
"api-version": "2022-10-01-preview",
"backupInstanceName": "testInstance1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/000pikumar/providers/Microsoft.DataProtection/backupVaults/PratikPrivatePreviewVault1/deletedBackupInstances/testInstance1",
"name": "testInstance1",
"type": "Microsoft.DataProtection/backupVaults/deletedBackupInstances",
"properties": {
"friendlyName": "testInstance1",
"dataSourceInfo": {
"resourceID": "/subscriptions/f75d8d8b-6735-4697-82e1-1a7a3ff0d5d4/resourceGroups/viveksipgtest/providers/Microsoft.DBforPostgreSQL/servers/viveksipgtest/databases/testdb",
"resourceUri": "",
"datasourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceName": "testdb",
"resourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceLocation": "",
"objectType": "Datasource"
},
"dataSourceSetInfo": {
"resourceID": "/subscriptions/f75d8d8b-6735-4697-82e1-1a7a3ff0d5d4/resourceGroups/viveksipgtest/providers/Microsoft.DBforPostgreSQL/servers/viveksipgtest",
"resourceUri": "",
"datasourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceName": "viveksipgtest",
"resourceType": "Microsoft.DBforPostgreSQL/servers",
"resourceLocation": "",
"objectType": "DatasourceSet"
},
"deletionInfo": {
"deletionTime": "2022-05-04T00:00:36.6660445Z",
"scheduledPurgeTime": "2022-05-20T00:00:36.6660445Z",
"billingEndDate": "2022-05-06T00:00:36.6660445Z",
"deleteActivityID": "1e9ec790-d198-4efb-bbd7-e4669d5351a4"
},
"policyInfo": {
"policyId": "/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/000pikumar/providers/Microsoft.DataProtection/backupVaults/PratikPrivatePreviewVault1/backupPolicies/PratikPolicy1"
},
"protectionStatus": {
"status": "SoftDeleted"
},
"provisioningState": "Succeeded",
"objectType": "DeletedBackupInstance"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"subscriptionId": "04cf684a-d41f-4550-9f70-7708a3a2283b",
"resourceGroupName": "000pikumar",
"vaultName": "PratikPrivatePreviewVault1",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/000pikumar/providers/Microsoft.DataProtection/backupVaults/PratikPrivatePreviewVault1/deletedBackupInstances/testInstance1",
"name": "testInstance1",
"type": "Microsoft.DataProtection/backupVaults/deletedBackupInstances",
"properties": {
"friendlyName": "testInstance1",
"dataSourceInfo": {
"resourceID": "/subscriptions/f75d8d8b-6735-4697-82e1-1a7a3ff0d5d4/resourceGroups/viveksipgtest/providers/Microsoft.DBforPostgreSQL/servers/viveksipgtest/databases/testdb",
"resourceUri": "",
"datasourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceName": "testdb",
"resourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceLocation": "",
"objectType": "Datasource"
},
"dataSourceSetInfo": {
"resourceID": "/subscriptions/f75d8d8b-6735-4697-82e1-1a7a3ff0d5d4/resourceGroups/viveksipgtest/providers/Microsoft.DBforPostgreSQL/servers/viveksipgtest",
"resourceUri": "",
"datasourceType": "Microsoft.DBforPostgreSQL/servers/databases",
"resourceName": "viveksipgtest",
"resourceType": "Microsoft.DBforPostgreSQL/servers",
"resourceLocation": "",
"objectType": "DatasourceSet"
},
"deletionInfo": {
"deletionTime": "2022-05-04T00:00:36.6660445Z",
"scheduledPurgeTime": "2022-05-20T00:00:36.6660445Z",
"billingEndDate": "2022-05-06T00:00:36.6660445Z",
"deleteActivityID": "1e9ec790-d198-4efb-bbd7-e4669d5351a4"
},
"policyInfo": {
"policyId": "/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/000pikumar/providers/Microsoft.DataProtection/backupVaults/PratikPrivatePreviewVault1/backupPolicies/PratikPolicy1"
},
"protectionStatus": {
"status": "SoftDeleted"
},
"provisioningState": "Succeeded",
"objectType": "DeletedBackupInstance"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"subscriptionId": "04cf684a-d41f-4550-9f70-7708a3a2283b",
"resourceGroupName": "testrg",
"vaultName": "testvault",
"backupInstanceName": "testbi",
"api-version": "2022-10-01-preview"
},
"responses": {
"202": {
"headers": {
"Location": "https://api-dogfood.resources.windows-int.net/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/testrg/providers/Microsoft.DataProtection/backupInstances/testbi/operationResults/ZTA4YjQ0ZGYtYmNkNS00YTk1LWFjZTMtOTc1MjNmZWIxYWZlO2Y1ODg1MzA3LWJkNjItNDQ2OC05ZjZlLTJkMGM2NjNiNmJmNg==?api-version=2022-07-01-preview",
"Azure-AsyncOperation": "https://api-dogfood.resources.windows-int.net/subscriptions/04cf684a-d41f-4550-9f70-7708a3a2283b/resourceGroups/testrg/providers/Microsoft.DataProtection/backupVaults/testvault/operationStatus/ZTA4YjQ0ZGYtYmNkNS00YTk1LWFjZTMtOTc1MjNmZWIxYWZlO2Y1ODg1MzA3LWJkNjItNDQ2OC05ZjZlLTJkMGM2NjNiNmJmNg==?api-version=2022-07-01-preview",
"Retry-After": "60"
}
},
"200": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"subscriptionId": "5e13b949-1218-4d18-8b99-7e12155ec4f7",
"vaultName": "sampleVault",
"resourceGroupName": "SampleResourceGroup",
"resourceGuardProxyName": "swaggerExample",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parameters": {
"subscriptionId": "5e13b949-1218-4d18-8b99-7e12155ec4f7",
"vaultName": "sampleVault",
"resourceGroupName": "SampleResourceGroup",
"resourceGuardProxyName": "swaggerExample",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/5e13b949-1218-4d18-8b99-7e12155ec4f7/resourceGroups/SampleResourceGroup/providers/Microsoft.DataProtection/backupVaults/sampleVault/backupResourceGuardProxies/swaggerExample",
"name": "swaggerExample",
"type": "Microsoft.DataProtection/vaults/backupResourceGuardProxies",
"properties": {
"resourceGuardResourceId": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource",
"resourceGuardOperationDetails": [
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupInstances/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteBackupInstanceRequests/default"
},
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupResourceGuardProxies/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteResourceGuardProxyRequests/default"
}
],
"lastUpdatedTime": "2022-09-16T11:44:37.6130487Z",
"description": "Please take JIT access before performing any of the critical operation"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"subscriptionId": "5e13b949-1218-4d18-8b99-7e12155ec4f7",
"vaultName": "sampleVault",
"resourceGroupName": "SampleResourceGroup",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/5e13b949-1218-4d18-8b99-7e12155ec4f7/resourceGroups/SampleResourceGroup/providers/Microsoft.DataProtection/backupVaults/sampleVault/backupResourceGuardProxies/swaggerExample",
"name": "swaggerExample",
"type": "Microsoft.DataProtection/vaults/backupResourceGuardProxies",
"properties": {
"resourceGuardResourceId": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource",
"resourceGuardOperationDetails": [
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupInstances/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteBackupInstanceRequests/default"
},
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupResourceGuardProxies/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteResourceGuardProxyRequests/default"
}
],
"lastUpdatedTime": "2022-09-16T11:44:37.6130487Z",
"description": "Please take JIT access before performing any of the critical operation"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"parameters": {
"subscriptionId": "5e13b949-1218-4d18-8b99-7e12155ec4f7",
"vaultName": "sampleVault",
"resourceGroupName": "SampleResourceGroup",
"resourceGuardProxyName": "swaggerExample",
"api-version": "2022-10-01-preview",
"parameters": {
"properties": {
"resourceGuardResourceId": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/5e13b949-1218-4d18-8b99-7e12155ec4f7/resourceGroups/SampleResourceGroup/providers/Microsoft.DataProtection/backupVaults/sampleVault/backupResourceGuardProxies/swaggerExample",
"name": "swaggerExample",
"type": "Microsoft.DataProtection/vaults/backupResourceGuardProxies",
"properties": {
"resourceGuardResourceId": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource",
"resourceGuardOperationDetails": [
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupInstances/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteBackupInstanceRequests/default"
},
{
"vaultCriticalOperation": "Microsoft.DataProtection/backupVaults/backupResourceGuardProxies/delete",
"defaultResourceRequest": "/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteResourceGuardProxyRequests/default"
}
],
"lastUpdatedTime": "2022-09-16T11:44:37.6130487Z",
"description": "Please take JIT access before performing any of the critical operation"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"subscriptionId": "5e13b949-1218-4d18-8b99-7e12155ec4f7",
"vaultName": "sampleVault",
"resourceGroupName": "SampleResourceGroup",
"resourceGuardProxyName": "swaggerExample",
"api-version": "2022-10-01-preview",
"parameters": {
"resourceGuardOperationRequests": [
"/subscriptions/f9e67185-f313-4e79-aa71-6458d429369d/resourceGroups/ResourceGuardSecurityAdminRG/providers/Microsoft.DataProtection/resourceGuards/ResourceGuardTestResource/deleteBackupInstanceRequests/default"
],
"resourceToBeDeleted": "/subscriptions/5e13b949-1218-4d18-8b99-7e12155ec4f7/resourceGroups/SampleResourceGroup/providers/Microsoft.DataProtection/backupVaults/sampleVault/backupInstances/TestBI9779f4de"
}
},
"responses": {
"200": {
"body": {
"unlockDeleteExpiryTime": "2022-09-16T12:50:10.7039695Z"
}
}
}
}

0 comments on commit 408bb20

Please sign in to comment.