Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up version number for "old" preview api #10768

Merged
merged 28 commits into from
Sep 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
11ce62d
WIP: Updating Microsoft.AzureData
jorgbaca Jul 20, 2020
4c74ee7
Merge remote-tracking branch 'azure-remote/master'
jorgbaca Jul 20, 2020
e44ca90
Minor changes
jorgbaca Jul 20, 2020
e55b9bd
Adding new SystemData property to examples
jorgbaca Jul 20, 2020
a5ee8a3
Fixed formatting
jorgbaca Jul 20, 2020
7337b93
Update azuredata.json
jorgbaca Jul 20, 2020
78e2146
Update azuredata.json
jorgbaca Jul 20, 2020
7f7d4bf
Fixed formatting
jorgbaca Jul 21, 2020
b35a214
Merge remote-tracking branch 'azure-remote/master'
jorgbaca Jul 21, 2020
d0468ae
Removing changes from this PR (suggested by ARM). Will send a differe…
jorgbaca Jul 21, 2020
8d0c323
Merge remote-tracking branch 'upstream/master'
jorgbaca Aug 19, 2020
c03d76a
Added optional properties to sqlManagedInstances.
jorgbaca Aug 19, 2020
049699e
Ran prettier check
jorgbaca Aug 19, 2020
199e6a3
Adding missing parameter
jorgbaca Aug 19, 2020
fc355db
Added new definition for data controller patch model
jorgbaca Aug 21, 2020
f53c424
Fixed parameter
jorgbaca Aug 21, 2020
a08e33f
Merge branch 'master' of github.com:Azure/azure-rest-api-specs
jorgbaca Aug 28, 2020
98fe8f5
Copying 2019 api to 2020
jorgbaca Sep 11, 2020
f17a34d
Removing EOS examples (and list operation which is not supported)
jorgbaca Sep 11, 2020
a58b739
Remvoing EOS stuff from azuredata.json. Removing operation resource as
jorgbaca Sep 11, 2020
a07f2d1
Update postgres details
jorgbaca Sep 11, 2020
61909cb
Update postgres example
jorgbaca Sep 11, 2020
0babe01
Updating api-version in examples
jorgbaca Sep 11, 2020
301995d
Adding last uploaded date and k8sRaw
jorgbaca Sep 11, 2020
d81f060
Update descriptions
jorgbaca Sep 11, 2020
29bdbb7
Fix paramters
jorgbaca Sep 11, 2020
a9d2f1e
Add missing bracket
jorgbaca Sep 11, 2020
ab5c036
Update readme
jorgbaca Sep 11, 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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"dataControllerName": "testdataController",
"api-version": "2019-09-08-preview",
"dataControllerResource": {
"location": "northeurope",
"tags": {
"mytag": "myval"
},
"properties": {
"onPremiseProperty": {
"id": "12345678-1234-1234-ab12-1a2b3c4d5e6f",
"publicSigningKey": "publicOnPremSigningKey"
}
}
}
},
"responses": {
"200": {
"body": {
"properties": {
"onPremiseProperty": {
"id": "12345678-1234-1234-ab12-1a2b3c4d5e6f",
"publicSigningKey": "publicOnPremSigningKey",
"signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded"
}
},
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"location": "northeurope",
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/dataControllers/testdataController",
"name": "testdataController",
"type": "Microsoft.AzureData/dataControllers"
}
},
"201": {
"body": {
"properties": {
"onPremiseProperty": {
"id": "12345678-1234-1234-ab12-1a2b3c4d5e6f",
"publicSigningKey": "publicOnPremSigningKey",
"signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded"
}
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/dataControllers/testdataController",
"name": "testdataController",
"type": "Microsoft.AzureData/dataControllers"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"postgresInstanceName": "testpostgresInstance",
"api-version": "2019-09-08-preview",
"location": "northeurope",
"tags": {
"mytag": "myval"
},
"resource": {
"location": "eastus",
"properties": {
"dataControllerId": "dataControllerId",
"admin": "admin",
"k8sRaw": {
"apiVersion": "apiVersion",
"kind": "postgresql-12",
"metadata": {
"creationTimestamp": "2020-08-25T14:55:10Z",
"generation": 1,
"name": "pg1",
"namespace": "test",
"resourceVersion": "527780",
"selfLink": "/apis/arcdata.microsoft.com/v1alpha1/namespaces/test/postgresql-12s/pg1",
"uid": "1111aaaa-ffff-ffff-ffff-99999aaaaaaa"
},
"spec": {
"backups": {
"deltaMinutes": 3,
"fullMinutes": 10,
"tiers": [
{
"retention": {
"maximums": [
"6",
"512MB"
],
"minimums": [
"3"
]
},
"storage": {
"volumeSize": "1Gi"
}
}
]
},
"engine": {
"extensions": [
{
"name": "citus"
}
]
},
"scale": {
"shards": 3
},
"scheduling": {
"default": {
"resources": {
"requests": {
"memory": "256Mi"
}
}
}
},
"service": {
"type": "NodePort"
},
"storage": {
"data": {
"className": "local-storage",
"size": "5Gi"
},
"logs": {
"className": "local-storage",
"size": "5Gi"
}
}
},
"status": {
"externalEndpoint": null,
"readyPods": "4/4",
"state": "Ready"
}
}
}
}
},
"responses": {
"200": {
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/PostgresInstance/testpostgresInstance",
"name": "testpostgresInstance",
"type": "Microsoft.AzureData/PostgresInstance"
}
},
"201": {
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/PostgresInstance/testpostgresInstance",
"name": "testsqlregistration",
"type": "Microsoft.AzureData/PostgresInstance"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"sqlManagedInstanceName": "testsqlManagedInstance",
"api-version": "2019-09-08-preview",
"sqlManagedInstance": {
"location": "northeurope",
"tags": {
"mytag": "myval"
},
"properties": {
"instanceEndpoint": "The on premise instance endpoint",
"admin": "Admin user",
"startTime": "Instance start time",
"endTime": "Instance end time"
}
}
},
"responses": {
"200": {
"body": {
"properties": {
"instanceEndpoint": "The on premise instance endpoint",
"admin": "Admin user",
"startTime": "Instance start time",
"endTime": "Instance end time"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/sqlManagedInstances/testsqlManagedInstance",
"name": "testsqlManagedInstance",
"type": "Microsoft.AzureData/sqlManagedInstances"
}
},
"201": {
"body": {
"properties": {
"instanceEndpoint": "The on premise instance endpoint",
"admin": "Admin user",
"startTime": "Instance start time",
"endTime": "Instance end time"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/sqlManagedInstances/testsqlManagedInstance",
"name": "testsqlManagedInstance",
"type": "Microsoft.AzureData/sqlManagedInstances"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"sqlServerInstanceName": "testsqlServerInstance",
"api-version": "2019-09-08-preview",
"sqlServerInstance": {
"location": "northeurope",
"tags": {
"mytag": "myval"
},
"properties": {
"version": "SQL Server 2017",
"edition": "Developer",
"containerResourceId": "Arc Machine Name",
"vCore": "4",
"status": "Connected"
}
}
},
"responses": {
"200": {
"body": {
"properties": {
"version": "SQL Server 2017",
"edition": "Developer",
"containerResourceId": "Arc Machine Name",
"createTime": "01/01/2020 01:01:01",
"updateTime": "01/01/2020 01:01:01",
"vCore": "4",
"status": "Connected"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/SqlServerInstances/testsqlServerInstance",
"name": "testsqlServerInstance",
"type": "Microsoft.AzureData/SqlServerInstances"
}
},
"201": {
"body": {
"properties": {
"version": "SQL Server 2017",
"edition": "Developer",
"containerResourceId": "Arc Machine Name",
"createTime": "01/01/2020 01:01:01",
"updateTime": "01/01/2020 01:01:01",
"vCore": "4",
"status": "Connected"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureData/SqlServerInstances/testsqlServerInstance",
"name": "testsqlServerInstance",
"type": "Microsoft.AzureData/SqlServerInstances"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"dataControllerName": "testdataController",
"api-version": "2019-09-08-preview"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "testrg",
"postgresInstanceName": "testpostgresInstance",
"api-version": "2019-09-08-preview"
},
"responses": {
"200": {},
"204": {}
}
}
Loading