trufflesecurity/trufflehog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add proto that was missing. (#986)

Browse Source
This commit is contained in:
ahrav
2022-12-23 13:27:07 -08:00
committed by GitHub
parent 8859771a2a
commit 009756dce6
7 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sources/filesystem/filesystem.go
-2
View File
@@ -34,7 +34,6 @@ type Source struct {
jobId int64 jobId int64
verify bool verify bool
paths []string paths []string
aCtx context.Context
log *log.Entry log *log.Entry
sources.Progress sources.Progress
} }
@@ -60,7 +59,6 @@ func (s *Source) JobID() int64 {
func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, _ int) error { func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, _ int) error {
s.log = log.WithField("source", s.Type()).WithField("name", name) s.log = log.WithField("source", s.Type()).WithField("name", name)
s.aCtx = aCtx
s.name = name s.name = name
s.sourceId = sourceId s.sourceId = sourceId
s.jobId = jobId s.jobId = jobId
pkg/sources/git/git.go
-2
View File
@@ -40,7 +40,6 @@ type Source struct {
jobId int64 jobId int64
verify bool verify bool
git *Git git *Git
aCtx context.Context
sources.Progress sources.Progress
conn *sourcespb.Git conn *sourcespb.Git
} }
@@ -89,7 +88,6 @@ func (s *Source) JobID() int64 {
// Init returns an initialized GitHub source. // Init returns an initialized GitHub source.
func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error { func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error {
s.aCtx = aCtx
s.name = name s.name = name
s.sourceId = sourceId s.sourceId = sourceId
s.jobId = jobId s.jobId = jobId
pkg/sources/github/github.go
-2
View File
@@ -56,7 +56,6 @@ type Source struct {
ignoreRepos []string ignoreRepos []string
git *git.Git git *git.Git
httpClient *http.Client httpClient *http.Client
aCtx context.Context
log *log.Entry log *log.Entry
conn *sourcespb.GitHub conn *sourcespb.GitHub
jobPool *errgroup.Group jobPool *errgroup.Group
@@ -128,7 +127,6 @@ func (s *Source) UserAndToken(ctx context.Context, installationClient *github.Cl
func (s *Source) Init(aCtx context.Context, name string, jobID, sourceID int64, verify bool, connection *anypb.Any, concurrency int) error { func (s *Source) Init(aCtx context.Context, name string, jobID, sourceID int64, verify bool, connection *anypb.Any, concurrency int) error {
s.log = log.WithField("source", s.Type()).WithField("name", name) s.log = log.WithField("source", s.Type()).WithField("name", name)
s.aCtx = aCtx
s.name = name s.name = name
s.sourceID = sourceID s.sourceID = sourceID
s.jobID = jobID s.jobID = jobID
pkg/sources/gitlab/gitlab.go
+1 -3
View File
@@ -43,7 +43,6 @@ type Source struct {
ignoreRepos []string ignoreRepos []string
git *git.Git git *git.Git
scanOptions *git.ScanOptions scanOptions *git.ScanOptions
aCtx context.Context
resumeInfoSlice []string resumeInfoSlice []string
resumeInfoMutex sync.Mutex resumeInfoMutex sync.Mutex
jobSem *semaphore.Weighted jobSem *semaphore.Weighted
@@ -68,9 +67,8 @@ func (s *Source) JobID() int64 {
} }
// Init returns an initialized Gitlab source. // Init returns an initialized Gitlab source.
func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error { func (s *Source) Init(_ context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error {
s.aCtx = aCtx
s.name = name s.name = name
s.sourceId = sourceId s.sourceId = sourceId
s.jobId = jobId s.jobId = jobId
pkg/sources/s3/s3.go
-2
View File
@@ -35,7 +35,6 @@ type Source struct {
jobId int64 jobId int64
verify bool verify bool
concurrency int concurrency int
aCtx context.Context
log logr.Logger log logr.Logger
sources.Progress sources.Progress
errorCount *sync.Map errorCount *sync.Map
@@ -62,7 +61,6 @@ func (s *Source) JobID() int64 {
func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error { func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error {
s.log = context.WithValues(aCtx, "source", s.Type(), "name", name).Logger() s.log = context.WithValues(aCtx, "source", s.Type(), "name", name).Logger()
s.aCtx = aCtx
s.name = name s.name = name
s.sourceId = sourceId s.sourceId = sourceId
s.jobId = jobId s.jobId = jobId
pkg/sources/syslog/syslog.go
+1 -3
View File
@@ -32,7 +32,6 @@ type Source struct {
jobId int64 jobId int64
verify bool verify bool
syslog *Syslog syslog *Syslog
aCtx context.Context
sources.Progress sources.Progress
conn *sourcespb.Syslog conn *sourcespb.Syslog
} }
@@ -83,9 +82,8 @@ func (s *Source) InjectConnection(conn *sourcespb.Syslog) {
} }
// Init returns an initialized Syslog source. // Init returns an initialized Syslog source.
func (s *Source) Init(aCtx context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error { func (s *Source) Init(_ context.Context, name string, jobId, sourceId int64, verify bool, connection *anypb.Any, concurrency int) error {
s.aCtx = aCtx
s.name = name s.name = name
s.sourceId = sourceId s.sourceId = sourceId
s.jobId = jobId s.jobId = jobId
proto/sources.proto
+1
View File
@@ -157,6 +157,7 @@ message GitHub {
string head = 9; string head = 9;
string base = 10; string base = 10;
repeated string ignoreRepos = 11; repeated string ignoreRepos = 11;
repeated string includeRepos = 12;
} }
message JIRA { message JIRA {