Merge pull request #19 from deckhouse/windows-build

Add Windows support. Build binary for windows-amd64

Author: asviel

README.md

@@ -4,7 +4,7 @@ Deckhouse Client (d8) is a command-line client for Deckhouse.
 
 ## How to install?
 
-### From install script
+### From install script (Linux or macOS)
 
 The install script will automatically grab the latest version of `d8` and install it locally.
 

Taskfile.yml

@@ -67,7 +67,7 @@ tasks:
   _build:go:dev:
     internal: true
     cmds:
-      - go build -o "{{ .outputDir | default (printf "./build/%s-%s" .targetOS .targetArch) }}/d8"
+      - go build -o "{{ .outputDir | default (printf "./build/%s-%s" .targetOS .targetArch) }}/d8{{ if (eq .targetOS "windows") }}.exe{{ end }}"
         -ldflags="{{ .goDevLDFlags }}" -tags="{{ .goTags }}" {{ .CLI_ARGS }} main.go
     env:
       CGO_ENABLED: "0"
@@ -77,7 +77,7 @@ tasks:
   _build:go:dist:
     internal: true
     cmds:
-      - go build -o "{{ .outputDir | default (printf "./dist/%s/%s-%s" .version .targetOS .targetArch) }}/d8"
+      - go build -o "{{ .outputDir | default (printf "./dist/%s/%s-%s" .version .targetOS .targetArch) }}/d8{{ if (eq .targetOS "windows") }}.exe{{ end }}"
         -ldflags="{{ .goReleaseLDFlags }}" -tags="{{ .goTags }}" {{ .CLI_ARGS }} main.go
     env:
       CGO_ENABLED: "0"
@@ -119,12 +119,22 @@ tasks:
           targetArch: "arm64"
           outputDir: "{{ .outputDir }}"
 
+  build:dev:windows:amd64:
+    desc: Build d8 dev binary for windows/amd64
+    cmds:
+      - task: _build:go:dev
+        vars:
+          targetOS: "windows"
+          targetArch: "amd64"
+          outputDir: "{{.outputDir}}"
+
   build:dist:all:
     desc: Build all d8 release binaries in parallel
     deps:
       - build:dist:linux:amd64
       - build:dist:darwin:amd64
       - build:dist:darwin:arm64
+      - build:dist:windows:amd64
 
   build:dist:linux:amd64:
     desc: Build d8 release binary for linux/amd64
@@ -153,6 +163,15 @@ tasks:
           targetArch: "arm64"
           outputDir: "{{ .outputDir }}"
 
+  build:dist:windows:amd64:
+    desc: Build d8 release binary for windows/amd64
+    cmds:
+      - task: _build:go:dist
+        vars:
+          targetOS: "windows"
+          targetArch: "amd64"
+          outputDir: "{{ .outputDir }}"
+
   _package:dist:
     dir: dist/{{ .version }}
     cmds:
@@ -165,6 +184,7 @@ tasks:
       - package:dist:linux:amd64
       - package:dist:darwin:amd64
       - package:dist:darwin:arm64
+      - package:dist:windows:amd64
 
   package:dist:linux:amd64:
     desc: Package release asset for linux/amd64
@@ -190,6 +210,14 @@ tasks:
         vars:
           target: "darwin-arm64"
 
+  package:dist:windows:amd64:
+    desc: Package release asset for windows/amd64
+    dir: dist/{{ .version }}
+    cmds:
+      - task: _package:dist
+        vars:
+          target: "windows-amd64"
+
   checksum:
     desc: Calculate sha256 checksum for release assets
     dir: dist/{{ .version }}

internal/mirror/bundle/bundle.go

@@ -25,6 +25,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/deckhouse/deckhouse-cli/internal/mirror/chunked"
 	"github.com/deckhouse/deckhouse-cli/internal/mirror/contexts"
@@ -131,12 +132,9 @@ func packFunc(mirrorCtx *contexts.BaseContext, out *tar.Writer) filepath.WalkFun
 			return fmt.Errorf("read file: %w", err)
 		}
 
