From d2af11b0770939b1ff33a0a2ca0187f8c2c5a546 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Mon, 26 Aug 2019 19:23:36 +0200
Subject: [PATCH 01/15] :sparkles: : add option to make module variable
 mandatory

resolves #72
---
 .../io/codeka/gaia/modules/bo/TerraformVariable.java   | 10 ++++++++++
 src/main/resources/templates/module.html               |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
index e84c88a39..7818154f0 100644
--- a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
+++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
@@ -13,6 +13,8 @@ public class TerraformVariable {
 
     private boolean editable;
 
+    private boolean mandatory;
+
     public String getName() {
         return name;
     }
@@ -44,4 +46,12 @@ public boolean isEditable() {
     public void setEditable(boolean editable) {
         this.editable = editable;
     }
+
+    public boolean isMandatory() {
+        return mandatory;
+    }
+
+    public void setMandatory(boolean mandatory) {
+        this.mandatory = mandatory;
+    }
 }
diff --git a/src/main/resources/templates/module.html b/src/main/resources/templates/module.html
index 34bff5ea0..1bd34501b 100644
--- a/src/main/resources/templates/module.html
+++ b/src/main/resources/templates/module.html
@@ -125,11 +125,8 @@ <h2>Variables <button type="button" class="btn btn-success" @click="addVar()">+<
                         <input type="text" class="form-control" id="var-defaultValue" v-model="modVar.defaultValue">
                     </div>
                     <div class="form-group col-md-1">
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" :id="'check-' + modVarIdx" v-model="modVar.editable">
-                            <label class="form-check-label" :for="'check-' + modVarIdx"
-                                   data-toggle="tooltip" data-placement="top" title="Set this variable as editable for module users">Editable</label>
-                        </div>
+                        <b-form-checkbox v-model="modVar.editable" switch inline>Editable</b-form-checkbox>
+                        <b-form-checkbox v-model="modVar.mandatory" switch inline>Mandatory</b-form-checkbox>
                     </div>
                     <div class="form-group" >
                         <button type="button" class="form-control btn btn-danger" @click="removeVar(modVarIdx)">-</button>

From 86976be83f263e6d69db8ba19ef437862465c1be Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien@codeka.io>
Date: Mon, 26 Aug 2019 19:24:56 +0200
Subject: [PATCH 02/15] :recycle: : use bootstrap-vue buttons

---
 src/main/resources/templates/stack.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/stack.html b/src/main/resources/templates/stack.html
index 338e9ccbe..273ceac4c 100644
--- a/src/main/resources/templates/stack.html
+++ b/src/main/resources/templates/stack.html
@@ -50,13 +50,13 @@
 
 <template id="stack-controls">
     <div class="page_controls">
-        <a href="#" class="btn btn-primary" @click="saveStack"><i class="far fa-save"></i> Save</a>
-        <a href="#" class="btn btn-primary" @click="runStack" v-if="stack.state === 'NEW' || stack.state === 'STOPPED'"><i class="fas fa-rocket"></i> Run</a>
-        <a href="#" class="btn btn-warning" @click="runStack" v-if="stack.state === 'TO_UPDATE'"><i class="fas fa-upload"></i> Update</a>
+        <b-button variant="primary" @click="saveStack"><i class="far fa-save"></i> Save</b-button>
+        <b-button varian="primary" @click="runStack" v-if="stack.state === 'NEW' || stack.state === 'STOPPED'"><i class="fas fa-rocket"></i> Run</b-button>
+        <b-button variant="warning" @click="runStack" v-if="stack.state === 'TO_UPDATE'"><i class="fas fa-upload"></i> Update</b-button>
 
-        <a href="#" class="btn btn-info" @click="previewStack" v-if="stack.state !== 'RUNNING'"><i class="fas fa-binoculars"></i> Preview</a>
+        <b-button variant="info" @click="previewStack" v-if="stack.state !== 'RUNNING'"><i class="fas fa-binoculars"></i> Preview</b-button>
 
-        <a href="#" class="btn btn-danger" @click="stopStack" v-if="stack.state === 'RUNNING' || stack.state === 'TO_UPDATE'"><i class="fas fa-stop-circle"></i> Stop</a>
+        <b-button variant="danger" @click="stopStack" v-if="stack.state === 'RUNNING' || stack.state === 'TO_UPDATE'"><i class="fas fa-stop-circle"></i> Stop</b-button>
     </div>
 </template>
 

From 3e57d77ea25943f11910733f1bc952f312a0d2b9 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien@codeka.io>
Date: Mon, 26 Aug 2019 19:27:37 +0200
Subject: [PATCH 03/15] :children_crossing: : add variable validation to
 stack-vars component

---
 .../templates/vue_templates/stack-vars.vue    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/vue_templates/stack-vars.vue b/src/main/resources/templates/vue_templates/stack-vars.vue
index 39a4c8099..4edf6b262 100644
--- a/src/main/resources/templates/vue_templates/stack-vars.vue
+++ b/src/main/resources/templates/vue_templates/stack-vars.vue
@@ -1,11 +1,17 @@
 <template id="stack-vars">
     <div>
         <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in editableVars" v-if="editableVars.length > 0">
-            <div class="form-group col">
+            <b-form-group class="form-group col">
                 <label for="var-name">{{modVar.name}}: </label>
-                <input type="text" class="form-control" id="var-name" v-model="stack.variableValues[modVar.name]" @change="recomputeState" />
-                <small id="emailHelp" class="form-text text-muted">{{modVar.description}}</small>
-            </div>
+                <b-input id="var-name"
+                         v-model="stack.variableValues[modVar.name]"
+                         :state="validateVariable(modVar)"
+                         @update="recomputeState"
+                         aria-describedby="input-live-help input-live-feedback"
+                         trim></b-input>
+                <b-form-invalid-feedback id="input-live-feedback">This field is mandatory</b-form-invalid-feedback>
+                <b-form-text id="input-live-help">{{modVar.description}}</b-form-text>
+            </b-form-group>
         </div>
         <div v-if="editableVars.length === 0">
             <p>No editable variable defined for this module.</p>
@@ -19,14 +25,28 @@ Vue.component('stack-vars', {
     props: ["stack", "module"],
     methods: {
         recomputeState: function(){
-            if(stack.state === "RUNNING"){
-                stack.state = "TO_UPDATE";
+            if(this.stack.state === "RUNNING"){
+                this.stack.state = "TO_UPDATE";
             }
+            this.$emit("validated", this.variablesValid);
+        },
+        validateVariable: function(moduleVariable){
+            if(! moduleVariable.mandatory){
+                return null;
+            }
+            const value = this.stack.variableValues[moduleVariable.name];
+            return !(value === null || typeof value === "undefined" || value.length === 0);
         }
     },
     computed: {
         editableVars: function() {
             return this.module.variables.filter(variable => variable.editable);
+        },
+        variablesValid: function(){
+            return this.editableVars.every(moduleVar => {
+                const valid = this.validateVariable(moduleVar);
+                return valid === null || valid === true;
+            });
         }
     }
 });

From e98b2db72aa4fdd6fa232f5d8044fe835a25c6be Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Mon, 26 Aug 2019 20:20:11 +0200
Subject: [PATCH 04/15] :children_crossing: : disable save button when stack
 form is invalid

resolves #74
---
 src/main/resources/templates/stack.html | 104 ++++++++++++++----------
 1 file changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/templates/stack.html b/src/main/resources/templates/stack.html
index 273ceac4c..81954eee2 100644
--- a/src/main/resources/templates/stack.html
+++ b/src/main/resources/templates/stack.html
@@ -50,13 +50,13 @@
 
 <template id="stack-controls">
     <div class="page_controls">
-        <b-button variant="primary" @click="saveStack"><i class="far fa-save"></i> Save</b-button>
-        <b-button varian="primary" @click="runStack" v-if="stack.state === 'NEW' || stack.state === 'STOPPED'"><i class="fas fa-rocket"></i> Run</b-button>
-        <b-button variant="warning" @click="runStack" v-if="stack.state === 'TO_UPDATE'"><i class="fas fa-upload"></i> Update</b-button>
+        <b-button variant="primary" @click="saveStack" :disabled="!formValid"><i class="far fa-save"></i> Save</b-button>
+        <b-button varian="primary" @click="runStack" :disabled="!formValid" v-if="stack.state === 'NEW' || stack.state === 'STOPPED'"><i class="fas fa-rocket"></i> Run</b-button>
+        <b-button variant="warning" @click="runStack" :disabled="!formValid" v-if="stack.state === 'TO_UPDATE'"><i class="fas fa-upload"></i> Update</b-button>
 
-        <b-button variant="info" @click="previewStack" v-if="stack.state !== 'RUNNING'"><i class="fas fa-binoculars"></i> Preview</b-button>
+        <b-button variant="info" @click="previewStack" :disabled="!formValid" v-if="stack.state !== 'RUNNING'"><i class="fas fa-binoculars"></i> Preview</b-button>
 
-        <b-button variant="danger" @click="stopStack" v-if="stack.state === 'RUNNING' || stack.state === 'TO_UPDATE'"><i class="fas fa-stop-circle"></i> Stop</b-button>
+        <b-button variant="danger" @click="stopStack" :disabled="!formValid" v-if="stack.state === 'RUNNING' || stack.state === 'TO_UPDATE'"><i class="fas fa-stop-circle"></i> Stop</b-button>
     </div>
 </template>
 
@@ -106,10 +106,16 @@ <h2>
                         </h2>
                     </div>
                     <div class="block_content">
-                        <div class="form-group">
-                            <label for="name">Name</label>
-                            <input type="text" class="form-control" id="name" v-model="stack.name">
-                        </div>
+                        <b-form-group label="Name">
+                            <b-input id="var-name"
+                                     v-model="stack.name"
+                                     :state="stack.name !== ''"
+                                     aria-describedby="input-live-help input-live-feedback"
+                                     trim></b-input>
+                            <b-form-invalid-feedback id="input-live-feedback">This field is mandatory</b-form-invalid-feedback>
+                            <b-form-text id="input-live-help">This is the name of your stack</b-form-text>
+                        </b-form-group>
+                        <b-form-invalid-feedback id="input-live-feedback">This field is mandatory</b-form-invalid-feedback>
                         <div class="form-group">
                             <label for="description">Description</label>
                             <input type="text" class="form-control" id="description" v-model="stack.description">
@@ -129,7 +135,7 @@ <h2>Module variables values</h2>
                         <small>This is the configuration of your module's variables !</small>
                     </div>
                     <div class="block_content">
-                        <stack-vars v-bind:module="stack.module" v-bind:stack="stack"></stack-vars>
+                        <stack-vars v-bind:module="stack.module" v-bind:stack="stack" @validated="variablesValidated"></stack-vars>
                     </div>
                 </div>
             </div>
@@ -182,66 +188,76 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
     Vue.filter('dateTime', function (value) {
         if (!value || !moment(value).isValid()) return '';
         return moment(value).format('L LTS');
-    })
+    });
 
     Vue.filter('dateTimeLong', function (value) {
         if (!value || !moment(value).isValid()) return '';
         return moment(value).format('LLL');
-    })
+    });
 
 </script>
 
 <div th:replace="helpers/messenger"></div>
 
 <script th:inline="javascript" type="application/ecmascript">
