Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PUT and POST APIs for tenant creation #779

Merged
merged 4 commits into from
Mar 12, 2024
Merged

PUT and POST APIs for tenant creation #779

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a74384
prevent existing tenant from being overwritten by distinguishing betw…
boriwo Mar 11, 2024
f3a1760
dedicated field to configure client id for credentials api
boriwo Mar 12, 2024
51ff74f
make execution of google profiler conditional
boriwo Mar 12, 2024
c9d32ed
some clarification around the otel b3 propagator
boriwo Mar 12, 2024
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
67 changes: 59 additions & 8 deletions internal/pkg/app/handlers_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/trace"
"io/ioutil"
"io"
"net/http"
"regexp"
"strings"
Expand Down Expand Up @@ -175,12 +175,16 @@ func NewAPIManager(routingMgr tablemgr.RoutingTableManager, tenantStorer tenant.
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/fragments/{fragmentId}", api.getFragmentHandler).Methods(http.MethodGet)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/fragments", api.getAllTenantFragmentsHandler).Methods(http.MethodGet)

// old tenant APIs for backward compatibility

api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/config", api.getTenantConfigHandler).Methods(http.MethodGet)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/config", api.addTenantConfigHandler).Methods(http.MethodPut)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/config", api.updateTenantConfigHandler).Methods(http.MethodPut)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/config", api.addTenantConfigHandler).Methods(http.MethodPost)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}/config", api.deleteTenantConfigHandler).Methods(http.MethodDelete)

api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}", api.getTenantConfigHandler).Methods(http.MethodGet)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}", api.addTenantConfigHandler).Methods(http.MethodPut)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}", api.updateTenantConfigHandler).Methods(http.MethodPut)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}", api.addTenantConfigHandler).Methods(http.MethodPost)
api.muxRouter.HandleFunc("/ears/v1/orgs/{orgId}/applications/{appId}", api.deleteTenantConfigHandler).Methods(http.MethodDelete)

api.muxRouter.HandleFunc("/ears/v1/routes", api.getAllRoutesHandler).Methods(http.MethodGet)
Expand Down Expand Up @@ -327,7 +331,7 @@ func (a *APIManager) webhookHandler(w http.ResponseWriter, r *http.Request) {
resp.Respond(ctx, w, doYaml(r))
return
}
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "webhookHandler").Msg(err.Error())
resp := ErrorResponse(&InternalServerError{err})
Expand Down Expand Up @@ -387,7 +391,7 @@ func (a *APIManager) sendEventHandler(w http.ResponseWriter, r *http.Request) {
r.Body = http.MaxBytesReader(w, r.Body, maxEventSize)
defer r.Body.Close()
}
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "sendEventHandler").Msg(err.Error())
resp := ErrorResponse(&InternalServerError{err})
Expand Down Expand Up @@ -506,7 +510,7 @@ func (a *APIManager) addRouteHandler(w http.ResponseWriter, r *http.Request) {
return
}
routeId := vars["routeId"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "addRouteHandler").Msg(err.Error())
a.addRouteFailureRecorder.Add(ctx, 1.0)
Expand Down Expand Up @@ -872,7 +876,7 @@ func (a *APIManager) addFragmentHandler(w http.ResponseWriter, r *http.Request)
return
}
fragmentId := vars["fragmentId"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "addFragmentHandler").Msg(err.Error())
a.addRouteFailureRecorder.Add(ctx, 1.0)
Expand Down Expand Up @@ -964,7 +968,15 @@ func (a *APIManager) addTenantConfigHandler(w http.ResponseWriter, r *http.Reque
resp.Respond(ctx, w, doYaml(r))
return
}
body, err := ioutil.ReadAll(r.Body)
config, err := a.tenantStorer.GetConfig(ctx, *tid)
if err == nil && config != nil {
err = errors.New("cannot update existing tenant " + tid.AppId)
log.Ctx(ctx).Error().Str("op", "addTenantConfigHandler").Str("error", err.Error()).Msg("tenant " + tid.AppId + "already exists")
resp := ErrorResponse(convertToApiError(ctx, err))
resp.Respond(ctx, w, doYaml(r))
return
}
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "addTenantConfigHandler").Str("error", err.Error()).Msg("error reading request body")
resp := ErrorResponse(&InternalServerError{err})
Expand Down Expand Up @@ -993,6 +1005,45 @@ func (a *APIManager) addTenantConfigHandler(w http.ResponseWriter, r *http.Reque
resp.Respond(ctx, w, doYaml(r))
}

func (a *APIManager) updateTenantConfigHandler(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := mux.Vars(r)
tid, apiErr := getTenant(ctx, vars)
if apiErr != nil {
log.Ctx(ctx).Error().Str("op", "updateTenantConfigHandler").Str("error", apiErr.Error()).Msg("orgId or appId empty")
resp := ErrorResponse(apiErr)
resp.Respond(ctx, w, doYaml(r))
return
}
body, err := io.ReadAll(r.Body)
if err != nil {
log.Ctx(ctx).Error().Str("op", "updateTenantConfigHandler").Str("error", err.Error()).Msg("error reading request body")
resp := ErrorResponse(&InternalServerError{err})
resp.Respond(ctx, w, doYaml(r))
return
}
var tenantConfig tenant.Config
err = yaml.Unmarshal(body, &tenantConfig)
if err != nil {
log.Ctx(ctx).Error().Str("op", "updateTenantConfigHandler").Str("error", err.Error()).Msg("error unmarshal request body")
resp := ErrorResponse(&BadRequestError{"Cannot unmarshal request body", err})
resp.Respond(ctx, w, doYaml(r))
return
}
tenantConfig.Tenant = *tid
err = a.tenantStorer.SetConfig(ctx, tenantConfig)
if err != nil {
log.Ctx(ctx).Error().Str("op", "updateTenantConfigHandler").Str("error", err.Error()).Msg("error setting tenant config")
resp := ErrorResponse(convertToApiError(ctx, err))
resp.Respond(ctx, w, doYaml(r))
return
}
a.quotaManager.PublishQuota(ctx, *tid)
log.Ctx(ctx).Info().Str("op", "updateTenantConfigHandler").Msg("success")
resp := ItemResponse(tenantConfig)
resp.Respond(ctx, w, doYaml(r))
}

func (a *APIManager) deleteTenantConfigHandler(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := mux.Vars(r)
Expand Down
Loading