chore: rename project

Signed-off-by: black-desk <[email protected]>

.gitignore

@@ -1,4 +1,4 @@
-/deepin-network-proxy-manager
-/deepin-network-proxy-manager-debug
+/cgtproxy
+/cgtproxy-debug
 /test/coverage.html
 /test/coverprofile

Makefile

@@ -2,8 +2,8 @@
 	all \
 	coverage \
 	debug-build \
-	deepin-network-proxy-manager \
-	deepin-network-proxy-manager-debug \
+	cgtproxy \
+	cgtproxy-debug \
 	dlv-headless \
 	generate \
 	install \
@@ -12,22 +12,22 @@
 	test \
 	test/coverage.html
 
-all: deepin-network-proxy-manager
+all: cgtproxy
 
 coverage: test/coverage.html
 
-debug-build: deepin-network-proxy-manager-debug
+debug-build: cgtproxy-debug
 
-deepin-network-proxy-manager: generate
-	go build ./cmd/deepin-network-proxy-manager
-	strip ./deepin-network-proxy-manager
+cgtproxy: generate
+	go build ./cmd/cgtproxy
+	strip ./cgtproxy
 
-deepin-network-proxy-manager-debug: generate
-	go build -tags debug -o deepin-network-proxy-manager-debug \
-		./cmd/deepin-network-proxy-manager
+cgtproxy-debug: generate
+	go build -tags debug -o cgtproxy-debug \
+		./cmd/cgtproxy
 
 dlv-headless: generate
-	dlv debug ./cmd/deepin-network-proxy-manager --headless
+	dlv debug ./cmd/cgtproxy --headless
 
 generate:
 	go generate ./...

cmd/deepin-network-proxy-manager/cmd/check.go → cmd/cgtproxy/cmd/check.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	"github.com/spf13/cobra"
 )
 

cmd/deepin-network-proxy-manager/cmd/checkconfig.go → cmd/cgtproxy/cmd/checkconfig.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/spf13/cobra"
 )

cmd/deepin-network-proxy-manager/cmd/checkkernel.go → cmd/cgtproxy/cmd/checkkernel.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/spf13/cobra"
 )

cmd/deepin-network-proxy-manager/cmd/root.go → cmd/cgtproxy/cmd/root.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	"github.com/black-desk/cgtproxy/internal/core"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	"github.com/spf13/cobra"
 )
 
