Skip to content

Commit

Permalink
fix: change package name to avoid conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
luizfonseca committed Nov 26, 2023
1 parent 2a8fc73 commit f7bef93
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

# Dependency directories (remove the comment below to include it)
# vendor/
./dist/*
dist/*
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
. "github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/router"
. "github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/router"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/MuXiu1997/traefik-github-oauth-plugin
module github.com/luizfonseca/traefik-github-oauth-plugin

go 1.21.4

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package traefik_github_oauth_server

import (
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/patrickmn/go-cache"
"github.com/rs/xid"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/app/traefik-github-oauth-server/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/pkg/constant"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/pkg/constant"

"github.com/go-chi/render"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/app/traefik-github-oauth-server/router/oauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net/http"
"net/url"

server "github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/pkg/constant"
"github.com/go-chi/render"
"github.com/google/go-github/v49/github"
server "github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/pkg/constant"
"github.com/spf13/cast"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/app/traefik-github-oauth-server/router/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package router
import (
"net/http"

server "github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
"github.com/go-chi/chi/v5"
server "github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server"
)

func RegisterRoutes(app *server.App) {
Expand Down
6 changes: 3 additions & 3 deletions middleware_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"os"
"strings"

"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/pkg/constant"
"github.com/MuXiu1997/traefik-github-oauth-plugin/internal/pkg/jwt"
gologger "github.com/apsdehal/go-logger"
"github.com/dghubble/sling"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/app/traefik-github-oauth-server/model"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/pkg/constant"
"github.com/luizfonseca/traefik-github-oauth-plugin/internal/pkg/jwt"
"github.com/scylladb/go-set/strset"
)

Expand Down

0 comments on commit f7bef93

Please sign in to comment.