Skip to content

Commit 9ffc8e7

Browse files
Merge remote-tracking branch 'origin/main' into optimizations-cli
2 parents a5ff499 + 586efbd commit 9ffc8e7

File tree

616 files changed

+61018
-7513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

616 files changed

+61018
-7513
lines changed

go.mod

+22-10
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ go 1.20
55
require (
66
github.com/caarlos0/env v3.5.0+incompatible
77
github.com/devtron-labs/common-lib v0.0.10-0.20240118140811-762cb3b7f9a4
8-
github.com/devtron-labs/protos v0.0.2
8+
github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb
99
github.com/gammazero/workerpool v0.0.0-20200206003619-019d125201ab
10+
github.com/go-git/go-git/v5 v5.11.0
1011
github.com/go-pg/pg v6.15.1+incompatible
1112
github.com/google/wire v0.4.0
1213
github.com/gorilla/handlers v1.4.2
@@ -22,48 +23,59 @@ require (
2223
google.golang.org/grpc v1.56.3
2324
google.golang.org/protobuf v1.31.0
2425
gopkg.in/src-d/go-billy.v4 v4.3.2
25-
gopkg.in/src-d/go-git.v4 v4.13.1
2626
)
2727

2828
require (
29+
dario.cat/mergo v1.0.0 // indirect
30+
github.com/Microsoft/go-winio v0.6.1 // indirect
31+
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
2932
github.com/arl/statsviz v0.6.0 // indirect
3033
github.com/beorn7/perks v1.0.1 // indirect
3134
github.com/cespare/xxhash/v2 v2.2.0 // indirect
35+
github.com/cloudflare/circl v1.3.3 // indirect
36+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
3237
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/emirpasic/gods v1.12.0 // indirect
38+
github.com/emirpasic/gods v1.18.1 // indirect
3439
github.com/gammazero/deque v0.0.0-20200124200322-7e84b94275b8 // indirect
40+
github.com/gliderlabs/ssh v0.3.6 // indirect
41+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
42+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
43+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3544
github.com/golang/protobuf v1.5.3 // indirect
3645
github.com/gorilla/websocket v1.5.0 // indirect
46+
github.com/hpcloud/tail v1.0.0 // indirect
3747
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
3848
github.com/jinzhu/inflection v1.0.0 // indirect
39-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
49+
github.com/kevinburke/ssh_config v1.2.0 // indirect
4050
github.com/klauspost/compress v1.16.7 // indirect
41-
github.com/kr/pretty v0.2.1 // indirect
4251
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4352
github.com/minio/highwayhash v1.0.2 // indirect
44-
github.com/mitchellh/go-homedir v1.1.0 // indirect
4553
github.com/nats-io/jwt/v2 v2.3.0 // indirect
4654
github.com/nats-io/nats.go v1.28.0 // indirect
4755
github.com/nats-io/nkeys v0.4.6 // indirect
4856
github.com/nats-io/nuid v1.0.1 // indirect
4957
github.com/onsi/ginkgo v1.10.3 // indirect
50-
github.com/onsi/gomega v1.7.1 // indirect
58+
github.com/pjbgf/sha1cd v0.3.0 // indirect
5159
github.com/pmezard/go-difflib v1.0.0 // indirect
5260
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
5361
github.com/prometheus/common v0.38.0 // indirect
5462
github.com/prometheus/procfs v0.11.1 // indirect
5563
github.com/sergi/go-diff v1.1.0 // indirect
56-
github.com/src-d/gcfg v1.4.0 // indirect
64+
github.com/skeema/knownhosts v1.2.1 // indirect
5765
github.com/stretchr/objx v0.5.0 // indirect
5866
github.com/tidwall/match v1.1.1 // indirect
5967
github.com/tidwall/pretty v1.2.0 // indirect
60-
github.com/xanzy/ssh-agent v0.2.1 // indirect
68+
github.com/xanzy/ssh-agent v0.3.3 // indirect
6169
go.uber.org/atomic v1.10.0 // indirect
6270
go.uber.org/multierr v1.6.0 // indirect
6371
golang.org/x/crypto v0.17.0 // indirect
64-
golang.org/x/net v0.17.0 // indirect
72+
golang.org/x/mod v0.12.0 // indirect
73+
golang.org/x/net v0.19.0 // indirect
6574
golang.org/x/text v0.14.0 // indirect
75+
golang.org/x/tools v0.13.0 // indirect
6676
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
77+
gopkg.in/fsnotify.v1 v1.4.7 // indirect
78+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6779
gopkg.in/warnings.v0 v0.1.2 // indirect
6880
gopkg.in/yaml.v3 v3.0.1 // indirect
6981
mellium.im/sasl v0.3.1 // indirect

go.sum

+87-49
Large diffs are not rendered by default.

pkg/git/Bean.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package git
1919
import (
2020
"encoding/json"
2121
"github.com/devtron-labs/git-sensor/internal/sql"
22-
"gopkg.in/src-d/go-git.v4"
23-
"gopkg.in/src-d/go-git.v4/plumbing/object"
22+
"github.com/go-git/go-git/v5"
23+
"github.com/go-git/go-git/v5/plumbing/object"
2424
"io"
2525
"time"
2626
"unicode/utf8"

pkg/git/GoGitSDKManager.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package git
22

33
import (
44
"fmt"
5-
"gopkg.in/src-d/go-git.v4"
6-
"gopkg.in/src-d/go-git.v4/config"
7-
"gopkg.in/src-d/go-git.v4/plumbing"
5+
"github.com/go-git/go-git/v5"
6+
"github.com/go-git/go-git/v5/config"
7+
"github.com/go-git/go-git/v5/plumbing"
88
"os"
99
)
1010

pkg/git/RepositoryManagerAnalytics.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package git
33
import (
44
"fmt"
55
"github.com/devtron-labs/git-sensor/util"
6-
"gopkg.in/src-d/go-git.v4"
7-
"gopkg.in/src-d/go-git.v4/plumbing"
8-
"gopkg.in/src-d/go-git.v4/plumbing/object"
6+
"github.com/go-git/go-git/v5"
7+
"github.com/go-git/go-git/v5/plumbing"
8+
"github.com/go-git/go-git/v5/plumbing/object"
99
"io"
1010
"log"
1111
"strings"
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version = 1
2+
3+
test_patterns = [
4+
"*_test.go"
5+
]
6+
7+
[[analyzers]]
8+
name = "go"
9+
enabled = true
10+
11+
[analyzers.meta]
12+
import_path = "dario.cat/mergo"

vendor/dario.cat/mergo/.gitignore

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#### joe made this: http://goel.io/joe
2+
3+
#### go ####
4+
# Binaries for programs and plugins
5+
*.exe
6+
*.dll
7+
*.so
8+
*.dylib
9+
10+
# Test binary, build with `go test -c`
11+
*.test
12+
13+
# Output of the go coverage tool, specifically when used with LiteIDE
14+
*.out
15+
16+
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
17+
.glide/
18+
19+
#### vim ####
20+
# Swap
21+
[._]*.s[a-v][a-z]
22+
[._]*.sw[a-p]
23+
[._]s[a-v][a-z]
24+
[._]sw[a-p]
25+
26+
# Session
27+
Session.vim
28+
29+
# Temporary
30+
.netrwhist
31+
*~
32+
# Auto-generated tag files
33+
tags

vendor/dario.cat/mergo/.travis.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: go
2+
arch:
3+
- amd64
4+
- ppc64le
5+
install:
6+
- go get -t
7+
- go get golang.org/x/tools/cmd/cover
8+
- go get github.com/mattn/goveralls
9+
script:
10+
- go test -race -v ./...
11+
after_script:
12+
- $HOME/gopath/bin/goveralls -service=travis-ci -repotoken $COVERALLS_TOKEN
+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/
+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<!-- omit in toc -->
2+
# Contributing to mergo
3+
4+
First off, thanks for taking the time to contribute! ❤️
5+
6+
All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
7+
8+
> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
9+
> - Star the project
10+
> - Tweet about it
11+
> - Refer this project in your project's readme
12+
> - Mention the project at local meetups and tell your friends/colleagues
13+
14+
<!-- omit in toc -->
15+
## Table of Contents
16+
17+
- [Code of Conduct](#code-of-conduct)
18+
- [I Have a Question](#i-have-a-question)
19+
- [I Want To Contribute](#i-want-to-contribute)
20+
- [Reporting Bugs](#reporting-bugs)
21+
- [Suggesting Enhancements](#suggesting-enhancements)
22+
23+
## Code of Conduct
24+
25+
This project and everyone participating in it is governed by the
26+
[mergo Code of Conduct](https://github.com/imdario/mergoblob/master/CODE_OF_CONDUCT.md).
27+
By participating, you are expected to uphold this code. Please report unacceptable behavior
28+
to <>.
29+
30+
31+
## I Have a Question
32+
33+
> If you want to ask a question, we assume that you have read the available [Documentation](https://pkg.go.dev/github.com/imdario/mergo).
34+
35+
Before you ask a question, it is best to search for existing [Issues](https://github.com/imdario/mergo/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
36+
37+
If you then still feel the need to ask a question and need clarification, we recommend the following:
38+
39+
- Open an [Issue](https://github.com/imdario/mergo/issues/new).
40+
- Provide as much context as you can about what you're running into.
41+
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
42+
43+
We will then take care of the issue as soon as possible.
44+
45+
## I Want To Contribute
46+
47+
> ### Legal Notice <!-- omit in toc -->
48+
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
49+
50+
### Reporting Bugs
51+
52+
<!-- omit in toc -->
53+
#### Before Submitting a Bug Report
54+
55+
A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
56+
57+
- Make sure that you are using the latest version.
58+
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](). If you are looking for support, you might want to check [this section](#i-have-a-question)).
59+
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/imdario/mergoissues?q=label%3Abug).
60+
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
61+
- Collect information about the bug:
62+
- Stack trace (Traceback)
63+
- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
64+
- Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
65+
- Possibly your input and the output
66+
- Can you reliably reproduce the issue? And can you also reproduce it with older versions?
67+
68+
<!-- omit in toc -->
69+
#### How Do I Submit a Good Bug Report?
70+
71+
> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to .
72+
<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
73+
74+
We use GitHub issues to track bugs and errors. If you run into an issue with the project:
75+
76+
- Open an [Issue](https://github.com/imdario/mergo/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
77+
- Explain the behavior you would expect and the actual behavior.
78+
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
79+
- Provide the information you collected in the previous section.
80+
81+
Once it's filed:
82+
83+
- The project team will label the issue accordingly.
84+
- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
85+
- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be implemented by someone.
86+
87+
### Suggesting Enhancements
88+
89+
This section guides you through submitting an enhancement suggestion for mergo, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
90+
91+
<!-- omit in toc -->
92+
#### Before Submitting an Enhancement
93+
94+
- Make sure that you are using the latest version.
95+
- Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
96+
- Perform a [search](https://github.com/imdario/mergo/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
97+
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
98+
99+
<!-- omit in toc -->
100+
#### How Do I Submit a Good Enhancement Suggestion?
101+
102+
Enhancement suggestions are tracked as [GitHub issues](https://github.com/imdario/mergo/issues).
103+
104+
- Use a **clear and descriptive title** for the issue to identify the suggestion.
105+
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
106+
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
107+
- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. <!-- this should only be included if the project has a GUI -->
108+
- **Explain why this enhancement would be useful** to most mergo users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
109+
110+
<!-- omit in toc -->
111+
## Attribution
112+
This guide is based on the **contributing-gen**. [Make your own](https://github.com/bttger/contributing-gen)!

vendor/dario.cat/mergo/LICENSE

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (c) 2013 Dario Castañé. All rights reserved.
2+
Copyright (c) 2012 The Go Authors. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above
11+
copyright notice, this list of conditions and the following disclaimer
12+
in the documentation and/or other materials provided with the
13+
distribution.
14+
* Neither the name of Google Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)