Skip to content

Commit

Permalink
Move all directories/files to the top level and remove /server direct…
Browse files Browse the repository at this point in the history 
…ory (#11)

* Move all directories/files to the top level and remove /server directory

* Update GitHub action
  • Loading branch information
@kkajla12
kkajla12 authored Feb 23, 2023
1 parent 8b236ee commit 7b0e8a0
Show file tree
Hide file tree
Showing 101 changed files with 175 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 server/cmd/warrant/Makefile → cmd/warrant/Makefile
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions server/cmd/warrant/main.go → cmd/warrant/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 server/migrations/mysql/000001_init.down.sql → migrations/mysql/000001_init.down.sql
View file
File renamed without changes.
0 server/migrations/mysql/000001_init.up.sql → migrations/mysql/000001_init.up.sql
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions server/pkg/authz/check/handlers.go → pkg/authz/check/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions server/pkg/authz/check/service.go → pkg/authz/check/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/check/spec.go → pkg/authz/check/spec.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/pkg/authz/context/model.go → pkg/authz/context/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"regexp"
"time"

"github.com/warrant-dev/warrant/server/pkg/database"
"github.com/warrant-dev/warrant/pkg/database"
)

// Context model
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/context/mysql.go → pkg/authz/context/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/context/repository.go → pkg/authz/context/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 server/pkg/authz/context/spec.go → pkg/authz/context/spec.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions server/pkg/authz/feature/handlers.go → pkg/authz/feature/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 server/pkg/authz/feature/list.go → pkg/authz/feature/list.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion server/pkg/authz/feature/model.go → pkg/authz/feature/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/feature/mysql.go → pkg/authz/feature/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/feature/repository.go → pkg/authz/feature/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions server/pkg/authz/feature/service.go → pkg/authz/feature/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions server/pkg/authz/feature/spec.go → pkg/authz/feature/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/object/handlers.go → pkg/authz/object/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 server/pkg/authz/object/list.go → pkg/authz/object/list.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion server/pkg/authz/object/model.go → pkg/authz/object/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/object/mysql.go → pkg/authz/object/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/object/repository.go → pkg/authz/object/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/object/service.go → pkg/authz/object/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 server/pkg/authz/object/spec.go → pkg/authz/object/spec.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions server/pkg/authz/objecttype/handlers.go → pkg/authz/objecttype/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 server/pkg/authz/objecttype/list.go → pkg/authz/objecttype/list.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion server/pkg/authz/objecttype/model.go → pkg/authz/objecttype/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/objecttype/mysql.go → pkg/authz/objecttype/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/objecttype/repository.go → pkg/authz/objecttype/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/objecttype/service.go → pkg/authz/objecttype/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion server/pkg/authz/objecttype/spec.go → pkg/authz/objecttype/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/permission/handlers.go → pkg/authz/permission/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 server/pkg/authz/permission/list.go → pkg/authz/permission/list.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion server/pkg/authz/permission/model.go → pkg/authz/permission/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/permission/mysql.go → pkg/authz/permission/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions server/pkg/authz/permission/repository.go → pkg/authz/permission/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions server/pkg/authz/permission/service.go → pkg/authz/permission/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions server/pkg/authz/permission/spec.go → pkg/authz/permission/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/authz/pricingtier/handlers.go → pkg/authz/pricingtier/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 server/pkg/authz/pricingtier/list.go → pkg/authz/pricingtier/list.go
View file
File renamed without changes.
Loading

0 comments on commit 7b0e8a0

Please sign in to comment.