Merge pull request #8 from rwillert/modify-build

fix lint and use own modules namespace

Author: rwillert

.github/workflows/lint.yml

@@ -21,11 +21,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54
+          version: v1.62

.github/workflows/release.yml

@@ -12,15 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, darwin/386, darwin/amd64
-        goos: [linux, freebsd, darwin]
-        goarch: [386, amd64, arm, arm64]
+        goos: [linux, darwin]
+        goarch: [amd64, arm, arm64]
         exclude:
-          - goarch: 386
-            goos: darwin
           - goarch: arm
             goos: darwin
-          - goarch: arm64
-            goos: darwin
         goarm:
           - 7
     steps:

.golangci.yml

@@ -1,9 +1,5 @@
 run:
   timeout: 5m
-  skip-dirs:
-    - .github
-    - hack
-    - vendor
 linters:
   disable-all: true
   enable:
@@ -24,3 +20,7 @@ linters-settings:
         disabled: true
 issues:
   exclude-use-default: false
+  exclude-dirs:
+    - .github
+    - hack
+    - vendor

go.mod

@@ -1,4 +1,4 @@
-module github.com/ngoduykhanh/wireguard-ui
+module github.com/rwillert/wireguard-ui
 
 go 1.23
 

handler/routes.go

@@ -23,11 +23,11 @@ import (
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 
-	"github.com/ngoduykhanh/wireguard-ui/emailer"
-	"github.com/ngoduykhanh/wireguard-ui/model"
-	"github.com/ngoduykhanh/wireguard-ui/store"
-	"github.com/ngoduykhanh/wireguard-ui/telegram"
-	"github.com/ngoduykhanh/wireguard-ui/util"
+	"github.com/rwillert/wireguard-ui/emailer"
+	"github.com/rwillert/wireguard-ui/model"
+	"github.com/rwillert/wireguard-ui/store"
+	"github.com/rwillert/wireguard-ui/telegram"
+	"github.com/rwillert/wireguard-ui/util"
 )
 
 var usernameRegexp = regexp.MustCompile("^\\w[\\w\\-.]*$")

handler/routes_wake_on_lan.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
-	"github.com/ngoduykhanh/wireguard-ui/model"
-	"github.com/ngoduykhanh/wireguard-ui/store"
+	"github.com/rwillert/wireguard-ui/model"
+	"github.com/rwillert/wireguard-ui/store"
 	"github.com/sabhiram/go-wol/wol"
 )
 

handler/session.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gorilla/sessions"
 	"github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo/v4"
-	"github.com/ngoduykhanh/wireguard-ui/util"
+	"github.com/rwillert/wireguard-ui/util"
 )
 
 func ValidSession(next echo.HandlerFunc) echo.HandlerFunc {

main.go

@@ -15,22 +15,22 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
-	"github.com/ngoduykhanh/wireguard-ui/store"
-	"github.com/ngoduykhanh/wireguard-ui/telegram"
-
-	"github.com/ngoduykhanh/wireguard-ui/emailer"
-	"github.com/ngoduykhanh/wireguard-ui/handler"
-	"github.com/ngoduykhanh/wireguard-ui/router"
-	"github.com/ngoduykhanh/wireguard-ui/store/jsondb"
-	"github.com/ngoduykhanh/wireguard-ui/util"
+	"github.com/rwillert/wireguard-ui/store"
+	"github.com/rwillert/wireguard-ui/telegram"
+
+	"github.com/rwillert/wireguard-ui/emailer"
+	"github.com/rwillert/wireguard-ui/handler"
+	"github.com/rwillert/wireguard-ui/router"
+	"github.com/rwillert/wireguard-ui/store/jsondb"
+	"github.com/rwillert/wireguard-ui/util"
 )
 
 var (
 	// command-line banner information
 	appVersion = "development"
 	gitCommit  = "N/A"
 	gitRef     = "N/A"
-	buildTime  = fmt.Sprintf(time.Now().UTC().Format("01-02-2006 15:04:05"))
+	buildTime  = time.Now().UTC().Format("01-02-2006 15:04:05")
 	// configuration variables
 	flagDisableLogin             = false
 	flagBindAddress              = "0.0.0.0:5000"
@@ -161,7 +161,7 @@ func init() {
 		fmt.Println("Git Commit\t:", gitCommit)
 		fmt.Println("Git Ref\t\t:", gitRef)
 		fmt.Println("Build Time\t:", buildTime)
-		fmt.Println("Git Repo\t:", "https://github.com/ngoduykhanh/wireguard-ui")
+		fmt.Println("Git Repo\t:", "https://github.com/rwillert/wireguard-ui")
 		fmt.Println("Authentication\t:", !util.DisableLogin)
 		fmt.Println("Bind address\t:", util.BindAddress)
 		//fmt.Println("Sendgrid key\t:", util.SendgridApiKey)

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Wireguard web interface",
   "main": "index.js",
-  "repository": "[email protected]:ngoduykhanh/wireguard-ui.git",
+  "repository": "[email protected]:rwillert/wireguard-ui.git",
   "author": "Khanh Ngo <[email protected]>",
   "license": "MIT",
   "dependencies": {

router/router.go

@@ -13,7 +13,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/gommon/log"
-	"github.com/ngoduykhanh/wireguard-ui/util"
+	"github.com/rwillert/wireguard-ui/util"
 )
 
 // TemplateRegistry is a custom html/template renderer for Echo framework