Rueidis base

.github/workflows/goreleaser-test.yml

@@ -0,0 +1,139 @@
+name: GoReleaser Test
+
+on:
+  push:
+    tags:
+      - v*
+  workflow_dispatch:
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build binaries with goreleaser
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - name: Setup Zig
+        uses: goto-bus-stop/setup-zig@v2
+
+      - name: Run GoReleaser check
+        uses: goreleaser/goreleaser-action@v4
+        with:
+          version: latest
+          args: check
+
+      - name: Run GoReleaser build
+        uses: goreleaser/goreleaser-action@v4
+        with:
+          version: latest
+          args: build --clean --snapshot
+
+      - name: Upload dist folder
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist_folder
+          path: dist
+          retention-days: 1
+
+  tests:
+    name: Test binaries
+    runs-on: ${{matrix.runner}}
+    needs: build
+    strategy:
+      matrix:
+        distro: [ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, bullseye, buster, stretch]
+        arch: [armv7,aarch64]
+        os: [linux]
+        runner: [ubuntu-latest]
+        include:
+          - distro: stretch
+            runner: ubuntu-latest
+            arch: armv6
+            os: linux
+          - distro: buster
+            runner: ubuntu-latest
+            arch: armv6
+            os: linux
+          - distro: bullseye
+            runner: ubuntu-latest
+            arch: armv6
+            os: linux
+          - distro: ubuntu20.04
+            runner: ubuntu-20.04
+            arch: amd64
+            os: linux
+          - distro: ubuntu22.04
+            runner: ubuntu-22.04
+            arch: amd64
+            os: linux
+          - distro: macos
+            runner: macos-11
+            arch: amd64
+            os: darwin
+          - distro: macos
+            runner: macos-12
+            arch: amd64
+            os: darwin
+          - distro: windows
+            runner: windows-latest
+            arch: amd64
+            os: windows
+
+    steps:
+      - name: Download dist folder
+        id: download
+        uses: actions/download-artifact@v3
+        with:
+          name: dist_folder
+
+      - name: Get binary path
+        id: get_path
+        if: matrix.os != 'windows'
+        shell: bash
+        run: |
+          archs=(["aarch64"]="arm64" ["armv6"]="arm_6" ["armv7"]="arm_7" ["amd64"]="amd64_v1")
+          BINPATH="${{steps.download.outputs.download-path}}/blocky_${{ matrix.os }}_${archs[ ${{ matrix.arch }} ]}/blocky"
+          echo "bin=${BINPATH}" >> "$GITHUB_OUTPUT"
+          echo "Binary path: ${BINPATH}"
+
+      - name: Enable execution
+        if: matrix.os != 'windows'
+        shell: bash
+        run: |
+          chmod +x '${{ steps.get_path.outputs.bin }}'
+
+      - name: Test binary on ${{ matrix.arch }}
+        if: matrix.arch != 'amd64' 
+        uses: uraimo/run-on-arch-action@v2
+        with:
+          distro: ${{ matrix.distro }}
+          arch: ${{ matrix.arch }}
+          dockerRunArgs: |
+            --volume "${{steps.download.outputs.download-path}}:${{steps.download.outputs.download-path}}"
+          shell: /bin/sh
+          run: |
+            '${{ steps.get_path.outputs.bin }}' version
+
+      - name: Test binary on amd64
+        if: matrix.arch == 'amd64' && matrix.os != 'windows'
+        shell: bash
+        run: |
+          '${{ steps.get_path.outputs.bin }}' version
+
+      - name: Test windows binary
+        if: matrix.os == 'windows'
+        shell: cmd
+        run: |
+          ${{steps.download.outputs.download-path}}\blocky_windows_amd64_v1\blocky.exe version

.github/workflows/release.yml

@@ -80,6 +80,9 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      - name: Setup Zig
+        uses: goto-bus-stop/setup-zig@v2
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

.goreleaser.yml

@@ -3,6 +3,8 @@ project_name: blocky
 before:
   hooks:
     - go mod tidy
+    - go install github.com/dosgo/zigtool/zigcc@latest
+    - go install github.com/dosgo/zigtool/zigcpp@latest
 builds:
   - goos:
       - linux
@@ -24,7 +26,15 @@ builds:
       - goos: windows
         goarch: arm64
     ldflags:
-      - -w -s -X github.com/0xERR0R/blocky/util.Version=v{{.Version}} -X github.com/0xERR0R/blocky/util.BuildTime={{time "20060102-150405"}}
+      - -w
+      - -s
+      - -X github.com/0xERR0R/blocky/util.Version=v{{.Version}}
+      - -X github.com/0xERR0R/blocky/util.BuildTime={{time "20060102-150405"}}
+      - -X github.com/0xERR0R/blocky/util.Architecture={{.Arch}}{{.Arm}}
+    env:
+      - CGO_ENABLED=0
+      - CC=zigcc
+      - CXX=zigcpp
 release:
   draft: true
 archives:

