Drop forwarding by default (#214)

metal-stack · Jan 26, 2024 · 69661c5 · 69661c5
1 parent 302f7d4
commit 69661c5
Show file tree

Hide file tree

Showing 15 changed files with 177 additions and 513 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: google-github-actions/auth@v1
       with:
@@ -31,9 +31,10 @@ jobs:
       uses: google-github-actions/setup-gcloud@v0
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21.x'
+        cache: false
 
     - name: Lint
       uses: golangci/golangci-lint-action@v3
@@ -84,7 +85,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: google-github-actions/auth@v1
       with:
@@ -94,7 +95,7 @@ jobs:
       uses: google-github-actions/setup-gcloud@v0
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21.x'
         cache: false

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: google-github-actions/auth@v1
       with:
@@ -31,7 +31,7 @@ jobs:
       uses: google-github-actions/setup-gcloud@v0
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21.x'
         cache: false
@@ -87,7 +87,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: google-github-actions/auth@v1
       with:
@@ -97,9 +97,10 @@ jobs:
       uses: google-github-actions/setup-gcloud@v0
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21.x'
+        cache: false
 
     - name: build install
       run: make

diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml
@@ -18,10 +18,10 @@ jobs:
     # it adds a generated download table to the release body with images from the stable folder.
 
     # - name: Checkout
-    #   uses: actions/checkout@v3
+    #   uses: actions/checkout@v4
 
     # - name: Set up Go 1.20
-    #   uses: actions/setup-go@v4
+    #   uses: actions/setup-go@v5
     #   with:
     #     go-version: '1.20.x'
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -23,10 +23,10 @@ jobs:
         uses: google-github-actions/setup-gcloud@v0
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go 1.21
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.21.x'
           cache: false

diff --git a/cmd/cmdexec.go b/cmd/cmdexec.go
@@ -3,16 +3,15 @@ package main
 import (
 	"context"
 	"io"
+	"log/slog"
 	"os"
 	"os/exec"
 	"strings"
 	"time"
-
-	"go.uber.org/zap"
 )
 
 type cmdexec struct {
-	log *zap.SugaredLogger
+	log *slog.Logger
 	c   func(ctx context.Context, name string, arg ...string) *exec.Cmd
 }
 
@@ -31,7 +30,7 @@ func (i *cmdexec) command(p *cmdParams) (out string, err error) {
 		start  = time.Now()
 		output []byte
 	)
-	i.log.Infow("running command", "commmand", strings.Join(append([]string{p.name}, p.args...), " "), "start", start.String())
+	i.log.Info("running command", "commmand", strings.Join(append([]string{p.name}, p.args...), " "), "start", start.String())
 
 	ctx := context.Background()
 	if p.timeout != 0 {
@@ -60,7 +59,7 @@ func (i *cmdexec) command(p *cmdParams) (out string, err error) {
 			defer stdin.Close()
 			_, err = io.WriteString(stdin, p.stdin)
 			if err != nil {
-				i.log.Errorw("error when writing to command's stdin", "error", err)
+				i.log.Error("error when writing to command's stdin", "error", err)
 			}
 		}()
 	}
@@ -75,11 +74,11 @@ func (i *cmdexec) command(p *cmdParams) (out string, err error) {
 	took := time.Since(start)
 
 	if err != nil {
-		i.log.Errorw("executed command with error", "output", out, "duration", took.String(), "error", err)
+		i.log.Error("executed command with error", "output", out, "duration", took.String(), "error", err)
 		return "", err
 	}
 
-	i.log.Infow("executed command", "output", out, "duration", took.String())
+	i.log.Info("executed command", "output", out, "duration", took.String())
 
 	return
 }