feat(warden): added warden host as a config

cli/server/configs.go

@@ -23,6 +23,11 @@ type serverConfig struct {
 	Compass     compassConfig    `mapstructure:"compass"`
 	Optimus     optimusConfig    `mapstructure:"optimus"`
 	StencilAddr string           `mapstructure:"stencil_addr"`
+	Warden      wardenConfig     `mapstructure:"warden"`
+}
+
+type wardenConfig struct {
+	Addr string `mapstructure:"addr"`
 }
 
 type odinConfig struct {

cli/server/server.go

@@ -113,5 +113,6 @@ func runServer(baseCtx context.Context, nrApp *newrelic.Application, zapLog *zap
 		&gcs.Client{StorageClient: gcsClient},
 		cfg.Odin.Addr,
 		cfg.StencilAddr,
+		cfg.Warden.Addr,
 	)
 }

internal/server/server.go

@@ -39,6 +39,7 @@ func Serve(ctx context.Context, addr string,
 	gcsClient gcs.BlobStorageClient,
 	odinAddr string,
 	stencilAddr string,
+	wardenAddr string,
 ) error {
 	alertSvc := alertsv1.NewService(sirenClient)
 
@@ -67,7 +68,7 @@ func Serve(ctx context.Context, addr string,
 		r.Route("/dlq", dlqv1.Routes(entropyClient, gcsClient))
 		r.Route("/firehoses", firehosev1.Routes(entropyClient, shieldClient, alertSvc, compassClient, odinAddr, stencilAddr))
 		r.Route("/kubernetes", kubernetesv1.Routes(entropyClient))
-		r.Route("/warden", warden.Routes(shieldClient, http.DefaultClient))
+		r.Route("/warden", warden.Routes(shieldClient, http.DefaultClient, wardenAddr))
 	})
 
 	logger.Info("starting server", zap.String("addr", addr))

internal/server/v1/warden/handler_test.go

@@ -71,7 +71,7 @@ func TestHandler_teamList(t *testing.T) {
 		req.Header.Add("X-Auth-Email", "[email protected]")
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(nil, doer)(router)
+		warden.Routes(nil, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusOK, resp.Code)
@@ -112,7 +112,7 @@ func TestHandler_teamList(t *testing.T) {
 		req.Header.Add("X-Auth-Email", "[email protected]")
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(shieldClient, doer)(router)
+		warden.Routes(shieldClient, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusNotFound, resp.Code)
@@ -127,7 +127,7 @@ func TestHandler_teamList(t *testing.T) {
 		require.NoError(t, err)
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(shieldClient, doer)(router)
+		warden.Routes(shieldClient, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusUnauthorized, resp.Code)
@@ -198,7 +198,7 @@ func TestHandler_updateGroup(t *testing.T) {
 		require.NoError(t, err)
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(shieldClient, doer)(router)
+		warden.Routes(shieldClient, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusOK, resp.Code)
@@ -235,7 +235,7 @@ func TestHandler_updateGroup(t *testing.T) {
 		require.NoError(t, err)
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(shieldClient, doer)(router)
+		warden.Routes(shieldClient, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusInternalServerError, resp.Code)
@@ -250,7 +250,7 @@ func TestHandler_updateGroup(t *testing.T) {
 		require.NoError(t, err)
 		router := chi.NewRouter()
 		router.Use(reqctx.WithRequestCtx())
-		warden.Routes(shieldClient, doer)(router)
+		warden.Routes(shieldClient, doer, "")(router)
 		router.ServeHTTP(resp, req)
 
 		assert.Equal(t, http.StatusBadRequest, resp.Code)

internal/server/v1/warden/routes.go

@@ -5,8 +5,8 @@ import (
 	chiv5 "github.com/go-chi/chi/v5"
 )
 
-func Routes(shieldClient shieldv1beta1rpc.ShieldServiceClient, doer HTTPClient) func(r chiv5.Router) {
-	service := NewService(shieldClient, doer)
+func Routes(shieldClient shieldv1beta1rpc.ShieldServiceClient, doer HTTPClient, wardenAddr string) func(r chiv5.Router) {
+	service := NewService(shieldClient, doer, wardenAddr)
 	handler := NewHandler(service)
 	return func(r chiv5.Router) {
 		r.Get("/users/me/warden_teams", handler.teamList)

internal/server/v1/warden/service.go

@@ -13,23 +13,21 @@ import (
 
 //go:generate mockery --with-expecter --keeptree --case snake --name Doer
 
-const (
-	baseURL = "https://go-cloud.golabs.io"
-)
-
 type Service struct {
 	shieldClient shieldv1beta1rpc.ShieldServiceClient
 	doer         HTTPClient
+	wardenAddr   string
 }
 
 type HTTPClient interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
-func NewService(shieldClient shieldv1beta1rpc.ShieldServiceClient, doer HTTPClient) *Service {
+func NewService(shieldClient shieldv1beta1rpc.ShieldServiceClient, doer HTTPClient, wardenAddr string) *Service {
 	return &Service{
 		shieldClient: shieldClient,
 		doer:         doer,
+		wardenAddr:   wardenAddr,
 	}
 }
 
@@ -38,7 +36,7 @@ func (c *Service) TeamList(ctx context.Context, userEmail string) (*TeamData, er
 	userPath := "/users/"
 	teamsEndpoint := "/teams"
 
-	url := baseURL + endpoint + userPath + userEmail + teamsEndpoint
+	url := c.wardenAddr + endpoint + userPath + userEmail + teamsEndpoint
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
@@ -112,7 +110,7 @@ func (c *Service) TeamByUUID(ctx context.Context, teamByUUID string) (*Team, err
 	endpoint := "/api/v2"
 	teamPath := "/teams/"
 
-	url := baseURL + endpoint + teamPath + teamByUUID
+	url := c.wardenAddr + endpoint + teamPath + teamByUUID
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {