Skip to content

Commit

Permalink
Simplify packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
@tadaskay
tadaskay committed Sep 13, 2019
1 parent 60eb727 commit 357f9b4
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 166 deletions.
58 changes: 28 additions & 30 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,21 @@ import (
log "github.com/cihub/seelog"
"github.com/mysteriumnetwork/feedback/docs"
"github.com/mysteriumnetwork/feedback/feedback"
"github.com/mysteriumnetwork/feedback/logconfig"
"github.com/mysteriumnetwork/feedback/infra"
"github.com/mysteriumnetwork/feedback/server"
"github.com/mysteriumnetwork/feedback/storage"
"github.com/mysteriumnetwork/feedback/target/github"
)

const (
// ENV_AWS_ENDPOINT_URL AWS URL for file upload
ENV_AWS_ENDPOINT_URL = "AWS_ENDPOINT_URL"
// ENV_AWS_BUCKET AWS bucket for file upload
ENV_AWS_BUCKET = "AWS_BUCKET"
// ENV_GITHUB_ACCESS_TOKEN Github credentials for issue report
ENV_GITHUB_ACCESS_TOKEN = "GITHUB_ACCESS_TOKEN"
// ENV_GITHUB_OWNER Github owner of the repository for issue report
ENV_GITHUB_OWNER = "GITHUB_OWNER"
// ENV_GITHUB_REPOSITORY Github repository for issue report
ENV_GITHUB_REPOSITORY = "GITHUB_REPOSITORY"
// EnvAWSEndpointURL AWS URL for file upload
EnvAWSEndpointURL = "AWS_ENDPOINT_URL"
// EnvAWSBucket AWS bucket for file upload
EnvAWSBucket = "AWS_BUCKET"
// EnvGithubAccessToken Github credentials for issue report
EnvGithubAccessToken = "GITHUB_ACCESS_TOKEN"
// EnvGithubOwner Github owner of the repository for issue report
EnvGithubOwner = "GITHUB_OWNER"
// EnvGithubRepository Github repository for issue report
EnvGithubRepository = "GITHUB_REPOSITORY"
)

