File tree Expand file tree Collapse file tree 3 files changed +33
-25
lines changed Expand file tree Collapse file tree 3 files changed +33
-25
lines changed Original file line number Diff line number Diff line change @@ -89,9 +89,10 @@ module.exports = {
8989 name : event . sqs . name ,
9090 scw_sqs_config : {
9191 queue : event . sqs . queue ,
92- mnq_project_id : event . sqs . projectId || this . provider . getScwProject ( ) ,
93- mnq_region : event . sqs . region || this . provider . getScwRegion ( )
94- }
92+ mnq_project_id :
93+ event . sqs . projectId || this . provider . getScwProject ( ) ,
94+ mnq_region : event . sqs . region || this . provider . getScwRegion ( ) ,
95+ } ,
9596 } ) ;
9697 }
9798 } ) ;
Original file line number Diff line number Diff line change @@ -27,8 +27,8 @@ functions:
2727 - sqs :
2828 name : my-sqs-trigger
2929 queue : " name"
30- projectId : " project-id" # Optional
31- region : " fr-par" # Optional
30+ projectId : " project-id" # Optional
31+ region : " fr-par" # Optional
3232
3333# Container
3434custom :
Original file line number Diff line number Diff line change @@ -107,26 +107,33 @@ const TRIGGERS_VALIDATION = {
107107 }
108108 } ,
109109 sqs : ( trigger ) => {
110- if ( ! trigger . name || ! triggerNameRegex . test ( trigger . name ) ) {
111- throw new Error (
112- `Invalid trigger "${ trigger . name } ": name is invalid, should match regex "${ triggerNameRegex . toString ( ) } "`
113- ) ;
114- }
115- if ( ! trigger . queue || ! triggerSqsQueueRegex . test ( trigger . queue ) ) {
116- throw new Error (
117- `Invalid trigger "${ trigger . name } ": queue is invalid, should match regex "${ triggerSqsQueueRegex . toString ( ) } "`
118- ) ;
119- }
120- if ( trigger . projectId && ! triggerSqsProjectIdRegex . test ( trigger . projectId ) ) {
121- throw new Error (
122- `Invalid trigger "${ trigger . name } ": projectId is invalid, should match regex "${ triggerSqsProjectIdRegex . toString ( ) } "`
123- ) ;
124- }
125- if ( trigger . region && ! REGION_LIST . includes ( trigger . region ) ) {
126- throw new Error (
127- `Invalid trigger "${ trigger . name } ": region is unknown`
128- ) ;
129- }
110+ if ( ! trigger . name || ! triggerNameRegex . test ( trigger . name ) ) {
111+ throw new Error (
112+ `Invalid trigger "${
113+ trigger . name
114+ } ": name is invalid, should match regex "${ triggerNameRegex . toString ( ) } "`
115+ ) ;
116+ }
117+ if ( ! trigger . queue || ! triggerSqsQueueRegex . test ( trigger . queue ) ) {
118+ throw new Error (
119+ `Invalid trigger "${
120+ trigger . name
121+ } ": queue is invalid, should match regex "${ triggerSqsQueueRegex . toString ( ) } "`
122+ ) ;
123+ }
124+ if (
125+ trigger . projectId &&
126+ ! triggerSqsProjectIdRegex . test ( trigger . projectId )
127+ ) {
128+ throw new Error (
129+ `Invalid trigger "${
130+ trigger . name
131+ } ": projectId is invalid, should match regex "${ triggerSqsProjectIdRegex . toString ( ) } "`
132+ ) ;
133+ }
134+ if ( trigger . region && ! REGION_LIST . includes ( trigger . region ) ) {
135+ throw new Error ( `Invalid trigger "${ trigger . name } ": region is unknown` ) ;
136+ }
130137 }
131138} ;
132139
You can’t perform that action at this time.
0 commit comments