Skip to content

Commit

Permalink
updated to node 14/16
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonah Hauanio authored and Jonah Hauanio committed Sep 13, 2022
1 parent a419c34 commit 43a3e5d
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions builds/jazz-build-module/sls-app/serverless-build-rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ provider:
sbr-render: config-wins
sbr-constraint:
sbr-enum:
- nodejs10.x
- nodejs12.x
- nodejs14.x
- nodejs16.x
- java8
- java11
- python3.6
- python3.8
- go1.x
sbr-value:
sbr-formula: ${config.providerRuntime}
sbr-example: nodejs10.x
sbr-example: nodejs14.x
sbr-mandatory: true


Expand Down Expand Up @@ -583,16 +583,16 @@ function:
sbr-render: config-wins
sbr-constraint:
sbr-enum:
- nodejs10.x
- nodejs12.x
- nodejs14.x
- nodejs16.x
- java8
- java11
- python3.6
- python3.8
- go1.x
sbr-value:
sbr-formula: ${config.providerRuntime}
sbr-example: nodejs10.x
sbr-example: nodejs14.x

timeout: # in seconds 1 sec to 15 mins
sbr-type: int
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-api/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ def validateDeploymentConfigurations(def prop) {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"

} else {
def validRuntimes = ["nodejs10.x", "nodejs12.x", "python3.6", "python3.8", "java8", "java11", "go1.x"]
def validRuntimes = ["nodejs14.x", "nodejs16.x", "python3.6", "python3.8", "java8", "java11", "go1.x"]
def flag = false
for (int i = 0; i < validRuntimes.size(); i++) {
if (_runtime == validRuntimes[i]) {
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-function/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ def validateDeploymentConfigurations(def prop) {
if (_runtime == "") {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"
} else {
def validRuntimes = ["nodejs10.x", "nodejs12.x", "python3.6", "python3.8", "java8", "java11", "go1.x", "c#"]
def validRuntimes = ["nodejs14.x", "nodejs16.x", "python3.6", "python3.8", "java8", "java11", "go1.x", "c#"]
def flag = false

for (int i = 0; i < validRuntimes.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-sls-app/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ def validateDeploymentConfigurations(def prop) {
if (_runtime == "") {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"
} else {
def validRuntimes = ["nodejs10.x", "nodejs12.x", "python3.6", "python3.8", "java8", "java11", "go1.x"]
def validRuntimes = ["nodejs14.x", "nodejs16.x", "python3.6", "python3.8", "java8", "java11", "go1.x"]
def flag = false

for (int i = 0; i < validRuntimes.size(); i++) {
Expand Down
4 changes: 2 additions & 2 deletions core/jazz_create-serverless-service/swagger/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@
"type": "string",
"description": "The runtime framework for executing your code",
"enum": [
"nodejs10.x",
"nodejs12.x",
"nodejs14.x",
"nodejs16.x",
"java8",
"java11",
"python3.6",
Expand Down
4 changes: 2 additions & 2 deletions core/jazz_services/config/global-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
"inactive"
],
"SERVICE_RUNTIMES": [
"nodejs10.x",
"nodejs12.x",
"nodejs14.x",
"nodejs16.x",
"python3.6",
"python3.8",
"java8",
Expand Down
2 changes: 1 addition & 1 deletion core/jazz_services/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('platform_services', function() {
"domain" : "k!ngd0m",
"region" : "mewni",
"type" : "api",
"runtime" : "nodejs10.x",
"runtime" : "nodejs14.x",
"created_by" : "g10$saryck",
"status" : "active"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ export class CreateServiceComponent implements OnInit {

case 'java8' :
case 'java11': this.deploymentDescriptorText = this.deploymentDescriptorTextJava; break;
case 'nodejs10.x' :
case 'nodejs12.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break;
case 'nodejs14.x' :
case 'nodejs16.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break;
case 'go1.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextgo; break;
case 'python3.6' :
case 'python3.8' : this.deploymentDescriptorText = this.deploymentDescriptorTextpython; break;
Expand Down
6 changes: 3 additions & 3 deletions core/jazz_ui/src/environments/environment.oss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const environment = {
multi_env: {multi_env},
slack_support: {slack_support},
webLists: { "html": "Static", "angular": "Angular", "react": "ReactJS" },
envLists: {"nodejs12.x": "Nodejs 12.x", "python3.8": "Python 3.8", "java11": "Java 11", "go1.x": "Go 1.x", "c#": "C#" },
envLists: {"nodejs16.x": "Nodejs 12.x", "python3.8": "Python 3.8", "java11": "Java 11", "go1.x": "Go 1.x", "c#": "C#" },
runtimeLists: {"nodejs": ["Nodejs 10.x", "Nodejs 12.x"], "python": ["Python 3.6", "Python 3.8"], "java": ["Java 8", "Java 11"], "go": ["Go 1.x"], "c": ["C#"]},
serviceTabs: ["{overview}", "{access control}", "{metrics}", "{logs}", "{cost}"],
environmentTabs: ["{env_overview}", "{deployments}", "{code quality}", "{metrics}", "{assets}", "{env_logs}"],
Expand Down Expand Up @@ -56,7 +56,7 @@ export const environment = {
aws: {
account_number: '{account_number}',
region: '{region}',
envLists: {"nodejs12.x": "Nodejs 12.x", "python3.8": "Python 3.8", "java11": "Java 11", "go1.x": "Go 1.x", "c#": "C#"},
envLists: {"nodejs16.x": "Nodejs 12.x", "python3.8": "Python 3.8", "java11": "Java 11", "go1.x": "Go 1.x", "c#": "C#"},
accountMap: {accountMap},
default_region: '{default_region}',
default_account: '{default_account}'
Expand All @@ -65,7 +65,7 @@ export const environment = {
azure_account_number: '{azure_account_number}',
azure_region: '{azure_region}',
azure_enabled: {azure_enabled},
envLists: {"nodejs10.x": "Nodejs 10.x", "c#": "C#"},
envLists: {"nodejs14.x": "Nodejs 10.x", "c#": "C#"},
},
tvault: {
tvault_enabled: {tvault_enabled},
Expand Down

0 comments on commit 43a3e5d

Please sign in to comment.