Merge branch 'master' into dev

.github/workflows/build.yaml → .github/workflows/release.yaml

@@ -3,21 +3,21 @@ name: Build
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Cache Go modules
         uses: actions/cache@v1
@@ -30,7 +30,7 @@ jobs:
       - name: Install dependencies
         run: go mod download
 
-      - name: Docker Login
+      - name: Container Registry Login
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
@@ -41,6 +41,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}

.github/workflows/tests.yaml → .github/workflows/test.yaml

@@ -1,7 +1,6 @@
 name: Run tests
 
-on:
-  push
+on: push
 
 jobs:
   run-tests:
@@ -14,7 +13,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.21
 
       - name: Run tests
         run: go test -v -race -timeout 5s ./...

.goreleaser.yaml

@@ -25,8 +25,6 @@ builds:
 archives:
   - format: binary
     name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}'
-    replacements:
-      darwin: macOS
 
 dockers:
   - dockerfile: goreleaser.dockerfile

src/models/redirect.go

@@ -17,9 +17,9 @@ type Redirect struct {
 func (redirect Redirect) ResolvePath(request *http.Request) string {
 	toUrl, _ := url.Parse(redirect.To)
 
-	if strings.Contains(toUrl.Hostname(), "*") {
-		toSections := strings.Split(toUrl.Hostname(), ".")
-		requestSections := strings.Split(request.URL.Hostname(), ".")
+	if strings.Contains(toUrl.Host, "*") {
+		toSections := strings.Split(toUrl.Host, ".")
+		requestSections := strings.Split(request.Host, ".")
 
 		// Substitute every * in to with corresponding section in request
 		for i, section := range toSections {