From 7b0e8a09598e68aeed711c7d83bb18f75be3619f Mon Sep 17 00:00:00 2001 From: Karan Kajla Date: Wed, 22 Feb 2023 16:31:41 -0800 Subject: [PATCH] Move all directories/files to the top level and remove /server directory (#11) * Move all directories/files to the top level and remove /server directory * Update GitHub action --- .github/workflows/ci.yaml | 2 +- {server/cmd => cmd}/warrant/Makefile | 0 {server/cmd => cmd}/warrant/main.go | 24 +++++++++---------- .../mysql/000001_init.down.sql | 0 .../mysql/000001_init.up.sql | 0 {server/pkg => pkg}/authz/check/handlers.go | 4 ++-- {server/pkg => pkg}/authz/check/service.go | 8 +++---- {server/pkg => pkg}/authz/check/spec.go | 4 ++-- {server/pkg => pkg}/authz/context/model.go | 2 +- {server/pkg => pkg}/authz/context/mysql.go | 4 ++-- .../pkg => pkg}/authz/context/repository.go | 4 ++-- {server/pkg => pkg}/authz/context/spec.go | 0 {server/pkg => pkg}/authz/feature/handlers.go | 4 ++-- {server/pkg => pkg}/authz/feature/list.go | 0 {server/pkg => pkg}/authz/feature/model.go | 2 +- {server/pkg => pkg}/authz/feature/mysql.go | 6 ++--- .../pkg => pkg}/authz/feature/repository.go | 6 ++--- {server/pkg => pkg}/authz/feature/service.go | 8 +++---- {server/pkg => pkg}/authz/feature/spec.go | 8 +++---- {server/pkg => pkg}/authz/object/handlers.go | 4 ++-- {server/pkg => pkg}/authz/object/list.go | 0 {server/pkg => pkg}/authz/object/model.go | 2 +- {server/pkg => pkg}/authz/object/mysql.go | 6 ++--- .../pkg => pkg}/authz/object/repository.go | 6 ++--- {server/pkg => pkg}/authz/object/service.go | 6 ++--- {server/pkg => pkg}/authz/object/spec.go | 0 .../pkg => pkg}/authz/objecttype/handlers.go | 4 ++-- {server/pkg => pkg}/authz/objecttype/list.go | 0 {server/pkg => pkg}/authz/objecttype/model.go | 2 +- {server/pkg => pkg}/authz/objecttype/mysql.go | 6 ++--- .../authz/objecttype/repository.go | 6 ++--- .../pkg => pkg}/authz/objecttype/service.go | 4 ++-- {server/pkg => pkg}/authz/objecttype/spec.go | 2 +- .../pkg => pkg}/authz/permission/handlers.go | 4 ++-- {server/pkg => pkg}/authz/permission/list.go | 0 {server/pkg => pkg}/authz/permission/model.go | 2 +- {server/pkg => pkg}/authz/permission/mysql.go | 6 ++--- .../authz/permission/repository.go | 6 ++--- .../pkg => pkg}/authz/permission/service.go | 8 +++---- {server/pkg => pkg}/authz/permission/spec.go | 8 +++---- .../pkg => pkg}/authz/pricingtier/handlers.go | 4 ++-- {server/pkg => pkg}/authz/pricingtier/list.go | 0 .../pkg => pkg}/authz/pricingtier/model.go | 2 +- .../pkg => pkg}/authz/pricingtier/mysql.go | 6 ++--- .../authz/pricingtier/repository.go | 6 ++--- .../pkg => pkg}/authz/pricingtier/service.go | 8 +++---- {server/pkg => pkg}/authz/pricingtier/spec.go | 8 +++---- {server/pkg => pkg}/authz/role/handlers.go | 4 ++-- {server/pkg => pkg}/authz/role/list.go | 0 {server/pkg => pkg}/authz/role/model.go | 2 +- {server/pkg => pkg}/authz/role/mysql.go | 6 ++--- {server/pkg => pkg}/authz/role/repository.go | 6 ++--- {server/pkg => pkg}/authz/role/service.go | 8 +++---- {server/pkg => pkg}/authz/role/spec.go | 8 +++---- {server/pkg => pkg}/authz/tenant/handlers.go | 4 ++-- {server/pkg => pkg}/authz/tenant/list.go | 0 {server/pkg => pkg}/authz/tenant/model.go | 2 +- {server/pkg => pkg}/authz/tenant/mysql.go | 10 ++++---- .../pkg => pkg}/authz/tenant/repository.go | 6 ++--- {server/pkg => pkg}/authz/tenant/service.go | 12 +++++----- {server/pkg => pkg}/authz/tenant/spec.go | 6 ++--- {server/pkg => pkg}/authz/user/handlers.go | 4 ++-- {server/pkg => pkg}/authz/user/list.go | 0 {server/pkg => pkg}/authz/user/model.go | 2 +- {server/pkg => pkg}/authz/user/mysql.go | 8 +++---- {server/pkg => pkg}/authz/user/repository.go | 6 ++--- {server/pkg => pkg}/authz/user/service.go | 8 +++---- {server/pkg => pkg}/authz/user/spec.go | 6 ++--- {server/pkg => pkg}/authz/warrant/handlers.go | 4 ++-- {server/pkg => pkg}/authz/warrant/list.go | 0 {server/pkg => pkg}/authz/warrant/model.go | 4 ++-- {server/pkg => pkg}/authz/warrant/mysql.go | 6 ++--- .../pkg => pkg}/authz/warrant/repository.go | 6 ++--- {server/pkg => pkg}/authz/warrant/service.go | 8 +++---- {server/pkg => pkg}/authz/warrant/spec.go | 6 ++--- {server/pkg => pkg}/database/database.go | 0 {server/pkg => pkg}/database/mysql.go | 0 {server/pkg => pkg}/database/sql.go | 0 {server/pkg => pkg}/middleware/chain.go | 0 {server/pkg => pkg}/middleware/list.go | 2 +- {server/pkg => pkg}/service/config.go | 2 +- {server/pkg => pkg}/service/errors.go | 0 {server/pkg => pkg}/service/json.go | 0 {server/pkg => pkg}/service/router.go | 0 {server/pkg => pkg}/service/service.go | 2 +- {server/tests => tests}/authz-wildcard.json | 0 {server/tests => tests}/authz.json | 0 {server/tests => tests}/features-crud.json | 0 {server/tests => tests}/features-list.json | 0 {server/tests => tests}/objects-crud.json | 0 {server/tests => tests}/objects-list.json | 0 {server/tests => tests}/permissions-crud.json | 0 {server/tests => tests}/permissions-list.json | 0 .../tests => tests}/pricing-tiers-crud.json | 0 .../tests => tests}/pricing-tiers.list.json | 0 {server/tests => tests}/roles-crud.json | 0 {server/tests => tests}/roles-list.json | 0 {server/tests => tests}/tenants-crud.json | 0 {server/tests => tests}/users-crud.json | 0 {server/tests => tests}/users-list.json | 0 {server/tests => tests}/warrants.json | 0 101 files changed, 175 insertions(+), 175 deletions(-) rename {server/cmd => cmd}/warrant/Makefile (100%) rename {server/cmd => cmd}/warrant/main.go (65%) rename {server/migrations => migrations}/mysql/000001_init.down.sql (100%) rename {server/migrations => migrations}/mysql/000001_init.up.sql (100%) rename {server/pkg => pkg}/authz/check/handlers.go (86%) rename {server/pkg => pkg}/authz/check/service.go (97%) rename {server/pkg => pkg}/authz/check/spec.go (91%) rename {server/pkg => pkg}/authz/context/model.go (91%) rename {server/pkg => pkg}/authz/context/mysql.go (95%) rename {server/pkg => pkg}/authz/context/repository.go (86%) rename {server/pkg => pkg}/authz/context/spec.go (100%) rename {server/pkg => pkg}/authz/feature/handlers.go (96%) rename {server/pkg => pkg}/authz/feature/list.go (100%) rename {server/pkg => pkg}/authz/feature/model.go (92%) rename {server/pkg => pkg}/authz/feature/mysql.go (97%) rename {server/pkg => pkg}/authz/feature/repository.go (84%) rename {server/pkg => pkg}/authz/feature/service.go (93%) rename {server/pkg => pkg}/authz/feature/spec.go (77%) rename {server/pkg => pkg}/authz/object/handlers.go (95%) rename {server/pkg => pkg}/authz/object/list.go (100%) rename {server/pkg => pkg}/authz/object/model.go (91%) rename {server/pkg => pkg}/authz/object/mysql.go (97%) rename {server/pkg => pkg}/authz/object/repository.go (84%) rename {server/pkg => pkg}/authz/object/service.go (93%) rename {server/pkg => pkg}/authz/object/spec.go (100%) rename {server/pkg => pkg}/authz/objecttype/handlers.go (96%) rename {server/pkg => pkg}/authz/objecttype/list.go (100%) rename {server/pkg => pkg}/authz/objecttype/model.go (92%) rename {server/pkg => pkg}/authz/objecttype/mysql.go (97%) rename {server/pkg => pkg}/authz/objecttype/repository.go (84%) rename {server/pkg => pkg}/authz/objecttype/service.go (96%) rename {server/pkg => pkg}/authz/objecttype/spec.go (98%) rename {server/pkg => pkg}/authz/permission/handlers.go (96%) rename {server/pkg => pkg}/authz/permission/list.go (100%) rename {server/pkg => pkg}/authz/permission/model.go (92%) rename {server/pkg => pkg}/authz/permission/mysql.go (97%) rename {server/pkg => pkg}/authz/permission/repository.go (85%) rename {server/pkg => pkg}/authz/permission/service.go (93%) rename {server/pkg => pkg}/authz/permission/spec.go (77%) rename {server/pkg => pkg}/authz/pricingtier/handlers.go (96%) rename {server/pkg => pkg}/authz/pricingtier/list.go (100%) rename {server/pkg => pkg}/authz/pricingtier/model.go (93%) rename {server/pkg => pkg}/authz/pricingtier/mysql.go (97%) rename {server/pkg => pkg}/authz/pricingtier/repository.go (85%) rename {server/pkg => pkg}/authz/pricingtier/service.go (93%) rename {server/pkg => pkg}/authz/pricingtier/spec.go (78%) rename {server/pkg => pkg}/authz/role/handlers.go (96%) rename {server/pkg => pkg}/authz/role/list.go (100%) rename {server/pkg => pkg}/authz/role/model.go (92%) rename {server/pkg => pkg}/authz/role/mysql.go (97%) rename {server/pkg => pkg}/authz/role/repository.go (83%) rename {server/pkg => pkg}/authz/role/service.go (92%) rename {server/pkg => pkg}/authz/role/spec.go (76%) rename {server/pkg => pkg}/authz/tenant/handlers.go (97%) rename {server/pkg => pkg}/authz/tenant/list.go (100%) rename {server/pkg => pkg}/authz/tenant/model.go (94%) rename {server/pkg => pkg}/authz/tenant/mysql.go (97%) rename {server/pkg => pkg}/authz/tenant/repository.go (85%) rename {server/pkg => pkg}/authz/tenant/service.go (93%) rename {server/pkg => pkg}/authz/tenant/spec.go (77%) rename {server/pkg => pkg}/authz/user/handlers.go (97%) rename {server/pkg => pkg}/authz/user/list.go (100%) rename {server/pkg => pkg}/authz/user/model.go (94%) rename {server/pkg => pkg}/authz/user/mysql.go (97%) rename {server/pkg => pkg}/authz/user/repository.go (85%) rename {server/pkg => pkg}/authz/user/service.go (94%) rename {server/pkg => pkg}/authz/user/spec.go (78%) rename {server/pkg => pkg}/authz/warrant/handlers.go (95%) rename {server/pkg => pkg}/authz/warrant/list.go (100%) rename {server/pkg => pkg}/authz/warrant/model.go (94%) rename {server/pkg => pkg}/authz/warrant/mysql.go (98%) rename {server/pkg => pkg}/authz/warrant/repository.go (92%) rename {server/pkg => pkg}/authz/warrant/service.go (95%) rename {server/pkg => pkg}/authz/warrant/spec.go (96%) rename {server/pkg => pkg}/database/database.go (100%) rename {server/pkg => pkg}/database/mysql.go (100%) rename {server/pkg => pkg}/database/sql.go (100%) rename {server/pkg => pkg}/middleware/chain.go (100%) rename {server/pkg => pkg}/middleware/list.go (99%) rename {server/pkg => pkg}/service/config.go (96%) rename {server/pkg => pkg}/service/errors.go (100%) rename {server/pkg => pkg}/service/json.go (100%) rename {server/pkg => pkg}/service/router.go (100%) rename {server/pkg => pkg}/service/service.go (84%) rename {server/tests => tests}/authz-wildcard.json (100%) rename {server/tests => tests}/authz.json (100%) rename {server/tests => tests}/features-crud.json (100%) rename {server/tests => tests}/features-list.json (100%) rename {server/tests => tests}/objects-crud.json (100%) rename {server/tests => tests}/objects-list.json (100%) rename {server/tests => tests}/permissions-crud.json (100%) rename {server/tests => tests}/permissions-list.json (100%) rename {server/tests => tests}/pricing-tiers-crud.json (100%) rename {server/tests => tests}/pricing-tiers.list.json (100%) rename {server/tests => tests}/roles-crud.json (100%) rename {server/tests => tests}/roles-list.json (100%) rename {server/tests => tests}/tenants-crud.json (100%) rename {server/tests => tests}/users-crud.json (100%) rename {server/tests => tests}/users-list.json (100%) rename {server/tests => tests}/warrants.json (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 78f1c694..bee28a94 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: install-go: false - name: Build Binary run: make build - working-directory: server/cmd/warrant + working-directory: cmd/warrant - name: GoReleaser Check uses: goreleaser/goreleaser-action@v2 with: diff --git a/server/cmd/warrant/Makefile b/cmd/warrant/Makefile similarity index 100% rename from server/cmd/warrant/Makefile rename to cmd/warrant/Makefile diff --git a/server/cmd/warrant/main.go b/cmd/warrant/main.go similarity index 65% rename from server/cmd/warrant/main.go rename to cmd/warrant/main.go index fa85dbe7..b2fd4f9f 100644 --- a/server/cmd/warrant/main.go +++ b/cmd/warrant/main.go @@ -5,18 +5,18 @@ import ( "net/http" "github.com/rs/zerolog/log" - check "github.com/warrant-dev/warrant/server/pkg/authz/check" - feature "github.com/warrant-dev/warrant/server/pkg/authz/feature" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - permission "github.com/warrant-dev/warrant/server/pkg/authz/permission" - pricingtier "github.com/warrant-dev/warrant/server/pkg/authz/pricingtier" - role "github.com/warrant-dev/warrant/server/pkg/authz/role" - tenant "github.com/warrant-dev/warrant/server/pkg/authz/tenant" - user "github.com/warrant-dev/warrant/server/pkg/authz/user" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/service" + check "github.com/warrant-dev/warrant/pkg/authz/check" + feature "github.com/warrant-dev/warrant/pkg/authz/feature" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + permission "github.com/warrant-dev/warrant/pkg/authz/permission" + pricingtier "github.com/warrant-dev/warrant/pkg/authz/pricingtier" + role "github.com/warrant-dev/warrant/pkg/authz/role" + tenant "github.com/warrant-dev/warrant/pkg/authz/tenant" + user "github.com/warrant-dev/warrant/pkg/authz/user" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/service" ) type ServiceEnv struct { diff --git a/server/migrations/mysql/000001_init.down.sql b/migrations/mysql/000001_init.down.sql similarity index 100% rename from server/migrations/mysql/000001_init.down.sql rename to migrations/mysql/000001_init.down.sql diff --git a/server/migrations/mysql/000001_init.up.sql b/migrations/mysql/000001_init.up.sql similarity index 100% rename from server/migrations/mysql/000001_init.up.sql rename to migrations/mysql/000001_init.up.sql diff --git a/server/pkg/authz/check/handlers.go b/pkg/authz/check/handlers.go similarity index 86% rename from server/pkg/authz/check/handlers.go rename to pkg/authz/check/handlers.go index c7a9b7fa..c2991d94 100644 --- a/server/pkg/authz/check/handlers.go +++ b/pkg/authz/check/handlers.go @@ -3,8 +3,8 @@ package authz import ( "net/http" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) func (svc CheckService) GetRoutes() []service.Route { diff --git a/server/pkg/authz/check/service.go b/pkg/authz/check/service.go similarity index 97% rename from server/pkg/authz/check/service.go rename to pkg/authz/check/service.go index bd915932..9e311f90 100644 --- a/server/pkg/authz/check/service.go +++ b/pkg/authz/check/service.go @@ -6,10 +6,10 @@ import ( "time" "github.com/rs/zerolog/log" - wntContext "github.com/warrant-dev/warrant/server/pkg/authz/context" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" - "github.com/warrant-dev/warrant/server/pkg/service" + wntContext "github.com/warrant-dev/warrant/pkg/authz/context" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" + "github.com/warrant-dev/warrant/pkg/service" ) type CheckService struct { diff --git a/server/pkg/authz/check/spec.go b/pkg/authz/check/spec.go similarity index 91% rename from server/pkg/authz/check/spec.go rename to pkg/authz/check/spec.go index 656ce5a9..6cb3aacb 100644 --- a/server/pkg/authz/check/spec.go +++ b/pkg/authz/check/spec.go @@ -1,8 +1,8 @@ package authz import ( - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" + context "github.com/warrant-dev/warrant/pkg/authz/context" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" ) const Authorized = "Authorized" diff --git a/server/pkg/authz/context/model.go b/pkg/authz/context/model.go similarity index 91% rename from server/pkg/authz/context/model.go rename to pkg/authz/context/model.go index df1bfed5..d4c12100 100644 --- a/server/pkg/authz/context/model.go +++ b/pkg/authz/context/model.go @@ -4,7 +4,7 @@ import ( "regexp" "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) // Context model diff --git a/server/pkg/authz/context/mysql.go b/pkg/authz/context/mysql.go similarity index 95% rename from server/pkg/authz/context/mysql.go rename to pkg/authz/context/mysql.go index 76c17224..1f28cd97 100644 --- a/server/pkg/authz/context/mysql.go +++ b/pkg/authz/context/mysql.go @@ -9,8 +9,8 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/context/repository.go b/pkg/authz/context/repository.go similarity index 86% rename from server/pkg/authz/context/repository.go rename to pkg/authz/context/repository.go index 678db0d6..726d0119 100644 --- a/server/pkg/authz/context/repository.go +++ b/pkg/authz/context/repository.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/service" ) type ContextRepository interface { diff --git a/server/pkg/authz/context/spec.go b/pkg/authz/context/spec.go similarity index 100% rename from server/pkg/authz/context/spec.go rename to pkg/authz/context/spec.go diff --git a/server/pkg/authz/feature/handlers.go b/pkg/authz/feature/handlers.go similarity index 96% rename from server/pkg/authz/feature/handlers.go rename to pkg/authz/feature/handlers.go index cbb8ceae..ce7cffde 100644 --- a/server/pkg/authz/feature/handlers.go +++ b/pkg/authz/feature/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/feature/list.go b/pkg/authz/feature/list.go similarity index 100% rename from server/pkg/authz/feature/list.go rename to pkg/authz/feature/list.go diff --git a/server/pkg/authz/feature/model.go b/pkg/authz/feature/model.go similarity index 92% rename from server/pkg/authz/feature/model.go rename to pkg/authz/feature/model.go index d6a0d62d..7310b4ae 100644 --- a/server/pkg/authz/feature/model.go +++ b/pkg/authz/feature/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type Feature struct { diff --git a/server/pkg/authz/feature/mysql.go b/pkg/authz/feature/mysql.go similarity index 97% rename from server/pkg/authz/feature/mysql.go rename to pkg/authz/feature/mysql.go index 2259f8a8..6d464bed 100644 --- a/server/pkg/authz/feature/mysql.go +++ b/pkg/authz/feature/mysql.go @@ -7,9 +7,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/feature/repository.go b/pkg/authz/feature/repository.go similarity index 84% rename from server/pkg/authz/feature/repository.go rename to pkg/authz/feature/repository.go index c24069ee..501984b2 100644 --- a/server/pkg/authz/feature/repository.go +++ b/pkg/authz/feature/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type FeatureRepository interface { diff --git a/server/pkg/authz/feature/service.go b/pkg/authz/feature/service.go similarity index 93% rename from server/pkg/authz/feature/service.go rename to pkg/authz/feature/service.go index 1ea4b54a..39a351c9 100644 --- a/server/pkg/authz/feature/service.go +++ b/pkg/authz/feature/service.go @@ -3,10 +3,10 @@ package authz import ( "context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type FeatureService struct { diff --git a/server/pkg/authz/feature/spec.go b/pkg/authz/feature/spec.go similarity index 77% rename from server/pkg/authz/feature/spec.go rename to pkg/authz/feature/spec.go index 1429a0f1..0891c3e9 100644 --- a/server/pkg/authz/feature/spec.go +++ b/pkg/authz/feature/spec.go @@ -3,10 +3,10 @@ package authz import ( "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type FeatureSpec struct { diff --git a/server/pkg/authz/object/handlers.go b/pkg/authz/object/handlers.go similarity index 95% rename from server/pkg/authz/object/handlers.go rename to pkg/authz/object/handlers.go index 10d75625..187705fa 100644 --- a/server/pkg/authz/object/handlers.go +++ b/pkg/authz/object/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) func (svc ObjectService) GetRoutes() []service.Route { diff --git a/server/pkg/authz/object/list.go b/pkg/authz/object/list.go similarity index 100% rename from server/pkg/authz/object/list.go rename to pkg/authz/object/list.go diff --git a/server/pkg/authz/object/model.go b/pkg/authz/object/model.go similarity index 91% rename from server/pkg/authz/object/model.go rename to pkg/authz/object/model.go index 01cf8691..324b432f 100644 --- a/server/pkg/authz/object/model.go +++ b/pkg/authz/object/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) // Object model diff --git a/server/pkg/authz/object/mysql.go b/pkg/authz/object/mysql.go similarity index 97% rename from server/pkg/authz/object/mysql.go rename to pkg/authz/object/mysql.go index 61c7d362..0312c675 100644 --- a/server/pkg/authz/object/mysql.go +++ b/pkg/authz/object/mysql.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/object/repository.go b/pkg/authz/object/repository.go similarity index 84% rename from server/pkg/authz/object/repository.go rename to pkg/authz/object/repository.go index 7b983eb1..b2f518d7 100644 --- a/server/pkg/authz/object/repository.go +++ b/pkg/authz/object/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type ObjectRepository interface { diff --git a/server/pkg/authz/object/service.go b/pkg/authz/object/service.go similarity index 93% rename from server/pkg/authz/object/service.go rename to pkg/authz/object/service.go index 9603151b..7184f29e 100644 --- a/server/pkg/authz/object/service.go +++ b/pkg/authz/object/service.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type ObjectService struct { diff --git a/server/pkg/authz/object/spec.go b/pkg/authz/object/spec.go similarity index 100% rename from server/pkg/authz/object/spec.go rename to pkg/authz/object/spec.go diff --git a/server/pkg/authz/objecttype/handlers.go b/pkg/authz/objecttype/handlers.go similarity index 96% rename from server/pkg/authz/objecttype/handlers.go rename to pkg/authz/objecttype/handlers.go index 685d5e77..988dbeae 100644 --- a/server/pkg/authz/objecttype/handlers.go +++ b/pkg/authz/objecttype/handlers.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/objecttype/list.go b/pkg/authz/objecttype/list.go similarity index 100% rename from server/pkg/authz/objecttype/list.go rename to pkg/authz/objecttype/list.go diff --git a/server/pkg/authz/objecttype/model.go b/pkg/authz/objecttype/model.go similarity index 92% rename from server/pkg/authz/objecttype/model.go rename to pkg/authz/objecttype/model.go index 9a08c80e..fe3f4525 100644 --- a/server/pkg/authz/objecttype/model.go +++ b/pkg/authz/objecttype/model.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) // ObjectType model diff --git a/server/pkg/authz/objecttype/mysql.go b/pkg/authz/objecttype/mysql.go similarity index 97% rename from server/pkg/authz/objecttype/mysql.go rename to pkg/authz/objecttype/mysql.go index 1e4c1b2d..00dd24fd 100644 --- a/server/pkg/authz/objecttype/mysql.go +++ b/pkg/authz/objecttype/mysql.go @@ -7,9 +7,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/objecttype/repository.go b/pkg/authz/objecttype/repository.go similarity index 84% rename from server/pkg/authz/objecttype/repository.go rename to pkg/authz/objecttype/repository.go index 2addbb14..99634a96 100644 --- a/server/pkg/authz/objecttype/repository.go +++ b/pkg/authz/objecttype/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type ObjectTypeRepository interface { diff --git a/server/pkg/authz/objecttype/service.go b/pkg/authz/objecttype/service.go similarity index 96% rename from server/pkg/authz/objecttype/service.go rename to pkg/authz/objecttype/service.go index a5e07bc4..3dbe71e6 100644 --- a/server/pkg/authz/objecttype/service.go +++ b/pkg/authz/objecttype/service.go @@ -3,8 +3,8 @@ package authz import ( "context" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type ObjectTypeService struct { diff --git a/server/pkg/authz/objecttype/spec.go b/pkg/authz/objecttype/spec.go similarity index 98% rename from server/pkg/authz/objecttype/spec.go rename to pkg/authz/objecttype/spec.go index 249f3793..1e0ad606 100644 --- a/server/pkg/authz/objecttype/spec.go +++ b/pkg/authz/objecttype/spec.go @@ -3,7 +3,7 @@ package authz import ( "encoding/json" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/service" ) const ( diff --git a/server/pkg/authz/permission/handlers.go b/pkg/authz/permission/handlers.go similarity index 96% rename from server/pkg/authz/permission/handlers.go rename to pkg/authz/permission/handlers.go index eff0c278..fee9cefc 100644 --- a/server/pkg/authz/permission/handlers.go +++ b/pkg/authz/permission/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/permission/list.go b/pkg/authz/permission/list.go similarity index 100% rename from server/pkg/authz/permission/list.go rename to pkg/authz/permission/list.go diff --git a/server/pkg/authz/permission/model.go b/pkg/authz/permission/model.go similarity index 92% rename from server/pkg/authz/permission/model.go rename to pkg/authz/permission/model.go index 923e9b62..f48e1131 100644 --- a/server/pkg/authz/permission/model.go +++ b/pkg/authz/permission/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type Permission struct { diff --git a/server/pkg/authz/permission/mysql.go b/pkg/authz/permission/mysql.go similarity index 97% rename from server/pkg/authz/permission/mysql.go rename to pkg/authz/permission/mysql.go index 8d390700..ec05587f 100644 --- a/server/pkg/authz/permission/mysql.go +++ b/pkg/authz/permission/mysql.go @@ -7,9 +7,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/permission/repository.go b/pkg/authz/permission/repository.go similarity index 85% rename from server/pkg/authz/permission/repository.go rename to pkg/authz/permission/repository.go index e3bca9b5..2f6ac789 100644 --- a/server/pkg/authz/permission/repository.go +++ b/pkg/authz/permission/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type PermissionRepository interface { diff --git a/server/pkg/authz/permission/service.go b/pkg/authz/permission/service.go similarity index 93% rename from server/pkg/authz/permission/service.go rename to pkg/authz/permission/service.go index a35a9f42..585d4437 100644 --- a/server/pkg/authz/permission/service.go +++ b/pkg/authz/permission/service.go @@ -3,10 +3,10 @@ package authz import ( "context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type PermissionService struct { diff --git a/server/pkg/authz/permission/spec.go b/pkg/authz/permission/spec.go similarity index 77% rename from server/pkg/authz/permission/spec.go rename to pkg/authz/permission/spec.go index e0d1a213..594858c3 100644 --- a/server/pkg/authz/permission/spec.go +++ b/pkg/authz/permission/spec.go @@ -3,10 +3,10 @@ package authz import ( "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type PermissionSpec struct { diff --git a/server/pkg/authz/pricingtier/handlers.go b/pkg/authz/pricingtier/handlers.go similarity index 96% rename from server/pkg/authz/pricingtier/handlers.go rename to pkg/authz/pricingtier/handlers.go index 3e2a3200..23bbed60 100644 --- a/server/pkg/authz/pricingtier/handlers.go +++ b/pkg/authz/pricingtier/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/pricingtier/list.go b/pkg/authz/pricingtier/list.go similarity index 100% rename from server/pkg/authz/pricingtier/list.go rename to pkg/authz/pricingtier/list.go diff --git a/server/pkg/authz/pricingtier/model.go b/pkg/authz/pricingtier/model.go similarity index 93% rename from server/pkg/authz/pricingtier/model.go rename to pkg/authz/pricingtier/model.go index d25ea3db..99afcd6e 100644 --- a/server/pkg/authz/pricingtier/model.go +++ b/pkg/authz/pricingtier/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type PricingTier struct { diff --git a/server/pkg/authz/pricingtier/mysql.go b/pkg/authz/pricingtier/mysql.go similarity index 97% rename from server/pkg/authz/pricingtier/mysql.go rename to pkg/authz/pricingtier/mysql.go index 18b94742..2e12a363 100644 --- a/server/pkg/authz/pricingtier/mysql.go +++ b/pkg/authz/pricingtier/mysql.go @@ -7,9 +7,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/pricingtier/repository.go b/pkg/authz/pricingtier/repository.go similarity index 85% rename from server/pkg/authz/pricingtier/repository.go rename to pkg/authz/pricingtier/repository.go index 740643c7..281c8232 100644 --- a/server/pkg/authz/pricingtier/repository.go +++ b/pkg/authz/pricingtier/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type PricingTierRepository interface { diff --git a/server/pkg/authz/pricingtier/service.go b/pkg/authz/pricingtier/service.go similarity index 93% rename from server/pkg/authz/pricingtier/service.go rename to pkg/authz/pricingtier/service.go index b433ea19..1224e491 100644 --- a/server/pkg/authz/pricingtier/service.go +++ b/pkg/authz/pricingtier/service.go @@ -3,10 +3,10 @@ package authz import ( "context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type PricingTierService struct { diff --git a/server/pkg/authz/pricingtier/spec.go b/pkg/authz/pricingtier/spec.go similarity index 78% rename from server/pkg/authz/pricingtier/spec.go rename to pkg/authz/pricingtier/spec.go index 95512581..88028ae7 100644 --- a/server/pkg/authz/pricingtier/spec.go +++ b/pkg/authz/pricingtier/spec.go @@ -3,10 +3,10 @@ package authz import ( "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type PricingTierSpec struct { diff --git a/server/pkg/authz/role/handlers.go b/pkg/authz/role/handlers.go similarity index 96% rename from server/pkg/authz/role/handlers.go rename to pkg/authz/role/handlers.go index d4eddafc..36b8b0ad 100644 --- a/server/pkg/authz/role/handlers.go +++ b/pkg/authz/role/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/role/list.go b/pkg/authz/role/list.go similarity index 100% rename from server/pkg/authz/role/list.go rename to pkg/authz/role/list.go diff --git a/server/pkg/authz/role/model.go b/pkg/authz/role/model.go similarity index 92% rename from server/pkg/authz/role/model.go rename to pkg/authz/role/model.go index 4824d6ed..22998fb5 100644 --- a/server/pkg/authz/role/model.go +++ b/pkg/authz/role/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type Role struct { diff --git a/server/pkg/authz/role/mysql.go b/pkg/authz/role/mysql.go similarity index 97% rename from server/pkg/authz/role/mysql.go rename to pkg/authz/role/mysql.go index f4b5f651..167454e6 100644 --- a/server/pkg/authz/role/mysql.go +++ b/pkg/authz/role/mysql.go @@ -7,9 +7,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/role/repository.go b/pkg/authz/role/repository.go similarity index 83% rename from server/pkg/authz/role/repository.go rename to pkg/authz/role/repository.go index 7d67fef4..86de2648 100644 --- a/server/pkg/authz/role/repository.go +++ b/pkg/authz/role/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type RoleRepository interface { diff --git a/server/pkg/authz/role/service.go b/pkg/authz/role/service.go similarity index 92% rename from server/pkg/authz/role/service.go rename to pkg/authz/role/service.go index a99413ce..1fd50790 100644 --- a/server/pkg/authz/role/service.go +++ b/pkg/authz/role/service.go @@ -3,10 +3,10 @@ package authz import ( "context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type RoleService struct { diff --git a/server/pkg/authz/role/spec.go b/pkg/authz/role/spec.go similarity index 76% rename from server/pkg/authz/role/spec.go rename to pkg/authz/role/spec.go index 3b25b10c..64deacc8 100644 --- a/server/pkg/authz/role/spec.go +++ b/pkg/authz/role/spec.go @@ -3,10 +3,10 @@ package authz import ( "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type RoleSpec struct { diff --git a/server/pkg/authz/tenant/handlers.go b/pkg/authz/tenant/handlers.go similarity index 97% rename from server/pkg/authz/tenant/handlers.go rename to pkg/authz/tenant/handlers.go index a2623f63..85470746 100644 --- a/server/pkg/authz/tenant/handlers.go +++ b/pkg/authz/tenant/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/tenant/list.go b/pkg/authz/tenant/list.go similarity index 100% rename from server/pkg/authz/tenant/list.go rename to pkg/authz/tenant/list.go diff --git a/server/pkg/authz/tenant/model.go b/pkg/authz/tenant/model.go similarity index 94% rename from server/pkg/authz/tenant/model.go rename to pkg/authz/tenant/model.go index 56910733..dd5a03b6 100644 --- a/server/pkg/authz/tenant/model.go +++ b/pkg/authz/tenant/model.go @@ -3,7 +3,7 @@ package tenant import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) // Tenant model diff --git a/server/pkg/authz/tenant/mysql.go b/pkg/authz/tenant/mysql.go similarity index 97% rename from server/pkg/authz/tenant/mysql.go rename to pkg/authz/tenant/mysql.go index d9455df9..6ef8ed28 100644 --- a/server/pkg/authz/tenant/mysql.go +++ b/pkg/authz/tenant/mysql.go @@ -7,11 +7,11 @@ import ( "time" "github.com/pkg/errors" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/tenant/repository.go b/pkg/authz/tenant/repository.go similarity index 85% rename from server/pkg/authz/tenant/repository.go rename to pkg/authz/tenant/repository.go index ead0a86f..95e004cf 100644 --- a/server/pkg/authz/tenant/repository.go +++ b/pkg/authz/tenant/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type TenantRepository interface { diff --git a/server/pkg/authz/tenant/service.go b/pkg/authz/tenant/service.go similarity index 93% rename from server/pkg/authz/tenant/service.go rename to pkg/authz/tenant/service.go index 692fe419..97ed1bfa 100644 --- a/server/pkg/authz/tenant/service.go +++ b/pkg/authz/tenant/service.go @@ -5,12 +5,12 @@ import ( "regexp" "github.com/google/uuid" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - user "github.com/warrant-dev/warrant/server/pkg/authz/user" - warrant "github.com/warrant-dev/warrant/server/pkg/authz/warrant" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + user "github.com/warrant-dev/warrant/pkg/authz/user" + warrant "github.com/warrant-dev/warrant/pkg/authz/warrant" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type TenantService struct { diff --git a/server/pkg/authz/tenant/spec.go b/pkg/authz/tenant/spec.go similarity index 77% rename from server/pkg/authz/tenant/spec.go rename to pkg/authz/tenant/spec.go index 3eddc2f3..1baa0cf4 100644 --- a/server/pkg/authz/tenant/spec.go +++ b/pkg/authz/tenant/spec.go @@ -3,9 +3,9 @@ package tenant import ( "time" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type TenantSpec struct { diff --git a/server/pkg/authz/user/handlers.go b/pkg/authz/user/handlers.go similarity index 97% rename from server/pkg/authz/user/handlers.go rename to pkg/authz/user/handlers.go index f1917380..5bc0e29b 100644 --- a/server/pkg/authz/user/handlers.go +++ b/pkg/authz/user/handlers.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) func (svc UserService) GetRoutes() []service.Route { diff --git a/server/pkg/authz/user/list.go b/pkg/authz/user/list.go similarity index 100% rename from server/pkg/authz/user/list.go rename to pkg/authz/user/list.go diff --git a/server/pkg/authz/user/model.go b/pkg/authz/user/model.go similarity index 94% rename from server/pkg/authz/user/model.go rename to pkg/authz/user/model.go index 12995f8a..c53dadf9 100644 --- a/server/pkg/authz/user/model.go +++ b/pkg/authz/user/model.go @@ -3,7 +3,7 @@ package authz import ( "time" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type User struct { diff --git a/server/pkg/authz/user/mysql.go b/pkg/authz/user/mysql.go similarity index 97% rename from server/pkg/authz/user/mysql.go rename to pkg/authz/user/mysql.go index b2b5a107..b6e269e9 100644 --- a/server/pkg/authz/user/mysql.go +++ b/pkg/authz/user/mysql.go @@ -7,10 +7,10 @@ import ( "time" "github.com/pkg/errors" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/user/repository.go b/pkg/authz/user/repository.go similarity index 85% rename from server/pkg/authz/user/repository.go rename to pkg/authz/user/repository.go index 892550d5..898092db 100644 --- a/server/pkg/authz/user/repository.go +++ b/pkg/authz/user/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type UserRepository interface { diff --git a/server/pkg/authz/user/service.go b/pkg/authz/user/service.go similarity index 94% rename from server/pkg/authz/user/service.go rename to pkg/authz/user/service.go index dbc58e4b..91b9c730 100644 --- a/server/pkg/authz/user/service.go +++ b/pkg/authz/user/service.go @@ -5,10 +5,10 @@ import ( "regexp" "github.com/google/uuid" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type UserService struct { diff --git a/server/pkg/authz/user/spec.go b/pkg/authz/user/spec.go similarity index 78% rename from server/pkg/authz/user/spec.go rename to pkg/authz/user/spec.go index a8b30413..92d50d4d 100644 --- a/server/pkg/authz/user/spec.go +++ b/pkg/authz/user/spec.go @@ -3,9 +3,9 @@ package authz import ( "time" - object "github.com/warrant-dev/warrant/server/pkg/authz/object" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + object "github.com/warrant-dev/warrant/pkg/authz/object" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) type UserSpec struct { diff --git a/server/pkg/authz/warrant/handlers.go b/pkg/authz/warrant/handlers.go similarity index 95% rename from server/pkg/authz/warrant/handlers.go rename to pkg/authz/warrant/handlers.go index 9163bf6f..41ebaa99 100644 --- a/server/pkg/authz/warrant/handlers.go +++ b/pkg/authz/warrant/handlers.go @@ -3,8 +3,8 @@ package authz import ( "net/http" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) // GetRoutes registers all route handlers for this module diff --git a/server/pkg/authz/warrant/list.go b/pkg/authz/warrant/list.go similarity index 100% rename from server/pkg/authz/warrant/list.go rename to pkg/authz/warrant/list.go diff --git a/server/pkg/authz/warrant/model.go b/pkg/authz/warrant/model.go similarity index 94% rename from server/pkg/authz/warrant/model.go rename to pkg/authz/warrant/model.go index f3a63f54..e53bf460 100644 --- a/server/pkg/authz/warrant/model.go +++ b/pkg/authz/warrant/model.go @@ -3,8 +3,8 @@ package authz import ( "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + "github.com/warrant-dev/warrant/pkg/database" ) // Warrant model diff --git a/server/pkg/authz/warrant/mysql.go b/pkg/authz/warrant/mysql.go similarity index 98% rename from server/pkg/authz/warrant/mysql.go rename to pkg/authz/warrant/mysql.go index be110112..1c17ffcb 100644 --- a/server/pkg/authz/warrant/mysql.go +++ b/pkg/authz/warrant/mysql.go @@ -8,9 +8,9 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pkg/errors" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type MySQLRepository struct { diff --git a/server/pkg/authz/warrant/repository.go b/pkg/authz/warrant/repository.go similarity index 92% rename from server/pkg/authz/warrant/repository.go rename to pkg/authz/warrant/repository.go index e0f9e44d..859b433e 100644 --- a/server/pkg/authz/warrant/repository.go +++ b/pkg/authz/warrant/repository.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/warrant-dev/warrant/server/pkg/database" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/database" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type WarrantRepository interface { diff --git a/server/pkg/authz/warrant/service.go b/pkg/authz/warrant/service.go similarity index 95% rename from server/pkg/authz/warrant/service.go rename to pkg/authz/warrant/service.go index d0d3ab5f..a33140f0 100644 --- a/server/pkg/authz/warrant/service.go +++ b/pkg/authz/warrant/service.go @@ -3,10 +3,10 @@ package authz import ( "context" - wntContext "github.com/warrant-dev/warrant/server/pkg/authz/context" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/middleware" - "github.com/warrant-dev/warrant/server/pkg/service" + wntContext "github.com/warrant-dev/warrant/pkg/authz/context" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/middleware" + "github.com/warrant-dev/warrant/pkg/service" ) type WarrantService struct { diff --git a/server/pkg/authz/warrant/spec.go b/pkg/authz/warrant/spec.go similarity index 96% rename from server/pkg/authz/warrant/spec.go rename to pkg/authz/warrant/spec.go index 79e62653..fb5c6f6d 100644 --- a/server/pkg/authz/warrant/spec.go +++ b/pkg/authz/warrant/spec.go @@ -5,9 +5,9 @@ import ( "strings" "time" - context "github.com/warrant-dev/warrant/server/pkg/authz/context" - objecttype "github.com/warrant-dev/warrant/server/pkg/authz/objecttype" - "github.com/warrant-dev/warrant/server/pkg/database" + context "github.com/warrant-dev/warrant/pkg/authz/context" + objecttype "github.com/warrant-dev/warrant/pkg/authz/objecttype" + "github.com/warrant-dev/warrant/pkg/database" ) // FilterOptions type for the filter options available on the warrant table diff --git a/server/pkg/database/database.go b/pkg/database/database.go similarity index 100% rename from server/pkg/database/database.go rename to pkg/database/database.go diff --git a/server/pkg/database/mysql.go b/pkg/database/mysql.go similarity index 100% rename from server/pkg/database/mysql.go rename to pkg/database/mysql.go diff --git a/server/pkg/database/sql.go b/pkg/database/sql.go similarity index 100% rename from server/pkg/database/sql.go rename to pkg/database/sql.go diff --git a/server/pkg/middleware/chain.go b/pkg/middleware/chain.go similarity index 100% rename from server/pkg/middleware/chain.go rename to pkg/middleware/chain.go diff --git a/server/pkg/middleware/list.go b/pkg/middleware/list.go similarity index 99% rename from server/pkg/middleware/list.go rename to pkg/middleware/list.go index 4473bd81..5b42aba2 100644 --- a/server/pkg/middleware/list.go +++ b/pkg/middleware/list.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/rs/zerolog/log" - "github.com/warrant-dev/warrant/server/pkg/service" + "github.com/warrant-dev/warrant/pkg/service" ) type key uint8 diff --git a/server/pkg/service/config.go b/pkg/service/config.go similarity index 96% rename from server/pkg/service/config.go rename to pkg/service/config.go index 7604afb4..1aca5c0e 100644 --- a/server/pkg/service/config.go +++ b/pkg/service/config.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" "github.com/rs/zerolog/pkgerrors" "github.com/spf13/viper" - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) const ( diff --git a/server/pkg/service/errors.go b/pkg/service/errors.go similarity index 100% rename from server/pkg/service/errors.go rename to pkg/service/errors.go diff --git a/server/pkg/service/json.go b/pkg/service/json.go similarity index 100% rename from server/pkg/service/json.go rename to pkg/service/json.go diff --git a/server/pkg/service/router.go b/pkg/service/router.go similarity index 100% rename from server/pkg/service/router.go rename to pkg/service/router.go diff --git a/server/pkg/service/service.go b/pkg/service/service.go similarity index 84% rename from server/pkg/service/service.go rename to pkg/service/service.go index 6f1f1308..ca941ee2 100644 --- a/server/pkg/service/service.go +++ b/pkg/service/service.go @@ -1,7 +1,7 @@ package service import ( - "github.com/warrant-dev/warrant/server/pkg/database" + "github.com/warrant-dev/warrant/pkg/database" ) type Env interface { diff --git a/server/tests/authz-wildcard.json b/tests/authz-wildcard.json similarity index 100% rename from server/tests/authz-wildcard.json rename to tests/authz-wildcard.json diff --git a/server/tests/authz.json b/tests/authz.json similarity index 100% rename from server/tests/authz.json rename to tests/authz.json diff --git a/server/tests/features-crud.json b/tests/features-crud.json similarity index 100% rename from server/tests/features-crud.json rename to tests/features-crud.json diff --git a/server/tests/features-list.json b/tests/features-list.json similarity index 100% rename from server/tests/features-list.json rename to tests/features-list.json diff --git a/server/tests/objects-crud.json b/tests/objects-crud.json similarity index 100% rename from server/tests/objects-crud.json rename to tests/objects-crud.json diff --git a/server/tests/objects-list.json b/tests/objects-list.json similarity index 100% rename from server/tests/objects-list.json rename to tests/objects-list.json diff --git a/server/tests/permissions-crud.json b/tests/permissions-crud.json similarity index 100% rename from server/tests/permissions-crud.json rename to tests/permissions-crud.json diff --git a/server/tests/permissions-list.json b/tests/permissions-list.json similarity index 100% rename from server/tests/permissions-list.json rename to tests/permissions-list.json diff --git a/server/tests/pricing-tiers-crud.json b/tests/pricing-tiers-crud.json similarity index 100% rename from server/tests/pricing-tiers-crud.json rename to tests/pricing-tiers-crud.json diff --git a/server/tests/pricing-tiers.list.json b/tests/pricing-tiers.list.json similarity index 100% rename from server/tests/pricing-tiers.list.json rename to tests/pricing-tiers.list.json diff --git a/server/tests/roles-crud.json b/tests/roles-crud.json similarity index 100% rename from server/tests/roles-crud.json rename to tests/roles-crud.json diff --git a/server/tests/roles-list.json b/tests/roles-list.json similarity index 100% rename from server/tests/roles-list.json rename to tests/roles-list.json diff --git a/server/tests/tenants-crud.json b/tests/tenants-crud.json similarity index 100% rename from server/tests/tenants-crud.json rename to tests/tenants-crud.json diff --git a/server/tests/users-crud.json b/tests/users-crud.json similarity index 100% rename from server/tests/users-crud.json rename to tests/users-crud.json diff --git a/server/tests/users-list.json b/tests/users-list.json similarity index 100% rename from server/tests/users-list.json rename to tests/users-list.json diff --git a/server/tests/warrants.json b/tests/warrants.json similarity index 100% rename from server/tests/warrants.json rename to tests/warrants.json