Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Don't call auth service for user's OpenShift username #610

Closed
wants to merge 1 commit into from
Closed

Don't call auth service for user's OpenShift username #610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 7 additions & 20 deletions controller/tenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func (c *TenantController) Update(ctx *app.UpdateTenantContext) error {
if err != nil {
return jsonapi.JSONErrorResponse(ctx, errors.NewNotFoundError("tenants", ttoken.Subject().String()))
}
openshiftUsername := tenant.OSUsername

// fetch the cluster the user belongs to
user, err := c.userService.GetUser(ctx, ttoken.Subject())
Expand All @@ -159,16 +160,6 @@ func (c *TenantController) Update(ctx *app.UpdateTenantContext) error {
return jsonapi.JSONErrorResponse(ctx, errors.NewInternalError(ctx, fmt.Errorf("unable to provision to undefined cluster")))
}

// fetch the users cluster token
openshiftUsername, _, err := c.resolveTenant(ctx, *user.Cluster, userToken.Raw)
if err != nil {
log.Error(ctx, map[string]interface{}{
"err": err,
"cluster_url": *user.Cluster,
}, "unable to fetch tenant token from auth")
return jsonapi.JSONErrorResponse(ctx, errors.NewUnauthorizedError("Could not resolve user token"))
}

cluster, err := c.resolveCluster(ctx, *user.Cluster)
if err != nil {
log.Error(ctx, map[string]interface{}{
Expand Down Expand Up @@ -221,6 +212,12 @@ func (c *TenantController) Clean(ctx *app.CleanTenantContext) error {
}
ttoken := &TenantToken{token: userToken}

tenant, err := c.tenantService.GetTenant(ttoken.Subject())
if err != nil {
return jsonapi.JSONErrorResponse(ctx, errors.NewNotFoundError("tenants", ttoken.Subject().String()))
}
openshiftUsername := tenant.OSUsername

// fetch the cluster the user belongs to
user, err := c.userService.GetUser(ctx, ttoken.Subject())
if err != nil {
Expand All @@ -233,16 +230,6 @@ func (c *TenantController) Clean(ctx *app.CleanTenantContext) error {
removeFromCluster = ctx.Remove
}

// fetch the users cluster token
openshiftUsername, _, err := c.resolveTenant(ctx, *user.Cluster, userToken.Raw)
if err != nil {
log.Error(ctx, map[string]interface{}{
"err": err,
"cluster_url": *user.Cluster,
}, "unable to fetch tenant token from auth")
return jsonapi.JSONErrorResponse(ctx, errors.NewUnauthorizedError("Could not resolve user token"))
}

cluster, err := c.resolveCluster(ctx, *user.Cluster)
if err != nil {
log.Error(ctx, map[string]interface{}{
Expand Down