Add group locking feature

.mockery.yaml

@@ -1,4 +1,11 @@
 packages:
+  github.com/redis/go-redis/v9:
+    interfaces:
+      # select the interfaces you want mocked
+      Cmdable:
+        config:
+          outpkg: mocks
+          dir: ../../mocks
   github.com/fortnoxab/gitmachinecontroller/pkg/agent/command:
     interfaces:
       # select the interfaces you want mocked

cmd/gmc/main.go

@@ -155,6 +155,10 @@ func app() *cli.App {
 					Value: "8080",
 					Usage: "webserver port to listen to",
 				},
+				&cli.StringFlag{
+					Name:  "redis-url",
+					Usage: "redis url, ex redis://[[username]:[password]]@localhost:6379/0 or rediss://[[username]:[password]]@localhost:6379/0 for tls/ssl connections",
+				},
 			},
 		},
 		{
@@ -281,7 +285,7 @@ func app() *cli.App {
 				{
 					Name:   "zsh",
 					Usage:  "put in .zshrc: 'source <(" + os.Args[0] + " completion zsh)'",
-					Action: bashCompletion,
+					Action: zshCompletion,
 				},
 			},
 		},
@@ -330,7 +334,7 @@ _cli_bash_autocomplete() {
 
 complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete %s
 `, binaryName)
-	fmt.Printf(script)
+	fmt.Print(script)
 	// fmt.Println(os.Args)
 	return nil
 }
@@ -358,7 +362,7 @@ _cli_zsh_autocomplete() {
 
 compdef _cli_zsh_autocomplete %s
 `, binaryName)
-	fmt.Printf(script)
+	fmt.Print(script)
 	// fmt.Println(os.Args)
 	return nil
 }

e2e/e2e_test.go

@@ -14,8 +14,10 @@ import (
 	"github.com/fortnoxab/gitmachinecontroller/pkg/admin"
 	"github.com/fortnoxab/gitmachinecontroller/pkg/api/v1/types"
 	"github.com/fortnoxab/gitmachinecontroller/pkg/secrets"
+	"github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 func TestMasterAgentAccept(t *testing.T) {
@@ -70,25 +72,27 @@ metadata:
     type: server
   name: mycooltestagent
 spec:
-  commands: []
-  files:
-  - checksum: 9b76e7ea790545334ea524f3ca33db8eb6c4541a9b476911e5abf850a566b41c
-    path: /tmp/testfromurl
-    url: %s
-  - content: |
-      filecontentishere
-    path: /tmp/test.systemd
-    systemd:
-      action: restart
-      name: exporter_exporter
-      daemonreload: true
-  ip: 10.81.22.150
-  lines: []
-  packages:
-  - name: vim-enhanced
-    version: '*'
-  - name: mycoolpackage
-    version: '*'`, ts.URL)
+  tasks:
+    - commands: []
+      files:
+      - checksum: 9b76e7ea790545334ea524f3ca33db8eb6c4541a9b476911e5abf850a566b41c
+        path: /tmp/testfromurl
+        url: %s
+      - content: |
+          filecontentishere
+        path: /tmp/test.systemd
+        systemd:
+          action: restart
+          name: exporter_exporter
+          daemonreload: true
+      ip: 10.81.22.150
+      lines: []
+      packages:
+      - name: vim-enhanced
+        version: '*'
+      - name: mycoolpackage
+        version: '*'
+`, ts.URL)
 
 	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
 	assert.NoError(t, err)
@@ -126,6 +130,70 @@ spec:
 	c.wg.Wait()
 }
 
