Skip to content

Commit

Permalink
add specific handlers for api/git/web to allow replacement for harness (
Browse files Browse the repository at this point in the history 
#23)

Abstracting the api/git/web routers will allow us to replace API routing (and potentially web?), while keeping the rest the same.
  • Loading branch information
@johannesHarness
johannesHarness committed Oct 1, 2022
1 parent 4668e94 commit 4d3db64
Show file tree
Hide file tree
Showing 42 changed files with 160 additions and 113 deletions.
6 changes: 5 additions & 1 deletion cli/server/harness.wire.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
package server

import (
"context"

"github.com/harness/gitness/harness"
"github.com/harness/gitness/harness/auth/authn"
"github.com/harness/gitness/harness/auth/authz"
"github.com/harness/gitness/harness/client"
"github.com/harness/gitness/harness/router/translator"
"github.com/harness/gitness/internal/cron"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/router"
"github.com/harness/gitness/internal/server"
"github.com/harness/gitness/internal/store/database"
Expand All @@ -23,14 +26,15 @@ import (
"github.com/google/wire"
)

func initSystem(config *types.Config) (*system, error) {
func initSystem(ctx context.Context, config *types.Config) (*system, error) {
wire.Build(
newSystem,
database.WireSet,
memory.WireSet,
router.WireSet,
server.WireSet,
cron.WireSet,
guard.WireSet,
harness.LoadConfig,
authn.WireSet,
authz.WireSet,
Expand Down
18 changes: 11 additions & 7 deletions cli/server/harness.wire_gen.go
View file

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

2 changes: 2 additions & 0 deletions cli/server/standalone.wire.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/harness/gitness/internal/auth/authn"
"github.com/harness/gitness/internal/auth/authz"
"github.com/harness/gitness/internal/cron"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/router"
"github.com/harness/gitness/internal/router/translator"
"github.com/harness/gitness/internal/server"
Expand All @@ -31,6 +32,7 @@ func initSystem(ctx context.Context, config *types.Config) (*system, error) {
router.WireSet,
server.WireSet,
cron.WireSet,
guard.WireSet,
authn.WireSet,
authz.WireSet,
translator.WireSet,
Expand Down
12 changes: 7 additions & 5 deletions cli/server/standalone.wire_gen.go
View file

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

2 changes: 1 addition & 1 deletion internal/api/handler/repo/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"strings"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/check"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/createPath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"strings"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/handler/common"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/check"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package repo
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/deletePath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package repo
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/find.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package repo
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/listPaths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package repo
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/listServiceAccounts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package repo
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/move.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"
"strings"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/check"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/repo/update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/check"
"github.com/harness/gitness/types/enum"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/dchest/uniuri"
"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/handler/common"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/check"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/createSat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/internal/token"
"github.com/harness/gitness/types"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package serviceaccount
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/deleteSat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package serviceaccount
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/find.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package serviceaccount
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/types/enum"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/serviceaccount/listSats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package serviceaccount
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"strings"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/paths"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/createPath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"strings"
"time"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/handler/common"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/check"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/deletePath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/find.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/enum"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/listPaths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/listRepos.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/enum"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/listServiceAccounts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package space
import (
"net/http"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/hlog"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler/space/move.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"
"strings"

"github.com/harness/gitness/internal/api/guard"
"github.com/harness/gitness/internal/api/render"
"github.com/harness/gitness/internal/api/request"
"github.com/harness/gitness/internal/guard"
"github.com/harness/gitness/internal/paths"
"github.com/harness/gitness/internal/store"
"github.com/harness/gitness/types"
Expand Down

0 comments on commit 4d3db64

Please sign in to comment.