-    let stack;
+    const store = {
+        state: {
+            stack: {},
+            variablesValid: true
+        }
+    };
 
     $.get(`/api/stacks/${stackId}`)
-        .then(data => stack = data)
+        .then(data => store.state.stack = data)
         .then(loadModule)
         .then(loadJobs)
-        .then(loadOuputs)
+        .then(loadOutputs)
         .then(initFront);
 
     function loadModule(){
-        return $.get(`/api/modules/${stack.moduleId}`).then(module => {
-            stack.module = module;
+        return $.get(`/api/modules/${store.state.stack.moduleId}`).then(module => {
+            store.state.stack.module = module;
         });
     }
 
-    function loadOuputs(){
+    function loadOutputs(){
         // calling terraform backend
         return $.get(`/api/state/${stackId}`)
             .then(data => {
                 // finding stack output
                 // data.modules[0].outputs for CLI <= 0.11.x
-                stack.outputs = data.outputs || data.modules[0].outputs;
+                store.state.stack.outputs = data.outputs || data.modules[0].outputs;
             })
             .catch(e => {
                 // a 404 means that the stack is new
-                stack.outputs = {};
+                store.state.stack.outputs = {};
                 return Promise.resolve();
             });
     }
 
     function loadJobs(){
         return $.get(`/api/jobs?stackId=${stackId}`)
-            .then(data => stack.jobs = data.reverse());
+            .then(data => store.state.stack.jobs = data.reverse());
     }
 
     function initFront(){
         new Vue({
             el: "#app",
-            data: {
-                stack
-            },
+            data: _ => ({
+                state: store.state,
+                stack: store.state.stack
+            }),
             template: "#template",
             methods: {
                 recomputeState: function(){
-                    if(stack.state === "RUNNING"){
-                        stack.state = "TO_UPDATE";
+                    if(this.stack.state === "RUNNING"){
+                        this.stack.state = "TO_UPDATE";
                     }
+                },
+                variablesValidated: function(valid){
+                    this.state.variablesValid = valid;
                 }
+
             },
             computed: {
                 editableVars: function() {
@@ -250,36 +266,37 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
             }
         });
 
-        let stack_backup = JSON.stringify(stack);
+        let stack_backup = JSON.stringify(store.state.stack);
         new Vue({
             el: "#controls",
-            data: {
-                stack
-            },
+            data: _ => ({
+                state: store.state,
+                stack: store.state.stack
+            }),
             template: "#stack-controls",
             methods: {
                 previewStack: function() {
-                    let current_stack = JSON.stringify(stack);
+                    let current_stack = JSON.stringify(this.stack);
                     if (current_stack === stack_backup) {
-                        window.location = `/stacks/${stack.id}/preview`;
+                        window.location = `/stacks/${this.stack.id}/preview`;
                     } else {
                         this.confirmDialog('Preview request', 'Modifications must be saved before. Continue?')
                             .then(value => {
                                 if (value) {
-                                    return this.saveStack().then(_ => window.location = `/stacks/${stack.id}/preview`);
+                                    return this.saveStack().then(_ => window.location = `/stacks/${this.stack.id}/preview`);
                                 }
                             })
                     }
                 },
                 runStack: function () {
-                    let current_stack = JSON.stringify(stack);
+                    let current_stack = JSON.stringify(this.stack);
                     if (current_stack === stack_backup) {
-                        window.location = `/stacks/${stack.id}/apply`;
+                        window.location = `/stacks/${this.stack.id}/apply`;
                     } else {
                         this.confirmDialog('Run request', 'Modifications must be saved before. Continue?')
                             .then(value => {
                                 if (value) {
-                                    return this.saveStack().then(_ => window.location = `/stacks/${stack.id}/apply`);
+                                    return this.saveStack().then(_ => window.location = `/stacks/${this.stack.id}/apply`);
                                 }
                             })
                     }
@@ -290,13 +307,13 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                         message: "Saving stack."
                     });
                     return $.ajax({
-                        url: `/api/stacks/${stackId}`,
-                        data: JSON.stringify(stack),
+                        url: `/api/stacks/${this.stack.id}`,
+                        data: JSON.stringify(this.stack),
                         contentType: "application/json",
                         method: "PUT",
                         success: () => {
                             message.update({type: "success", message: "Stack saved."});
-                            stack_backup = JSON.stringify(stack);
+                            stack_backup = JSON.stringify(this.stack);
                         },
                         error: () => message.update({type: "error", message: "Error saving stack."})
                     });
@@ -307,7 +324,7 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                         .then(value => {
                             if (value) {
                                 // redirect
-                                window.location = `/stacks/${stack.id}/stop`;
+                                window.location = `/stacks/${this.stack.id}/stop`;
                             }
                         });
                 },
@@ -322,8 +339,13 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                         returnFocus: 'body'
                     });
                  }
+            },
+            computed: {
+                formValid: function(){
+                    return this.state.variablesValid && this.stack.name.trim() !== "";
+                }
             }
-        });
+        })
     }
 
     new Vue({

From eee74f5de604d8050afe43a5027550ecd7f19141 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Tue, 27 Aug 2019 13:04:05 +0200
Subject: [PATCH 05/15] :sparkles: : add server-side validation for stacks

---
 .../java/io/codeka/gaia/stacks/bo/Stack.java  |   4 +
 .../stacks/bo/StackVariablesValidation.java   |  22 ++++
 .../controller/StackRestController.java       |   7 +-
 .../StackValidationExceptionHandler.java      |  36 ++++++
 .../service/StackVariablesValidator.java      |  40 ++++++
 .../controller/ModuleRestControllerIT.java    |   6 +-
 .../controller/StackRestControllerIT.java     |  61 +++++++++-
 .../StackValidationExceptionHandlerTest.java  |  36 ++++++
 .../service/StackVariablesValidatorTest.java  | 114 ++++++++++++++++++
 src/test/resources/db/20_module.js            |  29 ++++-
 10 files changed, 344 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java
 create mode 100644 src/main/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandler.java
 create mode 100644 src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java
 create mode 100644 src/test/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandlerTest.java
 create mode 100644 src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java

diff --git a/src/main/java/io/codeka/gaia/stacks/bo/Stack.java b/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
index 6827b179b..43e0f74f3 100644
--- a/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
+++ b/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
@@ -4,6 +4,7 @@
 import io.codeka.gaia.teams.bo.User;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -15,6 +16,7 @@
  * It references the module it is based on, with all the values of its variables.
  * It also has a backend configuration, and a provider configuration (in terraform terms).
  */
+@StackVariablesValidation
 public class Stack {
 
     /**
@@ -25,6 +27,7 @@ public class Stack {
     /**
      * The id of the referenced module
      */
+    @NotBlank
     private String moduleId;
 
     /**
@@ -35,6 +38,7 @@ public class Stack {
     /**
      * The name of the stack
      */
+    @NotBlank
     private String name;
 
     /**
diff --git a/src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java b/src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java
new file mode 100644
index 000000000..2f867b242
--- /dev/null
+++ b/src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java
@@ -0,0 +1,22 @@
+package io.codeka.gaia.stacks.bo;
+
+import io.codeka.gaia.stacks.service.StackVariablesValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Constraint(validatedBy = StackVariablesValidator.class)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StackVariablesValidation {
+
+    String message() default "mandatory variables should not be blank";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/io/codeka/gaia/stacks/controller/StackRestController.java b/src/main/java/io/codeka/gaia/stacks/controller/StackRestController.java
index fe37252cf..074818a7f 100644
--- a/src/main/java/io/codeka/gaia/stacks/controller/StackRestController.java
+++ b/src/main/java/io/codeka/gaia/stacks/controller/StackRestController.java
@@ -9,6 +9,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
@@ -48,8 +49,8 @@ public Stack getStack(@PathVariable String id, User user){
         return stack;
     }
 
-    @PostMapping()
-    public Stack save(@RequestBody Stack stack, Team userTeam, User user){
+    @PostMapping
+    public Stack save(@RequestBody @Valid Stack stack, Team userTeam, User user){
         stack.setOwnerTeam(userTeam);
         stack.setId(UUID.randomUUID().toString());
         stack.setCreatedBy(user);
@@ -58,7 +59,7 @@ public Stack save(@RequestBody Stack stack, Team userTeam, User user){
     }
 
     @PutMapping("/{id}")
-    public Stack update(@PathVariable String id, @RequestBody Stack stack, User user){
+    public Stack update(@PathVariable String id, @RequestBody @Valid Stack stack, User user){
         stack.setUpdatedBy(user);
         stack.setUpdatedAt(LocalDateTime.now());
         return stackRepository.save(stack);
diff --git a/src/main/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandler.java b/src/main/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandler.java
new file mode 100644
index 000000000..743df0249
--- /dev/null
+++ b/src/main/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandler.java
@@ -0,0 +1,36 @@
+package io.codeka.gaia.stacks.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@ControllerAdvice
+public class StackValidationExceptionHandler {
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseBody
+    public Map<String, String> handleValidationExceptions(MethodArgumentNotValidException ex) {
+        var message = ex.getBindingResult().getAllErrors().stream()
+                .map(this::getMessage)
+                .collect(Collectors.joining("\n"));
+
+        return Map.of("message", message);
+    }
+
+    private String getMessage(ObjectError error){
+        if(error instanceof FieldError){
+            var fieldError = ((FieldError)error);
+            return fieldError.getField() + " " + fieldError.getDefaultMessage();
+        }
+        return error.getDefaultMessage();
+    }
+}
diff --git a/src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java b/src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java
new file mode 100644
index 000000000..f7bf7d6dd
--- /dev/null
+++ b/src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java
@@ -0,0 +1,40 @@
+package io.codeka.gaia.stacks.service;
+
+import io.codeka.gaia.modules.bo.TerraformVariable;
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
+import io.codeka.gaia.stacks.bo.Stack;
+import io.codeka.gaia.stacks.bo.StackVariablesValidation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+@Service
+public class StackVariablesValidator implements ConstraintValidator<StackVariablesValidation, Stack> {
+
+    @Autowired
+    private TerraformModuleRepository moduleRepository;
+
+    @Override
+    public void initialize(StackVariablesValidation constraintAnnotation) {
+        // nothing to do here
+    }
+
+    @Override
+    public boolean isValid(Stack stack, ConstraintValidatorContext constraintValidatorContext) {
+        if(stack.getModuleId() == null || stack.getModuleId().isBlank()){
+            // no module defined, so variables are valid !
+            return true;
+        }
+        // getting the module
+        var module = this.moduleRepository.findById(stack.getModuleId()).orElseThrow();
+
+        return module.getVariables().stream()
+                .filter(TerraformVariable::isMandatory)
+                .allMatch(variable -> {
+                    var variableValue = stack.getVariableValues().get(variable.getName());
+                    return variableValue != null && !variableValue.isBlank();
+                });
+    }
+}
diff --git a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
index 2bb659a0d..e927dead0 100644
--- a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
+++ b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
@@ -57,9 +57,9 @@ void findAllModules_shouldReturnLimitedModules_forStandardUsers() throws Excepti
     void findAllModules_shouldReturnAllModules_forAdmin() throws Exception {
         mockMvc.perform(get("/api/modules"))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$", hasSize(2)))
-                .andExpect(jsonPath("$[*]name", contains("terraform-docker-mongo", "terraform-docker-mongo-limited")))
-                .andExpect(jsonPath("$..authorizedTeams..id", contains("Ze Team", "Not Ze Team")));
+                .andExpect(jsonPath("$", hasSize(3)))
+                .andExpect(jsonPath("$[*]name", contains("terraform-docker-mongo", "terraform-docker-mongo-limited","terraform-docker-mongo-with-mandatory-variable")))
+                .andExpect(jsonPath("$..authorizedTeams..id", contains("Ze Team", "Not Ze Team", "Ze Team")));
     }
 
     @Test
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
index f2c3f43b8..a5581cec1 100644
--- a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
+++ b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
@@ -90,10 +90,10 @@ void getStacks_shouldReturnStack_forAdmin() throws Exception {
 
     @Test
     @WithMockUser("Mary J")
-    void saveModule_shouldBeAccessible() throws Exception {
+    void saveStack_shouldBeAccessible_forStandardUser() throws Exception {
         mockMvc.perform(post("/api/stacks")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content("{\"name\":\"stack-test\"}"))
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"e01f9925-a559-45a2-8a55-f93dc434c676\"}"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id", notNullValue()))
                 .andExpect(jsonPath("$.ownerTeam.id", is("Not Ze Team")))
@@ -103,13 +103,66 @@ void saveModule_shouldBeAccessible() throws Exception {
 
     @Test
     @WithMockUser("Mary J")
-    void updateModule_shouldBeAccessible() throws Exception {
+    void updateStack_shouldBeAccessible_forStandardUser() throws Exception {
         mockMvc.perform(put("/api/stacks/test")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content("{\"name\":\"stack-test\"}"))
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"e01f9925-a559-45a2-8a55-f93dc434c676\"}"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.updatedBy.username", is("Mary J")))
                 .andExpect(jsonPath("$.updatedAt", notNullValue()));
     }
 
+    @Test
+    void saveStack_shouldValidateStackContent() throws Exception {
+        mockMvc.perform(post("/api/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty name and module id
+                .content("{}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", containsString("name must not be blank")))
+                .andExpect(jsonPath("$.message", containsString("moduleId must not be blank")));
+    }
+
+    @Test
+    void saveStack_shouldValidateStackContent_forBlankFields() throws Exception {
+        mockMvc.perform(post("/api/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty name and module id
+                .content("{\"name\":\"      \",\"moduleId\":\"   \"}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", containsString("name must not be blank")))
+                .andExpect(jsonPath("$.message", containsString("moduleId must not be blank")));
+    }
+
+    @Test
+    void updateStack_shouldValidateStackContent() throws Exception {
+        mockMvc.perform(put("/api/stacks/test")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty name
+                .content("{\"name\":\"\", \"moduleId\": \"\"}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", containsString("name must not be blank")))
+                .andExpect(jsonPath("$.message", containsString("moduleId must not be blank")));
+    }
+
+    @Test
+    void saveStack_shouldValidateStackVariables() throws Exception {
+        mockMvc.perform(post("/api/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty name
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variablesValues\":{}}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", is("mandatory variables should not be blank")));
+    }
+
+    @Test
+    void saveStack_shouldWork_stackIsValid() throws Exception {
+        mockMvc.perform(post("/api/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty name
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variablesValues\":{\"mongo_container_name\":\"someContainerName\"}}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", is("mandatory variables should not be blank")));
+    }
+
 }
\ No newline at end of file
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandlerTest.java b/src/test/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandlerTest.java
new file mode 100644
index 000000000..42395641a
--- /dev/null
+++ b/src/test/java/io/codeka/gaia/stacks/controller/StackValidationExceptionHandlerTest.java
@@ -0,0 +1,36 @@
+package io.codeka.gaia.stacks.controller;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.validation.*;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class StackValidationExceptionHandlerTest {
+
+    @Mock
+    private BindingResult bindingResult;
+
+    private StackValidationExceptionHandler handler = new StackValidationExceptionHandler();
+
+    @Test
+    void shouldJoinAllErrorMessages() {
+        // given
+        var objectError = new ObjectError("stack", "mandatory variables should not be null");
+        var fieldError = new FieldError("stack", "name", "should not be blank");
+        when(bindingResult.getAllErrors()).thenReturn(List.of(objectError, fieldError));
+
+        // when
+        var result = handler.handleValidationExceptions(new MethodArgumentNotValidException(null, bindingResult));
+
+        // then
+        assertThat(result).containsEntry("message", "mandatory variables should not be null\nname should not be blank");
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java b/src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java
new file mode 100644
index 000000000..4d6a9473e
--- /dev/null
+++ b/src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java
@@ -0,0 +1,114 @@
+package io.codeka.gaia.stacks.service;
+
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.modules.bo.TerraformVariable;
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
+import io.codeka.gaia.stacks.bo.Stack;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class StackVariablesValidatorTest {
+
+    @Mock
+    private TerraformModuleRepository moduleRepository;
+
+    @InjectMocks
+    private StackVariablesValidator validator;
+
+    @Test
+    void validator_shouldWork_whenModuleIsNull(){
+        assertThat(validator.isValid(new Stack(), null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldWork_whenModuleIsBlank(){
+        var stack = new Stack();
+        stack.setModuleId("     ");
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldReturnFalse_whenMandatoryVariableIsEmpty(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setMandatory(true);
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+
+        assertThat(validator.isValid(stack, null)).isFalse();
+    }
+
+    @Test
+    void validator_shouldReturnFalse_whenMandatoryVariableIsBlank(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setMandatory(true);
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "     "));
+
+        assertThat(validator.isValid(stack, null)).isFalse();
+    }
+
+    @Test
+    void validator_shouldReturnTrue_whenMandatoryVariableIsNotBlank(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setMandatory(true);
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "value"));
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldReturnTrue_whenNonMandatoryVariableIsNull(){
+        var variable = new TerraformVariable();
+        variable.setName("testNonMandatory");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+}
diff --git a/src/test/resources/db/20_module.js b/src/test/resources/db/20_module.js
index 62408d73f..318818d7c 100644
--- a/src/test/resources/db/20_module.js
+++ b/src/test/resources/db/20_module.js
@@ -22,7 +22,7 @@ gaia.terraformModule.insert([
             {
                 "name": "mongo_exposed_port",
                 "description": "the exposed port of the mongo container",
-                "defaultValue": null,
+                "defaultValue": 27017,
                 "editable": true
             }
         ]
@@ -40,4 +40,31 @@ gaia.terraformModule.insert([
         "estimatedMonthlyCostDescription": "Not Ze Team! Not Ze Team!",
         "variables": []
     },
+    {
+        "_id": "b39ccd07-80f5-455f-a6b3-b94f915738c4",
+        "name": "terraform-docker-mongo-with-mandatory-variable",
+        "description": "A sample terraform 🌍 module for running a mongodb 🍃 database inside a docker 🐳 container",
+        "gitRepositoryUrl": "https://github.com/juwit/terraform-docker-mongo.git",
+        "directory": null,
+        "gitBranch": "master",
+        "cliVersion": "0.11.14",
+        "authorizedTeams": [{"$ref": "team", "$id": "Ze Team"}],
+        "estimatedMonthlyCost": 0.99,
+        "estimatedMonthlyCostDescription": "Kamoulox",
+        "variables": [
+            {
+                "name": "mongo_container_name",
+                "description": "the name of the docker container",
+                "defaultValue": null,
+                "editable": true,
+                "mandatory": true
+            },
+            {
+                "name": "mongo_exposed_port",
+                "description": "the exposed port of the mongo container",
+                "defaultValue": 27017,
+                "editable": true
+            }
+        ]
+    }
 ]);
\ No newline at end of file

From 73348d9b9222e96662d2b689ca10d7a50e633ab0 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Tue, 27 Aug 2019 13:35:22 +0200
Subject: [PATCH 06/15] :children_crossing: : add variable validation to
 new-stack

resolves #73
---
 src/main/resources/templates/new_stack.html | 68 ++++++++++-----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/templates/new_stack.html b/src/main/resources/templates/new_stack.html
index 82dd9983a..7c2dda032 100644
--- a/src/main/resources/templates/new_stack.html
+++ b/src/main/resources/templates/new_stack.html
@@ -86,28 +86,29 @@ <h4>{{module.name}}</h4>
                             <hr/>
 
                             <div class="form-group">
-                                <div class="form-group">
-                                    <label for="name">Name</label>
-                                    <input type="text" class="form-control" id="name" v-model="stack.name">
-                                    <small>The name of your stack.</small>
-                                </div>
-                                <div class="form-group">
-                                    <label for="description">Description</label>
-                                    <input type="text" class="form-control" id="description" v-model="stack.description">
-                                    <small>The description of your stack.</small>
-                                </div>
+                                <b-form-group
+                                    label="Name"
+                                    description="The name of your stack">
+                                    <b-input v-model="stack.name" :state="typeof stack.name !== 'undefined' && stack.name !== ''"></b-input>
+                                    <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
+                                </b-form-group>
+                                <b-form-group
+                                    label="Description"
+                                    description="The description of your stack">
+                                    <b-input v-model="stack.description"></b-input>
+                                </b-form-group>
                             </div>
 
                             <ul class="list-inline float-right">
-                                <li><button type="button" class="btn btn-primary next-step">Next</button></li>
+                                <li><button type="button" class="btn btn-primary next-step" :disabled="typeof stack.name === 'undefined' || stack.name.trim() === ''">Next</button></li>
                             </ul>
                         </div>
                         <div class="tab-pane" role="tabpanel" id="step2">
                             <h2>Input variables</h2>
                             <hr/>
-                            <stack-vars v-bind:module="module" v-bind:stack="stack"></stack-vars>
+                            <stack-vars v-bind:module="module" v-bind:stack="stack" @validated="validated => this.stacksVariablesValidated = validated"></stack-vars>
                             <ul class="d-flex flex-row-reverse">
-                                <li><button type="button" class="btn btn-primary next-step ml-1">Next</button></li>
+                                <li><button type="button" class="btn btn-primary next-step ml-1" :disabled="!this.stacksVariablesValidated">Next</button></li>
                                 <li><button type="button" class="btn btn-light prev-step">Previous</button></li>
                             </ul>
                         </div>
@@ -172,29 +173,30 @@ <h2>Run</h2>
     $(elem).prev().find('a[data-toggle="tab"]').click();
 }
 
-
 const moduleId = [[${moduleId}]];
-let module;
-let stack = {
-    moduleId,
-    variableValues: {}
+
+const store = {
+    state : {
+        stack : {
+            moduleId,
+            variableValues: {}
+        },
+        stacksVariablesValidated: false
+    }
 };
 
 function loadModule(){
     console.log("loadModule");
     return $.get(`/api/modules/${moduleId}`).then(data => {
-        module = data;
+        store.state.module = data;
     });
 }
 
 loadModule()
-    .then(() => {
+    .then(function () {
         new Vue({
             el: "#app",
-            data: {
-                stack,
-                module
-            },
+            data: _ => store.state,
             template: "#template",
             methods: {
                 save,
@@ -205,33 +207,27 @@ <h2>Run</h2>
     });
 
 function save(){
-    console.log("save");
     $.ajax({
         url: `/api/stacks`,
-        data: JSON.stringify(stack),
+        data: JSON.stringify(this.stack),
         contentType: "application/json",
         method: "POST"
     }).then(saved => {
-        stack = saved;
-        console.log("save done !");
-        // redirect
-        window.location = `/stacks/${stack.id}`;
+        this.stack = saved;
+        window.location = `/stacks/${this.stack.id}`;
     });
 }
 
 function run(){
     // save the stack & run job
-    console.log("run");
     $.ajax({
         url: `/api/stacks`,
-        data: JSON.stringify(stack),
+        data: JSON.stringify(this.stack),
         contentType: "application/json",
         method: "POST"
     }).then(saved => {
-        stack = saved;
-        console.log("run done !");
-        // redirect
-        window.location = `/stacks/${stack.id}/apply`;
+        this.stack = saved;
+        window.location = `/stacks/${this.stack.id}/apply`;
     })
 }
 </script>

From f84f204d7ebaf6bf45a197346e1089acbfca9083 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Tue, 27 Aug 2019 22:36:16 +0200
Subject: [PATCH 07/15] :recycle: : use b-button for new_stack wizard

---
 src/main/resources/static/css/style.css     |  4 ++--
 src/main/resources/templates/new_stack.html | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index ac28a2cf0..8a7ed9aee 100755
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -304,8 +304,8 @@ a.btn {
     color: #000;
 }
 
-button i {
-    color: #fff;
+#sidebarCollapse i {
+    color: #FFF;
 }
 
 .lead {
diff --git a/src/main/resources/templates/new_stack.html b/src/main/resources/templates/new_stack.html
index 7c2dda032..5f65ae5c3 100644
--- a/src/main/resources/templates/new_stack.html
+++ b/src/main/resources/templates/new_stack.html
@@ -89,7 +89,7 @@ <h4>{{module.name}}</h4>
                                 <b-form-group
                                     label="Name"
                                     description="The name of your stack">
-                                    <b-input v-model="stack.name" :state="typeof stack.name !== 'undefined' && stack.name !== ''"></b-input>
+                                    <b-input v-model="stack.name" :state="typeof stack.name !== 'undefined' && stack.name !== ''" autofocus></b-input>
                                     <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
                                 </b-form-group>
                                 <b-form-group
@@ -100,7 +100,7 @@ <h4>{{module.name}}</h4>
                             </div>
 
                             <ul class="list-inline float-right">
-                                <li><button type="button" class="btn btn-primary next-step" :disabled="typeof stack.name === 'undefined' || stack.name.trim() === ''">Next</button></li>
+                                <li><b-button variant="primary" class="next-step" :disabled="typeof stack.name === 'undefined' || stack.name.trim() === ''"><i class="fas fa-arrow-circle-right"></i> Next</b-button></li>
                             </ul>
                         </div>
                         <div class="tab-pane" role="tabpanel" id="step2">
@@ -108,8 +108,8 @@ <h2>Input variables</h2>
                             <hr/>
                             <stack-vars v-bind:module="module" v-bind:stack="stack" @validated="validated => this.stacksVariablesValidated = validated"></stack-vars>
                             <ul class="d-flex flex-row-reverse">
-                                <li><button type="button" class="btn btn-primary next-step ml-1" :disabled="!this.stacksVariablesValidated">Next</button></li>
-                                <li><button type="button" class="btn btn-light prev-step">Previous</button></li>
+                                <li><b-button variant="primary" class="next-step ml-1" :disabled="!this.stacksVariablesValidated"><i class="fas fa-arrow-circle-right"></i> Next</b-button></li>
+                                <li><b-button variant="light" class="prev-step"><i class="fas fa-arrow-circle-left"></i> Previous</b-button></li>
                             </ul>
                         </div>
                         <div class="tab-pane" role="tabpanel" id="step3">
@@ -117,9 +117,9 @@ <h2>Run</h2>
                             <hr/>
                             <p>Save your stack and run it !</p>
                             <ul class="d-flex flex-row-reverse flex-grow-0">
-                                <li><button type="button" class="btn btn-primary ml-1" @click="run"><i class="fas fa-rocket"></i> Save & Run</button></li>
-                                <li><button type="button" class="btn btn-primary ml-1" @click="save"><i class="far fa-save"></i> Save & Continue</button></li>
-                                <li><button type="button" class="btn btn-light prev-step">Previous</button></li>
+                                <li><b-button variant="primary" class="ml-1" @click="run"><i class="fas fa-rocket"></i> Save & Run</b-button></li>
+                                <li><b-button variant="primary" class="ml-1" @click="save"><i class="far fa-save"></i> Save & Continue</b-button></li>
+                                <li><b-button variant="light" class="prev-step"><i class="fas fa-arrow-circle-left"></i> Previous</b-button></li>
                             </ul>
                         </div>
                         <div class="clearfix"></div>

From eaefe721282808af6973c1c0ba0b74a5ac1c55c2 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Wed, 28 Aug 2019 08:22:58 +0200
Subject: [PATCH 08/15] :bug: : corrects NPE on sidebar when build information
 is not available

---
 src/main/resources/templates/layout/sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/layout/sidebar.html b/src/main/resources/templates/layout/sidebar.html
index 0d6eaa3cf..28ca1b06e 100644
--- a/src/main/resources/templates/layout/sidebar.html
+++ b/src/main/resources/templates/layout/sidebar.html
@@ -32,9 +32,9 @@ <h4>Menu</h4>
         </div>
     </div>
     <div class="sidebar-footer">
-        <span><i class="fas fa-tag"></i> <span th:text="${info.build.version}"></span></span>
+        <span th:if="${info[build] != null}"><i class="fas fa-tag"></i> <span th:text="${info.build.version}"></span></span>
 
-        <span><i class="fab fa-github"></i> <span th:text="${info.git.commit.id}"></span></span>
+        <span th:if="${info[git] != null}"><i class="fab fa-github"></i> <span th:text="${info.git.commit.id}"></span></span>
     </div>
 </nav>
 <!-- end sidebar -->

From f7190ffabb6b14410a5fd208533db2ca526ca094 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Wed, 28 Aug 2019 08:33:00 +0200
Subject: [PATCH 09/15] :recycle: : use boostrap-vue components for module form

---
 src/main/resources/templates/module.html | 123 ++++++++++++-----------
 1 file changed, 64 insertions(+), 59 deletions(-)

diff --git a/src/main/resources/templates/module.html b/src/main/resources/templates/module.html
index 1bd34501b..c4ea05b86 100644
--- a/src/main/resources/templates/module.html
+++ b/src/main/resources/templates/module.html
@@ -44,61 +44,60 @@ <h2>Module {{module.name}}</h2>
         </div>
 
         <div class="block_content">
-            <form v-on:submit.prevent="post">
-                <div class="form-row">
-                    <div class="form-group col-md-11">
-                        <label for="name">Name</label>
-                        <input type="text" class="form-control" id="name" v-model="module.name">
-                    </div>
-                    <div class="form-group col-md-1">
-                        <label for="cliVersion">CLI Version</label>
-                        <b-form-select class="form-control" id="cliVersion" v-model="module.cliVersion" :options="versions"></b-form-select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="description">Description</label>
-                    <input type="text" class="form-control" id="description" v-model="module.description">
-                </div>
+            <form>
+                <b-form-row>
+                    <b-col cols="11">
+                        <b-form-group label="Name" description="The name of your module">
+                            <b-input v-model="module.name"></b-input>
+                        </b-form-group>
+                    </b-col>
+                    <b-col>
+                        <b-form-group label="CLI Version">
+                            <b-form-select v-model="module.cliVersion" :options="versions"></b-form-select>
+                        </b-form-group>
+                    </b-col>
+                </b-form-row>
+                <b-form-group label="Description" description="The description of your module">
+                    <b-input v-model="module.description"></b-input>
+                </b-form-group>
 
                 <b-form-row>
                     <b-col cols="3">
-                        <b-form-group id="estimatedMonthlyCost-fieldSet"
-                                      label="Estimated monthly cost"
-                                      label-for="estimatedMonthlyCost">
+                        <b-form-group label="Estimated monthly cost">
                             <b-input-group append="$">
-                                <b-form-input id="estimatedMonthlyCost" v-model="module.estimatedMonthlyCost"></b-form-input>
+                                <b-form-input v-model="module.estimatedMonthlyCost"></b-form-input>
                             </b-input-group>
 
                         </b-form-group>
                     </b-col>
                 </b-form-row>
 
-                <b-form-group id="estimatedMonthlyCostDescription-fieldSet"
-                              label="Description of estimated monthly cost"
-                              label-for="estimatedMonthlyCostDescription">
+                <b-form-group label="Description of estimated monthly cost">
                     <b-input-group>
                         <b-input-group-text slot="append"><i class="fab fa-markdown"></i></b-input-group-text>
-                        <b-form-textarea id="estimatedMonthlyCostDescription" v-model="module.estimatedMonthlyCostDescription"></b-form-textarea>
+                        <b-form-textarea v-model="module.estimatedMonthlyCostDescription"></b-form-textarea>
                     </b-input-group>
                 </b-form-group>
 
-                <div class="form-row">
-                    <div class="form-group col">
-                        <label for="gitRepositoryUrl">Git Repository URL</label>
-                        <input type="text" class="form-control" id="gitRepositoryUrl" v-model="module.gitRepositoryUrl">
-                    </div>
-                    <div class="form-group col">
-                        <label for="directory">Git repository directory</label>
-                        <input type="text" class="form-control" id="directory" v-model="module.directory">
-                    </div>
-                </div>
+                <b-form-row>
+                    <b-col>
+                        <b-form-group label="Git Repository URL" description="The URL of the module's git repository">
+                            <b-input v-model="module.gitRepositoryUrl"></b-input>
+                        </b-form-group>
+                    </b-col>
+                    <b-col>
+                        <b-form-group label="Git repository directory" description="The sub-directory of the module's code inside the repository (leave empty if root)">
+                            <b-input v-model="module.directory"></b-input>
+                        </b-form-group>
+                    </b-col>
+                </b-form-row>
 
                 <h2>Authorized Teams</h2>
 
-                <div class="form-row">
-                    <div class="form-group col-md-6">
+                <b-form-row>
+                    <b-col cols="6">
+                    <b-form-group>
                         <vue-multiselect
-
                             :multiple="true"
                             label="id"
                             track-by="id"
@@ -106,34 +105,40 @@ <h2>Authorized Teams</h2>
                             placeholder="Select teams"
                             v-model="module.authorizedTeams"
                             :options="teams"></vue-multiselect>
-                    </div>
-                </div>
+                    </b-form-group>
+                    </b-col>
+                </b-form-row>
 
-                <h2>Variables <button type="button" class="btn btn-success" @click="addVar()">+</button></h2>
+                <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plus"></i></b-button></h2>
 
-                <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in module.variables">
-                    <div class="form-group col-md-3" >
-                        <label for="var-name">Name: </label>
-                        <input type="text" class="form-control" id="var-name" v-model="modVar.name">
-                    </div>
-                    <div class="form-group col-md-3" >
-                        <label for="var-description">Description: </label>
-                        <input type="text" class="form-control" id="var-description" v-model="modVar.description">
-                    </div>
-                    <div class="form-group col-md-2" >
-                        <label for="var-defaultValue">Default value: </label>
-                        <input type="text" class="form-control" id="var-defaultValue" v-model="modVar.defaultValue">
-                    </div>
-                    <div class="form-group col-md-1">
+                <b-form-row class="align-items-center" v-for="(modVar,modVarIdx) in module.variables">
+                    <b-col cols="3">
+                        <b-form-group label="Name">
+                            <b-input v-model="modVar.name"></b-input>
+                        </b-form-group>
+                    </b-col>
+                    <b-col cols="3">
+                        <b-form-group label="Description">
+                            <b-input v-model="modVar.description"></b-input>
+                        </b-form-group>
+                    </b-col>
+                    <b-col cols="2">
+                        <b-form-group label="Default value">
+                            <b-input v-model="modVar.defaultValue"></b-input>
+                        </b-form-group>
+                    </b-col>
+                    <b-col cols="1">
                         <b-form-checkbox v-model="modVar.editable" switch inline>Editable</b-form-checkbox>
                         <b-form-checkbox v-model="modVar.mandatory" switch inline>Mandatory</b-form-checkbox>
-                    </div>
-                    <div class="form-group" >
-                        <button type="button" class="form-control btn btn-danger" @click="removeVar(modVarIdx)">-</button>
-                    </div>
-                </div>
+                    </b-col>
+                    <b-col cols="1">
+                        <b-form-group>
+                            <b-button variant="danger" @click="removeVar(modVarIdx)"><i class="fas fa-minus"></i></b-button>
+                        </b-form-group>
+                    </b-col>
+                </b-form-row>
 
-                <button type="submit" class="btn btn-primary"><i class="far fa-save"></i> Save</button>
+                <b-button variant="primary" @click="post"><i class="far fa-save"></i> Save</b-button>
             </form>
         </div>
     </div>

From d814b763095ac30664e1291a8e34d849ff090900 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Wed, 28 Aug 2019 19:48:38 +0200
Subject: [PATCH 10/15] :children_crossing: : add client-side validation to
 module fields

resolves #71
---
 src/main/resources/templates/module.html | 25 +++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/module.html b/src/main/resources/templates/module.html
index c4ea05b86..69f770629 100644
--- a/src/main/resources/templates/module.html
+++ b/src/main/resources/templates/module.html
@@ -48,12 +48,14 @@ <h2>Module {{module.name}}</h2>
                 <b-form-row>
                     <b-col cols="11">
                         <b-form-group label="Name" description="The name of your module">
-                            <b-input v-model="module.name"></b-input>
+                            <b-input v-model="module.name" :state="notEmpty(module.name)"></b-input>
+                            <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
                         </b-form-group>
                     </b-col>
                     <b-col>
                         <b-form-group label="CLI Version">
-                            <b-form-select v-model="module.cliVersion" :options="versions"></b-form-select>
+                            <b-form-select v-model="module.cliVersion" :options="versions" :state="notEmpty(module.cliVersion)"></b-form-select>
+                            <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
                         </b-form-group>
                     </b-col>
                 </b-form-row>
@@ -82,7 +84,8 @@ <h2>Module {{module.name}}</h2>
                 <b-form-row>
                     <b-col>
                         <b-form-group label="Git Repository URL" description="The URL of the module's git repository">
-                            <b-input v-model="module.gitRepositoryUrl"></b-input>
+                            <b-input v-model="module.gitRepositoryUrl" :state="notEmpty(module.gitRepositoryUrl)"></b-input>
+                            <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
                         </b-form-group>
                     </b-col>
                     <b-col>
@@ -114,7 +117,8 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
                 <b-form-row class="align-items-center" v-for="(modVar,modVarIdx) in module.variables">
                     <b-col cols="3">
                         <b-form-group label="Name">
-                            <b-input v-model="modVar.name"></b-input>
+                            <b-input v-model="modVar.name" :state="notEmpty(modVar.name)"></b-input>
+                            <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
                         </b-form-group>
                     </b-col>
                     <b-col cols="3">
@@ -138,7 +142,7 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
                     </b-col>
                 </b-form-row>
 
-                <b-button variant="primary" @click="post"><i class="far fa-save"></i> Save</b-button>
+                <b-button variant="primary" :disabled="!formValid" @click="post"><i class="far fa-save"></i> Save</b-button>
             </form>
         </div>
     </div>
@@ -165,6 +169,10 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
 
     const moduleId = [[${module.id}]];
 
+    function notEmpty(field){
+        return typeof field !== "undefined" && field !== null && field.trim() !== "";
+    }
+
     $.get(`/api/modules/${moduleId}`)
         .then(module => $.get('/api/terraform-cli/versions').then(versions => ({module, versions})))
         .then(({module, versions}) => $.get('/api/teams').then(teams => ({module, versions, teams})))
@@ -195,6 +203,13 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
                     },
                     addVar(){
                         data.module.variables.push({});
+                    },
+                    notEmpty
+                },
+                computed: {
+                    formValid: _ => {
+                        return [this.module.name, this.module.cliVersion, this.module.gitRepositoryUrl].every(notEmpty)
+                            && this.module.variables.map(variable => variable.name).every(notEmpty);
                     }
                 }
             });

From 48b59699225b4621290ffae888fb6056fa26b03d Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Wed, 28 Aug 2019 20:04:04 +0200
Subject: [PATCH 11/15] :sparkles: : add server-side validation for modules

---
 .../gaia/modules/bo/TerraformModule.java      |  6 +++++
 .../gaia/modules/bo/TerraformVariable.java    |  3 +++
 .../controller/ModuleRestController.java      |  5 ++--
 .../controller/ModuleRestControllerIT.java    | 26 +++++++++++++++++--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
index 72f73d692..98424aa12 100644
--- a/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
+++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
@@ -4,6 +4,8 @@
 import io.codeka.gaia.teams.bo.User;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -12,18 +14,22 @@ public class TerraformModule {
 
     private String id;
 
+    @NotBlank
     private String gitRepositoryUrl;
 
     private String gitBranch;
 
     private String directory;
 
+    @Valid
     private List<TerraformVariable> variables = new ArrayList<>();
 
+    @NotBlank
     private String name;
 
     private String description;
 
+    @NotBlank
     private String cliVersion;
 
     @DBRef
diff --git a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
index 7818154f0..353daa907 100644
--- a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
+++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
@@ -1,10 +1,13 @@
 package io.codeka.gaia.modules.bo;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Represents a module variable
  */
 public class TerraformVariable {
 
+    @NotBlank
     private String name;
 
     private String description;
diff --git a/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java b/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java
index 9fbcc850b..a6c787f19 100644
--- a/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java
+++ b/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java
@@ -7,6 +7,7 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -23,7 +24,7 @@ public ModuleRestController(TerraformModuleRepository moduleRepository) {
         this.moduleRepository = moduleRepository;
     }
 
-    @GetMapping("")
+    @GetMapping
     public List<TerraformModule> findAllModules(User user){
         if(user.isAdmin()){
             return moduleRepository.findAll();
@@ -41,7 +42,7 @@ public TerraformModule findModule(@PathVariable String id, User user){
 
     @Secured("ROLE_ADMIN")
     @PutMapping("/{id}")
-    public TerraformModule saveModule(@PathVariable String id, @RequestBody TerraformModule module){
+    public TerraformModule saveModule(@PathVariable String id, @RequestBody @Valid TerraformModule module){
         return moduleRepository.save(module);
     }
 
diff --git a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
index e927dead0..bd02af793 100644
--- a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
+++ b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
@@ -96,7 +96,7 @@ void findModule_shouldReturnModulesOfOtherTeams_forAdmin() throws Exception {
     void saveModule_shouldNotBeAccessible_forStandardUsers() throws Exception {
         mockMvc.perform(put("/api/modules/test")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content("{\"name\":\"module-test\"}"))
+                .content("{\"name\":\"module-test\", \"cliVersion\": \"0.12.0\", \"gitRepositoryUrl\": \"https://github.com/juwit/terraform-docker-mongo.git\"}"))
                 .andExpect(status().isForbidden());
     }
 
@@ -104,10 +104,32 @@ void saveModule_shouldNotBeAccessible_forStandardUsers() throws Exception {
     void saveModule_shouldBeAccessible_forAdmin() throws Exception {
         mockMvc.perform(put("/api/modules/test")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content("{\"name\":\"module-test\"}"))
+                .content("{\"name\":\"module-test\", \"cliVersion\": \"0.12.0\", \"gitRepositoryUrl\": \"https://github.com/juwit/terraform-docker-mongo.git\"}"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id", notNullValue()))
                 .andExpect(jsonPath("$.name", is("module-test")));
     }
 
+    @Test
+    void saveModule_shouldValidateModuleContent_forBlankFields() throws Exception {
+        mockMvc.perform(put("/api/modules/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty module
+                .content("{}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", containsString("name must not be blank")))
+                .andExpect(jsonPath("$.message", containsString("cliVersion must not be blank")))
+                .andExpect(jsonPath("$.message", containsString("gitRepositoryUrl must not be blank")));
+    }
+
+    @Test
+    void saveModule_shouldValidateModuleVariables_forBlankFields() throws Exception {
+        mockMvc.perform(put("/api/modules/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // empty variable name
+                .content("{\"variables\":[{\"name\":\"  \"}]}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.message", containsString("variables[0].name must not be blank")));
+    }
+
 }
\ No newline at end of file

From ad22dee693976f45589a85aa43e1b597c113635b Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Thu, 29 Aug 2019 07:36:45 +0200
Subject: [PATCH 12/15] :sparkles: : add client-side regex validation for
 variables

resolves #119
---
 .../gaia/modules/bo/TerraformVariable.java    | 10 ++++
 src/main/resources/templates/module.html      |  5 ++
 src/main/resources/templates/stack.html       | 12 ++--
 .../templates/vue_templates/stack-vars.vue    | 57 +++++++++++++------
 4 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
index 353daa907..5be548843 100644
--- a/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
+++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java
@@ -18,6 +18,8 @@ public class TerraformVariable {
 
     private boolean mandatory;
 
+    private String validationRegex;
+
     public String getName() {
         return name;
     }
@@ -57,4 +59,12 @@ public boolean isMandatory() {
     public void setMandatory(boolean mandatory) {
         this.mandatory = mandatory;
     }
+
+    public String getValidationRegex() {
+        return validationRegex;
+    }
+
+    public void setValidationRegex(String validationRegex) {
+        this.validationRegex = validationRegex;
+    }
 }
diff --git a/src/main/resources/templates/module.html b/src/main/resources/templates/module.html
index 69f770629..2b2a5f249 100644
--- a/src/main/resources/templates/module.html
+++ b/src/main/resources/templates/module.html
@@ -135,6 +135,11 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
                         <b-form-checkbox v-model="modVar.editable" switch inline>Editable</b-form-checkbox>
                         <b-form-checkbox v-model="modVar.mandatory" switch inline>Mandatory</b-form-checkbox>
                     </b-col>
+                    <b-col>
+                        <b-form-group label="Validation Regex">
+                            <b-input v-model="modVar.validationRegex"></b-input>
+                        </b-form-group>
+                    </b-col>
                     <b-col cols="1">
                         <b-form-group>
                             <b-button variant="danger" @click="removeVar(modVarIdx)"><i class="fas fa-minus"></i></b-button>
diff --git a/src/main/resources/templates/stack.html b/src/main/resources/templates/stack.html
index 81954eee2..8dea2bffa 100644
--- a/src/main/resources/templates/stack.html
+++ b/src/main/resources/templates/stack.html
@@ -135,7 +135,7 @@ <h2>Module variables values</h2>
                         <small>This is the configuration of your module's variables !</small>
                     </div>
                     <div class="block_content">
-                        <stack-vars v-bind:module="stack.module" v-bind:stack="stack" @validated="variablesValidated"></stack-vars>
+                        <stack-vars v-bind:module="stack.module" v-bind:stack="stack" @validated="valid => {debugger;this.state.variablesValid = valid}"></stack-vars>
                     </div>
                 </div>
             </div>
@@ -253,11 +253,7 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                     if(this.stack.state === "RUNNING"){
                         this.stack.state = "TO_UPDATE";
                     }
-                },
-                variablesValidated: function(valid){
-                    this.state.variablesValid = valid;
                 }
-
             },
             computed: {
                 editableVars: function() {
@@ -315,7 +311,11 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                             message.update({type: "success", message: "Stack saved."});
                             stack_backup = JSON.stringify(this.stack);
                         },
-                        error: () => message.update({type: "error", message: "Error saving stack."})
+                        error: (e) => {
+                            if(e.responseJSON){
+                                message.update({type: "error", message: `Error saving stack : ${e.responseJSON.message}`})
+                            }
+                        }
                     });
                 },
                 stopStack: function () {
diff --git a/src/main/resources/templates/vue_templates/stack-vars.vue b/src/main/resources/templates/vue_templates/stack-vars.vue
index 4edf6b262..6c6092e2c 100644
--- a/src/main/resources/templates/vue_templates/stack-vars.vue
+++ b/src/main/resources/templates/vue_templates/stack-vars.vue
@@ -1,17 +1,15 @@
 <template id="stack-vars">
     <div>
         <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in editableVars" v-if="editableVars.length > 0">
-            <b-form-group class="form-group col">
-                <label for="var-name">{{modVar.name}}: </label>
-                <b-input id="var-name"
-                         v-model="stack.variableValues[modVar.name]"
-                         :state="validateVariable(modVar)"
-                         @update="recomputeState"
-                         aria-describedby="input-live-help input-live-feedback"
-                         trim></b-input>
-                <b-form-invalid-feedback id="input-live-feedback">This field is mandatory</b-form-invalid-feedback>
-                <b-form-text id="input-live-help">{{modVar.description}}</b-form-text>
-            </b-form-group>
+            <b-col>
+                <b-form-group :label="modVar.name" :description="modVar.description">
+                    <b-input v-model="stack.variableValues[modVar.name]"
+                             :state="validateVariable(modVar).result"
+                             @update="recomputeState"
+                             trim></b-input>
+                    <b-form-invalid-feedback>{{validateVariable(modVar).message}}</b-form-invalid-feedback>
+                </b-form-group>
+            </b-col>
         </div>
         <div v-if="editableVars.length === 0">
             <p>No editable variable defined for this module.</p>
@@ -31,11 +29,34 @@ Vue.component('stack-vars', {
             this.$emit("validated", this.variablesValid);
         },
         validateVariable: function(moduleVariable){
-            if(! moduleVariable.mandatory){
-                return null;
+            // no validation needed if variable is not mandatory and if no validation regex
+            if(! moduleVariable.mandatory && ! moduleVariable.validationRegex){
+                return {result:null};
             }
+
             const value = this.stack.variableValues[moduleVariable.name];
-            return !(value === null || typeof value === "undefined" || value.length === 0);
+
+            // checking mandatory first
+            if(moduleVariable.mandatory){
+                if(value === null || typeof value === "undefined" || value.trim().length === 0){
+                    return {result:false, message:"This field is mandatory"};
+                }
+            }
+            else{
+                // not checking empty values
+                if(value === null || typeof value === "undefined" || value.trim().length === 0){
+                    return {result:null};
+                }
+            }
+
+            // check regex if defined
+            if(moduleVariable.validationRegex){
+                if( ! new RegExp(moduleVariable.validationRegex).test(value) ) {
+                    return {result:false, message:`This field must match the regex ${moduleVariable.validationRegex}`};
+                }
+            }
+
+            return {result:true};
         }
     },
     computed: {
@@ -43,10 +64,10 @@ Vue.component('stack-vars', {
             return this.module.variables.filter(variable => variable.editable);
         },
         variablesValid: function(){
-            return this.editableVars.every(moduleVar => {
-                const valid = this.validateVariable(moduleVar);
-                return valid === null || valid === true;
-            });
+            return this.editableVars
+                .map(this.validateVariable)
+                .map(validationResult => validationResult.result)
+                .every(result => result === null || result === true);
         }
     }
 });

From a9b27b9c9f6b3cc34b7f4b3c57fee5d7257ba9c0 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Thu, 29 Aug 2019 08:27:36 +0200
Subject: [PATCH 13/15] :sparkles: : add server-side regex validation for stack
 variables

---
 ...=> MandatoryStackVariablesValidation.java} |   6 +-
 .../bo/RegexStackVariablesValidation.java     |  22 +++
 .../java/io/codeka/gaia/stacks/bo/Stack.java  |   3 +-
 ... => MandatoryStackVariablesValidator.java} |   6 +-
 .../service/RegexStackVariablesValidator.java |  49 +++++++
 .../controller/ModuleRestControllerIT.java    |   2 +-
 .../controller/StackRestControllerIT.java     |  19 ++-
 ...MandatoryStackVariablesValidatorTest.java} |   7 +-
 .../RegexStackVariablesValidatorTest.java     | 130 ++++++++++++++++++
 src/test/resources/db/20_module.js            |   5 +-
 10 files changed, 229 insertions(+), 20 deletions(-)
 rename src/main/java/io/codeka/gaia/stacks/bo/{StackVariablesValidation.java => MandatoryStackVariablesValidation.java} (72%)
 create mode 100644 src/main/java/io/codeka/gaia/stacks/bo/RegexStackVariablesValidation.java
 rename src/main/java/io/codeka/gaia/stacks/service/{StackVariablesValidator.java => MandatoryStackVariablesValidator.java} (82%)
 create mode 100644 src/main/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidator.java
 rename src/test/java/io/codeka/gaia/stacks/service/{StackVariablesValidatorTest.java => MandatoryStackVariablesValidatorTest.java} (93%)
 create mode 100644 src/test/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidatorTest.java

diff --git a/src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java b/src/main/java/io/codeka/gaia/stacks/bo/MandatoryStackVariablesValidation.java
similarity index 72%
rename from src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java
rename to src/main/java/io/codeka/gaia/stacks/bo/MandatoryStackVariablesValidation.java
index 2f867b242..85850160c 100644
--- a/src/main/java/io/codeka/gaia/stacks/bo/StackVariablesValidation.java
+++ b/src/main/java/io/codeka/gaia/stacks/bo/MandatoryStackVariablesValidation.java
@@ -1,6 +1,6 @@
 package io.codeka.gaia.stacks.bo;
 
-import io.codeka.gaia.stacks.service.StackVariablesValidator;
+import io.codeka.gaia.stacks.service.MandatoryStackVariablesValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -9,10 +9,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Constraint(validatedBy = StackVariablesValidator.class)
+@Constraint(validatedBy = MandatoryStackVariablesValidator.class)
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface StackVariablesValidation {
+public @interface MandatoryStackVariablesValidation {
 
     String message() default "mandatory variables should not be blank";
 
diff --git a/src/main/java/io/codeka/gaia/stacks/bo/RegexStackVariablesValidation.java b/src/main/java/io/codeka/gaia/stacks/bo/RegexStackVariablesValidation.java
new file mode 100644
index 000000000..e25469832
--- /dev/null
+++ b/src/main/java/io/codeka/gaia/stacks/bo/RegexStackVariablesValidation.java
@@ -0,0 +1,22 @@
+package io.codeka.gaia.stacks.bo;
+
+import io.codeka.gaia.stacks.service.RegexStackVariablesValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Constraint(validatedBy = RegexStackVariablesValidator.class)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RegexStackVariablesValidation {
+
+    String message() default "variables should match the regex";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/io/codeka/gaia/stacks/bo/Stack.java b/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
index 43e0f74f3..5116050b2 100644
--- a/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
+++ b/src/main/java/io/codeka/gaia/stacks/bo/Stack.java
@@ -16,7 +16,8 @@
  * It references the module it is based on, with all the values of its variables.
  * It also has a backend configuration, and a provider configuration (in terraform terms).
  */
-@StackVariablesValidation
+@MandatoryStackVariablesValidation
+@RegexStackVariablesValidation
 public class Stack {
 
     /**
diff --git a/src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java b/src/main/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidator.java
similarity index 82%
rename from src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java
rename to src/main/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidator.java
index f7bf7d6dd..7c32b29f7 100644
--- a/src/main/java/io/codeka/gaia/stacks/service/StackVariablesValidator.java
+++ b/src/main/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidator.java
@@ -3,7 +3,7 @@
 import io.codeka.gaia.modules.bo.TerraformVariable;
 import io.codeka.gaia.modules.repository.TerraformModuleRepository;
 import io.codeka.gaia.stacks.bo.Stack;
-import io.codeka.gaia.stacks.bo.StackVariablesValidation;
+import io.codeka.gaia.stacks.bo.MandatoryStackVariablesValidation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -11,13 +11,13 @@
 import javax.validation.ConstraintValidatorContext;
 
 @Service
-public class StackVariablesValidator implements ConstraintValidator<StackVariablesValidation, Stack> {
+public class MandatoryStackVariablesValidator implements ConstraintValidator<MandatoryStackVariablesValidation, Stack> {
 
     @Autowired
     private TerraformModuleRepository moduleRepository;
 
     @Override
-    public void initialize(StackVariablesValidation constraintAnnotation) {
+    public void initialize(MandatoryStackVariablesValidation constraintAnnotation) {
         // nothing to do here
     }
 
diff --git a/src/main/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidator.java b/src/main/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidator.java
new file mode 100644
index 000000000..178d511dd
--- /dev/null
+++ b/src/main/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidator.java
@@ -0,0 +1,49 @@
+package io.codeka.gaia.stacks.service;
+
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
+import io.codeka.gaia.stacks.bo.RegexStackVariablesValidation;
+import io.codeka.gaia.stacks.bo.Stack;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.util.Pair;
+import org.springframework.stereotype.Service;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Pattern;
+
+@Service
+public class RegexStackVariablesValidator implements ConstraintValidator<RegexStackVariablesValidation, Stack> {
+
+    @Autowired
+    private TerraformModuleRepository moduleRepository;
+
+    @Override
+    public void initialize(RegexStackVariablesValidation constraintAnnotation) {
+        // nothing to do here
+    }
+
+    @Override
+    public boolean isValid(Stack stack, ConstraintValidatorContext constraintValidatorContext) {
+        if(stack.getModuleId() == null || stack.getModuleId().isBlank()){
+            // no module defined, so variables are valid !
+            return true;
+        }
+        // getting the module
+        var module = this.moduleRepository.findById(stack.getModuleId()).orElseThrow();
+
+        return module.getVariables().stream()
+                // not checking non regex values
+                .filter(terraformVariable -> terraformVariable.getValidationRegex() != null)
+                // not checking blank values (doing it first because Pair want non-null values)
+                .filter(terraformVariable -> {
+                    var value = stack.getVariableValues().get(terraformVariable.getName());
+                    return value != null && ! value.isBlank();
+                })
+                // associating each variable with its value
+                .map(terraformVariable -> Pair.of(terraformVariable, stack.getVariableValues().get(terraformVariable.getName())))
+                .allMatch(pair -> {
+                    var pattern = Pattern.compile(pair.getFirst().getValidationRegex());
+                    return pattern.matcher(pair.getSecond()).matches();
+                });
+    }
+}
diff --git a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
index bd02af793..d4f783eba 100644
--- a/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
+++ b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerIT.java
@@ -58,7 +58,7 @@ void findAllModules_shouldReturnAllModules_forAdmin() throws Exception {
         mockMvc.perform(get("/api/modules"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$", hasSize(3)))
-                .andExpect(jsonPath("$[*]name", contains("terraform-docker-mongo", "terraform-docker-mongo-limited","terraform-docker-mongo-with-mandatory-variable")))
+                .andExpect(jsonPath("$[*]name", contains("terraform-docker-mongo", "terraform-docker-mongo-limited","terraform-docker-mongo-with-validation")))
                 .andExpect(jsonPath("$..authorizedTeams..id", contains("Ze Team", "Not Ze Team", "Ze Team")));
     }
 
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
index a5581cec1..5d33e1f74 100644
--- a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
+++ b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerIT.java
@@ -138,7 +138,7 @@ void saveStack_shouldValidateStackContent_forBlankFields() throws Exception {
     void updateStack_shouldValidateStackContent() throws Exception {
         mockMvc.perform(put("/api/stacks/test")
                 .contentType(MediaType.APPLICATION_JSON)
-                // empty name
+                // empty name and module id
                 .content("{\"name\":\"\", \"moduleId\": \"\"}"))
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.message", containsString("name must not be blank")))
@@ -149,8 +149,8 @@ void updateStack_shouldValidateStackContent() throws Exception {
     void saveStack_shouldValidateStackVariables() throws Exception {
         mockMvc.perform(post("/api/stacks")
                 .contentType(MediaType.APPLICATION_JSON)
-                // empty name
-                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variablesValues\":{}}"))
+                // null variable
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variableValues\":{}}"))
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.message", is("mandatory variables should not be blank")));
     }
@@ -160,9 +160,18 @@ void saveStack_shouldWork_stackIsValid() throws Exception {
         mockMvc.perform(post("/api/stacks")
                 .contentType(MediaType.APPLICATION_JSON)
                 // empty name
-                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variablesValues\":{\"mongo_container_name\":\"someContainerName\"}}"))
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variableValues\":{\"mongo_container_name\":\"someContainerName\"}}"))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    void saveStack_shouldValidateStackVariablesRegex() throws Exception {
+        mockMvc.perform(post("/api/stacks")
+                .contentType(MediaType.APPLICATION_JSON)
+                // null variable
+                .content("{\"name\":\"stack-test\", \"moduleId\": \"b39ccd07-80f5-455f-a6b3-b94f915738c4\", \"variableValues\":{\"mongo_container_name\":\"someContainerName\",\"mongo_exposed_port\":\"toto\"}}"))
                 .andExpect(status().isBadRequest())
-                .andExpect(jsonPath("$.message", is("mandatory variables should not be blank")));
+                .andExpect(jsonPath("$.message", is("variables should match the regex")));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java b/src/test/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidatorTest.java
similarity index 93%
rename from src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java
rename to src/test/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidatorTest.java
index 4d6a9473e..4c39db68c 100644
--- a/src/test/java/io/codeka/gaia/stacks/service/StackVariablesValidatorTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/service/MandatoryStackVariablesValidatorTest.java
@@ -8,26 +8,23 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class StackVariablesValidatorTest {
+class MandatoryStackVariablesValidatorTest {
 
     @Mock
     private TerraformModuleRepository moduleRepository;
 
     @InjectMocks
-    private StackVariablesValidator validator;
+    private MandatoryStackVariablesValidator validator;
 
     @Test
     void validator_shouldWork_whenModuleIsNull(){
diff --git a/src/test/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidatorTest.java b/src/test/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidatorTest.java
new file mode 100644
index 000000000..245af2220
--- /dev/null
+++ b/src/test/java/io/codeka/gaia/stacks/service/RegexStackVariablesValidatorTest.java
@@ -0,0 +1,130 @@
+package io.codeka.gaia.stacks.service;
+
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.modules.bo.TerraformVariable;
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
+import io.codeka.gaia.stacks.bo.Stack;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class RegexStackVariablesValidatorTest {
+
+    @Mock
+    private TerraformModuleRepository moduleRepository;
+
+    @InjectMocks
+    private RegexStackVariablesValidator validator;
+
+    @Test
+    void validator_shouldWork_whenModuleIsNull(){
+        assertThat(validator.isValid(new Stack(), null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldWork_whenModuleIsBlank(){
+        var stack = new Stack();
+        stack.setModuleId("     ");
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldNotCheckNullVariables(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setValidationRegex("\\d{3,6}");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldNotCheckBlankVariables(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setValidationRegex("\\d{3,6}");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "     "));
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldNotCheckNonRegexVariables(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "value"));
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+    @Test
+    void validator_shouldReturnFalse_whenMandatoryVariableWithRegexDoesNotMatch(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setValidationRegex("\\d{3,6}");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "value"));
+
+        assertThat(validator.isValid(stack, null)).isFalse();
+    }
+
+    @Test
+    void validator_shouldReturnTrue_whenMandatoryVariableWithRegexMatches(){
+        var variable = new TerraformVariable();
+        variable.setName("test");
+        variable.setValidationRegex("\\d{3,6}");
+
+        var module = new TerraformModule();
+        module.setVariables(List.of(variable));
+
+        when(moduleRepository.findById("12")).thenReturn(Optional.of(module));
+
+        var stack = new Stack();
+        stack.setModuleId("12");
+        stack.setVariableValues(Map.of("test", "1234"));
+
+        assertThat(validator.isValid(stack, null)).isTrue();
+    }
+
+}
diff --git a/src/test/resources/db/20_module.js b/src/test/resources/db/20_module.js
index 318818d7c..9cd271ee1 100644
--- a/src/test/resources/db/20_module.js
+++ b/src/test/resources/db/20_module.js
@@ -42,7 +42,7 @@ gaia.terraformModule.insert([
     },
     {
         "_id": "b39ccd07-80f5-455f-a6b3-b94f915738c4",
-        "name": "terraform-docker-mongo-with-mandatory-variable",
+        "name": "terraform-docker-mongo-with-validation",
         "description": "A sample terraform 🌍 module for running a mongodb 🍃 database inside a docker 🐳 container",
         "gitRepositoryUrl": "https://github.com/juwit/terraform-docker-mongo.git",
         "directory": null,
@@ -63,7 +63,8 @@ gaia.terraformModule.insert([
                 "name": "mongo_exposed_port",
                 "description": "the exposed port of the mongo container",
                 "defaultValue": 27017,
-                "editable": true
+                "editable": true,
+                "validationRegex": "\\d{3,6}"
             }
         ]
     }

From aabf79507194efb659b5c2eb4fa0d3a40438d523 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Thu, 29 Aug 2019 08:28:24 +0200
Subject: [PATCH 14/15] :alembic: : show list component for list-alike regex
 validated variables

---
 .../templates/vue_templates/stack-vars.vue     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/vue_templates/stack-vars.vue b/src/main/resources/templates/vue_templates/stack-vars.vue
index 6c6092e2c..5dca39e34 100644
--- a/src/main/resources/templates/vue_templates/stack-vars.vue
+++ b/src/main/resources/templates/vue_templates/stack-vars.vue
@@ -3,10 +3,16 @@
         <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in editableVars" v-if="editableVars.length > 0">
             <b-col>
                 <b-form-group :label="modVar.name" :description="modVar.description">
-                    <b-input v-model="stack.variableValues[modVar.name]"
+                    <b-input v-if="! isListRegex(modVar.validationRegex)"
+                             v-model="stack.variableValues[modVar.name]"
                              :state="validateVariable(modVar).result"
                              @update="recomputeState"
                              trim></b-input>
+                    <b-select v-if="isListRegex(modVar.validationRegex)"
+                              v-model="stack.variableValues[modVar.name]"
+                              :state="validateVariable(modVar).result"
+                              @change="recomputeState"
+                              :options="listOptions(modVar.validationRegex)"></b-select>
                     <b-form-invalid-feedback>{{validateVariable(modVar).message}}</b-form-invalid-feedback>
                 </b-form-group>
             </b-col>
@@ -57,6 +63,16 @@ Vue.component('stack-vars', {
             }
 
             return {result:true};
+        },
+        isListRegex: function(regex){
+            const listRegex = /^\((\w*)(\|(\w*))*\)$/;
+            return listRegex.test(regex);
+        },
+        listOptions: function(regex){
+            const listExtractRegex = /[^()|]+/g;
+            // extracting the values from the regex
+            // also adding empty string to the result to be able to not select anything !
+            return ["", ...regex.match(listExtractRegex)];
         }
     },
     computed: {

From c30568eb071986cb989f39ff874448549b4e0f9d Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 30 Aug 2019 10:10:13 +0200
Subject: [PATCH 15/15] :pencil: : add information related to scm, license & ci

---
 pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pom.xml b/pom.xml
index df1f5bfd6..225b0a18e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,31 @@
 	<groupId>io.codeka</groupId>
 	<artifactId>gaia</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
 	<name>gaia</name>
 	<description>gaia runs yours terraform modules</description>
+	<url>https://github.com/CodeKaio/gaia</url>
+	<inceptionYear>2019</inceptionYear>
+
+	<licenses>
+		<license>
+			<name>Mozilla Public License Version 2.0</name>
+			<url>http://mozilla.org/MPL/2.0/</url>
+		</license>
+	</licenses>
+
+	<scm>
+		<url>https://github.com/CodeKaio/gaia</url>
+	</scm>
+	<issueManagement>
+		<system>github</system>
+		<url>https://github.com/CodeKaio/gaia/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>travis-ci</system>
+		<url>https://travis-ci.org/CodeKaio/gaia</url>
+	</ciManagement>
 
 	<properties>
 		<java.version>11</java.version>