Skip to content

Commit

Permalink
Update Aspire schema to latest (#4430)
Browse files Browse the repository at this point in the history 
* tests

* more

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
@danmoseley @pre-commit-ci
danmoseley and pre-commit-ci[bot] authored Feb 7, 2025
1 parent c3a1dd7 commit 6426539
Show file tree
Hide file tree
Showing 40 changed files with 4,564 additions and 72 deletions.
232 changes: 160 additions & 72 deletions src/schemas/json/aspire-8.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@
"type": "string",
"description": "The entrypoint to use for the container image when executed."
},
"deployment": {
"oneOf": [
{
"$ref": "#/definitions/resource.azure.bicep.v0"
},
{
"$ref": "#/definitions/resource.azure.bicep.v1"
}
]
},
"args": {
"$ref": "#/definitions/args"
},
Expand Down Expand Up @@ -154,6 +164,40 @@
},
"additionalProperties": false
},
{
"type": "object",
"description": "Represents a .NET project resource.",
"required": ["type", "path"],
"properties": {
"type": {
"const": "project.v1"
},
"path": {
"type": "string",
"description": "The path to the project file. Relative paths are interpreted as being relative to the location of the manifest file."
},
"deployment": {
"oneOf": [
{
"$ref": "#/definitions/resource.azure.bicep.v0"
},
{
"$ref": "#/definitions/resource.azure.bicep.v1"
}
]
},
"args": {
"$ref": "#/definitions/args"
},
"env": {
"$ref": "#/definitions/env"
},
"bindings": {
"$ref": "#/definitions/bindings"
}
},
"additionalProperties": false
},
{
"type": "object",
"description": "Represents an executable resource.",
Expand Down Expand Up @@ -228,53 +272,65 @@
},
"default": {
"type": "object",
"required": ["generate"],
"properties": {
"generate": {
"type": "object",
"required": ["minLength"],
"oneOf": [
{
"required": ["generate"],
"properties": {
"minLength": {
"type": "number",
"description": "The minimum length of the generated value."
},
"lower": {
"type": "boolean",
"description": "Indicates whether lower case characters are allowed in the generated value."
},
"upper": {
"type": "boolean",
"description": "Indicates whether upper case characters are allowed in the generated value."
"generate": {
"type": "object",
"required": ["minLength"],
"properties": {
"minLength": {
"type": "number",
"description": "The minimum length of the generated value."
},
"lower": {
"type": "boolean",
"description": "Indicates whether lower case characters are allowed in the generated value."
},
"upper": {
"type": "boolean",
"description": "Indicates whether upper case characters are allowed in the generated value."
},
"numeric": {
"type": "boolean",
"description": "Indicates whether numeric characters are allowed in the generated value."
},
"special": {
"type": "boolean",
"description": "Indicates whether special characters are allowed in the generated value."
},
"minLower": {
"type": "number",
"description": "Specifies the minimum number of lower case characters that must appear in the generated value."
},
"minUpper": {
"type": "number",
"description": "Specifies the minimum number of upper case characters that must appear in the generated value."
},
"minNumeric": {
"type": "number",
"description": "Specifies the minimum number of numeric characters that must appear in the generated value."
},
"minSpecial": {
"type": "number",
"description": "Specifies the minimum number of special characters that must appear in the generated value."
}
}
},
"numeric": {
"type": "boolean",
"description": "Indicates whether numeric characters are allowed in the generated value."
},
"special": {
"type": "boolean",
"description": "Indicates whether special characters are allowed in the generated value."
},
"minLower": {
"type": "number",
"description": "Specifies the minimum number of lower case characters that must appear in the generated value."
},
"minUpper": {
"type": "number",
"description": "Specifies the minimum number of upper case characters that must appear in the generated value."
},
"minNumeric": {
"type": "number",
"description": "Specifies the minimum number of numeric characters that must appear in the generated value."
},
"minSpecial": {
"type": "number",
"description": "Specifies the minimum number of special characters that must appear in the generated value."
"additionalProperties": false
}
},
{
"required": ["value"],
"properties": {
"value": {
"type": "string",
"description": "The default value to use if the parameter is not provided at deployment time."
}
},
"additionalProperties": false
}
}
},
"additionalProperties": false
]
}
},
"additionalProperties": false
Expand Down Expand Up @@ -334,35 +390,10 @@
"additionalProperties": false
},
{
"type": "object",
"default": "Represents a resource that is deployed using Azure Bicep.",
"required": ["path"],
"properties": {
"type": {
"const": "azure.bicep.v0"
},
"path": {
"type": "string",
"description": "Path to the Bicep file to be used for deployment."
},
"connectionString": {
"$ref": "#/definitions/connectionString"
},
"params": {
"type": "object",
"description": "A list of parameters which are passed to Azure deployment.",
"additionalProperties": {
"oneOf": [
{ "type": "array" },
{ "type": "boolean" },
{ "type": "number" },
{ "type": "object" },
{ "type": "string" }
]
}
}
},
"additionalProperties": false
"$ref": "#/definitions/resource.azure.bicep.v0"
},
{
"$ref": "#/definitions/resource.azure.bicep.v1"
},
{
"type": "object",
Expand Down Expand Up @@ -431,9 +462,11 @@
"container.v1",
"dockerfile.v0",
"project.v0",
"project.v1",
"value.v0",
"executable.v0",
"azure.bicep.v0",
"azure.bicep.v1",
"aws.cloudformation.template.v0",
"aws.cloudformation.stack.v0",
"dapr.component.v0",
Expand All @@ -453,6 +486,61 @@
}
},
"definitions": {
"resource.azure.bicep.v0": {
"type": "object",
"description": "Represents a resource that is deployed using Azure Bicep.",
"required": ["path"],
"properties": {
"type": {
"const": "azure.bicep.v0"
},
"path": {
"type": "string",
"description": "Path to the Bicep file to be used for deployment."
},
"connectionString": {
"$ref": "#/definitions/connectionString"
},
"params": {
"type": "object",
"description": "A list of parameters which are passed to Azure deployment.",
"additionalProperties": {
"oneOf": [
{ "type": "array" },
{ "type": "boolean" },
{ "type": "number" },
{ "type": "object" },
{ "type": "string" }
]
}
}
},
"additionalProperties": false
},
"resource.azure.bicep.v1": {
"allOf": [
{
"$ref": "#/definitions/resource.azure.bicep.v0"
},
{
"type": "object",
"properties": {
"type": {
"const": "azure.bicep.v1"
},
"scope": {
"type": "object",
"properties": {
"resourceGroup": {
"type": "string",
"description": "The name of the resource group to deploy the resource to."
}
}
}
}
}
]
},
"connectionString": {
"type": "string",
"description": "A connection string that can be used to connect to this resource."
Expand Down
Loading

0 comments on commit 6426539

Please sign in to comment.