basic auth

Author: geropl

components/gitpod-cli/go.mod

@@ -23,9 +23,9 @@ require (
 	github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37
 	github.com/spf13/cobra v1.6.1
 	golang.org/x/sync v0.2.0
-	golang.org/x/term v0.6.0
+	golang.org/x/term v0.8.0
 	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f
-	google.golang.org/grpc v1.52.3
+	google.golang.org/grpc v1.55.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -40,7 +40,7 @@ require (
 	github.com/onsi/gomega v1.24.2 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
 	golang.org/x/sys v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
 )
 
 require (
@@ -56,8 +56,8 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/segmentio/analytics-go.v3 v3.1.0 // indirect
 )

components/gitpod-cli/go.sum

@@ -9,6 +9,7 @@ packages:
       - components/common-go:lib
       - components/public-api/go:lib
       - components/usage-api/go:lib
+      - components/usage:lib
       - components/gitpod-protocol/go:lib
       - components/gitpod-db/go:lib
       - components/gitpod-db/go:init-testdb

components/public-api-server/BUILD.yaml

@@ -8,11 +8,12 @@ require (
 	github.com/bufbuild/connect-go v1.10.0
 	github.com/coreos/go-oidc/v3 v3.5.0
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
-	github.com/gitpod-io/gitpod/components/gitpod-db/go v0.0.0-00010101000000-000000000000
+	github.com/gitpod-io/gitpod/components/gitpod-db/go v0.0.0-20231010172218-3eb86ff8b745
 	github.com/gitpod-io/gitpod/components/public-api/go v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000
+	github.com/gitpod-io/gitpod/usage v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/usage-api v0.0.0-00010101000000-000000000000
-	github.com/go-chi/chi/v5 v5.0.8
+	github.com/go-chi/chi/v5 v5.0.10
 	github.com/golang-jwt/jwt/v5 v5.0.0
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.5.9
@@ -46,7 +47,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
 	github.com/jzelinskie/stringz v0.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
+	github.com/yuin/gopher-lua v1.1.0 // indirect
 	go.opentelemetry.io/otel v1.16.0 // indirect
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
@@ -60,7 +61,7 @@ require (
 )
 
 require (
-	github.com/alicebob/miniredis/v2 v2.30.0
+	github.com/alicebob/miniredis/v2 v2.30.2
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -117,6 +118,8 @@ replace github.com/gitpod-io/gitpod/gitpod-protocol => ../gitpod-protocol/go //
 
 replace github.com/gitpod-io/gitpod/usage-api => ../usage-api/go // leeway
 
+replace github.com/gitpod-io/gitpod/usage => ../usage // leeway
+
 replace k8s.io/api => k8s.io/api v0.27.3 // leeway indirect from components/common-go:lib
 
 replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3 // leeway indirect from components/common-go:lib

components/public-api-server/go.mod

@@ -24,6 +24,7 @@ import (
 
 	"github.com/gitpod-io/gitpod/components/public-api/go/config"
 	"github.com/gitpod-io/gitpod/components/public-api/go/experimental/v1/v1connect"
+	usage_v1connect "github.com/gitpod-io/gitpod/usage-api/v1/v1connect"
 	"github.com/gorilla/handlers"
 
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
@@ -38,6 +39,7 @@ import (
 	"github.com/gitpod-io/gitpod/public-api-server/pkg/origin"
 	"github.com/gitpod-io/gitpod/public-api-server/pkg/proxy"
 	"github.com/gitpod-io/gitpod/public-api-server/pkg/webhooks"
+	usage_apiv1 "github.com/gitpod-io/gitpod/usage/pkg/apiv1"
 	"github.com/sirupsen/logrus"
 )
 
@@ -148,7 +150,7 @@ func Start(logger *logrus.Entry, version string, cfg *config.Configuration) erro
 		idpService:      idpService,
 		authCfg:         cfg.Auth,
 		sessionVerifier: rsa256,
-	}); registerErr != nil {
+	}, cfg); registerErr != nil {
 		return fmt.Errorf("failed to register services: %w", registerErr)
 	}
 
@@ -172,7 +174,7 @@ type registerDependencies struct {
 	authCfg         config.AuthConfiguration
 }
 
-func register(srv *baseserver.Server, deps *registerDependencies) error {
+func register(srv *baseserver.Server, deps *registerDependencies, cfg *config.Configuration) error {
 	proxy.RegisterMetrics(srv.MetricsRegistry())
 	oidc.RegisterMetrics(srv.MetricsRegistry())
 
@@ -205,6 +207,12 @@ func register(srv *baseserver.Server, deps *registerDependencies) error {
 	rootHandler.Mount(v1connect.NewOIDCServiceHandler(apiv1.NewOIDCService(deps.connPool, deps.expClient, deps.dbConn, deps.cipher), handlerOptions...))
 	rootHandler.Mount(v1connect.NewIdentityProviderServiceHandler(apiv1.NewIdentityProviderService(deps.connPool, deps.idpService), handlerOptions...))
 
+	usageService, err := usage_apiv1.NewUsageServiceConnect(deps.dbConn, &cfg.UsageConfiguration)
+	if err != nil {
+		return fmt.Errorf("cannot create usage service handler: %w", err)
+	}
+	rootHandler.Mount(usage_v1connect.NewUsageServiceHandler(usageService, handlerOptions...))
+
 	if deps.signer != nil {
 		rootHandler.Mount(v1connect.NewTokensServiceHandler(apiv1.NewTokensService(deps.connPool, deps.expClient, deps.dbConn, deps.signer), handlerOptions...))
 	}

components/public-api-server/go.sum

@@ -3,6 +3,7 @@ packages:
     type: go
     deps:
       - components/common-go:lib
+      - components/usage-api/go:lib
     srcs:
       - "**/*.go"
       - "go.mod"

components/public-api-server/pkg/server/server.go

@@ -6,6 +6,7 @@ package config
 
 import (
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
+	usage_config "github.com/gitpod-io/gitpod/usage-api/config"
 )
 
 type Configuration struct {
@@ -25,6 +26,8 @@ type Configuration struct {
 	// Path to file which contains personal access token singing key
 	PersonalAccessTokenSigningKeyPath string `json:"personalAccessTokenSigningKeyPath"`
 
+	UsageConfiguration usage_config.Config `json:"usage"`
+
 	// Path to directory containing database configuration files
 	DatabaseConfigPath string `json:"databaseConfigPath"`