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

Adding schema for server config and plugindefinition #812

Merged
merged 2 commits into from
Mar 22, 2022

Conversation

1000TurquoisePogs
Copy link
Member

Signed-off-by: 1000turquoisepogs [email protected]

Proposed changes

This PR is related to #778 but #789 still needs to be decided upon, so these files could move again.

Type of change

Please delete options that are not relevant.

  • New feature (non-breaking change which adds functionality)

Testing

This still needs testing, as I'm unsure if this schema works as intended when it comes to adding properties on top of a $ref or having a catch-all properties pattern and then having exceptions for specifically-defined properties.

Further comments

These files may be further changed as we learn how they must be associated with the zowe base schema and zowe server infrastructure validation code in general (see zowe/zowe-install-packaging#2686 )
It could be that these files $ref the zowe base one in some way, and these files may even be wrapped in a few ways to fit into the manifest schema and server schema

Signed-off-by: Sean Grady <[email protected]>
"tcpPort": {
"type": "integer",
"description": "TCP network port",
"minimum": 1,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better as 1024

"properties": {
"port": {
"$ref": "#/$defs/tcpPort",
"default": 8554
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but in v2 its 7556

},
"secureOptions": {
"type": "integer",
"description": "Controls nodejs' use of OpenSSL via integers composed of the values in the references https://github.com/openssl/openssl/blob/master/include/openssl/ssl.h and https://nodejs.org/api/crypto.html#openssl-options"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
},
"ipOrHostname": {
"type": "string"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have ipv4 right above so why not use it

"type": "object",
"properties": {
"port": {
"$ref": "#/$defs/tcpPort",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this deprecated because zowe.yaml has a port too?

"framework": {
"const": "iframe"
},
"destination": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oneOf... you can either have destination Or startingpage

},
"isSingleWindowApp": {
"type": "boolean",
"deprecated": true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we omit this and just use AdditionalProperties:true

"dependenciesIncluded": {
"type": "boolean",
"default": true,
"deprecated": true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again should we remove these?

"const": "service"
},
"initializerLookupMethod": {
"type": "string",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a description

}
}
},
"serviceService": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agentService?

… properties, and added missing library plugin

Signed-off-by: 1000TurquoisePogs <[email protected]>
@1000TurquoisePogs 1000TurquoisePogs merged commit 93d2932 into v2.x/staging Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant