From eb2b596f77017e248c32528bc3b5dc4ea3137adc Mon Sep 17 00:00:00 2001 From: Dustin Stiles Date: Tue, 25 Mar 2025 13:14:27 -0400 Subject: [PATCH] feat(project): switch go modules --- README.md | 6 ++-- cmd/dsfx/main.go | 6 ++-- cmd/dsfxctl/main.go | 6 ++-- docs/internals/README.md | 2 +- docs/operating/deploying.md | 2 +- docs/operating/installing.md | 31 +-------------------- go.mod | 2 +- internal/client/client.go | 12 ++++---- internal/lib/crypto/encryption/aead_test.go | 2 +- internal/lib/disk/default_test.go | 2 +- internal/lib/frame/frame_test.go | 2 +- internal/lib/handshake/bench.txt | 4 +-- internal/lib/handshake/handshake.go | 12 ++++---- internal/lib/handshake/handshake_test.go | 4 +-- internal/lib/network/addr.go | 2 +- internal/lib/network/conn.go | 4 +-- internal/lib/network/listener.go | 4 +-- internal/lib/network/network.go | 4 +-- internal/lib/storage/scoped/scoped.go | 2 +- internal/lib/storage/scoped/scoped_test.go | 4 +-- internal/lib/system/default.go | 2 +- internal/lib/system/system.go | 2 +- internal/peer/peer.go | 12 ++++---- internal/sim/disk.go | 2 +- internal/sim/system.go | 4 +-- internal/tool/genkey/main.go | 2 +- 26 files changed, 54 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index a32a324..45d12fb 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ ## Documentation -- [dsfx standard docs](https://koti.casa/numenor-labs/dsfx/src/branch/main/docs/README.md) +- [dsfx standard docs](./docs/README.md) ## Start ```bash # Run a server -go run koti.casa/numenor-labs/dsfx/cmd/dsfx@main +go run numenor-labs.us/dsfx/cmd/dsfx@main # serving: dsfx://0.0.0.0:8000# # Get the client -go run koti.casa/numenor-labs/dsfx/cmd/dsfxctl@main test dsfx://0.0.0.0:8000# +go run numenor-labs.us/dsfx/cmd/dsfxctl@main test dsfx://0.0.0.0:8000# ``` diff --git a/cmd/dsfx/main.go b/cmd/dsfx/main.go index 02fd6a0..7411162 100644 --- a/cmd/dsfx/main.go +++ b/cmd/dsfx/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/system" - "koti.casa/numenor-labs/dsfx/internal/peer" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/internal/peer" ) func main() { diff --git a/cmd/dsfxctl/main.go b/cmd/dsfxctl/main.go index e3daadf..1976552 100644 --- a/cmd/dsfxctl/main.go +++ b/cmd/dsfxctl/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "koti.casa/numenor-labs/dsfx/internal/client" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/internal/client" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/system" ) func main() { diff --git a/docs/internals/README.md b/docs/internals/README.md index cba78f3..c672cfd 100644 --- a/docs/internals/README.md +++ b/docs/internals/README.md @@ -1,7 +1,7 @@ # DSFX Internals Welcome, friend! You are viewing the DSFX internal documentation. If you want to _use_ -DSFX, you don't need to read this and could head straight to our user-level docs [here](https://koti.casa/numenor-labs/dsfx/src/branch/main/docs/README.md). +DSFX, you don't need to read this and could head straight to our user-level docs [here](../README.md). If you want to learn how DSFX works inside, here's what we got: diff --git a/docs/operating/deploying.md b/docs/operating/deploying.md index d53eb2f..ba8bc56 100644 --- a/docs/operating/deploying.md +++ b/docs/operating/deploying.md @@ -8,7 +8,7 @@ server on your deployment machine. If you opted to _not_ install dsfx locally, then you can run it directly with the go toolchain. ```bash -go run koti.casa/numenor-labs/dsfx/cmd/dsfx@main +go run numenor-labs.us/dsfx/cmd/dsfx@main ``` Otherwise, you can run the server with the `dsfx` command. For those who built diff --git a/docs/operating/installing.md b/docs/operating/installing.md index 0d938cd..0158333 100644 --- a/docs/operating/installing.md +++ b/docs/operating/installing.md @@ -38,42 +38,13 @@ are a few commands for various operating systems (not comprehensive): If the above commands don't work for you, please refer to the official documentation for your operating system. -### Git Setup - -Currently we are hosted on **gitea cloud**, which hides everything from the -public internet by default. This means that the machine you are deploying to -will need to be able to access the gitea cloud instance. One way to do this is -to use the `.netrc` file in conjunction with a personal access token. Once you -have a personal access token, you can create a `.netrc` file in your home -directory with the following contents: - -```plaintext -machine koti.casa login password -``` - -Finally, you'll need to set the `GOPRIVATE` environment variable to allow go to fetch -private repositories. You can do this by running the following command: - -```bash -export GOPRIVATE=koti.casa -``` - -If you want to persist this setting across sessions, you can add the above line to your -`~/.bashrc` or `~/.bash_profile`. - -### Stopping Point - -At this point, you should have the go toolchain installed and configured. If you -only want to run the server, and you don't care to actually install it, you can -you can skip directly the [deploying docs](./deploying.md). - ### Installation Now that you have the go toolchain set up with access to our repository, you can simply install the project by using the `go install` command. ```bash -go install koti.casa/numenorlabs/dsfx/cmd/dsfx@main +go install numenor-labs.us/dsfx/cmd/dsfx@main ``` Assuming that you have the `GOPATH` environment variable set up correctly, you will now be able to diff --git a/go.mod b/go.mod index 1f140e2..300068b 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module koti.casa/numenor-labs/dsfx +module numenor-labs.us/dsfx go 1.24.1 diff --git a/internal/client/client.go b/internal/client/client.go index fea59f3..e7d3b47 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -13,12 +13,12 @@ import ( "net" "os" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/logging" - "koti.casa/numenor-labs/dsfx/internal/lib/network" - "koti.casa/numenor-labs/dsfx/internal/lib/storage/scoped" - "koti.casa/numenor-labs/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/internal/lib/network" + "numenor-labs.us/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/internal/lib/system" ) const ( diff --git a/internal/lib/crypto/encryption/aead_test.go b/internal/lib/crypto/encryption/aead_test.go index a48aaa3..b134a96 100644 --- a/internal/lib/crypto/encryption/aead_test.go +++ b/internal/lib/crypto/encryption/aead_test.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "testing" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/internal/lib/crypto/encryption" ) func TestEncryptDecrypt(t *testing.T) { diff --git a/internal/lib/disk/default_test.go b/internal/lib/disk/default_test.go index 0e098db..c3f61a4 100644 --- a/internal/lib/disk/default_test.go +++ b/internal/lib/disk/default_test.go @@ -3,7 +3,7 @@ package disk_test import ( "testing" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/disk" ) func TestDefaultDisk(t *testing.T) { diff --git a/internal/lib/frame/frame_test.go b/internal/lib/frame/frame_test.go index b95a562..a091dab 100644 --- a/internal/lib/frame/frame_test.go +++ b/internal/lib/frame/frame_test.go @@ -5,7 +5,7 @@ import ( "bytes" "testing" - "koti.casa/numenor-labs/dsfx/internal/lib/frame" + "numenor-labs.us/dsfx/internal/lib/frame" ) func TestLenPrefixedWriteTo(t *testing.T) { diff --git a/internal/lib/handshake/bench.txt b/internal/lib/handshake/bench.txt index d651bb1..717cb40 100644 --- a/internal/lib/handshake/bench.txt +++ b/internal/lib/handshake/bench.txt @@ -1,7 +1,7 @@ goos: linux goarch: amd64 -pkg: koti.casa/numenor-labs/dsfx/internal/lib/handshake +pkg: numenor-labs.us/dsfx/internal/lib/handshake cpu: Intel(R) Core(TM) Ultra 9 185H BenchmarkHandshake 4508 285270 ns/op 12976 B/op 131 allocs/op PASS -ok koti.casa/numenor-labs/dsfx/internal/lib/handshake 1.291s +ok numenor-labs.us/dsfx/internal/lib/handshake 1.291s diff --git a/internal/lib/handshake/handshake.go b/internal/lib/handshake/handshake.go index 1e6a0a7..e54311e 100644 --- a/internal/lib/handshake/handshake.go +++ b/internal/lib/handshake/handshake.go @@ -10,12 +10,12 @@ import ( "io" "log/slog" - "koti.casa/numenor-labs/dsfx/internal/lib/assert" - "koti.casa/numenor-labs/dsfx/internal/lib/buffer" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/encryption" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/keyexchange" - "koti.casa/numenor-labs/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/internal/lib/assert" + "numenor-labs.us/dsfx/internal/lib/buffer" + "numenor-labs.us/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/crypto/keyexchange" + "numenor-labs.us/dsfx/internal/lib/logging" ) const ( diff --git a/internal/lib/handshake/handshake_test.go b/internal/lib/handshake/handshake_test.go index 13d8586..80c3650 100644 --- a/internal/lib/handshake/handshake_test.go +++ b/internal/lib/handshake/handshake_test.go @@ -10,8 +10,8 @@ import ( "sync" "testing" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" - "koti.casa/numenor-labs/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/handshake" ) func TestHandshake(t *testing.T) { diff --git a/internal/lib/network/addr.go b/internal/lib/network/addr.go index 61989e3..118ec2b 100644 --- a/internal/lib/network/addr.go +++ b/internal/lib/network/addr.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" ) var ( diff --git a/internal/lib/network/conn.go b/internal/lib/network/conn.go index 9622738..45f445d 100644 --- a/internal/lib/network/conn.go +++ b/internal/lib/network/conn.go @@ -5,8 +5,8 @@ import ( "net" "time" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/encryption" - "koti.casa/numenor-labs/dsfx/internal/lib/frame" + "numenor-labs.us/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/internal/lib/frame" ) // Conn is a wrapper around net.TCPConn that encrypts and decrypts data as it is diff --git a/internal/lib/network/listener.go b/internal/lib/network/listener.go index 9a26f8b..6bbec6e 100644 --- a/internal/lib/network/listener.go +++ b/internal/lib/network/listener.go @@ -6,8 +6,8 @@ import ( "log/slog" "net" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" - "koti.casa/numenor-labs/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/handshake" ) // Listener ... diff --git a/internal/lib/network/network.go b/internal/lib/network/network.go index 1ad9f1a..265e293 100644 --- a/internal/lib/network/network.go +++ b/internal/lib/network/network.go @@ -5,8 +5,8 @@ import ( "crypto/ed25519" "net" - "koti.casa/numenor-labs/dsfx/internal/lib/handshake" - "koti.casa/numenor-labs/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/internal/lib/logging" ) // Dial ... diff --git a/internal/lib/storage/scoped/scoped.go b/internal/lib/storage/scoped/scoped.go index faa2d3f..dffa415 100644 --- a/internal/lib/storage/scoped/scoped.go +++ b/internal/lib/storage/scoped/scoped.go @@ -4,7 +4,7 @@ import ( "io/fs" "path/filepath" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/disk" ) // StorageScope is an interface that extends the disk.Disk interface by ensuring diff --git a/internal/lib/storage/scoped/scoped_test.go b/internal/lib/storage/scoped/scoped_test.go index 6bc573e..1ba8013 100644 --- a/internal/lib/storage/scoped/scoped_test.go +++ b/internal/lib/storage/scoped/scoped_test.go @@ -4,8 +4,8 @@ import ( "io/fs" "testing" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/storage/scoped" ) func TestScopedStorage_Scope(t *testing.T) { diff --git a/internal/lib/system/default.go b/internal/lib/system/default.go index fd0387b..83326b1 100644 --- a/internal/lib/system/default.go +++ b/internal/lib/system/default.go @@ -3,7 +3,7 @@ package system import ( "os" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/disk" ) // Default returns a default implementation of the System interface. diff --git a/internal/lib/system/system.go b/internal/lib/system/system.go index ea26225..5687803 100644 --- a/internal/lib/system/system.go +++ b/internal/lib/system/system.go @@ -1,7 +1,7 @@ package system import ( - "koti.casa/numenor-labs/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/disk" ) type System interface { diff --git a/internal/peer/peer.go b/internal/peer/peer.go index da3f2a8..9d86d10 100644 --- a/internal/peer/peer.go +++ b/internal/peer/peer.go @@ -13,12 +13,12 @@ import ( "os" "strings" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/logging" - "koti.casa/numenor-labs/dsfx/internal/lib/network" - "koti.casa/numenor-labs/dsfx/internal/lib/storage/scoped" - "koti.casa/numenor-labs/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/internal/lib/network" + "numenor-labs.us/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/internal/lib/system" ) const ( diff --git a/internal/sim/disk.go b/internal/sim/disk.go index 2eca2cc..9afa157 100644 --- a/internal/sim/disk.go +++ b/internal/sim/disk.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/disk" ) // Tolerance defines simulation tolerance parameters. diff --git a/internal/sim/system.go b/internal/sim/system.go index f4e1a91..6184c56 100644 --- a/internal/sim/system.go +++ b/internal/sim/system.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "koti.casa/numenor-labs/dsfx/internal/lib/disk" - "koti.casa/numenor-labs/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/internal/lib/system" ) // SimSystem is a simulated implementation of system.System. diff --git a/internal/tool/genkey/main.go b/internal/tool/genkey/main.go index c61c0be..377848e 100644 --- a/internal/tool/genkey/main.go +++ b/internal/tool/genkey/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/internal/lib/crypto/identity" ) func main() {