Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .configs/gqlgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ autobind:
- "github.com/nais/api/internal/servicemaintenance"
- "github.com/nais/api/internal/servicemaintenance/activitylog"
- "github.com/nais/api/internal/team"
- "github.com/nais/api/internal/tunnel"
- "github.com/nais/api/internal/unleash"
- "github.com/nais/api/internal/user"
- "github.com/nais/api/internal/usersync"
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/authz/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ func CanCreateAivenCredentials(ctx context.Context, teamSlug slug.Slug) error {
return requireTeamAuthorization(ctx, teamSlug, "aiven:credentials:create")
}

func CanCreateTunnel(ctx context.Context, teamSlug slug.Slug) error {
return requireTeamAuthorization(ctx, teamSlug, "tunnels:create")
}

func RequireGlobalAdmin(ctx context.Context) error {
if ActorFromContext(ctx).User.IsAdmin() {
return nil
Expand Down
2 changes: 2 additions & 0 deletions internal/cmd/api/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import (
"github.com/nais/api/internal/thirdparty/hookd"
"github.com/nais/api/internal/thirdparty/promclient"
promfake "github.com/nais/api/internal/thirdparty/promclient/fake"
"github.com/nais/api/internal/tunnel"
"github.com/nais/api/internal/unleash"
"github.com/nais/api/internal/user"
"github.com/nais/api/internal/usersync"
Expand Down Expand Up @@ -311,6 +312,7 @@ func ConfigureGraph(
ctx = session.NewLoaderContext(ctx, pool)
ctx = search.NewLoaderContext(ctx, pool, searcher)
ctx = unleash.NewLoaderContext(ctx, tenantName, watchers.UnleashWatcher, bifrostAPIURL, allowedClusters, log)
ctx = tunnel.WithLoaders(ctx, tunnel.NewLoaders(watchers.TunnelWatcher))
ctx = logging.NewPackageContext(ctx, tenantName, defaultLogDestinations)
ctx = environment.NewLoaderContext(ctx, pool)
ctx = feature.NewLoaderContext(
Expand Down
27 changes: 27 additions & 0 deletions internal/database/migrations/0063_add_tunnel_authorization.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-- +goose Up
INSERT INTO
authorizations (name, description)
VALUES
(
'tunnels:create',
'Permission to create WireGuard tunnels.'
)
;

INSERT INTO
role_authorizations (role_name, authorization_name)
VALUES
('Team member', 'tunnels:create'),
('Team owner', 'tunnels:create')
;

-- +goose Down
DELETE FROM role_authorizations
WHERE
authorization_name = 'tunnels:create'
;

DELETE FROM authorizations
WHERE
name = 'tunnels:create'
;
15 changes: 15 additions & 0 deletions internal/graph/gengql/activitylog.generated.go

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

2 changes: 2 additions & 0 deletions internal/graph/gengql/alerts.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/applications.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/bigquery.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/bucket.generated.go

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

2 changes: 2 additions & 0 deletions internal/graph/gengql/config.generated.go

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

28 changes: 28 additions & 0 deletions internal/graph/gengql/issues.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/jobs.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/kafka.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/opensearch.generated.go

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

4 changes: 4 additions & 0 deletions internal/graph/gengql/postgres.generated.go

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

Loading
Loading