Skip to content

Commit

Permalink
Merge pull request #768 from tmobile/develop
Browse files Browse the repository at this point in the history
Release - v1.13
  • Loading branch information
suryajak authored Jan 18, 2019
2 parents 5afa9bf + 10f1778 commit 9b89d23
Show file tree
Hide file tree
Showing 25 changed files with 687 additions and 158 deletions.
20 changes: 10 additions & 10 deletions builds/jenkins-build-pack-api/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,16 @@ def buildLambda(String runtime, String repo_name) {
pip install pytest
"""
}
} else if (runtime.indexOf("go") > -1 ) {
// Installing dependencies using dep ensure
// golang build scripts
withEnv(["GOPATH=${env.WORKSPACE}"]) {
sh "mkdir -p $GOPATH/src"
sh "rsync -a --exclude='.*' $GOPATH/" + repo_name + " $GOPATH/src"
sh "cd $GOPATH/src/" + repo_name + " && dep ensure"
sh "env GOOS=linux GOARCH=amd64 go build -o main $GOPATH/src/" + repo_name + "/main.go"
}
}
} else if (runtime.indexOf("go") > -1 ){
//Installing dependencies using dep ensure
//golang build scripts
withEnv(["GOPATH=${env.WORKSPACE}"]) {
sh "mkdir -p $GOPATH/src"
sh "rsync -a --exclude='.*' $GOPATH/"+ repo_name+" $GOPATH/src"
sh "cd $GOPATH/src/"+ repo_name+" && dep ensure"
sh "cd $GOPATH/src/"+ repo_name+" && env GOOS=linux GOARCH=amd64 go build -o $GOPATH/"+ repo_name+"/main *.go"
}
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion builds/jenkins-build-pack-lambda/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def buildLambda(String runtime, String repo_name) {
sh "mkdir -p $GOPATH/src"
sh "rsync -a --exclude='.*' $GOPATH/" + repo_name + " $GOPATH/src"
sh "cd $GOPATH/src/"+ repo_name+" && dep ensure"
sh "env GOOS=linux GOARCH=amd64 go build -o main $GOPATH/src/" + repo_name + "/main.go"
sh "cd $GOPATH/src/"+ repo_name+" && env GOOS=linux GOARCH=amd64 go build -o $GOPATH/"+ repo_name+"/main *.go"
}
}
}
Expand Down
19 changes: 16 additions & 3 deletions builds/serverless-config-pack/serverless-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,20 @@ functions:
enabled: ${file(deployment-env.yml):eventScheduleEnable}
#End:isScheduleEnabled
#Start:isDynamoDbEnabled
- stream: {event_source_dynamodb}
- stream:
type: dynamodb
#Start:dynamoDbstreamArn
streamArnDisabled: {event_dynamodb_stream_arn}
#End:dynamoDbstreamArn
#Start:dynamoDbstreamGetArn
arn:
Fn::GetAtt:
- sourceDynamoDbTable
- StreamArn
#End:dynamoDbstreamGetArn
batchSize: 1
startingPosition: LATEST
enabled: true
#End:isDynamoDbEnabled
#Start:isSQSEventEnabled
- sqs:
Expand All @@ -62,7 +75,7 @@ functions:
#Start:streamGetArn
arn:
Fn::GetAtt:
- {event_source_kinesis}
- sourceKinesisStreams
- Arn
#End:streamGetArn
#Start:streamArn
Expand Down Expand Up @@ -96,7 +109,7 @@ resourcesDisabled:
customEventRole: ${file(policyFile.yml):kinesisRole}
#End:isStreamEnabled
#Start:isDynamoDbEnabled
customEventRole: ${file(policyFile.yml):eventSubscribed}
customEventRole: ${file(policyFile.yml):dynamoDbRole}
#End:isDynamoDbEnabled
#Start:isSQSEventEnabled
customEventRole: ${file(policyFile.yml):sqsRole}
Expand Down
5 changes: 3 additions & 2 deletions core/jazz_ui/src/app/pages/login/oss/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
</div>
</div>

<div class="form-row bottom-2" *ngIf="!forgot_password || register || new_pwd_req">

<div class="form-row bottom-2" *ngIf="!forgot_password || register || new_pwd_req">
<div class="form-label">Password </div>
<input required minlength="8" [class.err-border]='err_password_brd || (model.password && (!password.valid && (password.dirty || password.touched))) && (register || new_pwd_req)' type="password" name='password' [(ngModel)]="model.password" (ngModelChange)="onChange($event)" #password='ngModel'>
<ul class='login-form-errmsg' *ngIf="model.password && (!password.valid && (password.dirty || password.touched)) && (register || new_pwd_req)">
Expand All @@ -75,7 +76,7 @@
</div>

<div class="btn-wrp">
<btn-jazz-primary *ngIf="!register && !forgot_password && !new_pwd_req" [text]="buttonText" (click)="login($event)" newclass="loginbutton"></btn-jazz-primary>
<btn-jazz-primary *ngIf="!register && !forgot_password && !new_pwd_req" [text]="buttonText" (click)="login($event)" newclass="loginbutton" [disablePrimaryBtn]=' (!model.password) || (!model.username)'></btn-jazz-primary>
<btn-jazz-primary *ngIf="register && !forgot_password && !new_pwd_req" [text]="'REGISTER'" (click)="registerUser($event)" newclass="loginbutton" [disablePrimaryBtn]= '(!username.valid && (username.dirty || username.touched)) || (!password.valid && (password.dirty || password.touched)) || (!model.username) || (!model.password) || (!model.usercode)'></btn-jazz-primary>
<btn-jazz-primary *ngIf="!register && (forgot_password || new_pwd_req)" [text]="'SUBMIT'" (click)="resetPassword($event)" newclass="loginbutton" [disablePrimaryBtn]='disableLoginBtn() || (!username.valid && (username.dirty || username.touched)) || (model.password && (!password.valid && (password.dirty || password.touched)))'></btn-jazz-primary>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,13 @@ export class ServicesListComponent implements OnInit {
this.FilterTags.notifyServices(this.tableHeader2[i].key, colFilterVal);
}
} else if (col.filter['type'] === 'input') {
var colFilterVal = col.filter['value'];
// var colFilterVal = col.filter['value'];
if (col.filter['value'] != undefined) {
var colFilterVal = col.filter['value'].toLowerCase();
}
else {
var colFilterVal = col.filter['value'];
}
if (event.keyCode == 13 && colFilterVal != undefined) {
this.FilterTags.notifyServices(this.tableHeader2[i].key, colFilterVal);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ <h4 class="bold-title">
</div>
</section>
<section class="runtime-option">
<div class="radio-container" class="disable-event">
<input type="radio" disabled='disabled' name="runtime" id="runtimeKeys[4]" [value]="runtimeKeys[4]" [checked]="runtime == runtimeKeys[4]" (click)="onSelectionChange(runtimeKeys[4])">
<div class="radio-container">
<input type="radio" name="runtime" id="runtimeKeys[4]" [value]="runtimeKeys[4]" [checked]="runtime == runtimeKeys[4]" (click)="onSelectionChange(runtimeKeys[4])">
<label for="runtimeKeys[4]"><span class='outer'></span><span class="background"></span>{{runtimeObject[runtimeKeys[4]]}}</label>
</div>
</section>
Expand Down
4 changes: 2 additions & 2 deletions templates/api-template-go/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
version = "1.6.0"

[[constraint]]
name = "github.com/op/go-logging"
version = "1.0.0"
name = "github.com/spf13/viper"
version = "1.3.1"
59 changes: 59 additions & 0 deletions templates/api-template-go/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package main

/**
Go Template Project
@module: configModule
@description: Defines functions for Loading the right Configuration files to get loaded.
@author:
@version: 1.0
**/


import (
"github.com/spf13/viper"
"context"
"os"
"strings"
)

type Config struct {
ctx context.Context
event map[string]interface{}
}

// Load Configuration file
func (c *Config) LoadConfiguration(ctx context.Context, event map[string]interface{}) {
c.ctx = ctx
c.event = event

var stage string
var FunctionName string

if value, ok := event["stage"]; ok {
//get stage value from payload
stage = value.(string)
} else {
// get Function name from Environment Variables
FunctionName = os.Getenv("AWS_LAMBDA_FUNCTION_NAME")
fnName := string(FunctionName [strings.LastIndex(FunctionName , "-") + 1 :len(FunctionName )])
if (strings.HasPrefix(fnName, "dev")){
stage = "dev"
}else if (strings.HasPrefix(fnName, "stg")){
stage = "stg"
}else if (strings.HasPrefix(fnName, "prod")){
stage = "prod"
}
}

if len(stage) > 0 {
viper.SetConfigFile("./config/"+stage+"-config.json")
// Searches for config file in given paths and read it
if err := viper.ReadInConfig(); err != nil {
logger.ERROR("Error reading config file ")
}
}else{
logger.ERROR("Error! No stage Defined")
}
}


83 changes: 83 additions & 0 deletions templates/api-template-go/error-handler.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package main

// /**
// Go Template Project
// @module: errorhandler
// @description: Defines functions raising API Errors in required format for API Gateway integration
// @author:
// @version: 1.0
// **/

// Handle Input Validation error
type InputValidationError struct {
message string
}

func NewInputValidationError(message string) *InputValidationError {
return &InputValidationError{
message: message,
}
}

func (e *InputValidationError) Error() string {
return e.message
}

// Handle ForbiddenError
type ForbiddenError struct {
message string
}

func NewForbiddenError(message string) *ForbiddenError {
return &ForbiddenError{
message: message,
}
}

func (e *ForbiddenError) Error() string {
return e.message
}

// Unauthorized Error
type UnauthorizedError struct {
message string
}

func NewUnauthorizedError(message string) *UnauthorizedError {
return &UnauthorizedError{
message: message,
}
}

func (e *UnauthorizedError) Error() string {
return e.message
}
// NotFound Error
type NotFoundError struct {
message string
}

func NewNotFoundError(message string) *NotFoundError {
return &NotFoundError{
message: message,
}
}

func (e *NotFoundError) Error() string {
return e.message
}

// InternalServerError Error
type InternalServerError struct {
message string
}

func NewInternalServerError(message string) *InternalServerError {
return &InternalServerError{
message: message,
}
}

func (e *InternalServerError) Error() string {
return e.message
}
Loading

0 comments on commit 9b89d23

Please sign in to comment.