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.

Sign up for GitHub

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

Jump to bottom

[CDN][2023-05-01] Fix async operation options for migrate related APIs #24164

Merged
merged 8 commits into from
Jun 2, 2023
Merged

[CDN][2023-05-01] Fix async operation options for migrate related APIs #24164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e41b56
update example of CanMigrate API
May 25, 2023
ebb04e9
fix canMigrateResult schema
May 25, 2023
071e8f1
update properties schema
May 25, 2023
d1d71f6
update migrate API
May 26, 2023
503cb11
remove unused property of MigrateResult in RP
May 30, 2023
126b0a9
add 'id' and 'type' property in CanMigrate schema
Jun 1, 2023
bf61a4a
remove 202 schema for CanMigrate API
Jun 2, 2023
61c04ab
update Migrate API
Jun 2, 2023
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
56 changes: 43 additions & 13 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2023-05-01/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "azure-async-operation"
"final-state-via": "location"
}
}
},
Expand Down Expand Up @@ -2880,6 +2880,26 @@
"CanMigrateResult": {
"type": "object",
"description": "Result for canMigrate operation.",
"properties": {
"id": {
"description": "Resource ID.",
"readOnly": true,
"type": "string"
},
"type": {
"description": "Resource type.",
"readOnly": true,
"type": "string"
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/CanMigrateProperties"
}
},
"x-ms-azure-resource": true
},
"CanMigrateProperties": {
"type": "object",
"properties": {
"canMigrate": {
"readOnly": true,
Expand Down Expand Up @@ -2907,8 +2927,7 @@
"type": "array",
"x-ms-identifiers": []
}
},
"x-ms-azure-resource": true
}
},
"MigrationErrorType": {
"description": "Error response indicates CDN service is not able to process the incoming request. The reason is provided in the error message.",
Expand Down Expand Up @@ -3001,22 +3020,33 @@
"type": "object",
"description": "Result for migrate operation.",
"properties": {
"migratedProfileResourceId": {
"id": {
"description": "Resource ID.",
"readOnly": true,
"description": "Arm resource id of the migrated profile",
"$ref": "#/definitions/ResourceReference"
"type": "string"
},
"errors": {
"items": {
"description": "List of migration errors",
"$ref": "#/definitions/MigrationErrorType"
},
"type": "array",
"x-ms-identifiers": []
"type": {
"description": "Resource type.",
"readOnly": true,
"type": "string"
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/MigrateResultProperties"
}
},
"x-ms-azure-resource": true
},
"MigrateResultProperties": {
"type": "object",
"properties": {
"migratedProfileResourceId": {
"readOnly": true,
"description": "Arm resource id of the migrated profile",
"$ref": "#/definitions/ResourceReference"
}
}
},
"SsoUri": {
"description": "The URI required to login to the supplemental portal from the Azure portal.",
"type": "object",
Expand Down
12 changes: 8 additions & 4 deletions ...on/cdn/resource-manager/Microsoft.Cdn/stable/2023-05-01/examples/Profiles_CanMigrate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
"responses": {
"200": {
"body": {
"canMigrate": true,
"defaultSku": "Standard_AzureFrontDoor",
"errors": null
"id": "/subscriptions/subid/resourcegroups/yaoshitest/providers/Microsoft.Cdn/operationresults/operationid/profileresults/DummyProfile/canmigrateresults/DummyProfile",
"type": "Microsoft.Cdn/canmigrate",
"properties": {
"canMigrate": true,
"defaultSku": "Standard_AzureFrontDoor",
"errors": null
}
}
},
"202": {
"headers": {
"azure-asyncoperation": "https://management.azure.com/subscriptions/subid/resourcegroups/resourceGroupName/providers/Microsoft.Cdn/operationresults/operationId?api-version=2022-05-01-preview"
"azure-asyncoperation": "https://management.azure.com/subscriptions/subid/resourcegroups/resourceGroupName/providers/Microsoft.Cdn/operationresults/operationId?api-version=2023-05-01"
}
}
}
Expand Down
22 changes: 14 additions & 8 deletions ...ation/cdn/resource-manager/Microsoft.Cdn/stable/2023-05-01/examples/Profiles_Migrate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,27 @@
"responses": {
"200": {
"body": {
"migratedProfileResourceId": {
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1"
},
"errors": null
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/operationresults/operationid/profileresults/profile1/migrateresults/profile1",
"type": "Microsoft.Cdn/migrate",
"properties": {
"migratedProfileResourceId": {
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1"
}
}
}
},
"202": {
"headers": {
"azure-asyncoperation": "https://management.azure.com/subscriptions/subid/resourcegroups/resourceGroupName/providers/Microsoft.Cdn/operationresults/operationId?api-version=2023-05-01"
},
"body": {
"migratedProfileResourceId": {
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1"
},
"errors": null
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/operationresults/operationid/profileresults/profile1/migrateresults/profile1",
"type": "Microsoft.Cdn/migrate",
"properties": {
"migratedProfileResourceId": {
"id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1"
}
}
}
}
}
Expand Down