+func TestMasterAgentGitOpsWithLock(t *testing.T) {
+	t.Cleanup(func() {
+		os.Remove("./gitrepo/mycooltestagent.yml")
+		os.Remove("/tmp/test.systemd")
+		os.Remove("/tmp/testfromurl")
+	})
+	machineYaml := `apiVersion: gitmachinecontroller.io/v1beta1
+metadata:
+  annotations:
+    feature: ihavecoolfeature
+  labels:
+    os: rocky9
+    type: server
+  name: mycooltestagent
+spec:
+  tasks:
+    - name: install cool service
+      lock:
+        key: cool-service
+        ttl: 10m
+      commands:
+        - command: touch /tmp/test
+      files:
+      - content: |
+          filecontentishere
+        path: /tmp/test.systemd
+        systemd:
+          action: restart
+          name: exporter_exporter
+          daemonreload: true
+`
+
+	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
+	assert.NoError(t, err)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
+	c := initMasterAgent(t, ctx)
+
+	c.commander.Mock.On("Run", "systemctl restart exporter_exporter").Return("", "", nil).Once()
+	c.commander.Mock.On("Run", "systemctl daemon reload").Return("", "", nil).Once()
+	c.commander.Mock.On("Run", "touch /tmp/test").Return("", "", nil).Twice()
+
+	c.redis.On("SetNX", mock.Anything, "gmc.lockcool-service", "mycooltestagent", time.Minute*10).
+		Return(redis.NewBoolResult(true, nil)).
+		Twice()
+
+	c.redis.On("Del", mock.Anything, "gmc.lockcool-service").
+		Return(redis.NewIntResult(1, nil)).
+		Twice()
+
+	_, err = c.client.Post("/api/machines/accept-v1", bytes.NewBufferString(`{"host":"mycooltestagent"}`))
+	assert.NoError(t, err)
+
+	time.Sleep(2 * time.Second)
+
+	content, err := os.ReadFile("/tmp/test.systemd")
+	assert.NoError(t, err)
+	assert.EqualValues(t, "filecontentishere\n", content)
+
+	cancel()
+	c.wg.Wait()
+}
+
 func TestCliCommand(t *testing.T) {
 	os.Setenv("NO_COLOR", "true")
 	t.Cleanup(func() {
@@ -141,8 +209,7 @@ metadata:
     type: server
   name: mycooltestagent
 spec:
-  ip: 127.0.0.1
-  lines: []`
+  ip: 127.0.0.1`
 
 	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
 	assert.NoError(t, err)
@@ -191,8 +258,7 @@ metadata:
     type: server
   name: mycooltestagent
 spec:
-  ip: 127.0.0.1
-  lines: []`
+  ip: 127.0.0.1`
 
 	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
 	assert.NoError(t, err)
@@ -235,8 +301,7 @@ metadata:
     type: server
   name: mycooltestagent
 spec:
-  ip: 127.0.0.1
-  lines: []`
+  ip: 127.0.0.1`
 
 	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
 	assert.NoError(t, err)
@@ -277,12 +342,12 @@ metadata:
     type: server
   name: mycooltestagent
 spec:
-  files:
-  - content: |
-      itsfromgit
-    path: newfile.txt
-  ip: 127.0.0.1
-  lines: []`
+  tasks:
+    - files:
+      - content: |
+          itsfromgit
+        path: newfile.txt
+  ip: 127.0.0.1`
 
 	err := os.WriteFile("./gitrepo/mycooltestagent.yml", []byte(machineYaml), 0666)
 	assert.NoError(t, err)
@@ -319,10 +384,11 @@ metadata:
   name: mycooltestagent
 spec:
   ip: 127.0.0.1
-  files:
-  - content: |
-      filecontentishere
-    path: newfile.txt
+  tasks:
+    - files:
+      - content: |
+          filecontentishere
+        path: newfile.txt
   lines: []`
 
 	err = os.WriteFile("./newspec.yml", []byte(applyMachineYaml), 0666)

e2e/utils_test.go

@@ -25,6 +25,7 @@ type testWrapper struct {
 	agent     *agent.Agent
 	commander *mocks.MockCommander
 	wg        *sync.WaitGroup
+	redis     *mocks.MockCmdable
 }
 
 func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
@@ -33,12 +34,14 @@ func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
 	port, err := freePort()
 	assert.NoError(t, err)
 	portStr := strconv.Itoa(port)
+	redisMock := mocks.NewMockCmdable(t)
 	master := &master.Master{
 		GitURL:          "https://test/gitrepo",
 		GitPollInterval: time.Second,
 		WsPort:          portStr,
 		JWTKey:          "asdfasdf",
 		SecretKey:       "asdfasdf",
+		RedisClient:     redisMock,
 		Masters: config.Masters{
 			{
 				URL:  "http://localhost:" + portStr,
@@ -79,6 +82,7 @@ func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
 		agent:     agent,
 		commander: mockedCommander,
 		wg:        wg,
+		redis:     redisMock,
 	}
 }
 func freePort() (port int, err error) {

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/jonaz/ginlogrus v0.0.0-20191118094232-2f4da50f5dd6
 	github.com/olahol/melody v1.2.1
+	github.com/redis/go-redis/v9 v9.7.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.5
@@ -31,7 +32,6 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bytedance/sonic v1.12.5 // indirect
 	github.com/bytedance/sonic/loader v0.2.1 // indirect
@@ -42,8 +42,8 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/cyphar/filepath-securejoin v0.3.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 // indirect
 	github.com/fluxcd/pkg/auth v0.0.1 // indirect
 	github.com/fluxcd/pkg/ssh v0.14.1 // indirect
 	github.com/fluxcd/pkg/version v0.4.1 // indirect
@@ -59,8 +59,6 @@ require (
 	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -70,7 +68,6 @@ require (
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -92,14 +89,11 @@ require (
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/net v0.31.0 // indirect
 	golang.org/x/sys v0.27.0 // indirect
 	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
 	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
 )