From 2efe0614daa00a93b2d95f727d74bac394393743 Mon Sep 17 00:00:00 2001 From: Enver Bisevac Date: Fri, 4 Aug 2023 17:28:32 +0200 Subject: [PATCH] remove unused files --- internal/api/controller/pullreq/pr_diff.go | 85 ---------------------- internal/api/handler/pullreq/pr_diff.go | 59 --------------- 2 files changed, 144 deletions(-) delete mode 100644 internal/api/controller/pullreq/pr_diff.go delete mode 100644 internal/api/handler/pullreq/pr_diff.go diff --git a/internal/api/controller/pullreq/pr_diff.go b/internal/api/controller/pullreq/pr_diff.go deleted file mode 100644 index f7857f13d..000000000 --- a/internal/api/controller/pullreq/pr_diff.go +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2022 Harness Inc. All rights reserved. -// Use of this source code is governed by the Polyform Free Trial License -// that can be found in the LICENSE.md file for this repository. - -package pullreq - -import ( - "context" - "fmt" - "io" - - "github.com/harness/gitness/gitrpc" - "github.com/harness/gitness/internal/auth" - "github.com/harness/gitness/internal/config" - "github.com/harness/gitness/types" - "github.com/harness/gitness/types/enum" -) - -// RawDiff writes raw git diff to writer w. -func (c *Controller) RawDiff( - ctx context.Context, - session *auth.Session, - repoRef string, - pullreqNum int64, - setSHAs func(sourceSHA, mergeBaseSHA string), - w io.Writer, -) error { - repo, err := c.getRepoCheckAccess(ctx, session, repoRef, enum.PermissionRepoView) - if err != nil { - return fmt.Errorf("failed to acquire access to target repo: %w", err) - } - - pr, err := c.pullreqStore.FindByNumber(ctx, repo.ID, pullreqNum) - if err != nil { - return fmt.Errorf("failed to get pull request by number: %w", err) - } - - headRef := pr.SourceSHA - baseRef := pr.MergeBaseSHA - - setSHAs(headRef, baseRef) - - return c.gitRPCClient.RawDiff(ctx, &gitrpc.DiffParams{ - ReadParams: gitrpc.CreateRPCReadParams(repo), - BaseRef: baseRef, - HeadRef: headRef, - MergeBase: true, - }, w) -} - -func (c *Controller) Diff( - ctx context.Context, - session *auth.Session, - repoRef string, - pullreqNum int64, -) (types.Stream[*gitrpc.FileDiff], error) { - repo, err := c.getRepoCheckAccess(ctx, session, repoRef, enum.PermissionRepoEdit) - if err != nil { - return nil, fmt.Errorf("failed to acquire access to target repo: %w", err) - } - - pr, err := c.pullreqStore.FindByNumber(ctx, repo.ID, pullreqNum) - if err != nil { - return nil, fmt.Errorf("failed to get pull request by number: %w", err) - } - - headRef := pr.SourceBranch - if pr.SourceSHA != "" { - headRef = pr.SourceSHA - } - baseRef := pr.TargetBranch - if pr.State == enum.PullReqStateMerged { - baseRef = pr.MergeBaseSHA - } - - reader := gitrpc.NewStreamReader(c.gitRPCClient.Diff(ctx, &gitrpc.DiffParams{ - ReadParams: gitrpc.CreateRPCReadParams(repo), - BaseRef: baseRef, - HeadRef: headRef, - MergeBase: true, - IncludePatch: true, - }, config.ApiURL)) - - return reader, nil -} diff --git a/internal/api/handler/pullreq/pr_diff.go b/internal/api/handler/pullreq/pr_diff.go deleted file mode 100644 index 35c25034b..000000000 --- a/internal/api/handler/pullreq/pr_diff.go +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2022 Harness Inc. All rights reserved. -// Use of this source code is governed by the Polyform Free Trial License -// that can be found in the LICENSE.md file for this repository. - -package pullreq - -import ( - "net/http" - "strings" - - "github.com/harness/gitness/internal/api/controller/pullreq" - "github.com/harness/gitness/internal/api/render" - "github.com/harness/gitness/internal/api/request" -) - -// HandleDiff returns raw git diff for PR. -func HandleDiff(pullreqCtrl *pullreq.Controller) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - session, _ := request.AuthSessionFrom(ctx) - - repoRef, err := request.GetRepoRefFromPath(r) - if err != nil { - render.TranslatedUserError(w, err) - return - } - - pullreqNumber, err := request.GetPullReqNumberFromPath(r) - if err != nil { - render.TranslatedUserError(w, err) - return - } - - setSHAs := func(sourceSHA, mergeBaseSHA string) { - w.Header().Set("X-Source-Sha", sourceSHA) - w.Header().Set("X-Merge-Base-Sha", mergeBaseSHA) - } - - if err = pullreqCtrl.RawDiff(ctx, session, repoRef, pullreqNumber, setSHAs, w); err != nil { - render.TranslatedUserError(w, err) - return - } - - if strings.HasPrefix(r.Header.Get("Accept"), "text/plain") { - if err = pullreqCtrl.RawDiff(ctx, session, repoRef, pullreqNumber, setSHAs, w); err != nil { - render.TranslatedUserError(w, err) - } - return - } - - stream, err := pullreqCtrl.Diff(ctx, session, repoRef, pullreqNumber) - if err != nil { - render.TranslatedUserError(w, err) - return - } - - render.JSONArrayDynamic(ctx, w, stream) - } -}