Skip to content

Commit

Permalink
feat: update module name
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry Selivanov committed Sep 24, 2024
1 parent 805f674 commit a150681
Show file tree
Hide file tree
Showing 156 changed files with 261 additions and 276 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
- [ ] Update your protoc to the [latest version](https://github.com/google/protobuf/releases).
- [ ] Update your copy of the `grpc-gateway` library to the latest version from github:
```sh
go get github.com/grpc-ecosystem/grpc-gateway/v2@latest
go get github.com/gateway-fm/grpc-gateway/v2@latest
```
- [ ] Delete the `protoc-gen-grpc-gateway` and `protoc-gen-openapiv2` binary from your `PATH`, and reinstall the latest versions:

```sh
go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
go get github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway
go get github.com/gateway-fm/grpc-gateway/v2/protoc-gen-openapiv2
```

## I still have a problem!
Expand Down
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildifier(
)

# gazelle:exclude _output
# gazelle:prefix github.com/grpc-ecosystem/grpc-gateway/v2
# gazelle:prefix github.com/gateway-fm/grpc-gateway/v2
# gazelle:go_proto_compilers //:go_apiv2
# gazelle:go_grpc_compilers //:go_apiv2, //:go_grpc
# gazelle:go_naming_convention import_alias
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ to track the versions of the following executable packages:
package tools

import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"
_ "github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway"
_ "github.com/gateway-fm/grpc-gateway/v2/protoc-gen-openapiv2"
_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
_ "google.golang.org/protobuf/cmd/protoc-gen-go"
)
Expand All @@ -82,8 +82,8 @@ Run `go mod tidy` to resolve the versions. Install by running

