Merge pull request #43 from masterSplinter01/replace-gate-by-gw

Replace http-gate by http-gw
This commit is contained in:
Roman Khimov 2021-05-18 15:17:19 +03:00 committed by GitHub
commit 9604f9f4b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 27 additions and 27 deletions

View file

@ -33,5 +33,5 @@ Bugs fixed:
## Older versions ## Older versions
Please refer to [Github Please refer to [Github
releases](https://github.com/nspcc-dev/neofs-http-gate/releases/) for older releases](https://github.com/nspcc-dev/neofs-http-gw/releases/) for older
releases. releases.

View file

@ -3,8 +3,8 @@
First, thank you for contributing! We love and encourage pull requests from First, thank you for contributing! We love and encourage pull requests from
everyone. Please follow the guidelines: everyone. Please follow the guidelines:
- Check the open [issues](https://github.com/nspcc-dev/neofs-http-gate/issues) and - Check the open [issues](https://github.com/nspcc-dev/neofs-http-gw/issues) and
[pull requests](https://github.com/nspcc-dev/neofs-http-gate/pulls) for existing [pull requests](https://github.com/nspcc-dev/neofs-http-gw/pulls) for existing
discussions. discussions.
- Open an issue first, to discuss a new feature or enhancement. - Open an issue first, to discuss a new feature or enhancement.
@ -23,24 +23,24 @@ everyone. Please follow the guidelines:
## Development Workflow ## Development Workflow
Start by forking the `neofs-http-gate` repository, make changes in a branch and then Start by forking the `neofs-http-gw` repository, make changes in a branch and then
send a pull request. We encourage pull requests to discuss code changes. Here send a pull request. We encourage pull requests to discuss code changes. Here
are the steps in details: are the steps in details:
### Set up your GitHub Repository ### Set up your GitHub Repository
Fork [NeoFS HTTP Protocol Gateway Fork [NeoFS HTTP Protocol Gateway
upstream](https://github.com/nspcc-dev/neofs-http-gate/fork) source repository upstream](https://github.com/nspcc-dev/neofs-http-gw/fork) source repository
to your own personal repository. Copy the URL of your fork (you will need it for to your own personal repository. Copy the URL of your fork (you will need it for
the `git clone` command below). the `git clone` command below).
```sh ```sh
$ git clone https://github.com/nspcc-dev/neofs-http-gate $ git clone https://github.com/nspcc-dev/neofs-http-gw
``` ```
### Set up git remote as ``upstream`` ### Set up git remote as ``upstream``
```sh ```sh
$ cd neofs-http-gate $ cd neofs-http-gw
$ git remote add upstream https://github.com/nspcc-dev/neofs-http-gate $ git remote add upstream https://github.com/nspcc-dev/neofs-http-gw
$ git fetch upstream $ git fetch upstream
$ git merge upstream/master $ git merge upstream/master
... ...

View file

@ -6,9 +6,9 @@
</p> </p>
--- ---
[![Report](https://goreportcard.com/badge/github.com/nspcc-dev/neofs-http-gate)](https://goreportcard.com/report/github.com/nspcc-dev/neofs-http-gate) [![Report](https://goreportcard.com/badge/github.com/nspcc-dev/neofs-http-gw)](https://goreportcard.com/report/github.com/nspcc-dev/neofs-http-gw)
![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nspcc-dev/neofs-http-gate?sort=semver) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nspcc-dev/neofs-http-gw?sort=semver)
![License](https://img.shields.io/github/license/nspcc-dev/neofs-http-gate.svg?style=popout) ![License](https://img.shields.io/github/license/nspcc-dev/neofs-http-gw.svg?style=popout)
# NeoFS HTTP Protocol Gateway # NeoFS HTTP Protocol Gateway
@ -18,7 +18,7 @@ NeoFS HTTP Protocol Gateway bridges NeoFS internal protocol and HTTP standard.
## Installation ## Installation
```go get -u github.com/nspcc-dev/neofs-http-gate``` ```go get -u github.com/nspcc-dev/neofs-http-gw```
Or you can call `make` to build it from the cloned repository (the binary will Or you can call `make` to build it from the cloned repository (the binary will
end up in `bin/neofs-http-gw`). end up in `bin/neofs-http-gw`).

12
app.go
View file

@ -6,11 +6,11 @@ import (
"strconv" "strconv"
"github.com/fasthttp/router" "github.com/fasthttp/router"
"github.com/nspcc-dev/neofs-http-gate/connections" "github.com/nspcc-dev/neofs-http-gw/connections"
"github.com/nspcc-dev/neofs-http-gate/downloader" "github.com/nspcc-dev/neofs-http-gw/downloader"
"github.com/nspcc-dev/neofs-http-gate/logger" "github.com/nspcc-dev/neofs-http-gw/logger"
"github.com/nspcc-dev/neofs-http-gate/neofs" "github.com/nspcc-dev/neofs-http-gw/neofs"
"github.com/nspcc-dev/neofs-http-gate/uploader" "github.com/nspcc-dev/neofs-http-gw/uploader"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"go.uber.org/zap" "go.uber.org/zap"
@ -77,7 +77,7 @@ func newApp(ctx context.Context, opt ...Option) App {
grpclog.SetLoggerV2(a.auxiliaryLog) grpclog.SetLoggerV2(a.auxiliaryLog)
} }
// -- setup FastHTTP server -- // -- setup FastHTTP server --
a.webServer.Name = "neofs-http-gate" a.webServer.Name = "neofs-http-gw"
a.webServer.ReadBufferSize = a.cfg.GetInt(cfgWebReadBufferSize) a.webServer.ReadBufferSize = a.cfg.GetInt(cfgWebReadBufferSize)
a.webServer.WriteBufferSize = a.cfg.GetInt(cfgWebWriteBufferSize) a.webServer.WriteBufferSize = a.cfg.GetInt(cfgWebWriteBufferSize)
a.webServer.ReadTimeout = a.cfg.GetDuration(cfgWebReadTimeout) a.webServer.ReadTimeout = a.cfg.GetDuration(cfgWebReadTimeout)

View file

@ -14,8 +14,8 @@ import (
"github.com/nspcc-dev/neofs-api-go/pkg/container" "github.com/nspcc-dev/neofs-api-go/pkg/container"
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-http-gate/neofs" "github.com/nspcc-dev/neofs-http-gw/neofs"
"github.com/nspcc-dev/neofs-http-gate/tokens" "github.com/nspcc-dev/neofs-http-gw/tokens"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/nspcc-dev/neofs-http-gate module github.com/nspcc-dev/neofs-http-gw
go 1.16 go 1.16

View file

@ -1,8 +1,8 @@
package main package main
import ( import (
"github.com/nspcc-dev/neofs-http-gate/global" "github.com/nspcc-dev/neofs-http-gw/global"
"github.com/nspcc-dev/neofs-http-gate/logger" "github.com/nspcc-dev/neofs-http-gw/logger"
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
) )

View file

@ -10,7 +10,7 @@ import (
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-api-go/pkg/owner" "github.com/nspcc-dev/neofs-api-go/pkg/owner"
"github.com/nspcc-dev/neofs-api-go/pkg/token" "github.com/nspcc-dev/neofs-api-go/pkg/token"
"github.com/nspcc-dev/neofs-http-gate/connections" "github.com/nspcc-dev/neofs-http-gw/connections"
) )
// BaseOptions represents basic NeoFS request options. // BaseOptions represents basic NeoFS request options.

View file

@ -119,7 +119,7 @@ func settings() *viper.Viper {
peers := flags.StringArrayP(cfgPeers, "p", nil, "NeoFS nodes") peers := flags.StringArrayP(cfgPeers, "p", nil, "NeoFS nodes")
// set prefers: // set prefers:
v.Set(cfgApplicationName, "neofs-http-gate") v.Set(cfgApplicationName, "neofs-http-gw")
v.Set(cfgApplicationVersion, Version) v.Set(cfgApplicationVersion, Version)
// set defaults: // set defaults:

View file

@ -12,8 +12,8 @@ import (
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-api-go/pkg/owner" "github.com/nspcc-dev/neofs-api-go/pkg/owner"
"github.com/nspcc-dev/neofs-api-go/pkg/token" "github.com/nspcc-dev/neofs-api-go/pkg/token"
"github.com/nspcc-dev/neofs-http-gate/neofs" "github.com/nspcc-dev/neofs-http-gw/neofs"
"github.com/nspcc-dev/neofs-http-gate/tokens" "github.com/nspcc-dev/neofs-http-gw/tokens"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"go.uber.org/zap" "go.uber.org/zap"
) )