Merge pull request #52 from essentialkaos/develop

Version 1.2.0

Author: andyone

.github/workflows/ci.yml

@@ -22,9 +22,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  SRC_DIR: src/github.com/${{ github.repository }}
-
 jobs:
   Go:
     name: Go
@@ -35,20 +32,30 @@ jobs:
         go: [ '1.20.x' ]
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
 
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: ${{env.SRC_DIR}}
-
       - name: Download dependencies
-        working-directory: ${{env.SRC_DIR}}
         run: make deps
 
       - name: Build binary
-        working-directory: ${{env.SRC_DIR}}
         run: make all
+
+  Typos:
+    name: Typos
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Check spelling
+        continue-on-error: true
+        uses: crate-ci/typos@master

.typos.toml

@@ -0,0 +1,9 @@
+[files]
+extend-exclude = [
+  "go.sum",
+]
+
+[default.extend-identifiers]
+O_WRONLY = "O_WRONLY"
+Redy = "Redy"
+redy = "redy"

cli/cli.go

@@ -35,7 +35,7 @@ import (
 // Application info
 const (
 	APP  = "RDS Payload Generator"
-	VER  = "1.1.3"
+	VER  = "1.2.0"
 	DESC = "Payload generator for Redis-Split"
 )
 
@@ -66,7 +66,7 @@ type RedisStore struct {
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 var optMap = options.Map{
-	OPT_DIR:      {Value: "/opt/redis-split"},
+	OPT_DIR:      {},
 	OPT_KEYS:     {Type: options.INT, Value: 5000, Min: 10, Max: 1000000},
 	OPT_RATIO:    {Type: options.INT, Value: 4, Min: 1, Max: 100},
 	OPT_NO_COLOR: {Type: options.BOOL},
@@ -150,31 +150,19 @@ func configureUI() {
 
 // checkRDSInstallation checks Redis-Split installation
 func checkRDSInstallation() {
-	rdsDir := options.GetS(OPT_DIR)
-	metaDir := rdsDir + "/meta"
-
-	if !fsutil.IsExist(rdsDir) {
-		printError("Directory %s doesn't exist", rdsDir)
-		os.Exit(1)
-	}
-
-	if !fsutil.IsExist(metaDir) {
-		printError("Directory %s doesn't exist", metaDir)
-		os.Exit(1)
-	}
+	rdsDir := getRDSMainDir()
+	err := fsutil.ValidatePerms("DRX", rdsDir)
 
-	if !fsutil.IsDir(rdsDir) {
-		printError("%s is not a directory", metaDir)
+	if err != nil {
+		printError(err.Error())
 		os.Exit(1)
 	}
 
-	if !fsutil.IsDir(metaDir) {
-		printError("%s is not a directory", metaDir)
-		os.Exit(1)
-	}
+	metaDir := rdsDir + "/meta"
+	err = fsutil.ValidatePerms("DRX", metaDir)
 
-	if fsutil.IsEmptyDir(metaDir) {
-		printError("No instances are created")
+	if err != nil {
+		printError(err.Error())
 		os.Exit(1)
 	}
 }
@@ -188,7 +176,7 @@ func generatePayload() {
 	var reads, writes int64
 
 	store := &RedisStore{make(map[string]*redy.Client)}
-	metaDir := options.GetS(OPT_DIR) + "/meta"
+	metaDir := getRDSMainDir() + "/meta"
 	maxKey := options.GetI(OPT_KEYS)
 	ratio := options.GetI(OPT_RATIO)
 
@@ -230,6 +218,20 @@ func generatePayload() {
 	}
 }
 
+// getRDSMainDir returns path to main Redis-Split directory
+func getRDSMainDir() string {
+	return fsutil.ProperPath("DRX",
+		[]string{
+			options.GetS(OPT_DIR),
+			"/opt/redis-split",
+			"/srv/redis-split",
+			"/srv2/redis-split",
+			"/srv3/redis-split",
+			"/srv4/redis-split",
+		},
+	)
+}
+
 // getPause returns pause between requests
 func getPause() time.Duration {
 	r := 0.001 * float64(rand.Int(25))
@@ -243,7 +245,7 @@ func getKey(max int) string {
 
 // isInstanceWorks returns true if instance is works
 func isInstanceWorks(id string) bool {
-	pidDir := options.GetS(OPT_DIR) + "/pid"
+	pidDir := getRDSMainDir() + "/pid"
 	pidFile := fmt.Sprintf("%s/%s.pid", pidDir, id)
 
 	return fsutil.IsExist(pidFile)
@@ -326,9 +328,9 @@ func printMan() {
 func genUsage() *usage.Info {
 	info := usage.NewInfo()
 
-	info.AddOption(OPT_DIR, "Redis-Split main dir", "dir")
+	info.AddOption(OPT_DIR, "Path to Redis-Split main dir", "dir")
 	info.AddOption(OPT_KEYS, "Number of keys {s-}(10-1000000 default: 5000){!}")
-	info.AddOption(OPT_RATIO, "Writes/reads ration {s-}(1-100 default: 4){!}")
+	info.AddOption(OPT_RATIO, "Writes/reads ratio {s-}(1-100 default: 4){!}")
 	info.AddOption(OPT_NO_COLOR, "Disable colors in output")
 	info.AddOption(OPT_HELP, "Show this help message")
 	info.AddOption(OPT_VER, "Show version")

cli/support/support_linux.go

@@ -34,6 +34,7 @@ func showOSInfo() {
 		printInfo(12, "ID Like", osInfo.IDLike)
 		printInfo(12, "Version ID", osInfo.VersionID)
 		printInfo(12, "Version Code", osInfo.VersionCodename)
+		printInfo(12, "Platform ID", osInfo.PlatformID)
 		printInfo(12, "CPE", osInfo.CPEName)
 	}
 
@@ -81,8 +82,8 @@ func showEnvInfo(pkgs Pkgs) {
 // collectEnvInfo collects info about packages
 func collectEnvInfo() Pkgs {
 	return Pkgs{
-		getPackageInfo("redis"),
-		getPackageInfo("redis-client"),
+		getPackageInfo("redis", "redis5", "redis6", "redis7"),
+		getPackageInfo("redis-cli", "redis5-cli", "redis6-cli", "redis7-cli"),
 		getPackageInfo("redis-split"),
 		getPackageInfo("redis-split-sync"),
 	}

go.mod

@@ -4,8 +4,8 @@ go 1.18
 
 require (
 	github.com/essentialkaos/depsy v1.1.0
-	github.com/essentialkaos/ek/v12 v12.68.0
-	github.com/essentialkaos/redy/v4 v4.3.3
+	github.com/essentialkaos/ek/v12 v12.73.2
+	github.com/essentialkaos/redy/v4 v4.4.0
 )
 
 require golang.org/x/sys v0.10.0 // indirect

go.sum

@@ -1,10 +1,10 @@
 github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
 github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI=
 github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
-github.com/essentialkaos/ek/v12 v12.68.0 h1:/tNqKHfGypPUUu+aQ8LcmmWWEOO8itJZoJgOCPOZFY8=
-github.com/essentialkaos/ek/v12 v12.68.0/go.mod h1:CAPhbYcAiQsCP7CMyBlkgD/MgvuLcbr4EXjCIKn3DIk=
-github.com/essentialkaos/redy/v4 v4.3.3 h1:caq2gTnwTXdkq/j6tD0BNqzbTGVSZwZq+xmZSAgKEYg=
-github.com/essentialkaos/redy/v4 v4.3.3/go.mod h1:0TUOQZGzhRmZD13sCVUtYUYCa3Xd8v0zu2TgV6dwcHk=
+github.com/essentialkaos/ek/v12 v12.73.2 h1:MrHHcH1/qOmeMGruRdtcyWTxHQh85QEvxc8aUmjY07c=
+github.com/essentialkaos/ek/v12 v12.73.2/go.mod h1:juDcZWOWaj1QmYShZkT9RzdqJ3n0tmeP/iq4sw5fQF0=
+github.com/essentialkaos/redy/v4 v4.4.0 h1:6r6AkZiDkFWPqnvl0M+u7mcaaWQaeeiZOoLqLAMcnzQ=
+github.com/essentialkaos/redy/v4 v4.4.0/go.mod h1:0TUOQZGzhRmZD13sCVUtYUYCa3Xd8v0zu2TgV6dwcHk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=