diff --git a/pkg/argo_client/manifests.go b/pkg/argo_client/manifests.go index d61a54a9..dbfebccc 100644 --- a/pkg/argo_client/manifests.go +++ b/pkg/argo_client/manifests.go @@ -83,7 +83,6 @@ func GetManifestsLocal(ctx context.Context, name string, tempRepoDir string, cha KustomizeOptions: argoSettings.KustomizeOptions, KubeVersion: cluster.Info.ServerVersion, ApiVersions: cluster.Info.APIVersions, - Plugins: argoSettings.ConfigManagementPlugins, TrackingMethod: argoSettings.TrackingMethod, }, true, &git.NoopCredsStore{}, resource.MustParse("0"), nil) if err != nil { diff --git a/pkg/vcs/gitlab_client/merge.go b/pkg/vcs/gitlab_client/merge.go index fc7c1851..5fc328f7 100644 --- a/pkg/vcs/gitlab_client/merge.go +++ b/pkg/vcs/gitlab_client/merge.go @@ -4,11 +4,11 @@ import ( "context" "strings" - "github.com/zapier/kubechecks/pkg/repo_config" - "github.com/zapier/kubechecks/telemetry" + "github.com/xanzy/go-gitlab" "go.opentelemetry.io/otel" - "github.com/xanzy/go-gitlab" + "github.com/zapier/kubechecks/pkg/repo_config" + "github.com/zapier/kubechecks/telemetry" ) type Changes struct { @@ -26,14 +26,14 @@ func (c *Client) GetMergeChanges(ctx context.Context, projectId int, mergeReqId _, span := otel.Tracer("Kubechecks").Start(ctx, "GetMergeChanges") defer span.End() - changes := []*Changes{} - mr, _, err := c.MergeRequests.GetMergeRequestChanges(projectId, mergeReqId, &gitlab.GetMergeRequestChangesOptions{}) + var changes []*Changes + diffs, _, err := c.MergeRequests.ListMergeRequestDiffs(projectId, mergeReqId, &gitlab.ListMergeRequestDiffsOptions{}) if err != nil { telemetry.SetError(span, err, "Get MergeRequest Changes") return changes, err } - for _, change := range mr.Changes { + for _, change := range diffs { changes = append(changes, &Changes{ OldPath: change.OldPath, NewPath: change.NewPath,