Skip to content

Commit

Permalink
Merge branch 'develop' into secret-mgmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@raghits
raghits committed Jan 16, 2020
2 parents 9267bc0 + a6fe300 commit 940772e
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 69 deletions.
2 changes: 0 additions & 2 deletions builds/jazz-build-module/sls-app/serverless-build-rules.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ provider:
sbr-render: config-wins
sbr-constraint:
sbr-enum:
- nodejs8.10
- nodejs10.x
- java8
- python3.6
Expand Down Expand Up @@ -578,7 +577,6 @@ function:
sbr-render: config-wins
sbr-constraint:
sbr-enum:
- nodejs8.10
- nodejs10.x
- java8
- python3.6
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-api/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ def validateDeploymentConfigurations(def prop) {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"

} else {
def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x"]
def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x"]
def flag = false
for (int i = 0; i < validRuntimes.size(); i++) {
if (_runtime == validRuntimes[i]) {
Expand Down
72 changes: 36 additions & 36 deletions builds/jenkins-build-pack-function/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,42 +746,42 @@ def resetCredentials(credsId) {
missing.
*/
def validateDeploymentConfigurations(def prop) {
if (prop.containsKey("service")) {
if (prop['service'] == "") {
error "Wrong configuration. Value for Key 'service' is missing in the configuration"
}
} else {
error "Wrong configuration. Key 'service' is missing in the configuration"
}
if (prop.containsKey("providerRuntime")) {
def _runtime = prop['providerRuntime']
if (_runtime == "") {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"
} else {
def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x", "c#"]
def flag = false

for (int i = 0; i < validRuntimes.size(); i++) {
if (_runtime == validRuntimes[i]) {
flag = true
}
}

if (!flag) {
echo "$flag"
error "Runtime given in the configuration is not valid."
}
}
} else {
error "Wrong configuration. Key 'providerRuntime' is missing in the configuration"
}
if (prop.containsKey("providerTimeout")) {
if (prop['providerTimeout'] == "") {
error "Wrong configuration. Value for Key 'providerTimeout' is missing in the configuration"
} else if (Integer.parseInt(prop['providerTimeout']) > 300) { // Should not be a high
error "Wrong configuration. Value for Key 'providerTimeout' should be a less than 160"
}
} else if (config['provider'] == "azure") {
if (prop.containsKey("service")) {
if (prop['service'] == "") {
error "Wrong configuration. Value for Key 'service' is missing in the configuration"
}
} else {
error "Wrong configuration. Key 'service' is missing in the configuration"
}
if (prop.containsKey("providerRuntime")) {
def _runtime = prop['providerRuntime']
if (_runtime == "") {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"
} else {
def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x", "c#"]
def flag = false

for (int i = 0; i < validRuntimes.size(); i++) {
if (_runtime == validRuntimes[i]) {
flag = true
}
}

if (!flag) {
echo "$flag"
error "Runtime given in the configuration is not valid."
}
}
} else {
error "Wrong configuration. Key 'providerRuntime' is missing in the configuration"
}
if (prop.containsKey("providerTimeout")) {
if (prop['providerTimeout'] == "") {
error "Wrong configuration. Value for Key 'providerTimeout' is missing in the configuration"
} else if (Integer.parseInt(prop['providerTimeout']) > 300) { // Should not be a high
error "Wrong configuration. Value for Key 'providerTimeout' should be a less than 160"
}
} else if (config['provider'] == "azure") {
// we use azure default timeout
} else {
error "Wrong configuration. Key 'providerTimeout' is missing in the configuration"
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-sls-app/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def validateDeploymentConfigurations(def prop) {
if (_runtime == "") {
error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration"
} else {
def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x"]
def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x"]
def flag = false

for (int i = 0; i < validRuntimes.size(); i++) {
Expand Down
1 change: 0 additions & 1 deletion core/jazz_create-serverless-service/swagger/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@
"type": "string",
"description": "The runtime framework for executing your code",
"enum": [
"nodejs8.10",
"nodejs10.x",
"java8",
"python3.6",
Expand Down
1 change: 0 additions & 1 deletion core/jazz_services/config/global-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
],
"SERVICE_RUNTIMES": [
"nodejs10.x",
"nodejs8.10",
"python3.6",
"java8",
"go1.x",
Expand Down
2 changes: 1 addition & 1 deletion core/jazz_services/test/test.js
View file
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" : "nodejs8.10",
"runtime" : "nodejs10.x",
"created_by" : "g10$saryck",
"status" : "active"
},
Expand Down
32 changes: 10 additions & 22 deletions core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ <h4 class="bold-title">
<section class="pad-left0 service-box-section" *ngIf="typeOfPlatform == 'aws'">
<div tabindex="0" class="service-box" [ngClass]="{'service-box-selected': runtime == runtimeKeys[1]}"(keyup.enter)="onSelectionChange(runtimeKeys[1])" (click)="onSelectionChange(runtimeKeys[1])">
<div>
<img *ngIf="runtime == runtimeKeys[1]" [class.selected-image]="runtime == runtimeKeys[1]" src="./../../../assets/images/icons/nodejs.svg"/>
<img *ngIf="runtime != runtimeKeys[1]" [class.selected-image]="runtime == runtimeKeys[1]" src="./../../../../assets/images/icons/greyscale-icons/icon-nodejs.svg"/>
<img *ngIf="runtime == runtimeKeys[1]" [class.selected-image]="runtime == runtimeKeys[1]" src="./../../../assets/images/icons/python.svg"/>
<img *ngIf="runtime != runtimeKeys[1]" [class.selected-image]="runtime == runtimeKeys[1]" src="./../../../../assets/images/icons/greyscale-icons/icon-python.svg"/>
</div>
</div>
<div class="icon-name" [ngClass]="{'service-box-selected': runtime == runtimeKeys[1]}">
Expand All @@ -188,21 +188,21 @@ <h4 class="bold-title">
<section class="pad-left0 service-box-section" *ngIf="typeOfPlatform == 'aws'">
<div tabindex="0" class="service-box" [ngClass]="{'service-box-selected': runtime == runtimeKeys[2]}"(keyup.enter)="onSelectionChange(runtimeKeys[2])" (click)="onSelectionChange(runtimeKeys[2])">
<div class="icon-icon-python">
<img *ngIf="runtime == runtimeKeys[2]" [class.selected-image]="runtime == runtimeKeys[2]" src="./../../../assets/images/icons/python.svg"/>
<img *ngIf="runtime != runtimeKeys[2]" [class.selected-image]="runtime == runtimeKeys[2]" src="./../../../../assets/images/icons/greyscale-icons/icon-python.svg"/>
<img *ngIf="runtime == runtimeKeys[2]" [class.selected-image]="runtime == runtimeKeys[2]" src="./../../../assets/images/icons/Java.svg"/>
<img *ngIf="runtime != runtimeKeys[2]" [class.selected-image]="runtime == runtimeKeys[2]" src="./../../../../assets/images/icons/greyscale-icons/icon-java.svg"/>
</div>
</div>
<div class="icon-name" [ngClass]="{'service-box-selected': runtime == runtimeKeys[2]}">
<p class="name-style">{{runtimeKeys[2]}}</p>
</div>
</section>
</div>
<div class="runtime-row2 run-type-width space-between">
<div class="runtime-row2 run-type-width space-between contentSpace">
<section class="pad-left0 service-box-section" *ngIf="typeOfPlatform == 'aws'">
<div tabindex="0" class="service-box"[ngClass]="{'service-box-selected': runtime == runtimeKeys[3]}"(keyup.enter)="onSelectionChange(runtimeKeys[3])" (click)="onSelectionChange(runtimeKeys[3])">
<div class="icon-icon-go">
<img *ngIf="runtime == runtimeKeys[3]" [class.selected-image]="runtime == runtimeKeys[3]" src="./../../../assets/images/icons/Java.svg"/>
<img *ngIf="runtime != runtimeKeys[3]" [class.selected-image]="runtime == runtimeKeys[3]" src="./../../../../assets/images/icons/greyscale-icons/icon-java.svg"/>
<img *ngIf="runtime == runtimeKeys[3]" [class.selected-image]="runtime == runtimeKeys[3]" src="./../../../assets/images/icons/Go.svg"/>
<img *ngIf="runtime != runtimeKeys[3]" [class.selected-image]="runtime == runtimeKeys[3]" src="./../../../../assets/images/icons/greyscale-icons/icon-go.svg"/>
</div>
</div>
<div class="icon-name" [ngClass]="{'service-box-selected': runtime == runtimeKeys[3]}">
Expand All @@ -211,30 +211,18 @@ <h4 class="bold-title">
</section>


<section class="pad-left0 service-box-section" *ngIf="typeOfPlatform == 'aws'">
<section class="pad-left0 service-box-section disable-event" *ngIf="typeOfPlatform == 'aws'">
<div tabindex="0" class="service-box" [ngClass]="{'service-box-selected': runtime == runtimeKeys[4]}"(keyup.enter)="onSelectionChange(runtimeKeys[4])" (click)="onSelectionChange(runtimeKeys[4])">
<div class="icon-icon-go">
<img *ngIf="runtime == runtimeKeys[4]" [class.selected-image]="runtime == runtimeKeys[4]" src="./../../../assets/images/icons/Go.svg"/>
<img *ngIf="runtime != runtimeKeys[4]" [class.selected-image]="runtime == runtimeKeys[4]" src="./../../../../assets/images/icons/greyscale-icons/icon-go.svg"/>
<img *ngIf="runtime == runtimeKeys[4]" [class.selected-image]="runtime == runtimeKeys[4]" src="./../../../assets/images/icons/C.svg"/>
<img *ngIf="runtime != runtimeKeys[4]" [class.selected-image]="runtime == runtimeKeys[4]" src="./../../../../assets/images/icons/greyscale-icons/icon-c.svg"/>
</div>
</div>
<div class="icon-name" [ngClass]="{'service-box-selected': runtime == runtimeKeys[4]}">
<p class="name-style">{{runtimeKeys[4]}}</p>
</div>
</section>

<section class="pad-left0 service-box-section disable-event" *ngIf="typeOfPlatform == 'aws'">
<div tabindex="0" class="service-box disabled-box" [ngClass]="{'service-box-selected': runtime == runtimeKeys[5]}" (keyup.enter)="onSelectionChange(runtimeKeys[5])" (click)="onSelectionChange(runtimeKeys[5])">
<div class="icon-icon-go">
<img *ngIf="runtime == runtimeKeys[5]" [class.selected-image]="runtime == runtimeKeys[5]" src="./../../../assets/images/icons/C.svg"/>
<img *ngIf="runtime != runtimeKeys[5]" [class.selected-image]="runtime == runtimeKeys[5]" src="./../../../../assets/images/icons/greyscale-icons/icon-c.svg"/>
</div>
</div>
<div class="icon-name" [ngClass]="{'service-box-selected': runtime == runtimeKeys[5]}">
<p class="name-style">C#</p>
</div>
</section>

</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
height: 20px;
padding: 10px 10px;
}
.runtime-row2.contentSpace{
width: 41%
}

.create-service-wrap .bold-title {
padding: 1.33rem 0;
Expand Down
1 change: 0 additions & 1 deletion core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@ export class CreateServiceComponent implements OnInit {
switch(this.runtime){

case 'java8' : this.deploymentDescriptorText = this.deploymentDescriptorTextJava; break;
case 'nodejs8.10' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break;
case 'nodejs10.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break;
case 'go1.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextgo; break;
case 'python3.6' : this.deploymentDescriptorText = this.deploymentDescriptorTextpython; break;
Expand Down
6 changes: 3 additions & 3 deletions core/jazz_ui/src/environments/environment.oss.ts
View file
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: { "nodejs10.x": "Nodejs 10.x", "nodejs8.10": "Nodejs 8.10", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x", "c#": "C#" },
envLists: { "nodejs10.x": "Nodejs 10.x", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x", "c#": "C#" },
serviceTabs: ["{overview}", "{access control}", "{metrics}", "{logs}", "{cost}"],
environmentTabs: ["{env_overview}", "{deployments}", "{code quality}", "{metrics}", "{assets}", "{env_logs}"],
assetTypeList: [
Expand Down Expand Up @@ -55,7 +55,7 @@ export const environment = {
aws: {
account_number: '{account_number}',
region: '{region}',
envLists: {"nodejs10.x": "Nodejs 10.x", "nodejs8.10": "Nodejs 8.10", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x"},
envLists: {"nodejs10.x": "Nodejs 10.x", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x"},
accountMap: {accountMap},
default_region: '{default_region}',
default_account: '{default_account}'
Expand All @@ -64,7 +64,7 @@ export const environment = {
azure_account_number: '{azure_account_number}',
azure_region: '{azure_region}',
azure_enabled: {azure_enabled},
envLists: {"nodejs8.10": "Nodejs 8.10", "c#": "C#"},
envLists: {"nodejs10.x": "Nodejs 10.x", "c#": "C#"},
},
tvault: {
tvault_enabled: {tvault_enabled},
Expand Down

0 comments on commit 940772e

Please sign in to comment.