Skip to content

Fix schema issue for Microsoft.App in 2024-02-02-preview #28454

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

Merged
ms-henglu merged 6 commits into from
Mar 27, 2024
Merged

Fix schema issue for Microsoft.App in 2024-02-02-preview #28454

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0a2050
fix
Juliehzl Mar 26, 2024
f41e3f9
fix
Juliehzl Mar 26, 2024
46ca3f3
fix
Juliehzl Mar 26, 2024
4a3a75f
fix
Juliehzl Mar 26, 2024
f6e30d9
fix
Juliehzl Mar 26, 2024
c59780d
fix
Juliehzl Mar 26, 2024
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
2 changes: 1 addition & 1 deletion specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/AuthConfigs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
4 changes: 2 additions & 2 deletions .../resource-manager/Microsoft.App/preview/2024-02-02-preview/AvailableWorkloadProfiles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"default": {
"description": "Error response.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
}
}
},
Expand All @@ -62,7 +62,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Builders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
"description": "Information about the SourceToCloud builder resource.",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
]
},
Expand Down
69 changes: 3 additions & 66 deletions specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Builds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
"preBuildSteps": {
"type": "array",
"items": {
"$ref": "#/definitions/PreBuildStep"
"$ref": "./CommonDefinitions.json#/definitions/PreBuildStep"
},
"x-ms-identifiers": [],
"description": "List of steps to perform before the build."
Expand All @@ -342,7 +342,7 @@
"readOnly": true
},
"destinationContainerRegistry": {
"$ref": "#/definitions/ContainerRegistryWithCustomImage",
"$ref": "./CommonDefinitions.json#/definitions/ContainerRegistryWithCustomImage",
"description": "Container registry that the final image will be uploaded to."
},
"configuration": {
Expand Down Expand Up @@ -383,7 +383,7 @@
"description": "Information pertaining to an individual build.",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
]
},
Expand Down Expand Up @@ -423,23 +423,6 @@
"modelAsString": true
}
},
"ContainerRegistryWithCustomImage": {
"type": "object",
"properties": {
"server": {
"type": "string",
"description": "Login server of the container registry that the final image should be uploaded to. Builder resource needs to have this container registry defined along with an identity to use to access it."
},
"image": {
"type": "string",
"description": "Full name that the final image should be uploaded as, including both image name and tag."
}
},
"description": "Container registry that the final image will be uploaded to.",
"required": [
"server"
]
},
"BuildToken": {
"description": "Build Auth Token.",
"type": "object",
Expand All @@ -458,52 +441,6 @@
}
}
},
"HttpGet": {
"type": "object",
"properties": {
"url": {
"type": "string",
"description": "URL to make HTTP GET request against."
},
"fileName": {
"type": "string",
"description": "Name of the file that the request should be saved to."
},
"headers": {
"type": "array",
"items": {
"type": "string"
},
"description": "List of headers to send with the request."
}
},
"description": "Model representing a http get request.",
"required": [
"url"
]
},
"PreBuildStep": {
"type": "object",
"properties": {
"description": {
"type": "string",
"description": "Description of the pre-build step."
},
"scripts": {
"type": "array",
"items": {
"type": "string"
},
"description": "List of custom commands to run."
},
"httpGet": {
"$ref": "#/definitions/HttpGet",
"description": "Http get request to send before the build.",
"x-ms-identifiers": []
}
},
"description": "Model representing a pre-build step."
},
"BuildProvisioningState": {
"type": "string",
"description": "Resource instance provisioning state.",
Expand Down
75 changes: 69 additions & 6 deletions ...tion/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,23 @@
}
}
},
"ContainerRegistryWithCustomImage": {
"type": "object",
"properties": {
"server": {
"type": "string",
"description": "Login server of the container registry that the final image should be uploaded to. Builder resource needs to have this container registry defined along with an identity to use to access it."
},
"image": {
"type": "string",
"description": "Full name that the final image should be uploaded as, including both image name and tag."
}
},
"description": "Container registry that the final image will be uploaded to.",
"required": [
"server"
]
},
"CustomScaleRule": {
"description": "Container App container Custom scaling rule.",
"type": "object",
Expand Down Expand Up @@ -421,6 +438,30 @@
}
}
},
"HttpGet": {
"type": "object",
"properties": {
"url": {
"type": "string",
"description": "URL to make HTTP GET request against."
},
"fileName": {
"type": "string",
"description": "Name of the file that the request should be saved to."
},
"headers": {
"type": "array",
"items": {
"type": "string"
},
"description": "List of headers to send with the request."
}
},
"description": "Model representing a http get request.",
"required": [
"url"
]
},
"HttpScaleRule": {
"description": "Container App container Http scaling rule.",
"type": "object",
Expand All @@ -444,6 +485,28 @@
}
}
},
"PreBuildStep": {
"type": "object",
"properties": {
"description": {
"type": "string",
"description": "Description of the pre-build step."
},
"scripts": {
"type": "array",
"items": {
"type": "string"
},
"description": "List of custom commands to run."
},
"httpGet": {
"$ref": "./CommonDefinitions.json#/definitions/HttpGet",
"description": "Http get request to send before the build.",
"x-ms-identifiers": []
}
},
"description": "Model representing a pre-build step."
},
"TcpScaleRule": {
"description": "Container App container Tcp scaling rule.",
"type": "object",
Expand Down Expand Up @@ -745,7 +808,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -943,7 +1006,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1076,7 +1139,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1264,7 +1327,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -1410,7 +1473,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -1587,7 +1650,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion .../app/resource-manager/Microsoft.App/preview/2024-02-02-preview/ConnectedEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion ...ource-manager/Microsoft.App/preview/2024-02-02-preview/ConnectedEnvironmentsStorages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
4 changes: 2 additions & 2 deletions ...fication/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -1443,7 +1443,7 @@
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down
Loading