Skip to content

Commit

Permalink
Merge pull request #17 from nushkovg/goa-from-keitaroinc-fix
Browse files Browse the repository at this point in the history
Changed all goadesign occurencies with keitaroinc
  • Loading branch information
Pavle Jonoski authored May 18, 2019
2 parents d0cb7da + 499f69d commit a5ec309
Show file tree
Hide file tree
Showing 23 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ before_install:
- go get -u gopkg.in/h2non/gock.v1
- go get -u github.com/Microkubes/microservice-tools
- go get -u github.com/Microkubes/microservice-security/...
- go get -u github.com/goadesign/goa/...
- go get -u github.com/goadesign/oauth2
- go get -u github.com/keitaroinc/goa/...
- go get -u github.com/keitaroinc/oauth2
- go get -u gopkg.in/mgo.v2
- go get -u github.com/afex/hystrix-go/hystrix
- go get -u github.com/satori/go.uuid
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FROM golang:1.10-alpine3.7 as build

RUN apk --no-cache add git curl openssh

RUN go get -u -v github.com/goadesign/goa/... && \
RUN go get -u -v github.com/keitaroinc/goa/... && \
go get -u -v github.com/asaskevich/govalidator && \
go get -u -v github.com/goadesign/oauth2 && \
go get -u -v github.com/keitaroinc/oauth2 && \
go get -u -v github.com/gorilla/sessions && \
go get -u -v github.com/gorilla/securecookie && \
go get -u -v github.com/Microkubes/microservice-security/... && \
Expand Down
2 changes: 1 addition & 1 deletion app/contexts.go

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

4 changes: 2 additions & 2 deletions app/controllers.go

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

2 changes: 1 addition & 1 deletion app/media_types.go

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

2 changes: 1 addition & 1 deletion app/security.go

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

4 changes: 2 additions & 2 deletions app/test/authui_testing.go

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

4 changes: 2 additions & 2 deletions app/test/login_testing.go

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

6 changes: 3 additions & 3 deletions app/test/oauth2_provider_testing.go

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

2 changes: 1 addition & 1 deletion app/user_types.go

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

2 changes: 1 addition & 1 deletion authui.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/Microkubes/authorization-server/security"
"github.com/Microkubes/microservice-security/auth"
"github.com/Microkubes/microservice-security/oauth2"
"github.com/goadesign/goa"
"github.com/keitaroinc/goa"
)

// AuthUIController implements the authUI resource.
Expand Down
2 changes: 1 addition & 1 deletion authui_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/Microkubes/authorization-server/security"
"github.com/Microkubes/microservice-security/auth"
"github.com/Microkubes/microservice-security/oauth2"
"github.com/goadesign/goa"
"github.com/keitaroinc/goa"
"github.com/gorilla/sessions"
)

Expand Down
4 changes: 2 additions & 2 deletions client/client.go

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

2 changes: 1 addition & 1 deletion client/media_types.go

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

2 changes: 1 addition & 1 deletion client/user_types.go

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

6 changes: 3 additions & 3 deletions design/design.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package design

import (
. "github.com/goadesign/goa/design"
. "github.com/goadesign/goa/design/apidsl"
. "github.com/goadesign/oauth2/design"
. "github.com/keitaroinc/goa/design"
. "github.com/keitaroinc/goa/design/apidsl"
. "github.com/keitaroinc/oauth2/design"
)

var OAuth2Sec = OAuth2("/oauth2/authorize", "/oauth2/token", func() {
Expand Down
2 changes: 1 addition & 1 deletion login.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Microkubes/authorization-server/app"
"github.com/Microkubes/authorization-server/security"
"github.com/goadesign/goa"
"github.com/keitaroinc/goa"
)

// LoginController implements the login resource.
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/Microkubes/microservice-tools/gateway"
"github.com/Microkubes/microservice-tools/utils/healthcheck"
"github.com/Microkubes/microservice-tools/utils/version"
"github.com/goadesign/goa"
"github.com/goadesign/goa/middleware"
goaoauth2 "github.com/goadesign/oauth2"
"github.com/keitaroinc/goa"
"github.com/keitaroinc/goa/middleware"
goaoauth2 "github.com/keitaroinc/oauth2"
"github.com/gorilla/securecookie"
"github.com/gorilla/sessions"
)
Expand Down
4 changes: 2 additions & 2 deletions oauth2_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/Microkubes/authorization-server/security"
"github.com/Microkubes/microservice-security/auth"
oa2 "github.com/Microkubes/microservice-security/oauth2"
"github.com/goadesign/goa"
"github.com/goadesign/oauth2"
"github.com/keitaroinc/goa"
"github.com/keitaroinc/oauth2"
)

// Oauth2ProviderController implements the oauth2_provider resource.
Expand Down
4 changes: 2 additions & 2 deletions oauth2_provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/Microkubes/authorization-server/app/test"
"github.com/Microkubes/microservice-security/auth"
"github.com/Microkubes/microservice-security/oauth2"
"github.com/goadesign/goa"
oa2 "github.com/goadesign/oauth2"
"github.com/keitaroinc/goa"
oa2 "github.com/keitaroinc/oauth2"
)

func TestAuthorizeOauth2ProviderBadRequest(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion public.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/goadesign/goa"
"github.com/keitaroinc/goa"
)

// PublicController implements the public resource.
Expand Down
2 changes: 1 addition & 1 deletion security/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/Microkubes/microservice-security/auth"
"github.com/Microkubes/microservice-security/oauth2"
"github.com/goadesign/goa"
"github.com/keitaroinc/goa"
)

// FormLoginScheme holds the configuration for a Form-based user login and authentication.
Expand Down
6 changes: 3 additions & 3 deletions tool/cli/commands.go

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

0 comments on commit a5ec309

Please sign in to comment.