Merge branch 'semaphoreui:develop' into develop

Author: dguerri

api/system_info.go

@@ -60,8 +60,9 @@ func (c *SystemInfoController) GetSystemInfo(w http.ResponseWriter, r *http.Requ
 
 	if err != nil {
 		log.WithError(err).Error("Failed to get subscription plan")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
+		err = nil
+		//http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		//return
 	}
 
 	switch {
@@ -70,7 +71,9 @@ func (c *SystemInfoController) GetSystemInfo(w http.ResponseWriter, r *http.Requ
 		plan = ""
 	case err != nil:
 		log.WithError(err).Error("Failed to get subscription plan")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		err = nil
+		plan = ""
+		//http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	default:
 		plan = token.Plan

cli/cmd/project_export.go

@@ -0,0 +1,98 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	projectService "github.com/semaphoreui/semaphore/services/project"
+	"github.com/spf13/cobra"
+)
+
+type projectExportArgs struct {
+	projectID   int
+	projectName string
+	file        string
+}
+
+var targetProjectExportArgs projectExportArgs
+
+func init() {
+	projectExportCmd.PersistentFlags().IntVar(&targetProjectExportArgs.projectID, "project-id", 0, "Project ID to export")
+	projectExportCmd.PersistentFlags().StringVar(&targetProjectExportArgs.projectName, "project-name", "", "Project name to export")
+	projectExportCmd.PersistentFlags().StringVar(&targetProjectExportArgs.file, "file", "", "Output file path (default: stdout)")
+	projectCmd.AddCommand(projectExportCmd)
+}
+
+var projectExportCmd = &cobra.Command{
+	Use:   "export",
+	Short: "Export project backup",
+	Run: func(cmd *cobra.Command, args []string) {
+
+		ok := true
+		if targetProjectExportArgs.projectID == 0 && targetProjectExportArgs.projectName == "" {
+			fmt.Println("Argument --project-id or --project-name required")
+			ok = false
+		}
+
+		if targetProjectExportArgs.projectID != 0 && targetProjectExportArgs.projectName != "" {
+			fmt.Println("Only one of --project-id or --project-name can be specified")
+			ok = false
+		}
+
+		if !ok {
+			fmt.Println("Use command `semaphore project export --help` for details.")
+			os.Exit(1)
+		}
+
+		store := createStore("")
+		defer store.Close("")
+
+		projectID := targetProjectExportArgs.projectID
+
+		if targetProjectExportArgs.projectName != "" {
+			projects, err := store.GetAllProjects()
+			if err != nil {
+				fmt.Printf("Failed to get projects: %v\n", err)
+				os.Exit(1)
+			}
+
+			found := false
+			searchName := strings.ToLower(targetProjectExportArgs.projectName)
+			for _, p := range projects {
+				if strings.ToLower(p.Name) == searchName {
+					projectID = p.ID
+					found = true
+					break
+				}
+			}
+
+			if !found {
+				fmt.Printf("Project with name '%s' not found\n", targetProjectExportArgs.projectName)
+				os.Exit(1)
+			}
+		}
+
+		backup, err := projectService.GetBackup(projectID, store)
+		if err != nil {
+			fmt.Printf("Failed to create backup: %v\n", err)
+			os.Exit(1)
+		}
+
+		data, err := backup.Marshal()
+		if err != nil {
+			fmt.Printf("Failed to marshal backup: %v\n", err)
+			os.Exit(1)
+		}
+
+		if targetProjectExportArgs.file == "" {
+			fmt.Println(data)
+		} else {
+			if err := os.WriteFile(targetProjectExportArgs.file, []byte(data), 0644); err != nil {
+				fmt.Printf("Failed to write file: %v\n", err)
+				os.Exit(1)
+			}
+			fmt.Printf("Project exported to %s\n", targetProjectExportArgs.file)
+		}
+	},
+}

cli/cmd/project_import.go

@@ -16,15 +16,17 @@ import (
 )
 
 type projectImportArgs struct {
-	dir  string
-	file string
+	dir         string
+	file        string
+	projectName string
 }
 
 var targetProjectImportArgs projectImportArgs
 
 func init() {
 	projectImportCmd.PersistentFlags().StringVar(&targetProjectImportArgs.dir, "dir", "", "Directory path with project backups to import")
 	projectImportCmd.PersistentFlags().StringVar(&targetProjectImportArgs.file, "file", "", "Backup file path to import")
+	projectImportCmd.PersistentFlags().StringVar(&targetProjectImportArgs.projectName, "project-name", "", "Override project name (only valid with --file)")
 	projectCmd.AddCommand(projectImportCmd)
 }
 
@@ -44,6 +46,11 @@ var projectImportCmd = &cobra.Command{
 			ok = false
 		}
 
+		if targetProjectImportArgs.projectName != "" && targetProjectImportArgs.dir != "" {
+			fmt.Println("Option --project-name can only be used with --file, not --dir")
+			ok = false
+		}
+
 		if !ok {
 			fmt.Println("Use command `semaphore project import --help` for details.")
 			os.Exit(1)
@@ -94,7 +101,7 @@ var projectImportCmd = &cobra.Command{
 
 		okCount := 0
 		for _, f := range files {
-			if err := importProjectFromFile(f, user, store); err != nil {
+			if err := importProjectFromFile(f, targetProjectImportArgs.projectName, user, store); err != nil {
 				log.Errorf("failed to import %s: %v", f, err)
 				continue
 			}
@@ -134,7 +141,7 @@ func resolveImportUser(store db.Store) (res db.User, err error) {
 	return
 }
 
-func importProjectFromFile(path string, user db.User, store db.Store) error {
+func importProjectFromFile(path string, projectName string, user db.User, store db.Store) error {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return err
@@ -146,6 +153,9 @@ func importProjectFromFile(path string, user db.User, store db.Store) error {
 	if err := backup.Verify(); err != nil {
 		return err
 	}
+	if projectName != "" {
+		backup.Meta.Name = projectName
+	}
 	_, err = backup.Restore(user, store)
 	return err
 }

util/config.go

@@ -331,6 +331,10 @@ type ConfigType struct {
 	Debugging *DebuggingConfig `json:"debugging,omitempty"`
 
 	HA *HAConfig `json:"ha,omitempty"`
+
+	// SubscriptionKey is a subscription key or token that can be set via config.
+	// When this is set, subscription activation from the web interface is disabled.
+	SubscriptionKey string `json:"subscription_key,omitempty" db:"-" env:"SEMAPHORE_SUBSCRIPTION_KEY"`
 }
 
 func NewConfigType() *ConfigType {
@@ -594,6 +598,13 @@ func assignMapToStructRecursive(m map[string]any, structValue reflect.Value) err
 
 	for i := 0; i < structType.NumField(); i++ {
 		field := structType.Field(i)
+
+		// Skip fields with db:"-" tag
+		dbTag := field.Tag.Get("db")
+		if dbTag == "-" {
+			continue
+		}
+
 		jsonTag := field.Tag.Get("json")
 		if jsonTag == "" {
 			jsonTag = field.Name

util/config_assign_test.go

@@ -162,6 +162,86 @@ func TestAssignMapToStruct_MapPrimitiveConversions(t *testing.T) {
     }
 }
 
+func TestAssignMapToStruct_SkipsDbMinusTag(t *testing.T) {
+	type Sample struct {
+		Name     string `json:"name"`
+		Password string `json:"password" db:"-"`
+		Age      int    `json:"age"`
+		Secret   string `json:"secret" db:"-"`
+	}
+
+	t.Run("fields with db:- tag should not be assigned", func(t *testing.T) {
+		s := Sample{
+			Name:     "original",
+			Password: "original_password",
+			Age:      25,
+			Secret:   "original_secret",
+		}
+
+		m := map[string]any{
+			"name":     "updated",
+			"password": "new_password",
+			"age":      30,
+			"secret":   "new_secret",
+		}
+
+		if err := AssignMapToStruct(m, &s); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		// Fields without db:"-" should be updated
+		if s.Name != "updated" {
+			t.Errorf("expected Name to be 'updated', got '%s'", s.Name)
+		}
+		if s.Age != 30 {
+			t.Errorf("expected Age to be 30, got %d", s.Age)
+		}
+
+		// Fields with db:"-" should retain original values
+		if s.Password != "original_password" {
+			t.Errorf("expected Password to remain 'original_password', got '%s'", s.Password)
+		}
+		if s.Secret != "original_secret" {
+			t.Errorf("expected Secret to remain 'original_secret', got '%s'", s.Secret)
+		}
+	})
+
+	t.Run("nested struct with db:- tag fields", func(t *testing.T) {
+		type Inner struct {
+			Public  string `json:"public"`
+			Private string `json:"private" db:"-"`
+		}
+		type Outer struct {
+			Inner Inner `json:"inner"`
+		}
+
+		o := Outer{
+			Inner: Inner{
+				Public:  "original_public",
+				Private: "original_private",
+			},
+		}
+
+		m := map[string]any{
+			"inner": map[string]any{
+				"public":  "updated_public",
+				"private": "updated_private",
+			},
+		}
+
+		if err := AssignMapToStruct(m, &o); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		if o.Inner.Public != "updated_public" {
+			t.Errorf("expected Inner.Public to be 'updated_public', got '%s'", o.Inner.Public)
+		}
+		if o.Inner.Private != "original_private" {
+			t.Errorf("expected Inner.Private to remain 'original_private', got '%s'", o.Inner.Private)
+		}
+	})
+}
+
 func TestSetConfigValue_SliceAndMap(t *testing.T) {
     // This ensures setConfigValue (used by defaults/env) is compatible with slice/map JSON
     type X struct {

web/src/components/ArgsPicker.vue

@@ -66,21 +66,30 @@
     >
       <legend style="padding: 0 3px;">{{ title || $t('Args') }}</legend>
       <v-chip-group column style="margin-top: -4px;">
-        <v-chip
-          v-for="(v, i) in modifiedVars"
-          close
-          @click:close="deleteVar(i)"
-          :key="i"
-          @click="editVar(i)"
+        <draggable
+          v-model="modifiedVars"
+          @end="onDragEnd"
+          :animation="200"
+          class="d-flex flex-wrap"
+          ghost-class="chip-ghost"
         >
-          <div
-            style="
-              max-width: 200px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
-          >{{ v.name }}</div>
-        </v-chip>
+          <v-chip
+            v-for="(v, i) in modifiedVars"
+            close
+            @click:close="deleteVar(i)"
+            :key="i"
+            @click="editVar(i)"
+            class="draggable-chip"
+          >
+            <div
+              style="
+                max-width: 200px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+              "
+            >{{ v.name }}</div>
+          </v-chip>
+        </draggable>
         <v-chip @click="editVar(null)">
           + <span
                 class="ml-1"
@@ -92,10 +101,25 @@
   </div>
 </template>
 <style lang="scss">
+.draggable-chip {
+  cursor: grab;
 
+  &:active {
+    cursor: grabbing;
+  }
+}
+
+.chip-ghost {
+  opacity: 0.5;
+}
 </style>
 <script>
+import draggable from 'vuedraggable';
+
 export default {
+  components: {
+    draggable,
+  },
   props: {
     vars: Array,
     title: String,
@@ -175,6 +199,10 @@ export default {
       this.modifiedVars.splice(index, 1);
       this.$emit('change', this.modifiedVars.map((x) => x.name));
     },
+
+    onDragEnd() {
+      this.$emit('change', this.modifiedVars.map((x) => x.name));
+    },
   },
 };
 </script>