Skip to content

Using utils getApplication instead of WebApi getApplication #1230

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

Merged
pipecd-bot merged 1 commit into from
Dec 10, 2020
Merged

Using utils getApplication instead of WebApi getApplication #1230

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
18 changes: 3 additions & 15 deletions pkg/app/api/grpcapi/web_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func (a *WebAPI) GetApplication(ctx context.Context, req *webservice.GetApplicat
return nil, err
}

app, err := a.getApplication(ctx, req.ApplicationId)
app, err := getApplication(ctx, a.applicationStore, req.ApplicationId, a.logger)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -621,18 +621,6 @@ func (a *WebAPI) GenerateApplicationSealedSecret(ctx context.Context, req *webse
}, nil
}

func (a *WebAPI) getApplication(ctx context.Context, appID string) (*model.Application, error) {
app, err := a.applicationStore.GetApplication(ctx, appID)
if errors.Is(err, datastore.ErrNotFound) {
return nil, status.Error(codes.NotFound, "The application is not found")
}
if err != nil {
a.logger.Error("failed to get application", zap.Error(err))
return nil, status.Error(codes.Internal, "Failed to get application")
}
return app, nil
}

// validateAppBelongsToProject checks if the given application belongs to the given project.
// It gives back error unless the application belongs to the project.
func (a *WebAPI) validateAppBelongsToProject(ctx context.Context, appID, projectID string) error {
Expand All @@ -644,7 +632,7 @@ func (a *WebAPI) validateAppBelongsToProject(ctx context.Context, appID, project
return nil
}

app, err := a.getApplication(ctx, appID)
app, err := getApplication(ctx, a.applicationStore, appID, a.logger)
if err != nil {
return err
}
Expand Down Expand Up @@ -1099,7 +1087,7 @@ func (a *WebAPI) ListDeploymentConfigTemplates(ctx context.Context, req *webserv
return nil, err
}

app, err := a.getApplication(ctx, req.ApplicationId)
app, err := getApplication(ctx, a.applicationStore, req.ApplicationId, a.logger)
if err != nil {
return nil, err
}
Expand Down