From 211adc4a772ffcdb88bed7a1bcfb2a3e77dd76ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sat, 10 Sep 2022 04:46:10 +0200 Subject: [PATCH] Move to jochum.dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Jochum --- LICENSE.spdx | 2 +- README.md | 4 ++-- cmd/microrouterd/main.go | 8 ++++---- docker/router/Dockerfile | 2 +- go.mod | 2 +- handler.go | 6 +++--- internal/config/config.go | 2 +- internal/config/load.go | 2 +- internal/handler/handler.go | 8 ++++---- internal/proto/routerclientpb/routerclientpb.proto | 2 +- internal/proto/routerserverpb/routerserverpb.proto | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LICENSE.spdx b/LICENSE.spdx index 291c05c..05a883f 100644 --- a/LICENSE.spdx +++ b/LICENSE.spdx @@ -1,6 +1,6 @@ SPDXVersion: SPDX-2.1 DataLicense: CC0-1.0 Creator: René Jochum (rene@jochum.dev) -PackageName: git.jochum.dev/jo-micro/router +PackageName: jochum.dev/jo-micro/router PackageOriginator: René Jochum PackageLicenseDeclared: Apache-2.0 OR GPL-2.0-or-later \ No newline at end of file diff --git a/README.md b/README.md index f07d22b..5c98c9b 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ It looks for services that host "proto/routerclientpb/routerclientpb.RouterClien ## Examples -Have a look at [internalService](https://git.jochum.dev/jo-micro/router/blob/master/cmd/microrouterd/main.go#L35) or the author's FOSS project [microlobby](https://github.com/pcdummy/microlobby). +Have a look at [internalService](https://jochum.dev/jo-micro/router/blob/master/cmd/microrouterd/main.go#L35) or the author's FOSS project [microlobby](https://github.com/pcdummy/microlobby). Here's some code from the microlobby project ```go import ( - "git.jochum.dev/jo-micro/router" + "jochum.dev/jo-micro/router" "github.com/urfave/cli/v2" "go-micro.dev/v4" "wz2100.net/microlobby/shared/proto/authservicepb/v1" diff --git a/cmd/microrouterd/main.go b/cmd/microrouterd/main.go index ad861e2..991065e 100644 --- a/cmd/microrouterd/main.go +++ b/cmd/microrouterd/main.go @@ -5,13 +5,13 @@ import ( "go-micro.dev/v4" "go-micro.dev/v4/logger" - "git.jochum.dev/jo-micro/router" "github.com/gin-gonic/gin" httpServer "github.com/go-micro/plugins/v4/server/http" + "jochum.dev/jo-micro/router" - "git.jochum.dev/jo-micro/router/internal/config" - "git.jochum.dev/jo-micro/router/internal/handler" - "git.jochum.dev/jo-micro/router/internal/proto/routerserverpb" + "jochum.dev/jo-micro/router/internal/config" + "jochum.dev/jo-micro/router/internal/handler" + "jochum.dev/jo-micro/router/internal/proto/routerserverpb" ) func internalService(engine *gin.Engine) { diff --git a/docker/router/Dockerfile b/docker/router/Dockerfile index a608177..0ab6c89 100644 --- a/docker/router/Dockerfile +++ b/docker/router/Dockerfile @@ -13,7 +13,7 @@ ENV GOPATH="/go" ARG CACHEBUST=1 ARG VERSION -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix cgo -ldflags="-w -s -X 'git.jochum.dev/jo-micro/router/internal/config.Version=$VERSION'" -o /usr/local/bin/microrouterd git.jochum.dev/jo-micro/router/cmd/microrouterd +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix cgo -ldflags="-w -s -X 'jochum.dev/jo-micro/router/internal/config.Version=$VERSION'" -o /usr/local/bin/microrouterd jochum.dev/jo-micro/router/cmd/microrouterd # STEP 2 build a small image # start from busybox diff --git a/go.mod b/go.mod index e7dc676..cd59ea4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.jochum.dev/jo-micro/router +module jochum.dev/jo-micro/router go 1.19 diff --git a/handler.go b/handler.go index 03a133f..be6e28d 100644 --- a/handler.go +++ b/handler.go @@ -3,13 +3,13 @@ package router import ( "context" - "git.jochum.dev/jo-micro/router/internal/proto/routerclientpb" - "git.jochum.dev/jo-micro/router/internal/util" "go-micro.dev/v4/server" "google.golang.org/protobuf/types/known/emptypb" + "jochum.dev/jo-micro/router/internal/proto/routerclientpb" + "jochum.dev/jo-micro/router/internal/util" ) -// Handler is the handler for git.jochum.dev/jo-micro/router/proto/routerpb.RrouterService +// Handler is the handler for jochum.dev/jo-micro/router/proto/routerpb.RrouterService type Handler struct { routerURI string routes []*routerclientpb.RoutesReply_Route diff --git a/internal/config/config.go b/internal/config/config.go index 97df851..e4d5a38 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -6,7 +6,7 @@ var ( const ( Name = "go.micro.router" - PkgPath = "git.jochum.dev/jo-micro/router" + PkgPath = "jochum.dev/jo-micro/router" ) const ( diff --git a/internal/config/load.go b/internal/config/load.go index 661316b..969bde7 100644 --- a/internal/config/load.go +++ b/internal/config/load.go @@ -4,7 +4,6 @@ import ( "os" "strings" - "git.jochum.dev/jo-micro/router/internal/util" "github.com/go-micro/plugins/v4/config/encoder/toml" "github.com/go-micro/plugins/v4/config/encoder/yaml" "github.com/pkg/errors" @@ -14,6 +13,7 @@ import ( "go-micro.dev/v4/config/source/env" "go-micro.dev/v4/config/source/file" "go-micro.dev/v4/logger" + "jochum.dev/jo-micro/router/internal/util" ) // internal instance of Config diff --git a/internal/handler/handler.go b/internal/handler/handler.go index 994ecca..24c9de3 100644 --- a/internal/handler/handler.go +++ b/internal/handler/handler.go @@ -9,16 +9,16 @@ import ( "net/http" "time" - "git.jochum.dev/jo-micro/router/internal/config" - "git.jochum.dev/jo-micro/router/internal/proto/routerclientpb" - "git.jochum.dev/jo-micro/router/internal/proto/routerserverpb" - "git.jochum.dev/jo-micro/router/internal/util" "github.com/gin-gonic/gin" "go-micro.dev/v4" "go-micro.dev/v4/client" "go-micro.dev/v4/errors" "go-micro.dev/v4/logger" "google.golang.org/protobuf/types/known/emptypb" + "jochum.dev/jo-micro/router/internal/config" + "jochum.dev/jo-micro/router/internal/proto/routerclientpb" + "jochum.dev/jo-micro/router/internal/proto/routerserverpb" + "jochum.dev/jo-micro/router/internal/util" ) type JSONRoute struct { diff --git a/internal/proto/routerclientpb/routerclientpb.proto b/internal/proto/routerclientpb/routerclientpb.proto index 3e4a15d..2ec6e50 100644 --- a/internal/proto/routerclientpb/routerclientpb.proto +++ b/internal/proto/routerclientpb/routerclientpb.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package routerclientpb; -option go_package = "git.jochum.dev/jo-micro/router/proto/routerclientpb;routerclientpb"; +option go_package = "jochum.dev/jo-micro/router/proto/routerclientpb;routerclientpb"; import "google/protobuf/empty.proto"; diff --git a/internal/proto/routerserverpb/routerserverpb.proto b/internal/proto/routerserverpb/routerserverpb.proto index b474ecb..0c251be 100644 --- a/internal/proto/routerserverpb/routerserverpb.proto +++ b/internal/proto/routerserverpb/routerserverpb.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package routerserverpb; -option go_package = "git.jochum.dev/jo-micro/router/proto/routerserverpb;routerserverpb"; +option go_package = "jochum.dev/jo-micro/router/proto/routerserverpb;routerserverpb"; import "google/protobuf/empty.proto";