Merge pull request #407 from aerospike/v7.6.0

V7.6.0
aerospike · Sep 10, 2024 · a7f8f77 · a7f8f77
2 parents 960998c + 7deb8b2
commit a7f8f77
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 9 deletions.
diff --git a/src/cmdConfGenerator.go b/src/cmdConfGenerator.go
@@ -1,6 +1,9 @@
 package main
 
 import (
+	"fmt"
+	"os"
+
 	"github.com/aerospike/aerolab/confeditor"
 	"github.com/aerospike/aerolab/confeditor7"
 	flags "github.com/rglonek/jeddevdk-goflags"
@@ -17,6 +20,11 @@ func (c *confGeneratorCmd) Execute(args []string) error {
 	if earlyProcessV2(args, false) {
 		return nil
 	}
+	if _, err := os.Stat(string(c.Path)); err == nil {
+		fmt.Printf("WARNING!\nFile '%s' already exists. If you continue, aerolab will attempt to read and parse the file.\nNote that aerolab will not automatically recognise whether the config is for aerospike 7+ or older. The `--pre-7` flag must be provided for older versions.\n\nPress ENTER to continue or CTRL+C to abort.\n", c.Path)
+		var ignoreMe string
+		fmt.Scanln(&ignoreMe)
+	}
 	if c.Pre7 {
 		e := &confeditor.Editor{
 			Path:   string(c.Path),

diff --git a/src/cmdWeb.go b/src/cmdWeb.go
@@ -927,7 +927,14 @@ func (c *webCmd) jobsAndCommands(w http.ResponseWriter, r *http.Request, jobType
 			nusr = "N/A"
 		}
 		nUser := getHeaderUserValue(r)
-		if r.FormValue("jobsAllUsers") != "true" {
+		jobsAllUsers := ""
+		if allUserCookie, err := r.Cookie("AEROLAB_SHOW_ALL_USERS"); err == nil && allUserCookie != nil {
+			jobsAllUsers = allUserCookie.Value
+		}
+		if r.FormValue("jobsAllUsers") != "" {
+			jobsAllUsers = r.FormValue("jobsAllUsers")
+		}
+		if jobsAllUsers != "true" {
 			if nUser != nusr && nusr != "N/A" {
 				return nil
 			}

diff --git a/src/confeditor/editor.go b/src/confeditor/editor.go
@@ -889,7 +889,7 @@ func (e *Editor) ui(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 						}
 					}
 					aeroConfig.Stanza("namespace test").NewStanza("storage-engine device")
-					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("file", "/opt/aerospike/data/bar.dat")
+					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("file", "/opt/aerospike/data/test.dat")
 					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("filesize", "1G")
 				} else {
 					for _, key := range aeroConfig.Stanza("namespace test").ListKeys() {

diff --git a/src/confeditor7/editor.go b/src/confeditor7/editor.go
@@ -909,7 +909,7 @@ func (e *Editor) ui(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 						aeroConfig.Stanza("namespace test").Delete("storage-engine memory")
 					}
 					aeroConfig.Stanza("namespace test").NewStanza("storage-engine device")
-					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("file", "/opt/aerospike/data/bar.dat")
+					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("file", "/opt/aerospike/data/test.dat")
 					aeroConfig.Stanza("namespace test").Stanza("storage-engine device").SetValue("filesize", "4G")
 				} else {
 					for _, key := range aeroConfig.Stanza("namespace test").ListKeys() {
@@ -922,7 +922,7 @@ func (e *Editor) ui(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 				if change.Selected {
 					aeroConfig.Stanza("namespace test").Delete("storage-engine device")
 					aeroConfig.Stanza("namespace test").NewStanza("storage-engine memory")
-					aeroConfig.Stanza("namespace test").Stanza("storage-engine memory").SetValue("file", "/opt/aerospike/data/bar.dat")
+					aeroConfig.Stanza("namespace test").Stanza("storage-engine memory").SetValue("file", "/opt/aerospike/data/test.dat")
 					aeroConfig.Stanza("namespace test").Stanza("storage-engine memory").SetValue("filesize", "4G")
 					aeroConfig.Stanza("namespace test").Stanza("storage-engine memory").Delete("data-size")
 				} else {

diff --git a/src/go.mod b/src/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/nwaples/rardecode v1.1.3
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/pkg/sftp v1.13.6
-	github.com/rglonek/aerospike-config-file-parser v1.0.3
+	github.com/rglonek/aerospike-config-file-parser v1.0.4
 	github.com/rglonek/envconfig v0.0.0-20230911195903-c4c689bf1744
 	github.com/rglonek/jeddevdk-goflags v2.0.0+incompatible
 	github.com/rglonek/sbs v1.0.1

diff --git a/src/go.sum b/src/go.sum
@@ -159,8 +159,8 @@ github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Q
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rglonek/aerospike-config-file-parser v1.0.3 h1:KMkyHToAhFfNph/BUx3a8Fh7PH9vF4EHb0W4rquzuNY=
-github.com/rglonek/aerospike-config-file-parser v1.0.3/go.mod h1:MDD2s/4HAhTn8OcXUNcrppGBHpaW81INfNYeFHkS/eg=
+github.com/rglonek/aerospike-config-file-parser v1.0.4 h1:o9NV5UFs8xOXBn389FebKZnJAW1HEHX14mq5AFGAhfw=
+github.com/rglonek/aerospike-config-file-parser v1.0.4/go.mod h1:MDD2s/4HAhTn8OcXUNcrppGBHpaW81INfNYeFHkS/eg=
 github.com/rglonek/envconfig v0.0.0-20230911195903-c4c689bf1744 h1:HyBW093bA2fLY2ZnoYf2mYaC9ATDBX90kj++W5I3mTs=
 github.com/rglonek/envconfig v0.0.0-20230911195903-c4c689bf1744/go.mod h1:CS128EIeoFCR4HBOwZDqzicTdDDcwzAWSqPUof2r8vI=
 github.com/rglonek/jeddevdk-goflags v2.0.0+incompatible h1:YetOOw5mSL6xmwbF5GMcmvMbpthp03tmGLx3U/ke/YA=

diff --git a/src/vendor/github.com/rglonek/aerospike-config-file-parser/parse.go b/src/vendor/github.com/rglonek/aerospike-config-file-parser/parse.go
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
@@ -263,7 +263,7 @@ github.com/pkg/browser
 ## explicit; go 1.15
 github.com/pkg/sftp
 github.com/pkg/sftp/internal/encoding/ssh/filexfer
-# github.com/rglonek/aerospike-config-file-parser v1.0.3
+# github.com/rglonek/aerospike-config-file-parser v1.0.4
 ## explicit; go 1.19
 github.com/rglonek/aerospike-config-file-parser
 # github.com/rglonek/envconfig v0.0.0-20230911195903-c4c689bf1744