-		pathInTar, err := filepath.Rel(mirrorCtx.UnpackedImagesPath, path)
-		if err != nil {
-			return fmt.Errorf("build file path within bundle: %w", err)
-		}
+		pathInTar := strings.TrimPrefix(path, mirrorCtx.UnpackedImagesPath+string(os.PathSeparator))
 		err = out.WriteHeader(&tar.Header{
-			Name:    pathInTar,
+			Name:    filepath.ToSlash(pathInTar),
 			Size:    info.Size(),
 			Mode:    int64(info.Mode()),
 			ModTime: info.ModTime(),

internal/mirror/cmd/push/push.go

@@ -263,11 +263,11 @@ func pushModulesTags(mirrorCtx *contexts.BaseContext, modulesList []string) erro
 
 func findLayoutsToPush(mirrorCtx *contexts.PushContext) (map[string]layout.Path, []string, error) {
 	deckhouseIndexRef := mirrorCtx.RegistryHost + mirrorCtx.RegistryPath
-	installersIndexRef := filepath.Join(deckhouseIndexRef, "install")
-	releasesIndexRef := filepath.Join(deckhouseIndexRef, "release-channel")
-	trivyDBIndexRef := filepath.Join(deckhouseIndexRef, "security", "trivy-db")
-	trivyBDUIndexRef := filepath.Join(deckhouseIndexRef, "security", "trivy-bdu")
-	trivyJavaDBIndexRef := filepath.Join(deckhouseIndexRef, "security", "trivy-java-db")
+	installersIndexRef := path.Join(deckhouseIndexRef, "install")
+	releasesIndexRef := path.Join(deckhouseIndexRef, "release-channel")
+	trivyDBIndexRef := path.Join(deckhouseIndexRef, "security", "trivy-db")
+	trivyBDUIndexRef := path.Join(deckhouseIndexRef, "security", "trivy-bdu")
+	trivyJavaDBIndexRef := path.Join(deckhouseIndexRef, "security", "trivy-java-db")
 
 	deckhouseLayoutPath := mirrorCtx.UnpackedImagesPath
 	installersLayoutPath := filepath.Join(mirrorCtx.UnpackedImagesPath, "install")
@@ -327,8 +327,8 @@ func findLayoutsToPush(mirrorCtx *contexts.PushContext) (map[string]layout.Path,
 
 		moduleName := dir.Name()
 		modulesNames = append(modulesNames, moduleName)
-		moduleRef := filepath.Join(mirrorCtx.RegistryHost+mirrorCtx.RegistryPath, "modules", moduleName)
-		moduleReleasesRef := filepath.Join(mirrorCtx.DeckhouseRegistryRepo, "modules", moduleName, "release")
+		moduleRef := path.Join(mirrorCtx.RegistryHost+mirrorCtx.RegistryPath, "modules", moduleName)
+		moduleReleasesRef := path.Join(mirrorCtx.DeckhouseRegistryRepo, "modules", moduleName, "release")
 		moduleLayout, err := layout.FromPath(filepath.Join(modulesPath, moduleName))
 		if err != nil {
 			return nil, nil, fmt.Errorf("create module layout from path: %w", err)

internal/mirror/util/tomb/tomb.go

@@ -17,11 +17,7 @@ limitations under the License.
 package tomb
 
 import (
-	"fmt"
-	"os"
-	"os/signal"
 	"sync"
-	"syscall"
 
 	"github.com/deckhouse/deckhouse-cli/internal/mirror/util/log"
 )
@@ -91,19 +87,6 @@ func (c *teardownCallbacks) wait() {
 	<-c.waitCh
 }
 
-func RegisterOnShutdown(process string, cb func()) {
-	callbacks.registerOnShutdown(process, cb)
-}
-
-func Shutdown(code int) {
-	callbacks.shutdown(code)
-}
-
-func WaitShutdown() int {
-	callbacks.wait()
-	return callbacks.exitCode
-}
-
 func IsInterrupted() bool {
 	select {
 	case <-callbacks.interruptedCh:
@@ -112,60 +95,3 @@ func IsInterrupted() bool {
 	}
 	return false
 }
-
-func WithoutInterruptions(fn func()) {
-	callbacks.notInterruptable = true
-	defer func() { callbacks.notInterruptable = false }()
-	fn()
-}
-
-func WaitForProcessInterruption() {
-	interruptCh := make(chan os.Signal, 1)
-	signal.Notify(interruptCh, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR1)
-
-	for {
-		s, ok := <-interruptCh
-		if !ok {
-			return
-		}
-
-		var exitCode int
-		switch s {
-		case syscall.SIGUSR1:
-			exitCode = 1
-		case syscall.SIGTERM, syscall.SIGINT:
-			exitCode = 0
-		default:
-			os.Exit(1)
-			return
-		}
-
-		if callbacks.notInterruptable {
-			continue
-		}
-
-		graceShutdownForSignal(interruptCh, exitCode, s)
-		return
-	}
-}
-
-func graceShutdownForSignal(interruptCh <-chan os.Signal, exitCode int, s os.Signal) {
-	// Wait for the second signal to kill the main process immediately.
-	go func() {
-		<-interruptCh
-		log.ErrorLn("Killed by signal twice.")
-		os.Exit(1)
-	}()
-
-	// Close interrupted channel to signal interruptable loops to stop.
-	close(callbacks.interruptedCh)
-
-	// Run all registered teardown callbacks and print an explanation at the end.
-	callbacks.data = append([]callback{{
-		Name: "Shutdown message",
-		Do: func() {
-			log.WarnLn(fmt.Sprintf("Graceful shutdown by %q signal ...", s.String()))
-		},
-	}}, callbacks.data...)
-	Shutdown(exitCode)
-}