diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 00000000..05d654cb --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,44 @@ +name: EasyTier Go + +on: + push: + branches: ["develop", "main", "releases/**"] + paths: + - "easytier-go/**" + - ".github/workflows/go.yml" + pull_request: + branches: ["develop", "main"] + types: [opened, synchronize, reopened, ready_for_review] + paths: + - "easytier-go/**" + - ".github/workflows/go.yml" + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + test: + name: Test Go modules + if: github.event_name != 'pull_request' || !github.event.pull_request.draft + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + + - uses: actions/setup-go@v6 + with: + go-version: "1.25.x" + cache-dependency-path: | + easytier-go/go.sum + easytier-go/examples/tun/go.sum + + - name: Test main module + working-directory: easytier-go + run: go test ./... + + - name: Test TUN example module + working-directory: easytier-go/examples/tun + run: go test ./... diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml index 6d5eacee..3dfb37e7 100644 --- a/.github/workflows/ohos.yml +++ b/.github/workflows/ohos.yml @@ -30,6 +30,7 @@ on: type: boolean permissions: + actions: write contents: read pull-requests: read @@ -41,9 +42,24 @@ defaults: shell: bash jobs: + pre_job: + runs-on: ubuntu-latest + if: github.event_name != 'pull_request' || !github.event.pull_request.draft + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip == 'true' && github.ref_type != 'tag' && github.ref_name != 'main' && !startsWith(github.ref_name, 'releases/') }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@v5 + with: + concurrent_skipping: 'same_content_newer' + skip_after_successful_duplicate: 'true' + cancel_others: 'true' + paths: '["Cargo.toml", "Cargo.lock", "rust-toolchain.toml", ".cargo/**", "easytier/**", "easytier-core/**", "easytier-proto/**", "easytier-contrib/easytier-ohrs/**", ".github/workflows/ohos.yml", ".github/actions/**"]' + ohos: name: ohos - if: github.event_name != 'pull_request' || !github.event.pull_request.draft + needs: pre_job + if: needs.pre_job.outputs.should_skip != 'true' runs-on: ubuntu-latest steps: diff --git a/easytier-go/README.md b/easytier-go/README.md index ad2e1aa3..295b9caa 100644 --- a/easytier-go/README.md +++ b/easytier-go/README.md @@ -9,7 +9,7 @@ and imported by that artifact. import ( "net/netip" - corehost "github.com/EasyTier/EasyTier/easytier-go" + corehost "github.com/easytier/easytier/easytier-go" ) ``` diff --git a/easytier-go/cmd/dial-forward-bench/main.go b/easytier-go/cmd/dial-forward-bench/main.go index f973a509..602cbcf7 100644 --- a/easytier-go/cmd/dial-forward-bench/main.go +++ b/easytier-go/cmd/dial-forward-bench/main.go @@ -20,8 +20,8 @@ import ( "sync/atomic" "syscall" - corehost "github.com/EasyTier/EasyTier/easytier-go" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" + corehost "github.com/easytier/easytier/easytier-go" + "github.com/easytier/easytier/easytier-go/internal/contextutil" ) type options struct { diff --git a/easytier-go/examples/dial/main.go b/easytier-go/examples/dial/main.go index 2b515aec..b2fc33c5 100644 --- a/easytier-go/examples/dial/main.go +++ b/easytier-go/examples/dial/main.go @@ -16,8 +16,8 @@ import ( "syscall" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" + corehost "github.com/easytier/easytier/easytier-go" + "github.com/easytier/easytier/easytier-go/internal/contextutil" ) const maxUDPPayload = 65507 diff --git a/easytier-go/examples/dial/main_test.go b/easytier-go/examples/dial/main_test.go index 83001cfb..c7531976 100644 --- a/easytier-go/examples/dial/main_test.go +++ b/easytier-go/examples/dial/main_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" - "github.com/EasyTier/EasyTier/easytier-go/proto/common" + corehost "github.com/easytier/easytier/easytier-go" + "github.com/easytier/easytier/easytier-go/proto/common" ) func TestParseOptions(t *testing.T) { diff --git a/easytier-go/examples/tun/go.mod b/easytier-go/examples/tun/go.mod index 3b236045..756daeea 100644 --- a/easytier-go/examples/tun/go.mod +++ b/easytier-go/examples/tun/go.mod @@ -1,9 +1,9 @@ -module github.com/EasyTier/EasyTier/easytier-go/examples/tun +module github.com/easytier/easytier/easytier-go/examples/tun go 1.25.0 require ( - github.com/EasyTier/EasyTier/easytier-go v0.0.0 + github.com/easytier/easytier/easytier-go v0.0.0 github.com/sagernet/sing-tun v0.8.11 ) @@ -31,4 +31,4 @@ require ( google.golang.org/protobuf v1.36.11 // indirect ) -replace github.com/EasyTier/EasyTier/easytier-go => ../.. +replace github.com/easytier/easytier/easytier-go => ../.. diff --git a/easytier-go/examples/tun/main.go b/easytier-go/examples/tun/main.go index 362d33ca..b0e303a2 100644 --- a/easytier-go/examples/tun/main.go +++ b/easytier-go/examples/tun/main.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" + corehost "github.com/easytier/easytier/easytier-go" tun "github.com/sagernet/sing-tun" ) diff --git a/easytier-go/examples/web-client/main.go b/easytier-go/examples/web-client/main.go index f44c05a0..5fea3f51 100644 --- a/easytier-go/examples/web-client/main.go +++ b/easytier-go/examples/web-client/main.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - corehost "github.com/EasyTier/EasyTier/easytier-go" + corehost "github.com/easytier/easytier/easytier-go" ) type options struct { diff --git a/easytier-go/go.mod b/easytier-go/go.mod index acf062a6..79352ff2 100644 --- a/easytier-go/go.mod +++ b/easytier-go/go.mod @@ -1,4 +1,4 @@ -module github.com/EasyTier/EasyTier/easytier-go +module github.com/easytier/easytier/easytier-go go 1.20 diff --git a/easytier-go/host.go b/easytier-go/host.go index 774ccada..7469f0b7 100644 --- a/easytier-go/host.go +++ b/easytier-go/host.go @@ -3,7 +3,7 @@ package host import ( "context" - internalhost "github.com/EasyTier/EasyTier/easytier-go/internal/host" + internalhost "github.com/easytier/easytier/easytier-go/internal/host" ) type State = internalhost.State diff --git a/easytier-go/instance_config.go b/easytier-go/instance_config.go index 79e08c19..c1ec9d40 100644 --- a/easytier-go/instance_config.go +++ b/easytier-go/instance_config.go @@ -1,6 +1,6 @@ package host -import internalhost "github.com/EasyTier/EasyTier/easytier-go/internal/host" +import internalhost "github.com/easytier/easytier/easytier-go/internal/host" // P2PPolicy controls when an instance attempts peer-to-peer connections. type P2PPolicy = internalhost.P2PPolicy diff --git a/easytier-go/internal/coreabi/core.go b/easytier-go/internal/coreabi/core.go index f882577e..f2b55e64 100644 --- a/easytier-go/internal/coreabi/core.go +++ b/easytier-go/internal/coreabi/core.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/contextutil" "github.com/metacubex/wazero/api" ) diff --git a/easytier-go/internal/coreabi/dataplane.go b/easytier-go/internal/coreabi/dataplane.go index fc4fb3e6..97d1a4e4 100644 --- a/easytier-go/internal/coreabi/dataplane.go +++ b/easytier-go/internal/coreabi/dataplane.go @@ -8,7 +8,7 @@ import ( "math" "net/netip" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/contextutil" ) const ( diff --git a/easytier-go/internal/engine/config.go b/easytier-go/internal/engine/config.go index 61e5a183..2a5fdb04 100644 --- a/easytier-go/internal/engine/config.go +++ b/easytier-go/internal/engine/config.go @@ -6,7 +6,7 @@ import ( "net/netip" "net/url" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) const createConfigVersion = 14 diff --git a/easytier-go/internal/engine/config_test.go b/easytier-go/internal/engine/config_test.go index 434f1f65..587a07a3 100644 --- a/easytier-go/internal/engine/config_test.go +++ b/easytier-go/internal/engine/config_test.go @@ -5,7 +5,7 @@ import ( "net/netip" "testing" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) func TestEncodeCreateEnvelopeOwnsVersionAndEnvironmentSchema(t *testing.T) { diff --git a/easytier-go/internal/engine/conn.go b/easytier-go/internal/engine/conn.go index ad1e56db..ba6b9300 100644 --- a/easytier-go/internal/engine/conn.go +++ b/easytier-go/internal/engine/conn.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) const maxDataPlaneTransfer = 1024 * 1024 diff --git a/easytier-go/internal/engine/dataplane.go b/easytier-go/internal/engine/dataplane.go index 13e49697..00af6660 100644 --- a/easytier-go/internal/engine/dataplane.go +++ b/easytier-go/internal/engine/dataplane.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) const dataPlaneCompletionBatch = 64 diff --git a/easytier-go/internal/engine/driver_test.go b/easytier-go/internal/engine/driver_test.go index cffcd883..5a374a47 100644 --- a/easytier-go/internal/engine/driver_test.go +++ b/easytier-go/internal/engine/driver_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type recordingCore struct { diff --git a/easytier-go/internal/engine/host.go b/easytier-go/internal/engine/host.go index a67dc79e..2640f74b 100644 --- a/easytier-go/internal/engine/host.go +++ b/easytier-go/internal/engine/host.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/artifact" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" - "github.com/EasyTier/EasyTier/easytier-go/internal/hostabi" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/internal/artifact" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/hostabi" + "github.com/easytier/easytier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/platform" "github.com/metacubex/wazero" "github.com/metacubex/wazero/api" "github.com/metacubex/wazero/imports/wasi_snapshot_preview1" diff --git a/easytier-go/internal/engine/instance.go b/easytier-go/internal/engine/instance.go index 80e561df..c052ff7d 100644 --- a/easytier-go/internal/engine/instance.go +++ b/easytier-go/internal/engine/instance.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/reactor" ) type commandKind uint8 diff --git a/easytier-go/internal/engine/instance_test.go b/easytier-go/internal/engine/instance_test.go index e6d70436..ce6f0ae0 100644 --- a/easytier-go/internal/engine/instance_test.go +++ b/easytier-go/internal/engine/instance_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" - "github.com/EasyTier/EasyTier/easytier-go/platform/netstd" + "github.com/easytier/easytier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/platform/netstd" ) const minimalConfig = `instance_id = "018f4fb1-7a2c-7d1f-9d89-935b0ad7e135" diff --git a/easytier-go/internal/engine/listener.go b/easytier-go/internal/engine/listener.go index 4f01b889..d07701c6 100644 --- a/easytier-go/internal/engine/listener.go +++ b/easytier-go/internal/engine/listener.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type streamListener struct { diff --git a/easytier-go/internal/engine/packet_conn.go b/easytier-go/internal/engine/packet_conn.go index 6e1fe5b7..5ef57028 100644 --- a/easytier-go/internal/engine/packet_conn.go +++ b/easytier-go/internal/engine/packet_conn.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type packetConn struct { diff --git a/easytier-go/internal/engine/rpc.go b/easytier-go/internal/engine/rpc.go index 39d89b7b..baf68d2c 100644 --- a/easytier-go/internal/engine/rpc.go +++ b/easytier-go/internal/engine/rpc.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type rpcCore interface { diff --git a/easytier-go/internal/engine/rpc_test.go b/easytier-go/internal/engine/rpc_test.go index 41ed22ed..b0ab29b5 100644 --- a/easytier-go/internal/engine/rpc_test.go +++ b/easytier-go/internal/engine/rpc_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type readyRPC struct { diff --git a/easytier-go/internal/engine/web_client.go b/easytier-go/internal/engine/web_client.go index b17a18ea..6d0729b9 100644 --- a/easytier-go/internal/engine/web_client.go +++ b/easytier-go/internal/engine/web_client.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/coreabi" ) type WebClientOptions struct { diff --git a/easytier-go/internal/host/host.go b/easytier-go/internal/host/host.go index 4b5809f9..c4224b80 100644 --- a/easytier-go/internal/host/host.go +++ b/easytier-go/internal/host/host.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - "github.com/EasyTier/EasyTier/easytier-go/proto/common" + "github.com/easytier/easytier/easytier-go/proto/common" - "github.com/EasyTier/EasyTier/easytier-go/internal/artifact" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/internal/coreabi" - "github.com/EasyTier/EasyTier/easytier-go/internal/engine" - "github.com/EasyTier/EasyTier/easytier-go/platform" - "github.com/EasyTier/EasyTier/easytier-go/platform/netstd" - hostproto "github.com/EasyTier/EasyTier/easytier-go/proto" - "github.com/EasyTier/EasyTier/easytier-go/proto/api/manage" + "github.com/easytier/easytier/easytier-go/internal/artifact" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/coreabi" + "github.com/easytier/easytier/easytier-go/internal/engine" + "github.com/easytier/easytier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform/netstd" + hostproto "github.com/easytier/easytier/easytier-go/proto" + "github.com/easytier/easytier/easytier-go/proto/api/manage" ) type State int32 diff --git a/easytier-go/internal/host/management.go b/easytier-go/internal/host/management.go index 9602f052..a4724061 100644 --- a/easytier-go/internal/host/management.go +++ b/easytier-go/internal/host/management.go @@ -12,12 +12,12 @@ import ( "sync" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - apiconfig "github.com/EasyTier/EasyTier/easytier-go/proto/api/config" - apiinstance "github.com/EasyTier/EasyTier/easytier-go/proto/api/instance" - "github.com/EasyTier/EasyTier/easytier-go/proto/api/manage" - "github.com/EasyTier/EasyTier/easytier-go/proto/common" - errorpb "github.com/EasyTier/EasyTier/easytier-go/proto/error" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + apiconfig "github.com/easytier/easytier/easytier-go/proto/api/config" + apiinstance "github.com/easytier/easytier/easytier-go/proto/api/instance" + "github.com/easytier/easytier/easytier-go/proto/api/manage" + "github.com/easytier/easytier/easytier-go/proto/common" + errorpb "github.com/easytier/easytier/easytier-go/proto/error" "google.golang.org/protobuf/proto" ) diff --git a/easytier-go/internal/host/management_test.go b/easytier-go/internal/host/management_test.go index 02bf6fd5..a8974caf 100644 --- a/easytier-go/internal/host/management_test.go +++ b/easytier-go/internal/host/management_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - apiconfig "github.com/EasyTier/EasyTier/easytier-go/proto/api/config" - apiinstance "github.com/EasyTier/EasyTier/easytier-go/proto/api/instance" - "github.com/EasyTier/EasyTier/easytier-go/proto/api/manage" - "github.com/EasyTier/EasyTier/easytier-go/proto/common" + apiconfig "github.com/easytier/easytier/easytier-go/proto/api/config" + apiinstance "github.com/easytier/easytier/easytier-go/proto/api/instance" + "github.com/easytier/easytier/easytier-go/proto/api/manage" + "github.com/easytier/easytier/easytier-go/proto/common" "google.golang.org/protobuf/encoding/protowire" "google.golang.org/protobuf/proto" ) diff --git a/easytier-go/internal/host/rpc.go b/easytier-go/internal/host/rpc.go index b8c29c88..40ac3722 100644 --- a/easytier-go/internal/host/rpc.go +++ b/easytier-go/internal/host/rpc.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - apiinstance "github.com/EasyTier/EasyTier/easytier-go/proto/api/instance" - "github.com/EasyTier/EasyTier/easytier-go/proto/common" + apiinstance "github.com/easytier/easytier/easytier-go/proto/api/instance" + "github.com/easytier/easytier/easytier-go/proto/common" "google.golang.org/protobuf/proto" ) diff --git a/easytier-go/internal/host/web_client.go b/easytier-go/internal/host/web_client.go index 211ddf4c..4a64e525 100644 --- a/easytier-go/internal/host/web_client.go +++ b/easytier-go/internal/host/web_client.go @@ -6,7 +6,7 @@ import ( "os" "runtime" - "github.com/EasyTier/EasyTier/easytier-go/internal/engine" + "github.com/easytier/easytier/easytier-go/internal/engine" ) type WebClientOptions struct { diff --git a/easytier-go/internal/hostabi/adapter.go b/easytier-go/internal/hostabi/adapter.go index abee2952..9865ff87 100644 --- a/easytier-go/internal/hostabi/adapter.go +++ b/easytier-go/internal/hostabi/adapter.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/internal/reactor" "github.com/metacubex/wazero" ) diff --git a/easytier-go/internal/hostabi/conformance_test.go b/easytier-go/internal/hostabi/conformance_test.go index 42f6e996..d82c077d 100644 --- a/easytier-go/internal/hostabi/conformance_test.go +++ b/easytier-go/internal/hostabi/conformance_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/platform" "github.com/metacubex/wazero" "github.com/metacubex/wazero/api" "github.com/metacubex/wazero/imports/wasi_snapshot_preview1" diff --git a/easytier-go/internal/hostabi/dns.go b/easytier-go/internal/hostabi/dns.go index ae53c834..3bed47cc 100644 --- a/easytier-go/internal/hostabi/dns.go +++ b/easytier-go/internal/hostabi/dns.go @@ -3,7 +3,7 @@ package hostabi import ( "context" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/internal/reactor" "github.com/metacubex/wazero/api" ) diff --git a/easytier-go/internal/hostabi/dns_wire.go b/easytier-go/internal/hostabi/dns_wire.go index 109fbe04..362ee5f6 100644 --- a/easytier-go/internal/hostabi/dns_wire.go +++ b/easytier-go/internal/hostabi/dns_wire.go @@ -7,7 +7,7 @@ import ( "net/netip" "unicode/utf8" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) const ( diff --git a/easytier-go/internal/hostabi/socket_wire.go b/easytier-go/internal/hostabi/socket_wire.go index 1f1e5304..2097b713 100644 --- a/easytier-go/internal/hostabi/socket_wire.go +++ b/easytier-go/internal/hostabi/socket_wire.go @@ -6,7 +6,7 @@ import ( "net" "unicode/utf8" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" "github.com/metacubex/wazero/api" ) diff --git a/easytier-go/internal/hostabi/status.go b/easytier-go/internal/hostabi/status.go index 85e209dd..5dcd0d67 100644 --- a/easytier-go/internal/hostabi/status.go +++ b/easytier-go/internal/hostabi/status.go @@ -3,7 +3,7 @@ package hostabi import ( "errors" - "github.com/EasyTier/EasyTier/easytier-go/internal/reactor" + "github.com/easytier/easytier/easytier-go/internal/reactor" ) const ( diff --git a/easytier-go/internal/reactor/dns.go b/easytier-go/internal/reactor/dns.go index 725067ac..a9fa9136 100644 --- a/easytier-go/internal/reactor/dns.go +++ b/easytier-go/internal/reactor/dns.go @@ -6,7 +6,7 @@ import ( "net" "net/netip" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) type DNSKind uint8 diff --git a/easytier-go/internal/reactor/environment.go b/easytier-go/internal/reactor/environment.go index a8f9a2b3..37be29cb 100644 --- a/easytier-go/internal/reactor/environment.go +++ b/easytier-go/internal/reactor/environment.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) type environmentOperation struct { diff --git a/easytier-go/internal/reactor/factory.go b/easytier-go/internal/reactor/factory.go index b8a676cc..1e5e71ad 100644 --- a/easytier-go/internal/reactor/factory.go +++ b/easytier-go/internal/reactor/factory.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) type createOperation struct { diff --git a/easytier-go/internal/reactor/reactor.go b/easytier-go/internal/reactor/reactor.go index 504ee8e3..7389555b 100644 --- a/easytier-go/internal/reactor/reactor.go +++ b/easytier-go/internal/reactor/reactor.go @@ -7,8 +7,8 @@ import ( "net" "sync" - "github.com/EasyTier/EasyTier/easytier-go/internal/contextutil" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/internal/contextutil" + "github.com/easytier/easytier/easytier-go/platform" ) var ( diff --git a/easytier-go/internal/reactor/reactor_test.go b/easytier-go/internal/reactor/reactor_test.go index 26e599ed..e01402f4 100644 --- a/easytier-go/internal/reactor/reactor_test.go +++ b/easytier-go/internal/reactor/reactor_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) func TestOperationIDsAreUniqueAcrossOperationKinds(t *testing.T) { diff --git a/easytier-go/platform/netstd/netstd.go b/easytier-go/platform/netstd/netstd.go index 2df1c6e9..19cf3405 100644 --- a/easytier-go/platform/netstd/netstd.go +++ b/easytier-go/platform/netstd/netstd.go @@ -7,7 +7,7 @@ import ( "net/netip" "syscall" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) // SocketFactory implements platform.SocketFactory with the Go standard diff --git a/easytier-go/platform/netstd/netstd_test.go b/easytier-go/platform/netstd/netstd_test.go index 8686d0c7..c4cb2e7f 100644 --- a/easytier-go/platform/netstd/netstd_test.go +++ b/easytier-go/platform/netstd/netstd_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) func TestDNSResolverNormalizesIPv4Literal(t *testing.T) { diff --git a/easytier-go/platform/netstd/socket_options_other.go b/easytier-go/platform/netstd/socket_options_other.go index fe97683c..36679fd0 100644 --- a/easytier-go/platform/netstd/socket_options_other.go +++ b/easytier-go/platform/netstd/socket_options_other.go @@ -6,7 +6,7 @@ import ( "fmt" "runtime" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) func applyTCPSocketOptions( diff --git a/easytier-go/platform/netstd/socket_options_unix.go b/easytier-go/platform/netstd/socket_options_unix.go index edde12f2..30a4c64f 100644 --- a/easytier-go/platform/netstd/socket_options_unix.go +++ b/easytier-go/platform/netstd/socket_options_unix.go @@ -5,7 +5,7 @@ package netstd import ( "fmt" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" "golang.org/x/sys/unix" ) diff --git a/easytier-go/platform/netstd/socket_options_unix_test.go b/easytier-go/platform/netstd/socket_options_unix_test.go index fa04a800..700f4bb0 100644 --- a/easytier-go/platform/netstd/socket_options_unix_test.go +++ b/easytier-go/platform/netstd/socket_options_unix_test.go @@ -6,7 +6,7 @@ import ( "net" "testing" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" ) func TestSocketFactoryUsesNativeTCPReuseAddrDefault(t *testing.T) { diff --git a/easytier-go/platform/netstd/socket_options_windows.go b/easytier-go/platform/netstd/socket_options_windows.go index 68a886a6..1f22569a 100644 --- a/easytier-go/platform/netstd/socket_options_windows.go +++ b/easytier-go/platform/netstd/socket_options_windows.go @@ -5,7 +5,7 @@ package netstd import ( "fmt" - "github.com/EasyTier/EasyTier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform" "golang.org/x/sys/windows" ) diff --git a/easytier-go/proto/acl/acl.pb.go b/easytier-go/proto/acl/acl.pb.go index 4a3ef976..af9837b4 100644 --- a/easytier-go/proto/acl/acl.pb.go +++ b/easytier-go/proto/acl/acl.pb.go @@ -7,7 +7,7 @@ package acl import ( - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" + common "github.com/easytier/easytier/easytier-go/proto/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/proto/api/config/api_config.pb.go b/easytier-go/proto/api/config/api_config.pb.go index 8311c2f7..3491a84c 100644 --- a/easytier-go/proto/api/config/api_config.pb.go +++ b/easytier-go/proto/api/config/api_config.pb.go @@ -7,10 +7,10 @@ package config import ( - acl "github.com/EasyTier/EasyTier/easytier-go/proto/acl" - instance "github.com/EasyTier/EasyTier/easytier-go/proto/api/instance" - manage "github.com/EasyTier/EasyTier/easytier-go/proto/api/manage" - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" + acl "github.com/easytier/easytier/easytier-go/proto/acl" + instance "github.com/easytier/easytier/easytier-go/proto/api/instance" + manage "github.com/easytier/easytier/easytier-go/proto/api/manage" + common "github.com/easytier/easytier/easytier-go/proto/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/proto/api/instance/api_instance.pb.go b/easytier-go/proto/api/instance/api_instance.pb.go index 8431e3e7..3edb88e6 100644 --- a/easytier-go/proto/api/instance/api_instance.pb.go +++ b/easytier-go/proto/api/instance/api_instance.pb.go @@ -7,9 +7,9 @@ package instance import ( - acl "github.com/EasyTier/EasyTier/easytier-go/proto/acl" - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" - peer_rpc "github.com/EasyTier/EasyTier/easytier-go/proto/peer_rpc" + acl "github.com/easytier/easytier/easytier-go/proto/acl" + common "github.com/easytier/easytier/easytier-go/proto/common" + peer_rpc "github.com/easytier/easytier/easytier-go/proto/peer_rpc" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/proto/api/manage/api_manage.pb.go b/easytier-go/proto/api/manage/api_manage.pb.go index 44db9480..9e93c234 100644 --- a/easytier-go/proto/api/manage/api_manage.pb.go +++ b/easytier-go/proto/api/manage/api_manage.pb.go @@ -7,10 +7,10 @@ package manage import ( - acl "github.com/EasyTier/EasyTier/easytier-go/proto/acl" - instance "github.com/EasyTier/EasyTier/easytier-go/proto/api/instance" - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" - peer_rpc "github.com/EasyTier/EasyTier/easytier-go/proto/peer_rpc" + acl "github.com/easytier/easytier/easytier-go/proto/acl" + instance "github.com/easytier/easytier/easytier-go/proto/api/instance" + common "github.com/easytier/easytier/easytier-go/proto/common" + peer_rpc "github.com/easytier/easytier/easytier-go/proto/peer_rpc" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/proto/common/common.pb.go b/easytier-go/proto/common/common.pb.go index dd7622e3..327040bf 100644 --- a/easytier-go/proto/common/common.pb.go +++ b/easytier-go/proto/common/common.pb.go @@ -7,7 +7,7 @@ package common import ( - error1 "github.com/EasyTier/EasyTier/easytier-go/proto/error" + error1 "github.com/easytier/easytier/easytier-go/proto/error" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/proto/peer_rpc/peer_rpc.pb.go b/easytier-go/proto/peer_rpc/peer_rpc.pb.go index 5ec454ef..bd5fa9b1 100644 --- a/easytier-go/proto/peer_rpc/peer_rpc.pb.go +++ b/easytier-go/proto/peer_rpc/peer_rpc.pb.go @@ -7,7 +7,7 @@ package peer_rpc import ( - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" + common "github.com/easytier/easytier/easytier-go/proto/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" diff --git a/easytier-go/proto/web/web.pb.go b/easytier-go/proto/web/web.pb.go index 8977ef01..365c3ea1 100644 --- a/easytier-go/proto/web/web.pb.go +++ b/easytier-go/proto/web/web.pb.go @@ -7,7 +7,7 @@ package web import ( - common "github.com/EasyTier/EasyTier/easytier-go/proto/common" + common "github.com/easytier/easytier/easytier-go/proto/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/easytier-go/rpc.go b/easytier-go/rpc.go index c343826b..1f610917 100644 --- a/easytier-go/rpc.go +++ b/easytier-go/rpc.go @@ -1,6 +1,6 @@ package host -import internalhost "github.com/EasyTier/EasyTier/easytier-go/internal/host" +import internalhost "github.com/easytier/easytier/easytier-go/internal/host" // PeerInfo describes one peer visible to an EasyTier instance. type PeerInfo = internalhost.PeerInfo diff --git a/easytier-go/script/generate-proto.sh b/easytier-go/script/generate-proto.sh index 3019cd8e..21af3eb9 100755 --- a/easytier-go/script/generate-proto.sh +++ b/easytier-go/script/generate-proto.sh @@ -23,15 +23,15 @@ fi protoc \ -I "${proto_root}" \ --go_out="${repository_root}" \ - --go_opt=module=github.com/EasyTier/EasyTier/easytier-go \ - --go_opt=Mcommon.proto=github.com/EasyTier/EasyTier/easytier-go/proto/common \ - --go_opt=Merror.proto=github.com/EasyTier/EasyTier/easytier-go/proto/error \ - --go_opt=Macl.proto=github.com/EasyTier/EasyTier/easytier-go/proto/acl \ - --go_opt=Mpeer_rpc.proto=github.com/EasyTier/EasyTier/easytier-go/proto/peer_rpc \ - --go_opt=Mapi_instance.proto=github.com/EasyTier/EasyTier/easytier-go/proto/api/instance \ - --go_opt=Mapi_config.proto=github.com/EasyTier/EasyTier/easytier-go/proto/api/config \ - --go_opt=Mapi_manage.proto=github.com/EasyTier/EasyTier/easytier-go/proto/api/manage \ - --go_opt=Mweb.proto=github.com/EasyTier/EasyTier/easytier-go/proto/web \ + --go_opt=module=github.com/easytier/easytier/easytier-go \ + --go_opt=Mcommon.proto=github.com/easytier/easytier/easytier-go/proto/common \ + --go_opt=Merror.proto=github.com/easytier/easytier/easytier-go/proto/error \ + --go_opt=Macl.proto=github.com/easytier/easytier/easytier-go/proto/acl \ + --go_opt=Mpeer_rpc.proto=github.com/easytier/easytier/easytier-go/proto/peer_rpc \ + --go_opt=Mapi_instance.proto=github.com/easytier/easytier/easytier-go/proto/api/instance \ + --go_opt=Mapi_config.proto=github.com/easytier/easytier/easytier-go/proto/api/config \ + --go_opt=Mapi_manage.proto=github.com/easytier/easytier/easytier-go/proto/api/manage \ + --go_opt=Mweb.proto=github.com/easytier/easytier/easytier-go/proto/web \ "${proto_root}/common.proto" \ "${proto_root}/error.proto" \ "${proto_root}/acl.proto" \ diff --git a/easytier-go/tests/host_dataplane_test.go b/easytier-go/tests/host_dataplane_test.go index a687cc0d..b6027f12 100644 --- a/easytier-go/tests/host_dataplane_test.go +++ b/easytier-go/tests/host_dataplane_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" - "github.com/EasyTier/EasyTier/easytier-go/platform" + corehost "github.com/easytier/easytier/easytier-go" + "github.com/easytier/easytier/easytier-go/platform" ) func TestPublicDataPlaneTCPAndUDP(t *testing.T) { diff --git a/easytier-go/tests/host_public_test.go b/easytier-go/tests/host_public_test.go index e21ea88b..ae4529cd 100644 --- a/easytier-go/tests/host_public_test.go +++ b/easytier-go/tests/host_public_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" - "github.com/EasyTier/EasyTier/easytier-go/platform" - "github.com/EasyTier/EasyTier/easytier-go/platform/netstd" - hostproto "github.com/EasyTier/EasyTier/easytier-go/proto" + corehost "github.com/easytier/easytier/easytier-go" + "github.com/easytier/easytier/easytier-go/platform" + "github.com/easytier/easytier/easytier-go/platform/netstd" + hostproto "github.com/easytier/easytier/easytier-go/proto" ) func TestPublicLifecycleDoesNotExposeWazero(t *testing.T) { diff --git a/easytier-go/tests/host_rpc_test.go b/easytier-go/tests/host_rpc_test.go index 431477a9..35d55ac4 100644 --- a/easytier-go/tests/host_rpc_test.go +++ b/easytier-go/tests/host_rpc_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" + corehost "github.com/easytier/easytier/easytier-go" ) func TestPublicManagementRPCMethods(t *testing.T) { diff --git a/easytier-go/tests/web_client_e2e_test.go b/easytier-go/tests/web_client_e2e_test.go index 053672f3..c2c1cb1b 100644 --- a/easytier-go/tests/web_client_e2e_test.go +++ b/easytier-go/tests/web_client_e2e_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - corehost "github.com/EasyTier/EasyTier/easytier-go" + corehost "github.com/easytier/easytier/easytier-go" ) func TestWebClientEndToEnd(t *testing.T) { diff --git a/easytier-go/web_client.go b/easytier-go/web_client.go index e7e13ff5..464e1b5e 100644 --- a/easytier-go/web_client.go +++ b/easytier-go/web_client.go @@ -1,6 +1,6 @@ package host -import internalhost "github.com/EasyTier/EasyTier/easytier-go/internal/host" +import internalhost "github.com/easytier/easytier/easytier-go/internal/host" type WebClientOptions = internalhost.WebClientOptions