@@ -17,15 +17,15 @@ var flags struct {
 }
 
 var rootCmd = &cobra.Command{
-	Use:   "deepin-network-proxy-manager",
+	Use:   "cgtproxy",
 	Short: "A transparent network proxy manager for deepin",
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		defer func() {
 			if err == nil {
 				return
 			}
 
-			Log.Errorw("Error occur while running deepin-network-proxy-manager.",
+			Log.Errorw("Error occur while running cgtproxy.",
 				"config", flags.CfgPath,
 				"error", err,
 			)

cmd/cgtproxy/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/black-desk/cgtproxy/cmd/cgtproxy/cmd"
+
+func main() {
+	cmd.Execute()
+}

go.mod

@@ -1,4 +1,4 @@
-module github.com/black-desk/deepin-network-proxy-manager
+module github.com/black-desk/cgtproxy
 
 go 1.20
 

internal/config/alloc.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 )
 

internal/config/check.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	fstab "github.com/deniswernert/go-fstab"
 	"github.com/go-playground/validator/v10"

internal/config/config_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/config"
+	. "github.com/black-desk/cgtproxy/internal/config"
 	. "github.com/black-desk/lib/go/ginkgo-helper"
 	. "github.com/black-desk/lib/go/gomega-helper"
 	"github.com/go-playground/validator/v10"

internal/config/error.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
+	"github.com/black-desk/cgtproxy/internal/consts"
 )
 
 var (

internal/consts/consts.go

@@ -3,12 +3,12 @@ package consts
 const (
 	CheckDocumentString = `
 You might want check documentation and wiki on github for some help.
-https://github.com/black-desk/deepin-network-proxy-manager
+https://github.com/black-desk/cgtproxy
 `
 
-	CfgPath          = "/etc/deepin/network-proxy/config.yaml"
+	CfgPath = "/etc/cgtproxy/config.yaml"
 
 	PortsPattern = `^\[(\d+),(\d+)\)$`
 
-	NftTableName = "deepin_network_proxy"
+	NftTableName = "cgtproxy"
 )

internal/core/core.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/sourcegraph/conc/pool"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/config"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 )
 
@@ -19,7 +19,7 @@ type Core struct {
 type Opt = (func(*Core) (*Core, error))
 
 func New(opts ...Opt) (ret *Core, err error) {
-	defer Wrap(&err, "Failed to create new deepin-network-proxy-manager core.")
+	defer Wrap(&err, "Failed to create new cgtproxy core.")
 
 	core := &Core{}
 	for i := range opts {

internal/core/monitor/monitor.go

@@ -1,10 +1,10 @@
 package monitor
 
 import (
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/core/watcher"
+	. "github.com/black-desk/cgtproxy/internal/log"
+	"github.com/black-desk/cgtproxy/internal/types"
 	. "github.com/black-desk/lib/go/errwrap"
 )
 

internal/core/monitor/monitor_test.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	"github.com/black-desk/cgtproxy/internal/config"
+	. "github.com/black-desk/cgtproxy/internal/core/monitor"
+	"github.com/black-desk/cgtproxy/internal/core/watcher"
+	"github.com/black-desk/cgtproxy/internal/types"
 	. "github.com/black-desk/lib/go/ginkgo-helper"
 	. "github.com/black-desk/lib/go/gomega-helper"
 	. "github.com/onsi/ginkgo/v2"

internal/core/monitor/run.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	. "github.com/black-desk/cgtproxy/internal/log"
+	"github.com/black-desk/cgtproxy/internal/types"
 	. "github.com/black-desk/lib/go/errwrap"
 )
 

internal/core/providers.go

@@ -3,13 +3,13 @@ package core
 import (
 	"sync"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/table"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/core/monitor"
+	"github.com/black-desk/cgtproxy/internal/core/repeater"
+	"github.com/black-desk/cgtproxy/internal/core/rulemanager"
+	"github.com/black-desk/cgtproxy/internal/core/table"
+	"github.com/black-desk/cgtproxy/internal/core/watcher"
+	"github.com/black-desk/cgtproxy/internal/types"
 	"github.com/google/nftables"
 
 	"github.com/google/wire"

internal/core/rulemanager/rulemanager.go

@@ -3,10 +3,10 @@ package rulemanager
 import (
 	"regexp"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/table"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/core/table"
+	. "github.com/black-desk/cgtproxy/internal/log"
+	"github.com/black-desk/cgtproxy/internal/types"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/vishvananda/netlink"
 )

internal/core/rulemanager/run.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"os"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/table"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/types"
+	"github.com/black-desk/cgtproxy/internal/config"
+	"github.com/black-desk/cgtproxy/internal/core/table"
+	. "github.com/black-desk/cgtproxy/internal/log"
+	"github.com/black-desk/cgtproxy/internal/types"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/sys/unix"

internal/core/run.go

@@ -6,11 +6,11 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager"
-	"github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/core/monitor"
+	"github.com/black-desk/cgtproxy/internal/core/repeater"
+	"github.com/black-desk/cgtproxy/internal/core/rulemanager"
+	"github.com/black-desk/cgtproxy/internal/core/watcher"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 )
 
@@ -120,7 +120,7 @@ func (c *Core) runWatcher(ctx context.Context) (err error) {
 		return
 	}
 
-        Log.Debugw("Start filesystem watcher.")
+	Log.Debugw("Start filesystem watcher.")
 
 	err = w.Run(ctx)
 	if err != nil {

internal/core/table/dump_debug.go

@@ -6,8 +6,8 @@ package table
 import (
 	"go.uber.org/zap"
 
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/core/table/internal"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	. "github.com/black-desk/cgtproxy/internal/core/table/internal"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	"github.com/google/nftables/expr"
 )
 

internal/core/table/init.go

@@ -3,8 +3,8 @@ package table
 import (
 	"net"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/consts"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/consts"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/google/nftables"
 	"github.com/google/nftables/expr"
@@ -441,7 +441,7 @@ func (t *Table) initPreroutingChain() (err error) {
 			SourceRegister: 1,
 			IsDestRegSet:   true,
 			SetName:        t.markMap.Name,
-			SetID:        t.markMap.ID,
+			SetID:          t.markMap.ID,
 		},
 	}
 	exprs = addDebugCounter(exprs)

internal/core/table/method.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/config"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/google/nftables"
 	"github.com/google/nftables/binaryutil"

internal/core/table/new.go

@@ -1,8 +1,8 @@
 package table
 
 import (
-	"github.com/black-desk/deepin-network-proxy-manager/internal/config"
-	. "github.com/black-desk/deepin-network-proxy-manager/internal/log"
+	"github.com/black-desk/cgtproxy/internal/config"
+	. "github.com/black-desk/cgtproxy/internal/log"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/google/nftables"
 )
@@ -26,7 +26,7 @@ type Table struct {
 	cgroupMap        *nftables.Set
 	cgroupMapElement map[string]nftables.SetElement
 
-	markMap        *nftables.Set
+	markMap *nftables.Set
 
 	outputChain     *nftables.Chain
 	preroutingChain *nftables.Chain