func main() {
Expand All @@ -69,7 +67,7 @@ func main() {

func app() (retValue int) {
configureFromFlags()
logconfig.BootstrapWith(logconfig.CurrentLogOptions)
infra.BootstrapLogger(infra.CurrentLogOptions)

log.Info("Starting feedback service")
defer func() {
Expand All @@ -78,36 +76,36 @@ func app() (retValue int) {
}()

err := envPresent(
ENV_AWS_ENDPOINT_URL,
ENV_AWS_BUCKET,
ENV_GITHUB_ACCESS_TOKEN,
ENV_GITHUB_OWNER,
ENV_GITHUB_REPOSITORY,
EnvAWSEndpointURL,
EnvAWSBucket,
EnvGithubAccessToken,
EnvGithubOwner,
EnvGithubRepository,
)
if err != nil {
_ = log.Critical(err)
return -1
}

storage, err := storage.New(&storage.NewStorageOpts{
EndpointURL: os.Getenv(ENV_AWS_ENDPOINT_URL),
Bucket: os.Getenv(ENV_AWS_BUCKET),
storage, err := feedback.New(&feedback.NewStorageOpts{
EndpointURL: os.Getenv(EnvAWSEndpointURL),
Bucket: os.Getenv(EnvAWSBucket),
})
if err != nil {
_ = log.Critical("Failed to initialize storage: ", err)
return -1
}

githubReporter := github.NewReporter(&github.NewReporterOpts{
Token: os.Getenv(ENV_GITHUB_ACCESS_TOKEN),
Owner: os.Getenv(ENV_GITHUB_OWNER),
Repository: os.Getenv(ENV_GITHUB_REPOSITORY),
githubReporter := feedback.NewReporter(&feedback.NewReporterOpts{
Token: os.Getenv(EnvGithubAccessToken),
Owner: os.Getenv(EnvGithubOwner),
Repository: os.Getenv(EnvGithubRepository),
})
rateLimiter := server.NewRateLimiter(0.0166) // 1/minute
rateLimiter := infra.NewRateLimiter(0.0166) // 1/minute

srvr := server.New(
feedback.NewEndpoint(githubReporter, storage, rateLimiter),
server.NewPingEndpoint(),
infra.NewPingEndpoint(),
docs.NewEndpoint(),
)

Expand All @@ -130,7 +128,7 @@ func envPresent(vars ...string) error {
}

func configureFromFlags() {
logconfig.RegisterFlags()
infra.RegisterLoggerFlags()
flag.Parse()
logconfig.Configure()
infra.ConfigureLogger()
}
31 changes: 14 additions & 17 deletions feedback/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,18 @@ import (

log "github.com/cihub/seelog"
"github.com/gin-gonic/gin"
"github.com/mysteriumnetwork/feedback/apierr"
"github.com/mysteriumnetwork/feedback/server"
"github.com/mysteriumnetwork/feedback/storage"
"github.com/mysteriumnetwork/feedback/target/github"
"github.com/mysteriumnetwork/feedback/infra"
)

// Endpoint user feedback endpoint
type Endpoint struct {
reporter *github.Reporter
storage *storage.Storage
rateLimiter *server.RateLimiter
reporter *Reporter
storage *Storage
rateLimiter *infra.RateLimiter
}

// NewEndpoint creates new Endpoint
func NewEndpoint(reporter *github.Reporter, storage *storage.Storage, rateLimiter *server.RateLimiter) *Endpoint {
func NewEndpoint(reporter *Reporter, storage *Storage, rateLimiter *infra.RateLimiter) *Endpoint {
return &Endpoint{reporter: reporter, storage: storage, rateLimiter: rateLimiter}
}

Expand Down Expand Up @@ -72,20 +69,20 @@ func ParseGithubIssueRequest(c *gin.Context) (form CreateGithubIssueRequest, err
var ok bool
form.UserId, ok = c.GetPostForm("userId")
if !ok {
errors = append(errors, apierr.Required("userId"))
errors = append(errors, infra.Required("userId"))
}

form.Description, ok = c.GetPostForm("description")
if !ok {
errors = append(errors, apierr.Required("description"))
errors = append(errors, infra.Required("description"))
}

form.Email = c.PostForm("email")

var err error
form.File, err = c.FormFile("file")
if err != nil {
errors = append(errors, apierr.Required("file"))
errors = append(errors, infra.Required("file"))
}

return form, errors
Expand Down Expand Up @@ -121,14 +118,14 @@ func ParseGithubIssueRequest(c *gin.Context) (form CreateGithubIssueRequest, err
func (e *Endpoint) CreateGithubIssue(c *gin.Context) {
form, requestErrs := ParseGithubIssueRequest(c)
if len(requestErrs) > 0 {
c.JSON(http.StatusBadRequest, apierr.Multiple(requestErrs))
c.JSON(http.StatusBadRequest, infra.Multiple(requestErrs))
return
}

tempFile, err := ioutil.TempFile("", form.File.Filename)
if err != nil {
err := fmt.Errorf("could not allocate a temporary file: %w", err)
c.JSON(http.StatusInternalServerError, apierr.Single(err))
c.JSON(http.StatusInternalServerError, infra.Single(err))
return
}
defer func() {
Expand All @@ -141,26 +138,26 @@ func (e *Endpoint) CreateGithubIssue(c *gin.Context) {
err = c.SaveUploadedFile(form.File, tempFile.Name())
if err != nil {
err := fmt.Errorf("could not save the uploaded file: %w", err)
c.JSON(http.StatusInternalServerError, apierr.Single(err))
c.JSON(http.StatusInternalServerError, infra.Single(err))
return
}

logURL, err := e.storage.Upload(tempFile.Name())
if err != nil {
err := fmt.Errorf("could not upload file to the storage: %w", err)
c.JSON(http.StatusServiceUnavailable, apierr.Single(err))
c.JSON(http.StatusServiceUnavailable, infra.Single(err))
return
}

issueId, err := e.reporter.ReportIssue(&github.Report{
issueId, err := e.reporter.ReportIssue(&Report{
UserId: form.UserId,
Description: form.Description,
Email: form.Email,
LogURL: *logURL,
})
if err != nil {
err := fmt.Errorf("could not report issue to github: %w", err)
c.JSON(http.StatusServiceUnavailable, apierr.Single(err))
c.JSON(http.StatusServiceUnavailable, infra.Single(err))
return
}

Expand Down
2 changes: 1 addition & 1 deletion target/github/github.go → feedback/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package github
package feedback

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion storage/storage.go → feedback/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package storage
package feedback

import (
"fmt"
Expand Down
8 changes: 2 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,17 @@ require (
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.4.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/runtime v0.19.5 // indirect
github.com/go-swagger/go-swagger v0.20.1
github.com/gofrs/uuid v3.2.0+incompatible
github.com/google/go-github/v28 v28.1.1
github.com/magefile/mage v1.8.0
github.com/mailru/easyjson v0.7.0 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/mattn/go-isatty v0.0.9 // indirect
github.com/mysteriumnetwork/go-ci v0.0.0-20190912064927-c54e2b0b3b5c
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b // indirect
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
golang.org/x/tools v0.0.0-20190911230505-6bfd74cf029c // indirect
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 // indirect
google.golang.org/appengine v1.6.2 // indirect
)
31 changes: 4 additions & 27 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpR
github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
github.com/go-openapi/analysis v0.19.4 h1:1TjOzrWkj+9BrjnM1yPAICbaoC0FyfD49oVkTBrSSa0=
github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI=
github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
Expand All @@ -98,40 +96,28 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds
github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI=
github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
github.com/go-openapi/loads v0.19.3 h1:jwIoahqCmaA5OBoc/B+1+Mu2L0Gr8xYQnbeyQEo/7b0=
github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
github.com/go-openapi/runtime v0.19.4 h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI=
github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
github.com/go-openapi/runtime v0.19.5 h1:h4Zk7oTfB3ZYM2oMNliQvL+3BrDstTIX8lqP7yaYCuI=
github.com/go-openapi/runtime v0.19.5/go.mod h1:WIH6IYPXOrtgTClTV8xzdrD20jBlrK25D0aQbdSlqp8=
github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
github.com/go-openapi/strfmt v0.19.2 h1:clPGfBnJohokno0e+d7hs6Yocrzjlgz6EsQSDncCRnE=
github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA=
github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
Expand All @@ -140,8 +126,6 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js=
github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
github.com/go-openapi/validate v0.19.3 h1:PAH/2DylwWcIU1s0Y7k3yNmeAgWOcKrNE2Q7Ww/kCg4=
github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
Expand Down Expand Up @@ -233,8 +217,6 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
Expand Down Expand Up @@ -342,8 +324,6 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.0 h1:aeOqSrhl9eDRAap/3T5pCfMBEBxZ0vuXBP+RMtp2KX8=
go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.1 h1:Sq1fR+0c58RME5EoqKdjkiQAmPjmfHlZOoRI6fTUOcs=
go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
Expand Down Expand Up @@ -395,9 +375,8 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsiImhB2jgVBGc9L0lPGc=
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 h1:4dVFTC832rPn4pomLSz1vA+are2+dU19w1H8OngV7nc=
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
Expand Down Expand Up @@ -427,8 +406,8 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 h1:SW/0nsKCUaozCUtZTakri5laocGx/5bkDSSLrFUsa5s=
golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 h1:41hwlulw1prEMBxLQSlMSux1zxJf07B3WPsdjJlKZxE=
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
Expand Down Expand Up @@ -459,8 +438,6 @@ golang.org/x/tools v0.0.0-20190820033707-85edb9ef3283 h1:Seblypk5Prvsc9UDjPTV/1N
golang.org/x/tools v0.0.0-20190820033707-85edb9ef3283/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911022129-16c5e0f7d110 h1:6S6bidS7O4yAwA5ORRbRIjvNQ9tGbLd5e+LRIaTeVDQ=
golang.org/x/tools v0.0.0-20190911022129-16c5e0f7d110/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911230505-6bfd74cf029c h1:ZgedNh8bIOBjyY5XEG0kR/41dSN9H+5jFZWuR/TgA1g=
golang.org/x/tools v0.0.0-20190911230505-6bfd74cf029c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
Expand Down
2 changes: 1 addition & 1 deletion apierr/error.go → infra/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package apierr
package infra

// ErrorResponse represent HTTP error payload
// swagger:model
Expand Down
Loading

0 comments on commit 357f9b4

Please sign in to comment.