```sh
go install \
github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway \
github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 \
github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway \
github.com/gateway-fm/grpc-gateway/v2/protoc-gen-openapiv2 \
google.golang.org/protobuf/cmd/protoc-gen-go \
google.golang.org/grpc/cmd/protoc-gen-go-grpc
```
Expand Down Expand Up @@ -354,7 +354,7 @@ import (
"flag"
"net/http"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/grpclog"
Expand Down Expand Up @@ -488,7 +488,7 @@ This requires no local installation of any plugins. Be careful to use the same
version of the generator as the runtime library, i.e. if using `v2.16.2`, run

```shell
$ go get github.com/grpc-ecosystem/grpc-gateway/[email protected]
$ go get github.com/gateway-fm/grpc-gateway/[email protected]
```

To get the same version of the runtime in your `go.mod`.
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/development/installation_for_cygwin.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ From an elevated cmd.exe prompt set the GOPATH variable in Windows and add the `

Then `go get -u -v` the following packages:

go get -u -v github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
go get -u -v github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
go get -u -v github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway
go get -u -v github.com/gateway-fm/grpc-gateway/v2/protoc-gen-openapiv2
go get -u -v google.golang.org/protobuf/cmd/protoc-gen-go
go get -u -v google.golang.org/grpc/cmd/protoc-gen-go-grpc

Expand All @@ -49,7 +49,7 @@ This will probably fail with a similar output to this:
# cd .; git clone https://github.com/grpc-ecosystem/grpc-gateway C:\path\to\your\cygwin\home\user\go\src\github.com\grpc-ecosystem\grpc-gateway
Cloning into 'C:\path\to\your\cygwin\home\user\go\src\github.com\grpc-ecosystem\grpc-gateway'...
fatal: Invalid path '/home/user/go/C:\path\to\your\cygwin\home\user\go\src\github.com\grpc-ecosystem\grpc-gateway': No such file or directory
package github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway: exit status 128
package github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway: exit status 128

To fix this you need to run the `go get -u -v` commands and look for all lines starting with `# cd .;`. Copy and paste these lines into your shell and change the clone destination directories.

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/operations/annotated_context.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ It is often interesting to know what [HTTP path pattern](https://github.com/goog

```proto
syntax = "proto3";
option go_package = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb";
option go_package = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb";
package grpc.gateway.examples.internal.proto.examplepb;
import "google/api/annotations.proto";
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/operations/inject_router.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"net/http"

pb "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/helloworld"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
pb "github.com/gateway-fm/grpc-gateway/v2/examples/internal/helloworld"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/tutorials/adding_annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ import (
"net"
"net/http"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/tutorials/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ We will be using a Go gRPC server in the examples, so please install Go first fr
After installing Go, use `go install` to download and build the following binaries:

```sh
$ go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
$ go install github.com/gateway-fm/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
$ go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
$ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
```
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/using_custom_query_parser.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import (
"net/url"
"strconv"

"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/utilities"
"google.golang.org/protobuf/proto"

your_service_v1 "path/to/your/service/v1"
Expand Down Expand Up @@ -98,7 +98,7 @@ import (
"context"
"net/http"

"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
"google.golang.org/grpc/metadata"
"google.golang.org/protobuf/encoding/protojson"

Expand Down
2 changes: 1 addition & 1 deletion examples/internal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $ dep init
Follow the guides from this [README.md](./browser/README.md) to run the server and gateway.
```bash
# Make sure you are in the correct directory:
# $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/v2/examples
# $GOPATH/src/github.com/gateway-fm/grpc-gateway/v2/examples
$ cd examples/internal/browser
$ pwd

Expand Down
4 changes: 2 additions & 2 deletions examples/internal/browser/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ gulp.task('bower', function () {
});

gulp.task('server', shell.task([
'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-grpc-server',
'go build -o bin/example-server github.com/gateway-fm/grpc-gateway/v2/examples/internal/cmd/example-grpc-server',
]));

gulp.task('gateway', shell.task([
'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-gateway-server',
'go build -o bin/example-gw github.com/gateway-fm/grpc-gateway/v2/examples/internal/cmd/example-gateway-server',
]));

gulp.task('serve-server', ['server'], function () {
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/clients/abe/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ go_library(
"model_v1exampledeep_pathsingle_nested_name_single_nested.go",
"response.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/abe",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/abe",
deps = [
"//examples/internal/proto/examplepb",
"//examples/internal/proto/pathenum",
Expand Down
6 changes: 3 additions & 3 deletions examples/internal/clients/abe/enum_helper.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package abe

import (
pbexamplepb "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb"
pbpathenum "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/pathenum"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
pbexamplepb "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb"
pbpathenum "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/pathenum"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
)

// String returns a string representation of "NumericEnum"
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/clients/echo/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ go_library(
"model_rpc_status.go",
"response.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/echo",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/echo",
deps = [
"@com_github_antihax_optional//:optional",
"@org_golang_x_oauth2//:oauth2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ go_library(
"model_runtime_error.go",
"response.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/generateunboundmethods",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/generateunboundmethods",
visibility = ["//examples:__subpackages__"],
deps = ["@org_golang_x_oauth2//:oauth2"],
)
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/clients/responsebody/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ go_library(
"model_stream_result_of_examplepb_response_body_out.go",
"response.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/responsebody",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/responsebody",
visibility = ["//visibility:public"],
deps = ["@org_golang_x_oauth2//:oauth2"],
)
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/clients/unannotatedecho/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
"model_rpc_status.go",
"response.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/unannotatedecho",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/unannotatedecho",
deps = [
"@com_github_antihax_optional//:optional",
"@org_golang_x_oauth2//:oauth2",
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/cmd/example-gateway-server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "example-gateway-server_lib",
srcs = ["main.go"],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-gateway-server",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/cmd/example-gateway-server",
visibility = ["//visibility:private"],
deps = [
"//examples/internal/gateway",
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/cmd/example-gateway-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"context"
"flag"

"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/gateway"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/gateway"
"google.golang.org/grpc/grpclog"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/internal/cmd/example-grpc-server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:private"])
go_library(
name = "example-grpc-server_lib",
srcs = ["main.go"],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-grpc-server",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/cmd/example-grpc-server",
deps = [
"//examples/internal/server",
"@org_golang_google_grpc//grpclog",
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/cmd/example-grpc-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"context"
"flag"

"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/server"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/server"
"google.golang.org/grpc/grpclog"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/internal/gateway/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ go_library(
"handlers.go",
"main.go",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/gateway",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/gateway",
visibility = ["//visibility:public"],
deps = [
"//examples/internal/proto/examplepb",
Expand Down
6 changes: 3 additions & 3 deletions examples/internal/gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"google.golang.org/grpc/credentials/insecure"

"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb"
standalone "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/standalone"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb"
standalone "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/standalone"
gwruntime "github.com/gateway-fm/grpc-gateway/v2/runtime"
_ "google.golang.org/genproto/googleapis/rpc/errdetails"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/internal/gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
gwruntime "github.com/gateway-fm/grpc-gateway/v2/runtime"
"google.golang.org/grpc/grpclog"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/internal/helloworld/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ go_proto_library(
"//:go_grpc",
"//protoc-gen-grpc-gateway:go_gen_grpc_gateway",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/helloworld",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/helloworld",
proto = ":helloworld_proto",
visibility = ["//visibility:public"],
deps = [
Expand All @@ -34,7 +34,7 @@ go_proto_library(
go_library(
name = "helloworld",
embed = [":helloworld_go_proto"],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/helloworld",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/helloworld",
visibility = ["//examples:__subpackages__"],
)

Expand Down
4 changes: 2 additions & 2 deletions examples/internal/helloworld/helloworld.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/internal/helloworld/helloworld.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package grpc.gateway.examples.internal.helloworld;
import "google/api/annotations.proto";
import "google/protobuf/wrappers.proto";

option go_package = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/helloworld";
option go_package = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/helloworld";

service Greeter {
rpc SayHello(HelloRequest) returns (HelloReply) {
Expand Down
6 changes: 3 additions & 3 deletions examples/internal/integration/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"testing"

"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/abe"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/echo"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/unannotatedecho"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/abe"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/echo"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/clients/unannotatedecho"
"github.com/rogpeppe/fastuuid"
)

Expand Down
8 changes: 4 additions & 4 deletions examples/internal/integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"testing"
"time"

"github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/pathenum"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/sub"
"github.com/gateway-fm/grpc-gateway/v2/runtime"
"github.com/google/go-cmp/cmp"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/pathenum"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/sub"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
statuspb "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc/codes"
"google.golang.org/protobuf/encoding/protojson"
Expand Down
6 changes: 3 additions & 3 deletions examples/internal/integration/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"testing"
"time"

"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/gateway"
"github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/server"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/gateway"
"github.com/gateway-fm/grpc-gateway/v2/examples/internal/server"
gwruntime "github.com/gateway-fm/grpc-gateway/v2/runtime"
"google.golang.org/grpc/grpclog"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/internal/proto/examplepb/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ go_proto_library(
"//:go_grpc",
"//protoc-gen-grpc-gateway:go_gen_grpc_gateway",
],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb",
proto = ":examplepb_proto",
deps = [
"//examples/internal/proto/oneofenum",
Expand All @@ -134,7 +134,7 @@ go_library(
"openapi_merge_b_grpc.pb.go",
],
embed = [":examplepb_go_proto"],
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb",
importpath = "github.com/gateway-fm/grpc-gateway/v2/examples/internal/proto/examplepb",
deps = [
"//runtime",
"//utilities",
Expand Down
Loading

0 comments on commit a150681

Please sign in to comment.