config/config.go

@@ -156,7 +156,7 @@ func (b *BootstrappedUpstreamConfig) UnmarshalYAML(unmarshal func(interface{}) e
 
 // Config main configuration
 //
-//nolint:maligned
+//nolint:maligned,lll
 type Config struct {
 	Upstream            ParallelBestConfig        `yaml:"upstream"`
 	UpstreamTimeout     Duration                  `yaml:"upstreamTimeout" default:"2s"`
@@ -181,24 +181,15 @@ type Config struct {
 	FqdnOnly            FqdnOnlyConfig            `yaml:",inline"`
 	Filtering           FilteringConfig           `yaml:"filtering"`
 	Ede                 EdeConfig                 `yaml:"ede"`
-	// Deprecated
-	DisableIPv6 bool `yaml:"disableIPv6" default:"false"`
-	// Deprecated
-	LogLevel log.Level `yaml:"logLevel" default:"info"`
-	// Deprecated
-	LogFormat log.FormatType `yaml:"logFormat" default:"text"`
-	// Deprecated
-	LogPrivacy bool `yaml:"logPrivacy" default:"false"`
-	// Deprecated
-	LogTimestamp bool `yaml:"logTimestamp" default:"true"`
-	// Deprecated
-	DNSPorts ListenConfig `yaml:"port" default:"53"`
-	// Deprecated
-	HTTPPorts ListenConfig `yaml:"httpPort"`
-	// Deprecated
-	HTTPSPorts ListenConfig `yaml:"httpsPort"`
-	// Deprecated
-	TLSPorts ListenConfig `yaml:"tlsPort"`
+	DisableIPv6         bool                      `yaml:"disableIPv6" default:"false"` // Deprecated: use Filtering with TypeAAAA
+	LogLevel            log.Level                 `yaml:"logLevel" default:"info"`     // Deprecated: use Log.Level
+	LogFormat           log.FormatType            `yaml:"logFormat" default:"text"`    // Deprecated: use Log.Format
+	LogPrivacy          bool                      `yaml:"logPrivacy" default:"false"`  // Deprecated: use Log.Privacy
+	LogTimestamp        bool                      `yaml:"logTimestamp" default:"true"` // Deprecated: use Log.Timestamp
+	DNSPorts            ListenConfig              `yaml:"port" default:"53"`           // Deprecated: use Ports.DNS
+	HTTPPorts           ListenConfig              `yaml:"httpPort"`                    // Deprecated: use Ports.HTTP
+	HTTPSPorts          ListenConfig              `yaml:"httpsPort"`                   // Deprecated: use Ports.HTTPS
+	TLSPorts            ListenConfig              `yaml:"tlsPort"`                     // Deprecated: use Ports.TLS
 }
 
 type PortsConfig struct {
@@ -230,20 +221,6 @@ type (
 	}
 )
 
-// RedisConfig configuration for the redis connection
-type RedisConfig struct {
-	Address            string   `yaml:"address"`
-	Username           string   `yaml:"username" default:""`
-	Password           string   `yaml:"password" default:""`
-	Database           int      `yaml:"database" default:"0"`
-	Required           bool     `yaml:"required" default:"false"`
-	ConnectionAttempts int      `yaml:"connectionAttempts" default:"3"`
-	ConnectionCooldown Duration `yaml:"connectionCooldown" default:"1s"`
-	SentinelUsername   string   `yaml:"sentinelUsername" default:""`
-	SentinelPassword   string   `yaml:"sentinelPassword" default:""`
-	SentinelAddresses  []string `yaml:"sentinelAddresses"`
-}
-
 type (
 	FqdnOnlyConfig = toEnable
 	EdeConfig      = toEnable
@@ -374,12 +351,10 @@ func unmarshalConfig(data []byte, cfg *Config) error {
 		return fmt.Errorf("wrong file structure: %w", err)
 	}
 
-	validateConfig(cfg)
-
-	return nil
+	return validateConfig(cfg)
 }
 
-func validateConfig(cfg *Config) {
+func validateConfig(cfg *Config) error {
 	if cfg.DisableIPv6 {
 		log.Log().Warnf("'disableIPv6' is deprecated. Please use 'filtering.queryTypes' with 'AAAA' instead.")
 
@@ -400,6 +375,10 @@ func validateConfig(cfg *Config) {
 	fixDeprecatedLog(cfg)
 
 	fixDeprecatedPorts(cfg)
+
+	fixDeprecatedRedis(cfg)
+
+	return validateRedisConfig(cfg)
 }
 
 // fixDeprecatedLog ensures backwards compatibility for logging options