feat(environment): secret can be var or env

api/projects/environment.go

@@ -3,6 +3,7 @@ package projects
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/ansible-semaphore/semaphore/api/helpers"
 	"github.com/ansible-semaphore/semaphore/db"
@@ -12,14 +13,17 @@ import (
 
 func updateEnvironmentSecrets(store db.Store, env db.Environment) error {
 	for _, secret := range env.Secrets {
-		var err error
+		err := secret.Validate()
+		if err != nil {
+			continue
+		}
 
 		var key db.AccessKey
 
 		switch secret.Operation {
 		case db.EnvironmentSecretCreate:
 			key, err = store.CreateAccessKey(db.AccessKey{
-				Name:          secret.Name,
+				Name:          string(secret.Type) + "." + secret.Name,
 				String:        secret.Secret,
 				EnvironmentID: &env.ID,
 				ProjectID:     &env.ProjectID,
@@ -49,7 +53,7 @@ func updateEnvironmentSecrets(store db.Store, env db.Environment) error {
 			}
 
 			err = store.UpdateAccessKey(db.AccessKey{
-				Name:   secret.Name,
+				Name:   string(secret.Type) + "." + secret.Name,
 				String: secret.Secret,
 				Type:   db.AccessKeyString,
 			})
@@ -84,9 +88,24 @@ func EnvironmentMiddleware(next http.Handler) http.Handler {
 		}
 
 		for _, k := range keys {
+			var secretName string
+			var secretType db.EnvironmentSecretType
+
+			if strings.HasPrefix(k.Name, string(db.EnvironmentSecretVar)+".") {
+				secretType = db.EnvironmentSecretVar
+				secretName = strings.TrimPrefix(k.Name, string(db.EnvironmentSecretVar)+".")
+			} else if strings.HasPrefix(k.Name, string(db.EnvironmentSecretEnv)+".") {
+				secretType = db.EnvironmentSecretEnv
+				secretName = strings.TrimPrefix(k.Name, string(db.EnvironmentSecretEnv)+".")
+			} else {
+				secretType = db.EnvironmentSecretVar
+				secretName = k.Name
+			}
+
 			env.Secrets = append(env.Secrets, db.EnvironmentSecret{
 				ID:   k.ID,
-				Name: k.Name,
+				Name: secretName,
+				Type: secretType,
 			})
 		}
 

db/Environment.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"encoding/json"
+	"errors"
 )
 
 type EnvironmentSecretOperation string
@@ -38,8 +39,17 @@ type Environment struct {
 	Secrets   []EnvironmentSecret `db:"-" json:"secrets"`
 }
 
-func (secret *EnvironmentSecret) Validate() error {
-	return nil
+func (s *EnvironmentSecret) Validate() error {
+
+	if s.Type == EnvironmentSecretVar || s.Type == EnvironmentSecretEnv {
+		return nil
+	}
+
+	if s.Secret == "" {
+		return errors.New("missing secret")
+	}
+
+	return errors.New("invalid environment secret type")
 }
 
 func (env *Environment) Validate() error {

web/src/components/EnvironmentForm.vue

@@ -21,7 +21,7 @@
     ></v-text-field>
 
     <v-subheader class="px-0">
-      {{ $t('extraVariables') }}
+      <v-icon class="mr-1">mdi-variable</v-icon> {{ $t('extraVariables') }}
 
       <v-tooltip bottom color="black" open-delay="300" max-width="400">
         <template v-slot:activator="{ on, attrs }">
@@ -104,19 +104,20 @@
           </tr>
         </template>
       </v-data-table>
-      <div class="mt-2 mb-4 mx-1" v-if="extraVars != null">
+      <div class="mt-2 mb-4" v-if="extraVars != null">
         <v-btn
           color="primary"
           @click="addExtraVar()"
-        >New Variable</v-btn>
+        >{{ $t('New Extra Variable') }}</v-btn>
       </div>
       <v-alert color="error" v-else>Can't be displayed as table.</v-alert>
     </div>
 
     <div>
       <v-subheader class="px-0 mt-4">
+        <v-icon class="mr-1">mdi-application-settings</v-icon>
         {{ $t('environmentVariables') }}
-
+        <v-spacer />
         <v-tooltip bottom color="black" open-delay="300">
           <template v-slot:activator="{ on, attrs }">
             <v-icon
@@ -170,18 +171,18 @@
           </tr>
         </template>
       </v-data-table>
-      <div class="mt-2 mb-4 mx-1">
+      <div class="mt-2 mb-4">
         <v-btn
           color="primary"
           @click="addEnvVar()"
-        >New Environment Variable</v-btn>
+        >{{ $t('New Environment Variable') }}</v-btn>
       </div>
     </div>
 
     <div>
       <v-subheader class="px-0 mt-4">
-        {{ $t('Secrets') }}
-
+        <v-icon class="mr-1">mdi-lock</v-icon>{{ $t('Secrets') }}
+        <v-spacer />
         <v-tooltip bottom color="black" open-delay="300" max-width="400">
           <template v-slot:activator="{ on, attrs }">
             <v-icon
@@ -208,6 +209,11 @@
       >
         <template v-slot:item="props">
           <tr>
+            <td class="pa-1">
+              <v-icon>
+                {{ props.item.type === 'var' ? 'mdi-variable' : 'mdi-application-settings' }}
+              </v-icon>
+            </td>
             <td class="pa-1">
               <v-text-field
                 solo-inverted
@@ -241,12 +247,40 @@
         </template>
       </v-data-table>
 
-      <div class="mt-2 mb-4 mx-1">
-        <v-btn
-          color="primary"
-          @click="addSecret()"
-        >New Secret</v-btn>
+      <div class="mt-2 mb-4">
+        <v-menu
+          offset-y
+        >
+          <template v-slot:activator="{ on, attrs }">
+            <v-btn
+              v-bind="attrs"
+              v-on="on"
+              color="primary"
+            >New Secret</v-btn>
+          </template>
+          <v-list>
+            <v-list-item
+              link
+              @click="addSecret('var')"
+            >
+              <v-list-item-icon>
+                <v-icon>mdi-variable</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ $t('Extra Variable') }}</v-list-item-title>
+            </v-list-item>
+            <v-list-item
+              link
+              @click="addSecret('env')"
+            >
+              <v-list-item-icon>
+                <v-icon>mdi-application-settings</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ $t('Environment Variable') }}</v-list-item-title>
+            </v-list-item>
+          </v-list>
+        </v-menu>
       </div>
+
     </div>
 
   </v-form>
@@ -370,8 +404,10 @@ export default {
       }
     },
 
-    addSecret(name = '', value = '') {
-      this.secrets.push({ name, value, new: true });
+    addSecret(type) {
+      this.secrets.push({
+        type, name: '', value: '', new: true,
+      });
     },
 
     removeSecret(val) {
@@ -448,6 +484,7 @@ export default {
           id: s.id,
           name: s.name,
           secret: s.value,
+          type: s.type,
           operation,
         };
       }).filter((s) => s.operation != null);
@@ -491,6 +528,7 @@ export default {
         id: x.id,
         name: x.name,
         value: '',
+        type: x.type,
       }));
 
       // Object.keys(env).forEach((x) => {

web/src/views/project/Templates.vue

@@ -54,7 +54,6 @@
 
       <v-menu
         offset-y
-        :disabled="appsMixin.apps.length === 0"
       >
         <template v-slot:activator="{ on, attrs }">
           <v-btn