Context Management (#11)

piprate · Nov 22, 2024 · 15f40dc · 15f40dc
1 parent 28a19cc
commit 15f40dc
Show file tree

Hide file tree

Showing 139 changed files with 1,939 additions and 1,712 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: 1.22
 
       - name: Update packages list
         run: sudo apt-get update
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: 1.22
       - uses: actions/cache@v3
         with:
           path: |
@@ -75,7 +75,7 @@ jobs:
       - uses: zencargo/github-action-go-mod-tidy@v1
         with:
           path: .
-          go-version: '1.20'
+          go-version: 1.22
 
   test:
     runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: 1.22
       - name: Set up Cache
         uses: actions/cache@v3
         with:

diff --git a/.golangci.yml b/.golangci.yml
@@ -29,8 +29,13 @@ linters-settings:
       - unnamedResult
       - unnecessaryBlock
       - whyNoLint
+  gosec:
+    excludes:
+      - G115  # Potential integer overflow when converting between integer types
   govet:
-    check-shadowing: false
+    enable:
+      # report about shadowed variables
+      - shadowing
   nolintlint:
     require-explanation: false
     require-specific: true
@@ -49,16 +54,16 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - containedctx
+#    - containedctx
     - contextcheck
+    - copyloopvar
 #   - depguard
     - dogsled
 #   - dupl
     - durationcheck
     - errcheck
     - errname
     - errorlint
-    - exportloopref
     - exhaustive
     - goconst
     - gocritic
@@ -92,5 +97,7 @@ linters:
 
 run:
   issues-exit-code: 1
-  skip-dirs:
+  go: '1.22'
+issues:
+  exclude-dirs:
     - contexts
diff --git a/cmd/lockerd/main.go b/cmd/lockerd/main.go
@@ -108,15 +108,15 @@ func RunServer(c *cli.Context) error {
 	// start MetaLocker server
 
 	srv := node.NewMetaLockerServer(configDir)
-	if err = srv.InitServices(cfg, c.Bool("debug")); err != nil {
+	if err = srv.InitServices(c.Context, cfg, c.Bool("debug")); err != nil {
 		return err
 	}
 
-	if err = srv.InitAuthentication(cfg); err != nil {
+	if err = srv.InitAuthentication(c.Context, cfg); err != nil {
 		return err
 	}
 
-	if err = srv.InitStandardRoutes(cfg); err != nil {
+	if err = srv.InitStandardRoutes(c.Context, cfg); err != nil {
 		return err
 	}
 

diff --git a/cmd/metalo/actions/access_keys.go b/cmd/metalo/actions/access_keys.go
@@ -30,7 +30,7 @@ func GenerateAccessKey(c *cli.Context) error {
 		return err
 	}
 
-	ak, err := dataWallet.CreateAccessKey(dataWallet.Account().AccessLevel, time.Hour*24*365)
+	ak, err := dataWallet.CreateAccessKey(c.Context, dataWallet.Account().AccessLevel, time.Hour*24*365)
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func ListAccessKeys(c *cli.Context) error {
 		return err
 	}
 
-	accessKeys, err := dataWallet.AccessKeys()
+	accessKeys, err := dataWallet.AccessKeys(c.Context)
 	if err != nil {
 		return cli.Exit(err.Error(), OperationFailed)
 	}
@@ -87,7 +87,7 @@ func GetAccessKey(c *cli.Context) error {
 		return err
 	}
 
-	ak, err := dw.GetAccessKey(c.Args().Get(0))
+	ak, err := dw.GetAccessKey(c.Context, c.Args().Get(0))
 	if err != nil {
 		return cli.Exit(err.Error(), OperationFailed)
 	}
@@ -107,5 +107,5 @@ func DeleteAccessKey(c *cli.Context) error {
 		return err
 	}
 
-	return dw.RevokeAccessKey(c.Args().Get(0))
+	return dw.RevokeAccessKey(c.Context, c.Args().Get(0))
 }