Skip to content

Make the JavaComponent definitions polymorphism and expose fqdn for sba and eureka #28102

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
Caoxuyang merged 16 commits into from
Mar 15, 2024
Merged

Make the JavaComponent definitions polymorphism and expose fqdn for sba and eureka #28102

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7e53265
Make the JavaComponent definitions polymorphism
Mar 6, 2024
53aa713
fix api version
Mar 6, 2024
b8b5dbe
revert error response change
Mar 6, 2024
13bd85c
refine examples
Mar 6, 2024
33c5178
fix default value
Mar 7, 2024
025f12d
fix
Mar 7, 2024
4c37d97
fix
Mar 7, 2024
cbe33a5
try to remove required
Mar 7, 2024
1a92086
try remove require in patch body
Mar 7, 2024
ba95e6e
fix
Mar 7, 2024
4726cc5
Merge branch 'release-app-Microsoft.App-2024-02-02-preview' into xuya…
Caoxuyang Mar 8, 2024
9614613
try fix lint
Mar 9, 2024
d553407
Merge branch 'xuyang/0202p-jcrefactor' of https://github.com/Azure/az…
Mar 9, 2024
973883d
fix
Mar 9, 2024
0683348
add suppression for discriminator
Mar 12, 2024
9b51b7b
fix
Mar 12, 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
185 changes: 132 additions & 53 deletions ...ication/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/JavaComponents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,62 +401,141 @@
"properties": {
"description": "Java Component resource specific properties",
"type": "object",
"properties": {
"componentType": {
"description": "Type of the Java Component.",
"enum": [
"SpringBootAdmin",
"SpringCloudEureka",
"SpringCloudConfig",
"Nacos"
],
"type": "string",
"x-ms-enum": {
"name": "JavaComponentType",
"modelAsString": true
}
},
"provisioningState": {
"description": "Provisioning state of the Java Component.",
"enum": [
"Succeeded",
"Failed",
"Canceled",
"Deleting",
"InProgress"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "JavaComponentProvisioningState",
"modelAsString": true
}
},
"configurations": {
"description": "List of Java Components configuration properties",
"type": "array",
"items": {
"$ref": "#/definitions/JavaComponentConfigurationProperty"
},
"x-ms-identifiers": [
"propertyName"
]
},
"serviceBinds": {
"description": "List of Java Components that are bound to the Java component",
"type": "array",
"items": {
"$ref": "#/definitions/JavaComponentServiceBind"
},
"x-ms-identifiers": [
"name"
]
}
},
"x-ms-client-flatten": true
"$ref": "#/definitions/JavaComponentProperties"
}
}
},
"JavaComponentProperties": {
"description": "Java Component common properties.",
"type": "object",
"required": [
"componentType"
],
"properties": {
"componentType": {
"description": "Type of the Java Component.",
"enum": [
"SpringBootAdmin",
"SpringCloudEureka",
"SpringCloudConfig"
],
"type": "string",
"x-ms-enum": {
"name": "JavaComponentType",
"modelAsString": true
}
},
"provisioningState": {
"description": "Provisioning state of the Java Component.",
"enum": [
"Succeeded",
"Failed",
"Canceled",
"Deleting",
"InProgress"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "JavaComponentProvisioningState",
"modelAsString": true
}
},
"configurations": {
"description": "List of Java Components configuration properties",
"type": "array",
"items": {
"$ref": "#/definitions/JavaComponentConfigurationProperty"
},
"x-ms-identifiers": [
"propertyName"
]
},
"serviceBinds": {
"description": "List of Java Components that are bound to the Java component",
"type": "array",
"items": {
"$ref": "#/definitions/JavaComponentServiceBind"
},
"x-ms-identifiers": [
"name"
]
}
},
"x-ms-client-flatten": true,
"discriminator": "componentType"
},
"SpringBootAdminComponent": {
"description": "Spring Boot Admin properties.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/JavaComponentProperties"
}
],
"properties": {
"fqdn": {
"description": "Hostname of the Java Component endpoint",
"type": "string",
"readOnly": true
},
"httpEndpoint": {
"description": "Whether the Java Component exposes an external http endpoint",
"default": "Internal",
"enum": [
"External",
"Internal"
],
"type": "string",
"x-ms-enum": {
"name": "HttpEndpointEnum",
"modelAsString": true
}
}
},
"x-ms-discriminator-value": "SpringBootAdmin"
},
"SpringCloudEurekaComponent": {
"description": "Spring Cloud Eureka properties.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/JavaComponentProperties"
}
],
"properties": {
"fqdn": {
"description": "Hostname of the Java Component endpoint",
"type": "string",
"readOnly": true
},
"httpEndpoint": {
"description": "Whether the Java Component exposes an external http endpoint",
"default": "Internal",
"enum": [
"External",
"Internal"
],
"type": "string",
"x-ms-enum": {
"name": "HttpEndpointEnum",
"modelAsString": true
}
}
},
"x-ms-discriminator-value": "SpringCloudEureka"
},
"SpringCloudConfigComponent": {
"description": "Spring Cloud Config properties.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/JavaComponentProperties"
}
],
"properties": {},
"x-ms-discriminator-value": "SpringCloudConfig"
},
"JavaComponentsCollection": {
"description": "Java Components ARM resource.",
"required": [
Expand Down
11 changes: 8 additions & 3 deletions ...ager/Microsoft.App/preview/2024-02-02-preview/examples/JavaComponents_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External"
}
}
},
Expand All @@ -40,7 +41,9 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
}
},
Expand All @@ -62,7 +65,9 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion ...esource-manager/Microsoft.App/preview/2024-02-02-preview/examples/JavaComponents_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...source-manager/Microsoft.App/preview/2024-02-02-preview/examples/JavaComponents_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
},
{
Expand All @@ -40,7 +42,9 @@
"propertyName": "spring.cloud.config.server.git.uri",
"value": "<GIT-URL>"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
}
]
Expand Down
7 changes: 5 additions & 2 deletions ...ource-manager/Microsoft.App/preview/2024-02-02-preview/examples/JavaComponents_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External"
}
}
},
Expand All @@ -40,7 +41,9 @@
"propertyName": "spring.boot.admin.monitor.status-interval",
"value": "10000ms"
}
]
],
"httpEndpoint": "External",
"fqdn": "myjavacomponent.myenvironment.test.net"
}
}
},
Expand Down