diff --git a/CLAUDE.md b/CLAUDE.md index 6faab1c..7856110 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -58,7 +58,7 @@ deploy/ Docker, systemd, install scripts, examples ## Shared Library -MCNS uses `mcdsl` (git.wntrmute.dev/kyle/mcdsl) for shared platform packages: +MCNS uses `mcdsl` (git.wntrmute.dev/mc/mcdsl) for shared platform packages: auth, db, config, httpserver, grpcserver. These provide MCIAS authentication, SQLite database helpers, TOML config loading, and TLS-configured HTTP/gRPC server scaffolding. diff --git a/Makefile b/Makefile index d3c064e..00b43e4 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ lint: golangci-lint run ./... proto: - protoc --go_out=. --go_opt=module=git.wntrmute.dev/kyle/mcns \ - --go-grpc_out=. --go-grpc_opt=module=git.wntrmute.dev/kyle/mcns \ + protoc --go_out=. --go_opt=module=git.wntrmute.dev/mc/mcns \ + --go-grpc_out=. --go-grpc_opt=module=git.wntrmute.dev/mc/mcns \ proto/mcns/v1/*.proto proto-lint: diff --git a/cmd/mcns/main.go b/cmd/mcns/main.go index 0bca900..14d5125 100644 --- a/cmd/mcns/main.go +++ b/cmd/mcns/main.go @@ -16,14 +16,14 @@ import ( "github.com/spf13/cobra" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" - mcdsldb "git.wntrmute.dev/kyle/mcdsl/db" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" + mcdsldb "git.wntrmute.dev/mc/mcdsl/db" - "git.wntrmute.dev/kyle/mcns/internal/config" - "git.wntrmute.dev/kyle/mcns/internal/db" - mcnsdns "git.wntrmute.dev/kyle/mcns/internal/dns" - "git.wntrmute.dev/kyle/mcns/internal/grpcserver" - "git.wntrmute.dev/kyle/mcns/internal/server" + "git.wntrmute.dev/mc/mcns/internal/config" + "git.wntrmute.dev/mc/mcns/internal/db" + mcnsdns "git.wntrmute.dev/mc/mcns/internal/dns" + "git.wntrmute.dev/mc/mcns/internal/grpcserver" + "git.wntrmute.dev/mc/mcns/internal/server" ) var version = "dev" diff --git a/gen/mcns/v1/admin.pb.go b/gen/mcns/v1/admin.pb.go index f69565f..2136619 100644 --- a/gen/mcns/v1/admin.pb.go +++ b/gen/mcns/v1/admin.pb.go @@ -110,7 +110,7 @@ const file_proto_mcns_v1_admin_proto_rawDesc = "" + "\x0eHealthResponse\x12\x16\n" + "\x06status\x18\x01 \x01(\tR\x06status2I\n" + "\fAdminService\x129\n" + - "\x06Health\x12\x16.mcns.v1.HealthRequest\x1a\x17.mcns.v1.HealthResponseB/Z-git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1b\x06proto3" + "\x06Health\x12\x16.mcns.v1.HealthRequest\x1a\x17.mcns.v1.HealthResponseB/Z-git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1b\x06proto3" var ( file_proto_mcns_v1_admin_proto_rawDescOnce sync.Once diff --git a/gen/mcns/v1/auth.pb.go b/gen/mcns/v1/auth.pb.go index cb81910..e780d5a 100644 --- a/gen/mcns/v1/auth.pb.go +++ b/gen/mcns/v1/auth.pb.go @@ -222,7 +222,7 @@ const file_proto_mcns_v1_auth_proto_rawDesc = "" + "\x0eLogoutResponse2\x80\x01\n" + "\vAuthService\x126\n" + "\x05Login\x12\x15.mcns.v1.LoginRequest\x1a\x16.mcns.v1.LoginResponse\x129\n" + - "\x06Logout\x12\x16.mcns.v1.LogoutRequest\x1a\x17.mcns.v1.LogoutResponseB/Z-git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1b\x06proto3" + "\x06Logout\x12\x16.mcns.v1.LogoutRequest\x1a\x17.mcns.v1.LogoutResponseB/Z-git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1b\x06proto3" var ( file_proto_mcns_v1_auth_proto_rawDescOnce sync.Once diff --git a/gen/mcns/v1/record.pb.go b/gen/mcns/v1/record.pb.go index de3b179..57b15d9 100644 --- a/gen/mcns/v1/record.pb.go +++ b/gen/mcns/v1/record.pb.go @@ -551,7 +551,7 @@ const file_proto_mcns_v1_record_proto_rawDesc = "" + "\fCreateRecord\x12\x1c.mcns.v1.CreateRecordRequest\x1a\x0f.mcns.v1.Record\x127\n" + "\tGetRecord\x12\x19.mcns.v1.GetRecordRequest\x1a\x0f.mcns.v1.Record\x12=\n" + "\fUpdateRecord\x12\x1c.mcns.v1.UpdateRecordRequest\x1a\x0f.mcns.v1.Record\x12K\n" + - "\fDeleteRecord\x12\x1c.mcns.v1.DeleteRecordRequest\x1a\x1d.mcns.v1.DeleteRecordResponseB/Z-git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1b\x06proto3" + "\fDeleteRecord\x12\x1c.mcns.v1.DeleteRecordRequest\x1a\x1d.mcns.v1.DeleteRecordResponseB/Z-git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1b\x06proto3" var ( file_proto_mcns_v1_record_proto_rawDescOnce sync.Once diff --git a/gen/mcns/v1/zone.pb.go b/gen/mcns/v1/zone.pb.go index f402555..915b23c 100644 --- a/gen/mcns/v1/zone.pb.go +++ b/gen/mcns/v1/zone.pb.go @@ -595,7 +595,7 @@ const file_proto_mcns_v1_zone_proto_rawDesc = "" + "\n" + "UpdateZone\x12\x1a.mcns.v1.UpdateZoneRequest\x1a\r.mcns.v1.Zone\x12E\n" + "\n" + - "DeleteZone\x12\x1a.mcns.v1.DeleteZoneRequest\x1a\x1b.mcns.v1.DeleteZoneResponseB/Z-git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1b\x06proto3" + "DeleteZone\x12\x1a.mcns.v1.DeleteZoneRequest\x1a\x1b.mcns.v1.DeleteZoneResponseB/Z-git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1b\x06proto3" var ( file_proto_mcns_v1_zone_proto_rawDescOnce sync.Once diff --git a/go.mod b/go.mod index eb7009f..485ab12 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module git.wntrmute.dev/kyle/mcns +module git.wntrmute.dev/mc/mcns go 1.25.7 require ( - git.wntrmute.dev/kyle/mcdsl v1.1.0 + git.wntrmute.dev/mc/mcdsl v1.2.0 github.com/go-chi/chi/v5 v5.2.5 github.com/miekg/dns v1.1.66 github.com/spf13/cobra v1.10.2 diff --git a/go.sum b/go.sum index 6bc9843..2e5dee8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.wntrmute.dev/kyle/mcdsl v1.1.0 h1:NXfEXRtaCRPNjCbqqgU7L2SgDAZkQn9kd40xJDgxnns= -git.wntrmute.dev/kyle/mcdsl v1.1.0/go.mod h1:wo0tGfUAxci3XnOe4/rFmR0RjUElKdYUazc+Np986sg= +git.wntrmute.dev/mc/mcdsl v1.2.0 h1:41hep7/PNZJfN0SN/nM+rQpyF1GSZcvNNjyVG81DI7U= +git.wntrmute.dev/mc/mcdsl v1.2.0/go.mod h1:lXYrAt74ZUix6rx9oVN8d2zH1YJoyp4uxPVKQ+SSxuM= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= diff --git a/internal/config/config.go b/internal/config/config.go index 90013c0..a70e362 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,7 +3,7 @@ package config import ( "fmt" - mcdslconfig "git.wntrmute.dev/kyle/mcdsl/config" + mcdslconfig "git.wntrmute.dev/mc/mcdsl/config" ) // Config is the top-level MCNS configuration. diff --git a/internal/db/db.go b/internal/db/db.go index d6a791b..389599d 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - mcdsldb "git.wntrmute.dev/kyle/mcdsl/db" + mcdsldb "git.wntrmute.dev/mc/mcdsl/db" ) // DB wraps a SQLite database connection. diff --git a/internal/db/migrate.go b/internal/db/migrate.go index f5d5542..8b40d2c 100644 --- a/internal/db/migrate.go +++ b/internal/db/migrate.go @@ -1,7 +1,7 @@ package db import ( - mcdsldb "git.wntrmute.dev/kyle/mcdsl/db" + mcdsldb "git.wntrmute.dev/mc/mcdsl/db" ) // Migrations is the ordered list of MCNS schema migrations. diff --git a/internal/dns/server.go b/internal/dns/server.go index 06924e1..18f20cb 100644 --- a/internal/dns/server.go +++ b/internal/dns/server.go @@ -10,7 +10,7 @@ import ( "github.com/miekg/dns" - "git.wntrmute.dev/kyle/mcns/internal/db" + "git.wntrmute.dev/mc/mcns/internal/db" ) // Server is the MCNS DNS server. It listens on both UDP and TCP. diff --git a/internal/dns/server_test.go b/internal/dns/server_test.go index b8076ba..ec983c1 100644 --- a/internal/dns/server_test.go +++ b/internal/dns/server_test.go @@ -6,7 +6,7 @@ import ( "github.com/miekg/dns" - "git.wntrmute.dev/kyle/mcns/internal/db" + "git.wntrmute.dev/mc/mcns/internal/db" "log/slog" ) diff --git a/internal/grpcserver/admin.go b/internal/grpcserver/admin.go index e8f40a9..016eebf 100644 --- a/internal/grpcserver/admin.go +++ b/internal/grpcserver/admin.go @@ -3,8 +3,8 @@ package grpcserver import ( "context" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" - "git.wntrmute.dev/kyle/mcns/internal/db" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" + "git.wntrmute.dev/mc/mcns/internal/db" ) type adminService struct { diff --git a/internal/grpcserver/auth_handler.go b/internal/grpcserver/auth_handler.go index b1f858a..e5b9696 100644 --- a/internal/grpcserver/auth_handler.go +++ b/internal/grpcserver/auth_handler.go @@ -4,11 +4,11 @@ import ( "context" "errors" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" ) type authService struct { diff --git a/internal/grpcserver/handlers_test.go b/internal/grpcserver/handlers_test.go index 9104006..c367086 100644 --- a/internal/grpcserver/handlers_test.go +++ b/internal/grpcserver/handlers_test.go @@ -16,10 +16,10 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" - "git.wntrmute.dev/kyle/mcns/internal/db" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" + "git.wntrmute.dev/mc/mcns/internal/db" ) // mockMCIAS starts a fake MCIAS HTTP server for token validation. diff --git a/internal/grpcserver/interceptors.go b/internal/grpcserver/interceptors.go index 38dd65c..86172d2 100644 --- a/internal/grpcserver/interceptors.go +++ b/internal/grpcserver/interceptors.go @@ -1,7 +1,7 @@ package grpcserver import ( - mcdslgrpc "git.wntrmute.dev/kyle/mcdsl/grpcserver" + mcdslgrpc "git.wntrmute.dev/mc/mcdsl/grpcserver" ) // methodMap builds the mcdsl grpcserver.MethodMap for MCNS. diff --git a/internal/grpcserver/records.go b/internal/grpcserver/records.go index e99e518..d903299 100644 --- a/internal/grpcserver/records.go +++ b/internal/grpcserver/records.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" - "git.wntrmute.dev/kyle/mcns/internal/db" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" + "git.wntrmute.dev/mc/mcns/internal/db" ) type recordService struct { diff --git a/internal/grpcserver/server.go b/internal/grpcserver/server.go index d00eaee..110a733 100644 --- a/internal/grpcserver/server.go +++ b/internal/grpcserver/server.go @@ -4,11 +4,11 @@ import ( "log/slog" "net" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" - mcdslgrpc "git.wntrmute.dev/kyle/mcdsl/grpcserver" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" + mcdslgrpc "git.wntrmute.dev/mc/mcdsl/grpcserver" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" - "git.wntrmute.dev/kyle/mcns/internal/db" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" + "git.wntrmute.dev/mc/mcns/internal/db" ) // Deps holds the dependencies injected into the gRPC server. diff --git a/internal/grpcserver/zones.go b/internal/grpcserver/zones.go index b7c5426..8c3349c 100644 --- a/internal/grpcserver/zones.go +++ b/internal/grpcserver/zones.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - pb "git.wntrmute.dev/kyle/mcns/gen/mcns/v1" - "git.wntrmute.dev/kyle/mcns/internal/db" + pb "git.wntrmute.dev/mc/mcns/gen/mcns/v1" + "git.wntrmute.dev/mc/mcns/internal/db" ) type zoneService struct { diff --git a/internal/server/auth.go b/internal/server/auth.go index b1aacab..8ede2d9 100644 --- a/internal/server/auth.go +++ b/internal/server/auth.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" ) type loginRequest struct { diff --git a/internal/server/handlers_test.go b/internal/server/handlers_test.go index 52c7006..ed649a4 100644 --- a/internal/server/handlers_test.go +++ b/internal/server/handlers_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-chi/chi/v5" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" - "git.wntrmute.dev/kyle/mcns/internal/db" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" + "git.wntrmute.dev/mc/mcns/internal/db" ) // openTestDB creates a temporary SQLite database with all migrations applied. diff --git a/internal/server/middleware.go b/internal/server/middleware.go index 890d31f..b31a920 100644 --- a/internal/server/middleware.go +++ b/internal/server/middleware.go @@ -7,7 +7,7 @@ import ( "strings" "time" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" ) type contextKey string diff --git a/internal/server/records.go b/internal/server/records.go index d2967e6..7a4b39d 100644 --- a/internal/server/records.go +++ b/internal/server/records.go @@ -8,7 +8,7 @@ import ( "github.com/go-chi/chi/v5" - "git.wntrmute.dev/kyle/mcns/internal/db" + "git.wntrmute.dev/mc/mcns/internal/db" ) type createRecordRequest struct { diff --git a/internal/server/routes.go b/internal/server/routes.go index e322624..d8484d0 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -7,10 +7,10 @@ import ( "github.com/go-chi/chi/v5" - mcdslauth "git.wntrmute.dev/kyle/mcdsl/auth" - "git.wntrmute.dev/kyle/mcdsl/health" + mcdslauth "git.wntrmute.dev/mc/mcdsl/auth" + "git.wntrmute.dev/mc/mcdsl/health" - "git.wntrmute.dev/kyle/mcns/internal/db" + "git.wntrmute.dev/mc/mcns/internal/db" ) // Deps holds dependencies injected into the REST handlers. diff --git a/internal/server/zones.go b/internal/server/zones.go index feac849..0f157d5 100644 --- a/internal/server/zones.go +++ b/internal/server/zones.go @@ -7,7 +7,7 @@ import ( "github.com/go-chi/chi/v5" - "git.wntrmute.dev/kyle/mcns/internal/db" + "git.wntrmute.dev/mc/mcns/internal/db" ) type createZoneRequest struct { diff --git a/proto/mcns/v1/admin.proto b/proto/mcns/v1/admin.proto index f1a4e19..bfe0200 100644 --- a/proto/mcns/v1/admin.proto +++ b/proto/mcns/v1/admin.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package mcns.v1; -option go_package = "git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1"; +option go_package = "git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1"; // AdminService exposes server health and administrative operations. service AdminService { diff --git a/proto/mcns/v1/auth.proto b/proto/mcns/v1/auth.proto index 46cdcfc..e0e8037 100644 --- a/proto/mcns/v1/auth.proto +++ b/proto/mcns/v1/auth.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package mcns.v1; -option go_package = "git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1"; +option go_package = "git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1"; // AuthService handles authentication by delegating to MCIAS. service AuthService { diff --git a/proto/mcns/v1/record.proto b/proto/mcns/v1/record.proto index 2197f46..5fda474 100644 --- a/proto/mcns/v1/record.proto +++ b/proto/mcns/v1/record.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package mcns.v1; -option go_package = "git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1"; +option go_package = "git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1"; import "google/protobuf/timestamp.proto"; diff --git a/proto/mcns/v1/zone.proto b/proto/mcns/v1/zone.proto index 65b63d4..8bd1fd7 100644 --- a/proto/mcns/v1/zone.proto +++ b/proto/mcns/v1/zone.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package mcns.v1; -option go_package = "git.wntrmute.dev/kyle/mcns/gen/mcns/v1;mcnsv1"; +option go_package = "git.wntrmute.dev/mc/mcns/gen/mcns/v1;mcnsv1"; import "google/protobuf/timestamp.proto";