Update test

Currently it's a unstructured map[string]string that gets copied into
a Result.ExtraData after detection, but we might want to revisit this
decision when we get more handlers.

go.mod

@@ -4,9 +4,6 @@ go 1.20
 
 replace github.com/jpillora/overseer => github.com/trufflesecurity/overseer v1.1.7-custom5
 
-// go wants to pull in the latest but after v10.2.5 has a breaking API change
-replace github.com/couchbase/gocbcore/v10 => github.com/couchbase/gocbcore/v10 v10.2.4
-
 require (
 	cloud.google.com/go/secretmanager v1.11.1
 	cloud.google.com/go/storage v1.31.0
@@ -17,7 +14,7 @@ require (
 	github.com/bill-rich/disk-buffer-reader v0.1.7
 	github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574c
 	github.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fb
-	github.com/bradleyfalzon/ghinstallation/v2 v2.6.0
+	github.com/bradleyfalzon/ghinstallation/v2 v2.4.0
 	github.com/couchbase/gocb/v2 v2.6.3
 	github.com/crewjam/rfc5424 v0.1.0
 	github.com/denisenkom/go-mssqldb v0.12.3
@@ -35,7 +32,7 @@ require (
 	github.com/gobwas/glob v0.2.3
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/go-cmp v0.5.9
-	github.com/google/go-containerregistry v0.15.2
+	github.com/google/go-containerregistry v0.14.0
 	github.com/google/go-github/v42 v42.0.0
 	github.com/googleapis/gax-go/v2 v2.12.0
 	github.com/hashicorp/go-retryablehttp v0.7.4
@@ -54,7 +51,7 @@ require (
 	github.com/sergi/go-diff v1.3.1
 	github.com/stretchr/testify v1.8.4
 	github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502
-	github.com/xanzy/go-gitlab v0.88.0
+	github.com/xanzy/go-gitlab v0.86.0
 	go.mongodb.org/mongo-driver v1.12.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/crypto v0.11.0
@@ -83,7 +80,7 @@ require (
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
@@ -116,7 +113,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-github/v53 v53.2.0 // indirect
+	github.com/google/go-github/v52 v52.0.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
@@ -152,7 +149,7 @@ require (
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/skeema/knownhosts v1.2.0 // indirect
+	github.com/skeema/knownhosts v1.1.1 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/vbatts/tar-split v0.11.3 // indirect

go.sum

@@ -60,8 +60,8 @@ github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
-github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs=
+github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 h1:ZK3C5DtzV2nVAQTx5S5jQvMeDqWtD1By5mOoyY/xJek=
-github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
 github.com/TheZeroSlave/zapsentry v1.17.0 h1:RIQCG89U7vWWZVmmCxeUz/g32WEcAYXUrXHoMlbSDmc=
 github.com/TheZeroSlave/zapsentry v1.17.0/go.mod h1:D1YMfSuu6xnkhwFXxrronesmsiyDhIqo+86I3Ok+r64=
 github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
@@ -95,10 +95,9 @@ github.com/bodgit/sevenzip v1.3.0 h1:1ljgELgtHqvgIp8W8kgeEGHIWP4ch3xGI8uOBZgLVKY
 github.com/bodgit/sevenzip v1.3.0/go.mod h1:omwNcgZTEooWM8gA/IJ2Nk/+ZQ94+GsytRzOJJ8FBlM=
 github.com/bodgit/windows v1.0.0 h1:rLQ/XjsleZvx4fR1tB/UxQrK+SJ2OFHzfPjLWWOhDIA=
 github.com/bodgit/windows v1.0.0/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
-github.com/bradleyfalzon/ghinstallation/v2 v2.6.0 h1:IRY7Xy588KylkoycsUhFpW7cdGpy5Y5BPsz4IfuJtGk=
+github.com/bradleyfalzon/ghinstallation/v2 v2.4.0 h1:zYSzkoIwekCQAr6GT6KxISLt4YRS6kd4/ixfzMN+7yc=
-github.com/bradleyfalzon/ghinstallation/v2 v2.6.0/go.mod h1:oQ3etOwN3TRH4EwgW5/7MxSVMGlMlzG/O8TU7eYdoSk=
+github.com/bradleyfalzon/ghinstallation/v2 v2.4.0/go.mod h1:4MwZLSgBJJgg4i3nJwZJ95AMooSqN8fJDmegLVn9Q2U=
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -122,6 +121,7 @@ github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSk
 github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
 github.com/couchbase/gocb/v2 v2.6.3 h1:5RsMo+RRfK0mVxHLAfpBz3/tHlgXZb1WBNItLk9Ab+c=
 github.com/couchbase/gocb/v2 v2.6.3/go.mod h1:yF5F6BHTZ/ZowhEuZbySbXrlI4rHd1TIhm5azOaMbJU=
+github.com/couchbase/gocbcore/v10 v10.2.3/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM=
 github.com/couchbase/gocbcore/v10 v10.2.4 h1:TDTQ1mSBUw9eajuV71ZDJcLRbmfGcsvZV9SMeUDAVGc=
 github.com/couchbase/gocbcore/v10 v10.2.4/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM=
 github.com/couchbaselabs/gocaves/client v0.0.0-20230307083111-cc3960c624b1/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
@@ -258,12 +258,12 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-containerregistry v0.15.2 h1:MMkSh+tjSdnmJZO7ljvEqV1DjfekB6VUEAZgy3a+TQE=
+github.com/google/go-containerregistry v0.14.0 h1:z58vMqHxuwvAsVwvKEkmVBz2TlgBgH5k6koEXBtlYkw=
-github.com/google/go-containerregistry v0.15.2/go.mod h1:wWK+LnOv4jXMM23IT/F1wdYftGWGr47Is8CG+pmHK1Q=
+github.com/google/go-containerregistry v0.14.0/go.mod h1:aiJ2fp/SXvkWgmYHioXnbMdlgB8eXiiYOY55gfN91Wk=
 github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec=
 github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg=
-github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI=
+github.com/google/go-github/v52 v52.0.0 h1:uyGWOY+jMQ8GVGSX8dkSwCzlehU3WfdxQ7GweO/JP7M=
-github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
+github.com/google/go-github/v52 v52.0.0/go.mod h1:WJV6VEEUPuMo5pXqqa2ZCZEdbQqua4zAk2MZTIo+m+4=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
@@ -421,8 +421,8 @@ github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NF
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
+github.com/skeema/knownhosts v1.1.1 h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIngE=
-github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
+github.com/skeema/knownhosts v1.1.1/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
 github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
 github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/gunit v1.1.3 h1:32x+htJCu3aMswhPw3teoJ+PnWPONqdNgaGs6Qt8ZaU=
@@ -455,8 +455,8 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
 github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=
 github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
-github.com/xanzy/go-gitlab v0.88.0 h1:9GHBrxyCUNZZNuAsbJ1NbEH6XAYsKyTn6NfE0wYO5SY=
+github.com/xanzy/go-gitlab v0.86.0 h1:jR8V9cK9jXRQDb46KOB20NCF3ksY09luaG0IfXE6p7w=
-github.com/xanzy/go-gitlab v0.88.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw=
+github.com/xanzy/go-gitlab v0.86.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -502,7 +502,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
@@ -565,10 +564,9 @@ golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -576,7 +574,7 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
+golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
 golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
 golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -627,19 +625,17 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -649,7 +645,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

pkg/detectors/mongodb/mongodb.go

@@ -21,7 +21,7 @@ var _ detectors.Detector = (*Scanner)(nil)
 
 var (
 	// Make sure that your group is surrounded in boundary characters such as below to reduce false positives.
-	keyPat = regexp.MustCompile(`\b(mongodb(\+srv)?://[\S]{3,50}:([\S]{3,88})@[-.%\w\/:]+)\b`)
+	keyPat = regexp.MustCompile(`\b(mongodb(\+srv)?://[\S]{3,50}:([\S]{3,50})@[-.%\w\/:]+)\b`)
 	// TODO: Add support for sharded cluster, replica set and Atlas Deployment.
 )
 

pkg/engine/engine.go

@@ -349,8 +349,15 @@ func (e *Engine) detectorWorker(ctx context.Context) {
 								continue
 							}
 							result.DecoderType = decoderType
+							if result.ExtraData == nil && chunk.HandleMetadata != nil {
+								result.ExtraData = chunk.HandleMetadata
+							} else {
+								for k, v := range chunk.HandleMetadata {
+									// TODO: Check key collisions.
+									result.ExtraData[k] = v
+								}
+							}
 							chunkResults = append(chunkResults, detectors.CopyMetadata(resultChunk, result))
-
 						}
 						if len(results) > 0 {
 							elapsed := time.Since(start)

pkg/gitparse/gitparse.go

@@ -56,7 +56,6 @@ type ParseState int
 const (
 	Initial ParseState = iota
 	CommitLine
-	MergeLine
 	AuthorLine
 	DateLine
 	MessageStartLine
@@ -77,7 +76,6 @@ func (state ParseState) String() string {
 	return [...]string{
 		"Initial",
 		"CommitLine",
-		"MergeLine",
 		"AuthorLine",
 		"DateLine",
 		"MessageStartLine",
@@ -278,8 +276,6 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, commitChan ch
 			if len(line) >= 47 {
 				currentCommit.Hash = string(line[7:47])
 			}
-		case isMergeLine(isStaged, latestState, line):
-			latestState = MergeLine
 		case isAuthorLine(isStaged, latestState, line):
 			latestState = AuthorLine
 
@@ -432,16 +428,6 @@ func (c *Parser) FromReader(ctx context.Context, stdOut io.Reader, commitChan ch
 	ctx.Logger().V(2).Info("finished parsing git log.", "total_log_size", totalLogSize)
 }
 
-func isMergeLine(isStaged bool, latestState ParseState, line []byte) bool {
-	if isStaged || latestState != CommitLine {
-		return false
-	}
-	if len(line) > 6 && bytes.Equal(line[:6], []byte("Merge:")) {
-		return true
-	}
-	return false
-}
-
 // commit 7a95bbf0199e280a0e42dbb1d1a3f56cdd0f6e05
 func isCommitLine(isStaged bool, latestState ParseState, line []byte) bool {
 	if isStaged || !(latestState == Initial ||
@@ -464,7 +450,7 @@ func isCommitLine(isStaged bool, latestState ParseState, line []byte) bool {
 
 // Author: Bill Rich <bill.rich@trufflesec.com>
 func isAuthorLine(isStaged bool, latestState ParseState, line []byte) bool {
-	if isStaged || !(latestState == CommitLine || latestState == MergeLine) {
+	if isStaged || !(latestState == CommitLine) {
 		return false
 	}
 	if len(line) > 8 && bytes.Equal(line[:7], []byte("Author:")) {

pkg/gitparse/gitparse_test.go

@@ -2,20 +2,11 @@ package gitparse
 
 import (
 	"bytes"
-	_ "embed"
-	"io"
-	"os"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
-	"github.com/trufflesecurity/trufflehog/v3/pkg/log"
-)
-
-var (
-	//go:embed testdata/panic_diff_1.txt
-	panicDiff1 []byte
 )
 
 type testCaseLine struct {
@@ -29,20 +20,6 @@ type testCase struct {
 	function func(bool, ParseState, []byte) bool
 }
 
-func TestParsePanicDiff(t *testing.T) {
-	// setup logger
-	logger, sync := log.New("forager/scanner",
-		log.WithConsoleSink(os.Stderr),
-	)
-	defer func() { _ = sync() }()
-	context.SetDefaultLogger(logger)
-
-	ctx := context.Background()
-	parser := NewParser()
-	commitCh := make(chan Commit, 64)
-	parser.FromReader(ctx, io.NopCloser(bytes.NewReader(panicDiff1)), commitCh, false)
-}
-
 func TestLineChecks(t *testing.T) {
 	tests := map[string]testCase{
 		"commitLine": {
@@ -90,25 +67,6 @@ func TestLineChecks(t *testing.T) {
 			},
 			function: isCommitLine,
 		},
-		"mergeLine": {
-			passes: []testCaseLine{
-				{
-					CommitLine,
-					[]byte("Merge: f21a95535a2 ed08d10bcf5"),
-				},
-			},
-			fails: []testCaseLine{
-				{
-					DateLine,
-					[]byte("    Merge pull request #34511 from cescoffier/duplicated-context-doc"),
-				},
-				{
-					CommitLine,
-					[]byte("notcorrect"),
-				},
-			},
-			function: isMergeLine,
-		},
 		"authorLine": {
 			passes: []testCaseLine{
 				{

pkg/gitparse/testdata/panic_diff_1.txt

@@ -1,413 +0,0 @@
-diff --git a/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java b/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java
-index 98ebb34fc040..cc0468efb243 100644
---- a/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java
-+++ b/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java
-@@ -39,6 +39,7 @@
- import org.apache.lucene.index.TermsEnum;
- import org.apache.lucene.search.BooleanClause;
- import org.apache.lucene.search.BooleanQuery;
-+import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.MatchNoDocsQuery;
- import org.apache.lucene.search.MultiPhraseQuery;
- import org.apache.lucene.search.Query;
-@@ -159,8 +160,8 @@ public int[] getPositions() {
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
--        Query rewritten = super.rewrite(reader);
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-+        Query rewritten = super.rewrite(searcher);
-         if (rewritten != this) {
-             return rewritten;
-         }
-@@ -177,7 +178,7 @@ public Query rewrite(IndexReader reader) throws IOException {
-         int position = positions.get(sizeMinus1);
-         Set<Term> terms = new HashSet<>();
-         for (Term term : suffixTerms) {
--            getPrefixTerms(terms, term, reader);
-+            getPrefixTerms(terms, term, searcher.getIndexReader());
-             if (terms.size() > maxExpansions) {
-                 break;
-             }
-diff --git a/server/src/main/java/org/opensearch/common/lucene/search/function/FunctionScoreQuery.java b/server/src/main/java/org/opensearch/common/lucene/search/function/FunctionScoreQuery.java
-index ebd155b8a567..db92d4f1cba9 100644
---- a/server/src/main/java/org/opensearch/common/lucene/search/function/FunctionScoreQuery.java
-+++ b/server/src/main/java/org/opensearch/common/lucene/search/function/FunctionScoreQuery.java
-@@ -128,7 +128,7 @@ protected int doHashCode() {
- 
-         @Override
-         protected ScoreFunction rewrite(IndexReader reader) throws IOException {
--            Query newFilter = filter.rewrite(reader);
-+            Query newFilter = filter.rewrite(new IndexSearcher(reader));
-             if (newFilter == filter) {
-                 return this;
-             }
-@@ -322,16 +322,16 @@ public void visit(QueryVisitor visitor) {
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
--        Query rewritten = super.rewrite(reader);
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-+        Query rewritten = super.rewrite(searcher);
-         if (rewritten != this) {
-             return rewritten;
-         }
--        Query newQ = subQ2023-07-28T08:38:41-07:00     info-0  forager/scanner loaded decoders {"count": 3}
-uery.rewrite(reader);
-+        Query newQ = subQuery.rewrite(searcher);
-         ScoreFunction[] newFunctions = new ScoreFunction[functions.length];
-         boolean needsRewrite = (newQ != subQuery);
-         for (int i = 0; i < functions.length; i++) {
--            newFunctions[i] = functions[i].rewrite(reader);
-+            newFunctions[i] = functions[i].rewrite(searcher.getIndexReader());
-             needsRewrite |= (newFunctions[i] != functions[i]);
-         }
-         if (needsRewrite) {
-diff --git a/server/src/main/java/org/opensearch/common/lucene/search/function/ScriptScoreQuery.java b/server/src/main/java/org/opensearch/common/lucene/search/function/ScriptScoreQuery.java
-index 8bf5fc0f89d3..07084a6f690e 100644
---- a/server/src/main/java/org/opensearch/common/lucene/search/function/ScriptScoreQuery.java
-+++ b/server/src/main/java/org/opensearch/common/lucene/search/function/ScriptScoreQuery.java
-@@ -32,7 +32,6 @@
- 
- package org.opensearch.common.lucene.search.function;
- 
--import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.LeafReaderContext;
- import org.apache.lucene.search.BooleanClause;
- import org.apache.lucene.search.DocIdSetIterator;
-@@ -105,12 +104,12 @@ public ScriptScoreQuery(
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
--        Query newQ = subQuery.rewrite(reader);
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-+        Query newQ = subQuery.rewrite(searcher);
-         if (newQ != subQuery) {
-             return new ScriptScoreQuery(newQ, queryName, script, scriptBuilder, minScore, indexName, shardId, indexVersion);
-         }
--        return super.rewrite(reader);
-+        return super.rewrite(searcher);
-     }
- 
-     @Override
-diff --git a/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesRangeQuery.java b/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesRangeQuery.java
-index 04dd669d6088..234c67cc637f 100644
---- a/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesRangeQuery.java
-+++ b/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesRangeQuery.java
-@@ -10,7 +10,6 @@
- 
- import org.apache.lucene.index.DocValues;
- import org.apache.lucene.index.FieldInfo;
--import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.LeafReader;
- import org.apache.lucene.index.LeafReaderContext;
- import org.apache.lucene.index.NumericDocValues;
-@@ -87,12 +86,12 @@ public String toString(String field) {
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-         if (Long.compareUnsigned(lowerValue, Numbers.MIN_UNSIGNED_LONG_VALUE_AS_LONG) == 0
-             && Long.compareUnsigned(upperValue, Numbers.MAX_UNSIGNED_LONG_VALUE_AS_LONG) == 0) {
-             return new FieldExistsQuery(field);
-         }
--        return super.rewrite(reader);
-+        return super.rewrite(searcher);
-     }
- 
-     abstract SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException;
-diff --git a/server/src/main/java/org/opensearch/index/query/DateRangeIncludingNowQuery.java b/server/src/main/java/org/opensearch/index/query/DateRangeIncludingNowQuery.java
-index 2a7dbf314103..001d77facb82 100644
---- a/server/src/main/java/org/opensearch/index/query/DateRangeIncludingNowQuery.java
-+++ b/server/src/main/java/org/opensearch/index/query/DateRangeIncludingNowQuery.java
-@@ -32,8 +32,8 @@
- 
- package org.opensearch.index.query;
- 
--import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.search.BooleanClause;
-+import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.Query;
- import org.apache.lucene.search.QueryVisitor;
- 
-@@ -60,7 +60,7 @@ public Query getQuery() {
-     }
- 
-     @Override
--    public Query r2023-07-28T08:38:41-07:00    info-0  forager/scanner loaded detectors        {"total": 748, "verification_enabled": 748, "verification_disabled": 0}
-ewrite(IndexReader reader) throws IOException {
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-         return in;
-     }
- 
-diff --git a/server/src/main/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQuery.java b/server/src/main/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQuery.java
-index 770301629d96..cd28d8b6ef04 100644
---- a/server/src/main/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQuery.java
-+++ b/server/src/main/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQuery.java
-@@ -32,7 +32,6 @@
- 
- package org.opensearch.index.search;
- 
--import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.search.BooleanClause;
- import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.Query;
-@@ -82,8 +81,8 @@ public ScoreMode getScoreMode() {
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
--        Query innerRewrite = query.rewrite(reader);
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-+        Query innerRewrite = query.rewrite(searcher);
-         if (innerRewrite != query) {
-             // Right now ToParentBlockJoinQuery always rewrites to a ToParentBlockJoinQuery
-             // so the else block will never be used. It is useful in the case that
-@@ -97,7 +96,7 @@ public Query rewrite(IndexReader reader) throws IOException {
-                 return innerRewrite;
-             }
-         }
--        return super.rewrite(reader);
-+        return super.rewrite(searcher);
-     }
- 
-     @Override
-diff --git a/server/src/main/java/org/opensearch/lucene/queries/MinDocQuery.java b/server/src/main/java/org/opensearch/lucene/queries/MinDocQuery.java
-index 2af0237e800c..5c904d8a7770 100644
---- a/server/src/main/java/org/opensearch/lucene/queries/MinDocQuery.java
-+++ b/server/src/main/java/org/opensearch/lucene/queries/MinDocQuery.java
-@@ -86,7 +86,8 @@ public boolean equals(Object obj) {
-     }
- 
-     @Override
--    public Query rewrite(IndexReader reader) throws IOException {
-+    public Query rewrite(IndexSearcher searcher) throws IOException {
-+        final IndexReader reader = searcher.getIndexReader();
-         if (Objects.equals(reader.getContext().id(), readerId) == false) {
-             return new MinDocQuery(minDoc, reader.getContext().id());
-         }
-diff --git a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
-index 5384b47cc69e..575133fcffad 100644
---- a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
-+++ b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
-@@ -339,14 +339,9 @@ private void searchLeaf(LeafReaderContext ctx, Weight weight, Collector collecto
-                     // continue with the following leaf
-                 } catch (QueryPhase.TimeExceededException e) {
-                     searchContext.setSearchTimedOut(true);
--                    return;
-                 }
-             }
-         }
--
--        // Note: this is called if collection ran successfully, including the above special cases of
--        // CollectionTerminatedException and TimeExceededException, but no other exception.
--        leafCollector.finish();
-     }
- 
-     private Weight wrapWeight(Weight weight) {
-diff --git a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
-index df18e874be9c..af7b1a798a77 100644
---- a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
-+++ b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
-@@ -35,7 +35,6 @@
- import org.apache.lucene.search.BulkScorer;
- import org.apache.lucene.search.CollectionTerminatedException;
- import org.apache.lucene.search.IndexSearcher;
--import org.apache.lucene.search.LeafCollector;
- import org.apache.lucene.search.Weight;
- import org.apache.lucene.search.suggest.document.CompletionQuery;
- import org.apache.lucene.search.suggest.document.TopSuggestDocs;
-@@ -104,24 +103,17 @@ protected Suggest.Suggestion<? extends Suggest.Suggestion.Entry<? extends Sugges
-     }
- 
-     private static void suggest(IndexSearcher searcher, CompletionQuery query, TopSuggestDocsCollector collector) throws IOException {
--        query = (CompletionQuery) query.rewrite(searcher.getIndexReader());
-+        query = (CompletionQuery) query.rewrite(searcher);
-         Weight weight = query.createWeight(searcher, collector.scoreMode(), 1f);
-         for (LeafReaderContext context : searcher.getIndexReader().leaves()) {
-             BulkScorer scorer = weight.bulkScorer(context);
-             if (scorer != null) {
--                LeafCollector leafCollector = null;
-                 try {
--                    leafCollector = collector.getLeafCollector(context);
--                    scorer.score(leafCollector, context.reader().getLiveDocs());
-+                    scorer.score(collector.getLeafCollector(context), context.reader().getLiveDocs());
-                 } catch (CollectionTerminatedException e) {
-                     // collection was terminated prematurely
-                     // continue with the following leaf
-                 }
--                // Note: this is called if collection ran successfully, including the above special cases of
--                // CollectionTerminatedException and TimeExceededException, but no other exception.
--                if (leafCollector != null) {
--                    leafCollector.finish();
--                }
-             }
-         }
-     }
-diff --git a/server/src/test/java/org/opensearch/deps/lucene/VectorHighlighterTests.java b/server/src/test/java/org/opensearch/deps/lucene/VectorHighlighterTests.java
-index 0f831ff28af7..880eaeca99bb 100644
---- a/server/src/test/java/org/opensearch/deps/lucene/VectorHighlighterTests.java
-+++ b/server/src/test/java/org/opensearch/deps/lucene/VectorHighlighterTests.java
-@@ -125,7 +125,7 @@ public void testVectorHighlighterPrefixQuery() throws Exception {
-         assertThat(fragment, nullValue());
- 
-         prefixQuery = new PrefixQuery(new Term("content", "ba"), PrefixQuery.SCORING_BOOLEAN_REWRITE);
--        Query rewriteQuery = prefixQuery.rewrite(reader);
-+        Query rewriteQuery = prefixQuery.rewrite(searcher);
-         fragment = highlighter.getBestFragment(highlighter.getFieldQuery(rewriteQuery), reader, topDocs.scoreDocs[0].doc, "content", 30);
-         assertThat(fragment, notNullValue());
- 
-diff --git a/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
-index d360a2a767e8..510dd3456924 100644
---- a/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
-+++ b/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
-@@ -40,6 +40,7 @@
- import org.apache.lucene.index.IndexWriterConfig;
- import org.apache.lucene.index.MultiReader;
- import org.apache.lucene.index.SortedNumericDocValues;
-+import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
- import org.apache.lucene.search.DocIdSetIterator;
- import org.apache.lucene.search.IndexOrDocValuesQuery;
-@@ -259,7 +260,10 @@ public void testRangeQuery() throws IOException {
-             LongPoint.newRangeQuery("field", instant1, instant2),
-             SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2)
-         );
--        assertEquals(expected, ft.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(new MultiReader()));
-+        assertEquals(
-+            expected,
-+            ft.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(new IndexSearcher(new MultiReader()))
-+        );
- 
-         instant1 = nowInMillis;
-         instant2 = instant1 + 100;
-diff --git a/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
-index bc514208c803..be87f7ca1590 100644
---- a/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
-+++ b/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
-@@ -284,8 +284,9 @@ public void testTermExpansionExceptionOnSpanFailure() throws Exception {
-                     BooleanQuery.setMaxClauseCount(1);
-                     try {
-                         QueryBuilder queryBuilder = new SpanMultiTermQueryBuilder(QueryBuilders.prefixQuery("body", "bar"));
--                        Query query = queryBuilder.toQuery(createShardContext(new IndexSearcher(reader)));
--                        RuntimeException exc = expectThrows(RuntimeException.class, () -> query.rewrite(reader));
-+                        IndexSearcher searcher = new IndexSearcher(reader);
-+                        Query query = queryBuilder.toQuery(createShardContext(searcher));
-+                        RuntimeException exc = expectThrows(RuntimeException.class, () -> query.rewrite(searcher));
-                         assertThat(exc.getMessage(), containsString("maxClauseCount"));
-                     } finally {
-                         BooleanQuery.setMaxClauseCount(origBoolMaxClauseCount);
-diff --git a/server/src/test/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQueryTests.java b/server/src/test/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQueryTests.java
-index 39160b1ac49b..45172c946ab3 100644
---- a/server/src/test/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQueryTests.java
-+++ b/server/src/test/java/org/opensearch/index/search/OpenSearchToParentBlockJoinQueryTests.java
-@@ -34,6 +34,7 @@
- 
- import org.apache.lucene.index.MultiReader;
- import org.apache.lucene.index.Term;
-+import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.PhraseQuery;
- import org.apache.lucene.search.Query;
- import org.apache.lucene.search.TermQuery;
-@@ -112,7 +113,7 @@ public void testRewrite() throws IOException {
-             ScoreMode.Avg,
-             "nested"
-         );
--        Query rewritten = q.rewrite(new MultiReader());
-+        Query rewritten = q.rewrite(new IndexSearcher(new MultiReader()));
-         assertEquals(expected, rewritten);
-     }
- }
-diff --git a/server/src/test/java/org/opensearch/lucene/queries/MinDocQueryTests.java b/server/src/test/java/org/opensearch/lucene/queries/MinDocQueryTests.java
-index a75a1d5b2fdb..701ba5a756b4 100644
---- a/server/src/test/java/org/opensearch/lucene/queries/MinDocQueryTests.java
-+++ b/server/src/test/java/org/opensearch/lucene/queries/MinDocQueryTests.java
-@@ -61,10 +61,11 @@ public void testBasics() {
- 
-     public void testRewrite() throws Exception {
-         IndexReader reader = new MultiReader();
-+        IndexSearcher searcher = new IndexSearcher(reader);
-         MinDocQuery query = new MinDocQuery(42);
--        Query rewritten = query.rewrite(reader);
-+        Query rewritten = query.rewrite(searcher);
-         QueryUtils.checkUnequal(query, rewritten);
--        Query rewritten2 = rewritten.rewrite(reader);
-+        Query rewritten2 = rewritten.rewrite(searcher);
-         assertSame(rewritten, rewritten2);
-     }
- 
-diff --git a/server/src/test/java/org/opensearch/lucene/queries/SpanMatchNoDocsQueryTests.java b/server/src/test/java/org/opensearch/lucene/queries/SpanMatchNoDocsQueryTests.java
-index 727377c9a5d5..81f4290b6588 100644
---- a/server/src/test/java/org/opensearch/lucene/queries/SpanMatchNoDocsQueryTests.java
-+++ b/server/src/test/java/org/opensearch/lucene/queries/SpanMatchNoDocsQueryTests.java
-@@ -56,19 +56,11 @@
- 
- public class SpanMatchNoDocsQueryTests extends OpenSearchTestCase {
-     public void testSimple() throws Exception {
--        Directory dir = newDirectory();
--        IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig());
--        IndexReader ir = DirectoryReader.open(iw);
--
-         SpanMatchNoDocsQuery query = new SpanMatchNoDocsQuery("field", "a good reason");
-         assertEquals(query.toString(), "SpanMatchNoDocsQuery(\"a good reason\")");
--        Query rewrite = query.rewrite(ir);
-+        Query rewrite = query.rewrite((IndexSearcher) null);
-         assertTrue(rewrite instanceof SpanMatchNoDocsQuery);
-         assertEquals(rewrite.toString(), "SpanMatchNoDocsQuery(\"a good reason\")");
--
--        iw.close();
--        ir.close();
--        dir.close();
-     }
- 
-     public void testQuery() throws Exception {
-@@ -101,7 +93,7 @@ public void testQuery() throws Exception {
-         assertEquals(searcher.count(orQuery), 1);
-         hits = searcher.search(orQuery, 1000).scoreDocs;
-         assertEquals(1, hits.length);
--        Query rewrite = orQuery.rewrite(ir);
-+        Query rewrite = orQuery.rewrite(searcher);
-         assertEquals(rewrite, orQuery);
- 
-         SpanNearQuery nearQuery = new SpanNearQuery(
-@@ -112,7 +104,7 @@ public void testQuery() throws Exception {
-         assertEquals(searcher.count(nearQuery), 0);
-         hits = searcher.search(nearQuery, 1000).scoreDocs;
-         assertEquals(0, hits.length);
--        rewrite = nearQuery.rewrite(ir);
-+        rewrite = nearQuery.rewrite(searcher);
-         assertEquals(rewrite, nearQuery);
- 
-         iw.close();
-diff --git a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java
-index f3907355ac6e..823fc6b46390 100644
---- a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java
-+++ b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java
-@@ -40,7 +40,6 @@
- import org.apache.lucene.document.StringField;
- import org.apache.lucene.index.DirectoryReader;
- import org.apache.lucene.index.FilterDirectoryReader;
--import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.IndexWriter;
- import org.apache.lucene.index.IndexWriterConfig;
- import org.apache.lucene.index.LeafReader;
-@@ -466,12 +465,12 @@ public String toString(String field) {
-         }
- 
-         @Override
--        public Query rewrite(IndexReader reader) throws IOException {
--            Query queryRewritten = query.rewrite(reader);
-+        public Query rewrite(IndexSearcher searcher) throws IOException {
-+            Query queryRewritten = query.rewrite(searcher);
-             if (query != queryRewritten) {
-                 return new CreateScorerOnceQuery(queryRewritten);
-             }
--            return super.rewrite(reader);
-+            return super.rewrite(searcher);
-         }
- 
-         @Override

pkg/handlers/archive.go

@@ -6,12 +6,14 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strings"
 	"time"
 
 	"github.com/mholt/archiver/v4"
 
 	"github.com/trufflesecurity/trufflehog/v3/pkg/common"
 	logContext "github.com/trufflesecurity/trufflehog/v3/pkg/context"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/sources"
 )
 
 type ctxKey int
@@ -52,14 +54,14 @@ func SetArchiveMaxTimeout(timeout time.Duration) {
 }
 
 // FromFile extracts the files from an archive.
-func (d *Archive) FromFile(originalCtx context.Context, data io.Reader) chan ([]byte) {
+func (d *Archive) FromFile(originalCtx context.Context, data io.Reader) chan ChunkOpt {
-	archiveChan := make(chan ([]byte), 512)
+	archiveChan := make(chan ChunkOpt, 512)
 	go func() {
 		ctx, cancel := context.WithTimeout(originalCtx, maxTimeout)
 		logger := logContext.AddLogger(ctx).Logger()
 		defer cancel()
 		defer close(archiveChan)
-		err := d.openArchive(ctx, 0, data, archiveChan)
+		err := d.openArchive(ctx, nil, data, archiveChan)
 		if err != nil {
 			if errors.Is(err, archiver.ErrNoMatch) {
 				return
@@ -71,18 +73,21 @@ func (d *Archive) FromFile(originalCtx context.Context, data io.Reader) chan ([]
 }
 
 // openArchive takes a reader and extracts the contents up to the maximum depth.
-func (d *Archive) openArchive(ctx context.Context, depth int, reader io.Reader, archiveChan chan ([]byte)) error {
+func (d *Archive) openArchive(ctx context.Context, depth []string, reader io.Reader, archiveChan chan ChunkOpt) error {
-	if depth >= maxDepth {
+	if len(depth) >= maxDepth {
 		return fmt.Errorf("max archive depth reached")
 	}
 	format, reader, err := archiver.Identify("", reader)
 	if err != nil {
-		if errors.Is(err, archiver.ErrNoMatch) && depth > 0 {
+		if errors.Is(err, archiver.ErrNoMatch) && len(depth) > 0 {
 			chunkSize := 10 * 1024
 			for {
-				chunk := make([]byte, chunkSize)
+				data := make([]byte, chunkSize)
-				n, _ := reader.Read(chunk)
+				n, _ := reader.Read(data)
-				archiveChan <- chunk
+				archiveChan <- func(chunk *sources.Chunk) {
+					chunk.Data = data
+					chunk.HandleMetadata = map[string]string{"archive path": strings.Join(depth, " > ")}
+				}
 				if n < chunkSize {
 					break
 				}
@@ -102,9 +107,9 @@ func (d *Archive) openArchive(ctx context.Context, depth int, reader io.Reader,
 			return err
 		}
 		newReader := bytes.NewReader(fileBytes)
-		return d.openArchive(ctx, depth+1, newReader, archiveChan)
+		return d.openArchive(ctx, append(depth, "decompressed"), newReader, archiveChan)
 	case archiver.Extractor:
-		err := archive.Extract(context.WithValue(ctx, depthKey, depth+1), reader, nil, d.extractorHandler(archiveChan))
+		err := archive.Extract(context.WithValue(ctx, depthKey, depth), reader, nil, d.extractorHandler(archiveChan))
 		if err != nil {
 			return err
 		}
@@ -129,12 +134,12 @@ func (d *Archive) IsFiletype(ctx context.Context, reader io.Reader) (io.Reader,
 }
 
 // extractorHandler is applied to each file in an archiver.Extractor file.
-func (d *Archive) extractorHandler(archiveChan chan ([]byte)) func(context.Context, archiver.File) error {
+func (d *Archive) extractorHandler(archiveChan chan ChunkOpt) func(context.Context, archiver.File) error {
 	return func(ctx context.Context, f archiver.File) error {
 		logger := logContext.AddLogger(ctx).Logger()
 		logger.V(5).Info("Handling extracted file.", "filename", f.Name())
-		depth := 0
+		var depth []string
-		if ctxDepth, ok := ctx.Value(depthKey).(int); ok {
+		if ctxDepth, ok := ctx.Value(depthKey).([]string); ok {
 			depth = ctxDepth
 		}
 
@@ -148,7 +153,7 @@ func (d *Archive) extractorHandler(archiveChan chan ([]byte)) func(context.Conte
 		}
 		fileContent := bytes.NewReader(fileBytes)
 
-		err = d.openArchive(ctx, depth, fileContent, archiveChan)
+		err = d.openArchive(ctx, append(depth, f.Name()), fileContent, archiveChan)
 		if err != nil {
 			return err
 		}

pkg/handlers/archive_test.go

@@ -85,9 +85,11 @@ func TestArchiveHandler(t *testing.T) {
 		count := 0
 		re := regexp.MustCompile(testCase.matchString)
 		matched := false
-		for chunk := range archiveChan {
+		var chunk sources.Chunk
+		for opt := range archiveChan {
 			count++
-			if re.Match(chunk) {
+			opt(&chunk)
+			if re.Match(chunk.Data) {
 				matched = true
 			}
 		}

pkg/handlers/handlers.go

@@ -13,8 +13,10 @@ func DefaultHandlers() []Handler {
 	}
 }
 
+type ChunkOpt func(*sources.Chunk)
+
 type Handler interface {
-	FromFile(context.Context, io.Reader) chan ([]byte)
+	FromFile(context.Context, io.Reader) chan ChunkOpt
 	IsFiletype(context.Context, io.Reader) (io.Reader, bool)
 	New()
 }
@@ -38,13 +40,13 @@ func HandleFile(ctx context.Context, file io.Reader, chunkSkel *sources.Chunk, c
 	handlerChan := handler.FromFile(ctx, file)
 	for {
 		select {
-		case data, open := <-handlerChan:
+		case opt, open := <-handlerChan:
 			if !open {
 				// We finished reading everything from handlerChan.
 				return true
 			}
 			chunk := *chunkSkel
-			chunk.Data = data
+			opt(&chunk)
 			// Send data on chunksChan.
 			select {
 			case chunksChan <- &chunk:

pkg/output/plain.go

@@ -96,9 +96,9 @@ func structToMap(obj interface{}) (m map[string]map[string]interface{}, err erro
 }
 
 type outputFormat struct {
-	DetectorType,
+	DetectorType string
-	DecoderType string
+	DecoderType  string
-	Verified bool
+	Verified     bool
-	Raw      string
+	Raw          string
 	*source_metadatapb.MetaData
 }

pkg/pb/source_metadatapb/source_metadata.pb.go

@@ -2294,7 +2294,6 @@ type GoogleDrive struct {
 	Timestamp      string `protobuf:"bytes,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	Shared         bool   `protobuf:"varint,5,opt,name=shared,proto3" json:"shared,omitempty"`
 	LastModifiedBy string `protobuf:"bytes,6,opt,name=last_modified_by,json=lastModifiedBy,proto3" json:"last_modified_by,omitempty"`
-	Path           string `protobuf:"bytes,7,opt,name=path,proto3" json:"path,omitempty"`
 }
 
 func (x *GoogleDrive) Reset() {
@@ -2371,140 +2370,6 @@ func (x *GoogleDrive) GetLastModifiedBy() string {
 	return ""
 }
 
-func (x *GoogleDrive) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-type AzureRepos struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Link         string     `protobuf:"bytes,1,opt,name=link,proto3" json:"link,omitempty"`
-	Username     string     `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
-	Repository   string     `protobuf:"bytes,3,opt,name=repository,proto3" json:"repository,omitempty"`
-	Commit       string     `protobuf:"bytes,4,opt,name=commit,proto3" json:"commit,omitempty"`
-	Email        string     `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"`
-	File         string     `protobuf:"bytes,6,opt,name=file,proto3" json:"file,omitempty"`
-	Timestamp    string     `protobuf:"bytes,7,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
-	Line         int64      `protobuf:"varint,8,opt,name=line,proto3" json:"line,omitempty"`
-	Visibility   Visibility `protobuf:"varint,9,opt,name=visibility,proto3,enum=source_metadata.Visibility" json:"visibility,omitempty"`
-	Project      string     `protobuf:"bytes,10,opt,name=project,proto3" json:"project,omitempty"`
-	Organization string     `protobuf:"bytes,11,opt,name=organization,proto3" json:"organization,omitempty"`
-}
-
-func (x *AzureRepos) Reset() {
-	*x = AzureRepos{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_source_metadata_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AzureRepos) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AzureRepos) ProtoMessage() {}
-
-func (x *AzureRepos) ProtoReflect() protoreflect.Message {
-	mi := &file_source_metadata_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AzureRepos.ProtoReflect.Descriptor instead.
-func (*AzureRepos) Descriptor() ([]byte, []int) {
-	return file_source_metadata_proto_rawDescGZIP(), []int{26}
-}
-
-func (x *AzureRepos) GetLink() string {
-	if x != nil {
-		return x.Link
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetUsername() string {
-	if x != nil {
-		return x.Username
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetRepository() string {
-	if x != nil {
-		return x.Repository
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetCommit() string {
-	if x != nil {
-		return x.Commit
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetEmail() string {
-	if x != nil {
-		return x.Email
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetFile() string {
-	if x != nil {
-		return x.File
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetTimestamp() string {
-	if x != nil {
-		return x.Timestamp
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetLine() int64 {
-	if x != nil {
-		return x.Line
-	}
-	return 0
-}
-
-func (x *AzureRepos) GetVisibility() Visibility {
-	if x != nil {
-		return x.Visibility
-	}
-	return Visibility_public
-}
-
-func (x *AzureRepos) GetProject() string {
-	if x != nil {
-		return x.Project
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetOrganization() string {
-	if x != nil {
-		return x.Organization
-	}
-	return ""
-}
-
 type MetaData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2537,14 +2402,13 @@ type MetaData struct {
 	//	*MetaData_PublicEventMonitoring
 	//	*MetaData_Sharepoint
 	//	*MetaData_GoogleDrive
-	//	*MetaData_AzureRepos
 	Data isMetaData_Data `protobuf_oneof:"data"`
 }
 
 func (x *MetaData) Reset() {
 	*x = MetaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_source_metadata_proto_msgTypes[27]
+		mi := &file_source_metadata_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2557,7 +2421,7 @@ func (x *MetaData) String() string {
 func (*MetaData) ProtoMessage() {}
 
 func (x *MetaData) ProtoReflect() protoreflect.Message {
-	mi := &file_source_metadata_proto_msgTypes[27]
+	mi := &file_source_metadata_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2570,7 +2434,7 @@ func (x *MetaData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MetaData.ProtoReflect.Descriptor instead.
 func (*MetaData) Descriptor() ([]byte, []int) {
-	return file_source_metadata_proto_rawDescGZIP(), []int{27}
+	return file_source_metadata_proto_rawDescGZIP(), []int{26}
 }
 
 func (m *MetaData) GetData() isMetaData_Data {
@@ -2762,13 +2626,6 @@ func (x *MetaData) GetGoogleDrive() *GoogleDrive {
 	return nil
 }
 
-func (x *MetaData) GetAzureRepos() *AzureRepos {
-	if x, ok := x.GetData().(*MetaData_AzureRepos); ok {
-		return x.AzureRepos
-	}
-	return nil
-}
-
 type isMetaData_Data interface {
 	isMetaData_Data()
 }
@@ -2877,10 +2734,6 @@ type MetaData_GoogleDrive struct {
 	GoogleDrive *GoogleDrive `protobuf:"bytes,26,opt,name=googleDrive,proto3,oneof"`
 }
 
-type MetaData_AzureRepos struct {
-	AzureRepos *AzureRepos `protobuf:"bytes,27,opt,name=azureRepos,proto3,oneof"`
-}
-
 func (*MetaData_Azure) isMetaData_Data() {}
 
 func (*MetaData_Bitbucket) isMetaData_Data() {}
@@ -2933,8 +2786,6 @@ func (*MetaData_Sharepoint) isMetaData_Data() {}
 
 func (*MetaData_GoogleDrive) isMetaData_Data() {}
 
-func (*MetaData_AzureRepos) isMetaData_Data() {}
-
 var File_source_metadata_proto protoreflect.FileDescriptor
 
 var file_source_metadata_proto_rawDesc = []byte{
@@ -3198,7 +3049,7 @@ var file_source_metadata_proto_rawDesc = []byte{
 	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x69, 0x65, 0x77, 0x73, 0x12, 0x14,
 	0x0a, 0x05, 0x64, 0x6f, 0x63, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x64,
 	0x6f, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x22, 0xbf, 0x01, 0x0a, 0x0b, 0x47,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x22, 0xab, 0x01, 0x0a, 0x0b, 0x47,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69,
 	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x12,
 	0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69,
@@ -3209,130 +3060,104 @@ var file_source_metadata_proto_rawDesc = []byte{
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x12, 0x28,
 	0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f,
 	0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x4d, 0x6f,
-	0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x42, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x42, 0x79, 0x22, 0xff, 0x0a, 0x0a, 0x08, 0x4d, 0x65, 0x74,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0xcb, 0x02, 0x0a,
+	0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x05, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x18, 0x01,
-	0x0a, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6c,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65,
-	0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x12,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x05,
-	0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x61, 0x7a, 0x75, 0x72, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x62, 0x69, 0x74, 0x62, 0x75, 0x63, 0x6b,
-	0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
+	0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x69, 0x74, 0x62, 0x75,
-	0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x63,
+	0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x09, 0x62, 0x69, 0x74, 0x62, 0x75, 0x63, 0x6b, 0x65,
-	0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6d,
+	0x74, 0x12, 0x37, 0x0a, 0x08, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x18, 0x03, 0x20,
-	0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x05, 0x20, 0x01,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
-	0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x43, 0x49, 0x48, 0x00,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x1c, 0x0a,
+	0x52, 0x08, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f,
-	0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
-	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6c,
+	0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x69, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12,
+	0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x63,
-	0x3b, 0x0a, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20,
+	0x6f, 0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x6f, 0x63,
-	0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
+	0x6b, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
+	0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x6f, 0x63, 0x6b,
-	0x52, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07,
+	0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x03,
-	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70,
+	0x65, 0x63, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72,
-	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x43, 0x52, 0x48,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x72,
+	0x00, 0x52, 0x03, 0x65, 0x63, 0x72, 0x12, 0x28, 0x0a, 0x03, 0x67, 0x63, 0x73, 0x18, 0x07, 0x20,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xbe, 0x0b, 0x0a, 0x08, 0x4d,
+	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
-	0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x05, 0x61, 0x7a, 0x75, 0x72, 0x65,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x43, 0x53, 0x48, 0x00, 0x52, 0x03, 0x67, 0x63, 0x73,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
+	0x12, 0x31, 0x0a, 0x06, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
-	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x48, 0x00,
-	0x52, 0x05, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x62, 0x69, 0x74, 0x62, 0x75,
-	0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x69, 0x74,
-	0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x09, 0x62, 0x69, 0x74, 0x62, 0x75, 0x63,
-	0x6b, 0x65, 0x74, 0x12, 0x37, 0x0a, 0x08, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x43, 0x49,
-	0x48, 0x00, 0x52, 0x08, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x12, 0x3d, 0x0a, 0x0a,
-	0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52,
-	0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x64,
-	0x6f, 0x63, 0x6b, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x6f,
-	0x63, 0x6b, 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x12, 0x28,
-	0x0a, 0x03, 0x65, 0x63, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x43,
-	0x52, 0x48, 0x00, 0x52, 0x03, 0x65, 0x63, 0x72, 0x12, 0x28, 0x0a, 0x03, 0x67, 0x63, 0x73, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x43, 0x53, 0x48, 0x00, 0x52, 0x03, 0x67,
-	0x63, 0x73, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x69, 0x74, 0x68, 0x75, 0x62, 0x48, 0x00, 0x52, 0x06, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x48, 0x00,
-	0x52, 0x06, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x12, 0x2b, 0x0a, 0x04, 0x6a, 0x69, 0x72, 0x61,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
-	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4a, 0x69, 0x72, 0x61, 0x48, 0x00, 0x52,
-	0x04, 0x6a, 0x69, 0x72, 0x61, 0x12, 0x28, 0x0a, 0x03, 0x6e, 0x70, 0x6d, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x50, 0x4d, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x70, 0x6d, 0x12,
-	0x2b, 0x0a, 0x04, 0x70, 0x79, 0x70, 0x69, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x50, 0x79, 0x50, 0x69, 0x48, 0x00, 0x52, 0x04, 0x70, 0x79, 0x70, 0x69, 0x12, 0x25, 0x0a, 0x02,
-	0x73, 0x33, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x33, 0x48, 0x00, 0x52,
-	0x02, 0x73, 0x33, 0x12, 0x2e, 0x0a, 0x05, 0x73, 0x6c, 0x61, 0x63, 0x6b, 0x18, 0x0e, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x05, 0x73, 0x6c,
-	0x61, 0x63, 0x6b, 0x12, 0x3d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65,
-	0x6d, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79,
-	0x73, 0x74, 0x65, 0x6d, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74,
-	0x65, 0x6d, 0x12, 0x28, 0x0a, 0x03, 0x67, 0x69, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x47, 0x69, 0x74, 0x48, 0x00, 0x52, 0x03, 0x67, 0x69, 0x74, 0x12, 0x2b, 0x0a, 0x04,
-	0x74, 0x65, 0x73, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x48, 0x00, 0x52, 0x04, 0x74, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x6b, 0x69, 0x74, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42,
-	0x75, 0x69, 0x6c, 0x64, 0x6b, 0x69, 0x74, 0x65, 0x48, 0x00, 0x52, 0x09, 0x62, 0x75, 0x69, 0x6c,
-	0x64, 0x6b, 0x69, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x65, 0x72, 0x72, 0x69, 0x74, 0x18,
-	0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x72, 0x72, 0x69, 0x74, 0x48, 0x00,
-	0x52, 0x06, 0x67, 0x65, 0x72, 0x72, 0x69, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x6a, 0x65, 0x6e, 0x6b,
-	0x69, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4a, 0x65, 0x6e, 0x6b,
-	0x69, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x07, 0x6a, 0x65, 0x6e, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x2e,
-	0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x54, 0x65, 0x61, 0x6d, 0x73, 0x48, 0x00, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x40,
-	0x0a, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x16, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72,
-	0x79, 0x48, 0x00, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79,
-	0x12, 0x31, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x53, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x48, 0x00, 0x52, 0x06, 0x73, 0x79, 0x73,
+	0x74, 0x61, 0x2e, 0x47, 0x69, 0x74, 0x68, 0x75, 0x62, 0x48, 0x00, 0x52, 0x06, 0x67, 0x69, 0x74,
-	0x6c, 0x6f, 0x67, 0x12, 0x5e, 0x0a, 0x15, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65,
+	0x68, 0x75, 0x62, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x18, 0x09, 0x20,
-	0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x18, 0x20, 0x01,
+	0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
-	0x28, 0x0b, 0x32, 0x26, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x48, 0x00, 0x52, 0x06,
-	0x64, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x12, 0x2b, 0x0a, 0x04, 0x6a, 0x69, 0x72, 0x61, 0x18, 0x0a,
-	0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x15, 0x70, 0x75,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65,
-	0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4a, 0x69, 0x72, 0x61, 0x48, 0x00, 0x52, 0x04, 0x6a,
-	0x69, 0x6e, 0x67, 0x12, 0x3d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69, 0x6e,
+	0x69, 0x72, 0x61, 0x12, 0x28, 0x0a, 0x03, 0x6e, 0x70, 0x6d, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
-	0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x32, 0x14, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x65, 0x50,
+	0x74, 0x61, 0x2e, 0x4e, 0x50, 0x4d, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x70, 0x6d, 0x12, 0x2b, 0x0a,
-	0x6f, 0x69, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69,
+	0x04, 0x70, 0x79, 0x70, 0x69, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x6f,
-	0x6e, 0x74, 0x12, 0x40, 0x0a, 0x0b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69, 0x76,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x79,
-	0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x50, 0x69, 0x48, 0x00, 0x52, 0x04, 0x70, 0x79, 0x70, 0x69, 0x12, 0x25, 0x0a, 0x02, 0x73, 0x33,
-	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
-	0x44, 0x72, 0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x33, 0x48, 0x00, 0x52, 0x02, 0x73,
-	0x72, 0x69, 0x76, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65, 0x70,
+	0x33, 0x12, 0x2e, 0x0a, 0x05, 0x73, 0x6c, 0x61, 0x63, 0x6b, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b,
-	0x6f, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x32, 0x16, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x7a, 0x75, 0x72, 0x65,
+	0x74, 0x61, 0x2e, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x05, 0x73, 0x6c, 0x61, 0x63,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65,
+	0x6b, 0x12, 0x3d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18,
-	0x70, 0x6f, 0x73, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x3e, 0x0a, 0x0a, 0x56,
+	0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
-	0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x75, 0x62,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74,
-	0x6c, 0x69, 0x63, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x65, 0x6d, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
-	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x10, 0x02, 0x12, 0x0b,
+	0x12, 0x28, 0x0a, 0x03, 0x67, 0x69, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x03, 0x42, 0x43, 0x5a, 0x41, 0x67,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c,
+	0x47, 0x69, 0x74, 0x48, 0x00, 0x52, 0x03, 0x67, 0x69, 0x74, 0x12, 0x2b, 0x0a, 0x04, 0x74, 0x65,
-	0x65, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c,
+	0x73, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x73,
+	0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x48,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x70, 0x62,
+	0x00, 0x52, 0x04, 0x74, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6b, 0x69, 0x74, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x75, 0x69,
+	0x6c, 0x64, 0x6b, 0x69, 0x74, 0x65, 0x48, 0x00, 0x52, 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x6b,
+	0x69, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x65, 0x72, 0x72, 0x69, 0x74, 0x18, 0x13, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x72, 0x72, 0x69, 0x74, 0x48, 0x00, 0x52, 0x06,
+	0x67, 0x65, 0x72, 0x72, 0x69, 0x74, 0x12, 0x34, 0x0a, 0x07, 0x6a, 0x65, 0x6e, 0x6b, 0x69, 0x6e,
+	0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4a, 0x65, 0x6e, 0x6b, 0x69, 0x6e,
+	0x73, 0x48, 0x00, 0x52, 0x07, 0x6a, 0x65, 0x6e, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x05,
+	0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65,
+	0x61, 0x6d, 0x73, 0x48, 0x00, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x40, 0x0a, 0x0b,
+	0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x16, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x48,
+	0x00, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x31,
+	0x0a, 0x06, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
+	0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x53, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x48, 0x00, 0x52, 0x06, 0x73, 0x79, 0x73, 0x6c, 0x6f,
+	0x67, 0x12, 0x5e, 0x0a, 0x15, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x26, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x6f,
+	0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x15, 0x70, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e,
+	0x67, 0x12, 0x3d, 0x0a, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18,
+	0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x65, 0x50, 0x6f, 0x69,
+	0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x12, 0x40, 0x0a, 0x0b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69, 0x76, 0x65, 0x18,
+	0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72,
+	0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69,
+	0x76, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x3e, 0x0a, 0x0a, 0x56, 0x69,
+	0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x10,
+	0x01, 0x12, 0x0a, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x10, 0x02, 0x12, 0x0b, 0x0a,
+	0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x03, 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65,
+	0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65,
+	0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3348,7 +3173,7 @@ func file_source_metadata_proto_rawDescGZIP() []byte {
 }
 
 var file_source_metadata_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_source_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
+var file_source_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_source_metadata_proto_goTypes = []interface{}{
 	(Visibility)(0),               // 0: source_metadata.Visibility
 	(*Azure)(nil),                 // 1: source_metadata.Azure
@@ -3377,46 +3202,43 @@ var file_source_metadata_proto_goTypes = []interface{}{
 	(*PublicEventMonitoring)(nil), // 24: source_metadata.PublicEventMonitoring
 	(*SharePoint)(nil),            // 25: source_metadata.SharePoint
 	(*GoogleDrive)(nil),           // 26: source_metadata.GoogleDrive
-	(*AzureRepos)(nil),            // 27: source_metadata.AzureRepos
+	(*MetaData)(nil),              // 27: source_metadata.MetaData
-	(*MetaData)(nil),              // 28: source_metadata.MetaData
 }
 var file_source_metadata_proto_depIdxs = []int32{
 	0,  // 0: source_metadata.Github.visibility:type_name -> source_metadata.Visibility
 	0,  // 1: source_metadata.Slack.visibility:type_name -> source_metadata.Visibility
 	10, // 2: source_metadata.PublicEventMonitoring.github:type_name -> source_metadata.Github
-	0,  // 3: source_metadata.AzureRepos.visibility:type_name -> source_metadata.Visibility
+	1,  // 3: source_metadata.MetaData.azure:type_name -> source_metadata.Azure
-	1,  // 4: source_metadata.MetaData.azure:type_name -> source_metadata.Azure
+	2,  // 4: source_metadata.MetaData.bitbucket:type_name -> source_metadata.Bitbucket
-	2,  // 5: source_metadata.MetaData.bitbucket:type_name -> source_metadata.Bitbucket
+	4,  // 5: source_metadata.MetaData.circleci:type_name -> source_metadata.CircleCI
-	4,  // 6: source_metadata.MetaData.circleci:type_name -> source_metadata.CircleCI
+	5,  // 6: source_metadata.MetaData.confluence:type_name -> source_metadata.Confluence
-	5,  // 7: source_metadata.MetaData.confluence:type_name -> source_metadata.Confluence
+	6,  // 7: source_metadata.MetaData.docker:type_name -> source_metadata.Docker
-	6,  // 8: source_metadata.MetaData.docker:type_name -> source_metadata.Docker
+	7,  // 8: source_metadata.MetaData.ecr:type_name -> source_metadata.ECR
-	7,  // 9: source_metadata.MetaData.ecr:type_name -> source_metadata.ECR
+	12, // 9: source_metadata.MetaData.gcs:type_name -> source_metadata.GCS
-	12, // 10: source_metadata.MetaData.gcs:type_name -> source_metadata.GCS
+	10, // 10: source_metadata.MetaData.github:type_name -> source_metadata.Github
-	10, // 11: source_metadata.MetaData.github:type_name -> source_metadata.Github
+	11, // 11: source_metadata.MetaData.gitlab:type_name -> source_metadata.Gitlab
-	11, // 12: source_metadata.MetaData.gitlab:type_name -> source_metadata.Gitlab
+	13, // 12: source_metadata.MetaData.jira:type_name -> source_metadata.Jira
-	13, // 13: source_metadata.MetaData.jira:type_name -> source_metadata.Jira
+	14, // 13: source_metadata.MetaData.npm:type_name -> source_metadata.NPM
-	14, // 14: source_metadata.MetaData.npm:type_name -> source_metadata.NPM
+	15, // 14: source_metadata.MetaData.pypi:type_name -> source_metadata.PyPi
-	15, // 15: source_metadata.MetaData.pypi:type_name -> source_metadata.PyPi
+	16, // 15: source_metadata.MetaData.s3:type_name -> source_metadata.S3
-	16, // 16: source_metadata.MetaData.s3:type_name -> source_metadata.S3
+	17, // 16: source_metadata.MetaData.slack:type_name -> source_metadata.Slack
-	17, // 17: source_metadata.MetaData.slack:type_name -> source_metadata.Slack
+	8,  // 17: source_metadata.MetaData.filesystem:type_name -> source_metadata.Filesystem
-	8,  // 18: source_metadata.MetaData.filesystem:type_name -> source_metadata.Filesystem
+	9,  // 18: source_metadata.MetaData.git:type_name -> source_metadata.Git
-	9,  // 19: source_metadata.MetaData.git:type_name -> source_metadata.Git
+	19, // 19: source_metadata.MetaData.test:type_name -> source_metadata.Test
-	19, // 20: source_metadata.MetaData.test:type_name -> source_metadata.Test
+	3,  // 20: source_metadata.MetaData.buildkite:type_name -> source_metadata.Buildkite
-	3,  // 21: source_metadata.MetaData.buildkite:type_name -> source_metadata.Buildkite
+	18, // 21: source_metadata.MetaData.gerrit:type_name -> source_metadata.Gerrit
-	18, // 22: source_metadata.MetaData.gerrit:type_name -> source_metadata.Gerrit
+	20, // 22: source_metadata.MetaData.jenkins:type_name -> source_metadata.Jenkins
-	20, // 23: source_metadata.MetaData.jenkins:type_name -> source_metadata.Jenkins
+	21, // 23: source_metadata.MetaData.teams:type_name -> source_metadata.Teams
-	21, // 24: source_metadata.MetaData.teams:type_name -> source_metadata.Teams
+	22, // 24: source_metadata.MetaData.artifactory:type_name -> source_metadata.Artifactory
-	22, // 25: source_metadata.MetaData.artifactory:type_name -> source_metadata.Artifactory
+	23, // 25: source_metadata.MetaData.syslog:type_name -> source_metadata.Syslog
-	23, // 26: source_metadata.MetaData.syslog:type_name -> source_metadata.Syslog
+	24, // 26: source_metadata.MetaData.publicEventMonitoring:type_name -> source_metadata.PublicEventMonitoring
-	24, // 27: source_metadata.MetaData.publicEventMonitoring:type_name -> source_metadata.PublicEventMonitoring
+	25, // 27: source_metadata.MetaData.sharepoint:type_name -> source_metadata.SharePoint
-	25, // 28: source_metadata.MetaData.sharepoint:type_name -> source_metadata.SharePoint
+	26, // 28: source_metadata.MetaData.googleDrive:type_name -> source_metadata.GoogleDrive
-	26, // 29: source_metadata.MetaData.googleDrive:type_name -> source_metadata.GoogleDrive
+	29, // [29:29] is the sub-list for method output_type
-	27, // 30: source_metadata.MetaData.azureRepos:type_name -> source_metadata.AzureRepos
+	29, // [29:29] is the sub-list for method input_type
-	31, // [31:31] is the sub-list for method output_type
+	29, // [29:29] is the sub-list for extension type_name
-	31, // [31:31] is the sub-list for method input_type
+	29, // [29:29] is the sub-list for extension extendee
-	31, // [31:31] is the sub-list for extension type_name
+	0,  // [0:29] is the sub-list for field type_name
-	31, // [31:31] is the sub-list for extension extendee
-	0,  // [0:31] is the sub-list for field type_name
 }
 
 func init() { file_source_metadata_proto_init() }
@@ -3738,18 +3560,6 @@ func file_source_metadata_proto_init() {
 			}
 		}
 		file_source_metadata_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AzureRepos); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_source_metadata_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MetaData); i {
 			case 0:
 				return &v.state
@@ -3765,7 +3575,7 @@ func file_source_metadata_proto_init() {
 	file_source_metadata_proto_msgTypes[23].OneofWrappers = []interface{}{
 		(*PublicEventMonitoring_Github)(nil),
 	}
-	file_source_metadata_proto_msgTypes[27].OneofWrappers = []interface{}{
+	file_source_metadata_proto_msgTypes[26].OneofWrappers = []interface{}{
 		(*MetaData_Azure)(nil),
 		(*MetaData_Bitbucket)(nil),
 		(*MetaData_Circleci)(nil),
@@ -3792,7 +3602,6 @@ func file_source_metadata_proto_init() {
 		(*MetaData_PublicEventMonitoring)(nil),
 		(*MetaData_Sharepoint)(nil),
 		(*MetaData_GoogleDrive)(nil),
-		(*MetaData_AzureRepos)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -3800,7 +3609,7 @@ func file_source_metadata_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_source_metadata_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   28,
+			NumMessages:   27,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pkg/pb/source_metadatapb/source_metadata.pb.validate.go

@@ -2865,8 +2865,6 @@ func (m *GoogleDrive) validate(all bool) error {
 
 	// no validation rules for LastModifiedBy
 
-	// no validation rules for Path
-
 	if len(errors) > 0 {
 		return GoogleDriveMultiError(errors)
 	}
@@ -2944,127 +2942,6 @@ var _ interface {
 	ErrorName() string
 } = GoogleDriveValidationError{}
 
-// Validate checks the field values on AzureRepos with the rules defined in the
-// proto definition for this message. If any rules are violated, the first
-// error encountered is returned, or nil if there are no violations.
-func (m *AzureRepos) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on AzureRepos with the rules defined in
-// the proto definition for this message. If any rules are violated, the
-// result is a list of violation errors wrapped in AzureReposMultiError, or
-// nil if none found.
-func (m *AzureRepos) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *AzureRepos) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	// no validation rules for Link
-
-	// no validation rules for Username
-
-	// no validation rules for Repository
-
-	// no validation rules for Commit
-
-	// no validation rules for Email
-
-	// no validation rules for File
-
-	// no validation rules for Timestamp
-
-	// no validation rules for Line
-
-	// no validation rules for Visibility
-
-	// no validation rules for Project
-
-	// no validation rules for Organization
-
-	if len(errors) > 0 {
-		return AzureReposMultiError(errors)
-	}
-
-	return nil
-}
-
-// AzureReposMultiError is an error wrapping multiple validation errors
-// returned by AzureRepos.ValidateAll() if the designated constraints aren't met.
-type AzureReposMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m AzureReposMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m AzureReposMultiError) AllErrors() []error { return m }
-
-// AzureReposValidationError is the validation error returned by
-// AzureRepos.Validate if the designated constraints aren't met.
-type AzureReposValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e AzureReposValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e AzureReposValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e AzureReposValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e AzureReposValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e AzureReposValidationError) ErrorName() string { return "AzureReposValidationError" }
-
-// Error satisfies the builtin error interface
-func (e AzureReposValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sAzureRepos.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = AzureReposValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = AzureReposValidationError{}
-
 // Validate checks the field values on MetaData with the rules defined in the
 // proto definition for this message. If any rules are violated, the first
 // error encountered is returned, or nil if there are no violations.
@@ -3895,37 +3772,6 @@ func (m *MetaData) validate(all bool) error {
 			}
 		}
 
-	case *MetaData_AzureRepos:
-
-		if all {
-			switch v := interface{}(m.GetAzureRepos()).(type) {
-			case interface{ ValidateAll() error }:
-				if err := v.ValidateAll(); err != nil {
-					errors = append(errors, MetaDataValidationError{
-						field:  "AzureRepos",
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			case interface{ Validate() error }:
-				if err := v.Validate(); err != nil {
-					errors = append(errors, MetaDataValidationError{
-						field:  "AzureRepos",
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			}
-		} else if v, ok := interface{}(m.GetAzureRepos()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return MetaDataValidationError{
-					field:  "AzureRepos",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
 	}
 
 	if len(errors) > 0 {

pkg/pb/sourcespb/sources.pb.go

@@ -59,7 +59,6 @@ const (
 	SourceType_SOURCE_TYPE_GOOGLE_DRIVE               SourceType = 28
 	SourceType_SOURCE_TYPE_SHAREPOINT                 SourceType = 29
 	SourceType_SOURCE_TYPE_GCS_UNAUTHED               SourceType = 30
-	SourceType_SOURCE_TYPE_AZURE_REPOS                SourceType = 31
 )
 
 // Enum value maps for SourceType.
@@ -96,7 +95,6 @@ var (
 		28: "SOURCE_TYPE_GOOGLE_DRIVE",
 		29: "SOURCE_TYPE_SHAREPOINT",
 		30: "SOURCE_TYPE_GCS_UNAUTHED",
-		31: "SOURCE_TYPE_AZURE_REPOS",
 	}
 	SourceType_value = map[string]int32{
 		"SOURCE_TYPE_AZURE_STORAGE":              0,
@@ -130,7 +128,6 @@ var (
 		"SOURCE_TYPE_GOOGLE_DRIVE":               28,
 		"SOURCE_TYPE_SHAREPOINT":                 29,
 		"SOURCE_TYPE_GCS_UNAUTHED":               30,
-		"SOURCE_TYPE_AZURE_REPOS":                31,
 	}
 )
 
@@ -2980,158 +2977,6 @@ type Sharepoint_Oauth struct {
 
 func (*Sharepoint_Oauth) isSharepoint_Credential() {}
 
-type AzureRepos struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Endpoint string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
-	// Types that are assignable to Credential:
-	//	*AzureRepos_Token
-	//	*AzureRepos_Oauth
-	Credential      isAzureRepos_Credential `protobuf_oneof:"credential"`
-	Repositories    []string                `protobuf:"bytes,4,rep,name=repositories,proto3" json:"repositories,omitempty"`
-	Organizations   []string                `protobuf:"bytes,5,rep,name=organizations,proto3" json:"organizations,omitempty"`
-	Projects        []string                `protobuf:"bytes,6,rep,name=projects,proto3" json:"projects,omitempty"`
-	IncludeForks    bool                    `protobuf:"varint,7,opt,name=includeForks,proto3" json:"includeForks,omitempty"`
-	IgnoreRepos     []string                `protobuf:"bytes,8,rep,name=ignoreRepos,proto3" json:"ignoreRepos,omitempty"`
-	IncludeRepos    []string                `protobuf:"bytes,9,rep,name=includeRepos,proto3" json:"includeRepos,omitempty"`
-	IncludeProjects []string                `protobuf:"bytes,10,rep,name=includeProjects,proto3" json:"includeProjects,omitempty"`
-	IgnoreProjects  []string                `protobuf:"bytes,11,rep,name=ignoreProjects,proto3" json:"ignoreProjects,omitempty"`
-}
-
-func (x *AzureRepos) Reset() {
-	*x = AzureRepos{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_sources_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AzureRepos) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AzureRepos) ProtoMessage() {}
-
-func (x *AzureRepos) ProtoReflect() protoreflect.Message {
-	mi := &file_sources_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AzureRepos.ProtoReflect.Descriptor instead.
-func (*AzureRepos) Descriptor() ([]byte, []int) {
-	return file_sources_proto_rawDescGZIP(), []int{28}
-}
-
-func (x *AzureRepos) GetEndpoint() string {
-	if x != nil {
-		return x.Endpoint
-	}
-	return ""
-}
-
-func (m *AzureRepos) GetCredential() isAzureRepos_Credential {
-	if m != nil {
-		return m.Credential
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetToken() string {
-	if x, ok := x.GetCredential().(*AzureRepos_Token); ok {
-		return x.Token
-	}
-	return ""
-}
-
-func (x *AzureRepos) GetOauth() *credentialspb.Oauth2 {
-	if x, ok := x.GetCredential().(*AzureRepos_Oauth); ok {
-		return x.Oauth
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetRepositories() []string {
-	if x != nil {
-		return x.Repositories
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetOrganizations() []string {
-	if x != nil {
-		return x.Organizations
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetProjects() []string {
-	if x != nil {
-		return x.Projects
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetIncludeForks() bool {
-	if x != nil {
-		return x.IncludeForks
-	}
-	return false
-}
-
-func (x *AzureRepos) GetIgnoreRepos() []string {
-	if x != nil {
-		return x.IgnoreRepos
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetIncludeRepos() []string {
-	if x != nil {
-		return x.IncludeRepos
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetIncludeProjects() []string {
-	if x != nil {
-		return x.IncludeProjects
-	}
-	return nil
-}
-
-func (x *AzureRepos) GetIgnoreProjects() []string {
-	if x != nil {
-		return x.IgnoreProjects
-	}
-	return nil
-}
-
-type isAzureRepos_Credential interface {
-	isAzureRepos_Credential()
-}
-
-type AzureRepos_Token struct {
-	Token string `protobuf:"bytes,2,opt,name=token,proto3,oneof"`
-}
-
-type AzureRepos_Oauth struct {
-	Oauth *credentialspb.Oauth2 `protobuf:"bytes,3,opt,name=oauth,proto3,oneof"`
-}
-
-func (*AzureRepos_Token) isAzureRepos_Credential() {}
-
-func (*AzureRepos_Oauth) isAzureRepos_Credential() {}
-
 var File_sources_proto protoreflect.FileDescriptor
 
 var file_sources_proto_rawDesc = []byte{
@@ -3536,95 +3381,66 @@ var file_sources_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52,
 	0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x74, 0x65, 0x5f, 0x75,
 	0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x74, 0x65, 0x55, 0x72,
-	0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22,
+	0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x2a,
-	0xa7, 0x03, 0x0a, 0x0a, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x24,
+	0xe7, 0x06, 0x0a, 0x0a, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d,
-	0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x0a, 0x19, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70,
+	0x55, 0x52, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a,
-	0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20,
+	0x15, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x49, 0x54,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2b, 0x0a, 0x05,
+	0x42, 0x55, 0x43, 0x4b, 0x45, 0x54, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52,
-	0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72,
+	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x49, 0x52, 0x43, 0x4c, 0x45, 0x43, 0x49,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32,
+	0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
-	0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70,
+	0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x4c, 0x55, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x16,
-	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f,
-	0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x24, 0x0a,
+	0x43, 0x4b, 0x45, 0x52, 0x10, 0x04, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45,
-	0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x43, 0x52, 0x10, 0x05, 0x12, 0x13, 0x0a, 0x0f, 0x53,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x10, 0x06,
-	0x6f, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18,
+	0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12,
+	0x47, 0x49, 0x54, 0x48, 0x55, 0x42, 0x10, 0x07, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52,
-	0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x18,
+	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x47,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x6f,
+	0x49, 0x54, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54,
-	0x72, 0x6b, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70,
+	0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x4c, 0x41, 0x42, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10,
-	0x6f, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65,
+	0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x49, 0x52, 0x41,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
+	0x10, 0x0a, 0x12, 0x24, 0x0a, 0x20, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x63,
+	0x45, 0x5f, 0x4e, 0x50, 0x4d, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41,
-	0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x69, 0x6e, 0x63,
+	0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, 0x0b, 0x12, 0x25, 0x0a, 0x21, 0x53, 0x4f, 0x55, 0x52,
-	0x6c, 0x75, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x03,
+	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x59, 0x50, 0x49, 0x5f, 0x55, 0x4e, 0x41,
-	0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65,
+	0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, 0x0c, 0x12,
-	0x63, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f,
+	0x12, 0x0a, 0x0e, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-	0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x67, 0x6e,
+	0x33, 0x10, 0x0d, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59,
-	0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63,
+	0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41, 0x43, 0x4b, 0x10, 0x0e, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f,
-	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x2a, 0x84, 0x07, 0x0a, 0x0a, 0x53, 0x6f,
+	0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x53, 0x59,
-	0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x4f, 0x55, 0x52,
+	0x53, 0x54, 0x45, 0x4d, 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45,
-	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, 0x53, 0x54,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x10, 0x10, 0x12, 0x14, 0x0a, 0x10, 0x53,
-	0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, 0x52, 0x43,
+	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10,
-	0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x49, 0x54, 0x42, 0x55, 0x43, 0x4b, 0x45, 0x54,
+	0x11, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
+	0x5f, 0x53, 0x33, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x44, 0x10, 0x12, 0x12, 0x2a,
-	0x45, 0x5f, 0x43, 0x49, 0x52, 0x43, 0x4c, 0x45, 0x43, 0x49, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16,
+	0x0a, 0x26, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49,
-	0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x46,
+	0x54, 0x48, 0x55, 0x42, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49, 0x43,
-	0x4c, 0x55, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52,
+	0x41, 0x54, 0x45, 0x44, 0x5f, 0x4f, 0x52, 0x47, 0x10, 0x13, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f,
-	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x43, 0x4b, 0x45, 0x52, 0x10, 0x04,
+	0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x55, 0x49, 0x4c, 0x44, 0x4b,
-	0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x49, 0x54, 0x45, 0x10, 0x14, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f,
-	0x45, 0x43, 0x52, 0x10, 0x05, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x45, 0x52, 0x52, 0x49, 0x54, 0x10, 0x15, 0x12, 0x17, 0x0a,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f,
+	0x13, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x45, 0x4e,
-	0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42,
+	0x4b, 0x49, 0x4e, 0x53, 0x10, 0x16, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45,
-	0x10, 0x07, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x41, 0x4d, 0x53, 0x10, 0x17, 0x12, 0x21, 0x0a,
-	0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x47, 0x49, 0x54, 0x10, 0x08, 0x12, 0x16,
+	0x1d, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x46, 0x52,
-	0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49,
+	0x4f, 0x47, 0x5f, 0x41, 0x52, 0x54, 0x49, 0x46, 0x41, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x18,
-	0x54, 0x4c, 0x41, 0x42, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45,
+	0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x49, 0x52, 0x41, 0x10, 0x0a, 0x12, 0x24, 0x0a, 0x20,
+	0x53, 0x59, 0x53, 0x4c, 0x4f, 0x47, 0x10, 0x19, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x4f, 0x55, 0x52,
-	0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4e, 0x50, 0x4d, 0x5f,
+	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x45,
-	0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53,
+	0x56, 0x45, 0x4e, 0x54, 0x5f, 0x4d, 0x4f, 0x4e, 0x49, 0x54, 0x4f, 0x52, 0x49, 0x4e, 0x47, 0x10,
-	0x10, 0x0b, 0x12, 0x25, 0x0a, 0x21, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
+	0x1a, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x45, 0x5f, 0x50, 0x59, 0x50, 0x49, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50,
+	0x5f, 0x53, 0x4c, 0x41, 0x43, 0x4b, 0x5f, 0x52, 0x45, 0x41, 0x4c, 0x54, 0x49, 0x4d, 0x45, 0x10,
-	0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e, 0x53, 0x4f, 0x55,
+	0x1b, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x10, 0x0d, 0x12, 0x15, 0x0a,
+	0x5f, 0x47, 0x4f, 0x4f, 0x47, 0x4c, 0x45, 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x10, 0x1c, 0x12,
-	0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41,
+	0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-	0x43, 0x4b, 0x10, 0x0e, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54,
+	0x48, 0x41, 0x52, 0x45, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x1d, 0x12, 0x1c, 0x0a, 0x18, 0x53,
-	0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x10, 0x0f,
+	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x5f, 0x55,
-	0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x44, 0x10, 0x1e, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74,
-	0x47, 0x49, 0x54, 0x10, 0x10, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x11, 0x12, 0x1b, 0x0a, 0x17, 0x53,
+	0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x68,
-	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x5f, 0x55, 0x4e,
+	0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x73, 0x6f, 0x75,
-	0x41, 0x55, 0x54, 0x48, 0x45, 0x44, 0x10, 0x12, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x4f, 0x55, 0x52,
+	0x72, 0x63, 0x65, 0x73, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42, 0x5f, 0x55,
-	0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x4f,
-	0x52, 0x47, 0x10, 0x13, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x42, 0x55, 0x49, 0x4c, 0x44, 0x4b, 0x49, 0x54, 0x45, 0x10, 0x14, 0x12,
-	0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47,
-	0x45, 0x52, 0x52, 0x49, 0x54, 0x10, 0x15, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x4f, 0x55, 0x52, 0x43,
-	0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x45, 0x4e, 0x4b, 0x49, 0x4e, 0x53, 0x10, 0x16,
-	0x12, 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x54, 0x45, 0x41, 0x4d, 0x53, 0x10, 0x17, 0x12, 0x21, 0x0a, 0x1d, 0x53, 0x4f, 0x55, 0x52, 0x43,
-	0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x46, 0x52, 0x4f, 0x47, 0x5f, 0x41, 0x52, 0x54,
-	0x49, 0x46, 0x41, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x18, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f,
-	0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x53, 0x4c, 0x4f, 0x47,
-	0x10, 0x19, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x4d,
-	0x4f, 0x4e, 0x49, 0x54, 0x4f, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x1a, 0x12, 0x1e, 0x0a, 0x1a, 0x53,
-	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41, 0x43, 0x4b,
-	0x5f, 0x52, 0x45, 0x41, 0x4c, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x1b, 0x12, 0x1c, 0x0a, 0x18, 0x53,
-	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x4f, 0x4f, 0x47, 0x4c,
-	0x45, 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x10, 0x1c, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55,
-	0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, 0x50, 0x4f,
-	0x49, 0x4e, 0x54, 0x10, 0x1d, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45,
-	0x44, 0x10, 0x1e, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, 0x52, 0x45, 0x50, 0x4f, 0x53, 0x10, 0x1f,
-	0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74,
-	0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74,
-	0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67,
-	0x2f, 0x70, 0x62, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3640,7 +3456,7 @@ func file_sources_proto_rawDescGZIP() []byte {
 }
 
 var file_sources_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_sources_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
+var file_sources_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
 var file_sources_proto_goTypes = []interface{}{
 	(SourceType)(0),                             // 0: sources.SourceType
 	(Confluence_GetAllSpacesScope)(0),           // 1: sources.Confluence.GetAllSpacesScope
@@ -3672,73 +3488,71 @@ var file_sources_proto_goTypes = []interface{}{
 	(*PublicEventMonitoring)(nil),               // 27: sources.PublicEventMonitoring
 	(*SlackRealtime)(nil),                       // 28: sources.SlackRealtime
 	(*Sharepoint)(nil),                          // 29: sources.Sharepoint
-	(*AzureRepos)(nil),                          // 30: sources.AzureRepos
+	(*durationpb.Duration)(nil),                 // 30: google.protobuf.Duration
-	(*durationpb.Duration)(nil),                 // 31: google.protobuf.Duration
+	(*anypb.Any)(nil),                           // 31: google.protobuf.Any
-	(*anypb.Any)(nil),                           // 32: google.protobuf.Any
+	(*credentialspb.BasicAuth)(nil),             // 32: credentials.BasicAuth
-	(*credentialspb.BasicAuth)(nil),             // 33: credentials.BasicAuth
+	(*credentialspb.Unauthenticated)(nil),       // 33: credentials.Unauthenticated
-	(*credentialspb.Unauthenticated)(nil),       // 34: credentials.Unauthenticated
+	(*credentialspb.Oauth2)(nil),                // 34: credentials.Oauth2
-	(*credentialspb.Oauth2)(nil),                // 35: credentials.Oauth2
+	(*credentialspb.KeySecret)(nil),             // 35: credentials.KeySecret
-	(*credentialspb.KeySecret)(nil),             // 36: credentials.KeySecret
+	(*credentialspb.CloudEnvironment)(nil),      // 36: credentials.CloudEnvironment
-	(*credentialspb.CloudEnvironment)(nil),      // 37: credentials.CloudEnvironment
+	(*credentialspb.SSHAuth)(nil),               // 37: credentials.SSHAuth
-	(*credentialspb.SSHAuth)(nil),               // 38: credentials.SSHAuth
+	(*credentialspb.GitHubApp)(nil),             // 38: credentials.GitHubApp
-	(*credentialspb.GitHubApp)(nil),             // 39: credentials.GitHubApp
+	(*credentialspb.AWSSessionTokenSecret)(nil), // 39: credentials.AWSSessionTokenSecret
-	(*credentialspb.AWSSessionTokenSecret)(nil), // 40: credentials.AWSSessionTokenSecret
+	(*credentialspb.SlackTokens)(nil),           // 40: credentials.SlackTokens
-	(*credentialspb.SlackTokens)(nil),           // 41: credentials.SlackTokens
+	(*credentialspb.Header)(nil),                // 41: credentials.Header
-	(*credentialspb.Header)(nil),                // 42: credentials.Header
+	(*credentialspb.ClientCredentials)(nil),     // 42: credentials.ClientCredentials
-	(*credentialspb.ClientCredentials)(nil),     // 43: credentials.ClientCredentials
+	(*timestamppb.Timestamp)(nil),               // 43: google.protobuf.Timestamp
-	(*timestamppb.Timestamp)(nil),               // 44: google.protobuf.Timestamp
 }
 var file_sources_proto_depIdxs = []int32{
-	31, // 0: sources.LocalSource.scan_interval:type_name -> google.protobuf.Duration
+	30, // 0: sources.LocalSource.scan_interval:type_name -> google.protobuf.Duration
-	32, // 1: sources.LocalSource.connection:type_name -> google.protobuf.Any
+	31, // 1: sources.LocalSource.connection:type_name -> google.protobuf.Any
-	33, // 2: sources.AzureStorage.basic_auth:type_name -> credentials.BasicAuth
+	32, // 2: sources.AzureStorage.basic_auth:type_name -> credentials.BasicAuth
-	34, // 3: sources.AzureStorage.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 3: sources.AzureStorage.unauthenticated:type_name -> credentials.Unauthenticated
-	35, // 4: sources.Bitbucket.oauth:type_name -> credentials.Oauth2
+	34, // 4: sources.Bitbucket.oauth:type_name -> credentials.Oauth2
-	33, // 5: sources.Bitbucket.basic_auth:type_name -> credentials.BasicAuth
+	32, // 5: sources.Bitbucket.basic_auth:type_name -> credentials.BasicAuth
-	34, // 6: sources.Confluence.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 6: sources.Confluence.unauthenticated:type_name -> credentials.Unauthenticated
-	33, // 7: sources.Confluence.basic_auth:type_name -> credentials.BasicAuth
+	32, // 7: sources.Confluence.basic_auth:type_name -> credentials.BasicAuth
 	1,  // 8: sources.Confluence.spaces_scope:type_name -> sources.Confluence.GetAllSpacesScope
-	34, // 9: sources.Docker.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 9: sources.Docker.unauthenticated:type_name -> credentials.Unauthenticated
-	33, // 10: sources.Docker.basic_auth:type_name -> credentials.BasicAuth
+	32, // 10: sources.Docker.basic_auth:type_name -> credentials.BasicAuth
-	36, // 11: sources.ECR.access_key:type_name -> credentials.KeySecret
+	35, // 11: sources.ECR.access_key:type_name -> credentials.KeySecret
-	34, // 12: sources.GCS.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 12: sources.GCS.unauthenticated:type_name -> credentials.Unauthenticated
-	37, // 13: sources.GCS.adc:type_name -> credentials.CloudEnvironment
+	36, // 13: sources.GCS.adc:type_name -> credentials.CloudEnvironment
-	35, // 14: sources.GCS.oauth:type_name -> credentials.Oauth2
+	34, // 14: sources.GCS.oauth:type_name -> credentials.Oauth2
-	33, // 15: sources.Git.basic_auth:type_name -> credentials.BasicAuth
+	32, // 15: sources.Git.basic_auth:type_name -> credentials.BasicAuth
-	34, // 16: sources.Git.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 16: sources.Git.unauthenticated:type_name -> credentials.Unauthenticated
-	38, // 17: sources.Git.ssh_auth:type_name -> credentials.SSHAuth
+	37, // 17: sources.Git.ssh_auth:type_name -> credentials.SSHAuth
-	35, // 18: sources.GitLab.oauth:type_name -> credentials.Oauth2
+	34, // 18: sources.GitLab.oauth:type_name -> credentials.Oauth2
-	33, // 19: sources.GitLab.basic_auth:type_name -> credentials.BasicAuth
+	32, // 19: sources.GitLab.basic_auth:type_name -> credentials.BasicAuth
-	39, // 20: sources.GitHub.github_app:type_name -> credentials.GitHubApp
+	38, // 20: sources.GitHub.github_app:type_name -> credentials.GitHubApp
-	34, // 21: sources.GitHub.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 21: sources.GitHub.unauthenticated:type_name -> credentials.Unauthenticated
-	33, // 22: sources.GitHub.basic_auth:type_name -> credentials.BasicAuth
+	32, // 22: sources.GitHub.basic_auth:type_name -> credentials.BasicAuth
-	33, // 23: sources.JIRA.basic_auth:type_name -> credentials.BasicAuth
+	32, // 23: sources.JIRA.basic_auth:type_name -> credentials.BasicAuth
-	34, // 24: sources.JIRA.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 24: sources.JIRA.unauthenticated:type_name -> credentials.Unauthenticated
-	35, // 25: sources.JIRA.oauth:type_name -> credentials.Oauth2
+	34, // 25: sources.JIRA.oauth:type_name -> credentials.Oauth2
-	34, // 26: sources.NPMUnauthenticatedPackage.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 26: sources.NPMUnauthenticatedPackage.unauthenticated:type_name -> credentials.Unauthenticated
-	34, // 27: sources.PyPIUnauthenticatedPackage.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 27: sources.PyPIUnauthenticatedPackage.unauthenticated:type_name -> credentials.Unauthenticated
-	36, // 28: sources.S3.access_key:type_name -> credentials.KeySecret
+	35, // 28: sources.S3.access_key:type_name -> credentials.KeySecret
-	34, // 29: sources.S3.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 29: sources.S3.unauthenticated:type_name -> credentials.Unauthenticated
-	37, // 30: sources.S3.cloud_environment:type_name -> credentials.CloudEnvironment
+	36, // 30: sources.S3.cloud_environment:type_name -> credentials.CloudEnvironment
-	40, // 31: sources.S3.session_token:type_name -> credentials.AWSSessionTokenSecret
+	39, // 31: sources.S3.session_token:type_name -> credentials.AWSSessionTokenSecret
-	41, // 32: sources.Slack.tokens:type_name -> credentials.SlackTokens
+	40, // 32: sources.Slack.tokens:type_name -> credentials.SlackTokens
-	33, // 33: sources.Gerrit.basic_auth:type_name -> credentials.BasicAuth
+	32, // 33: sources.Gerrit.basic_auth:type_name -> credentials.BasicAuth
-	34, // 34: sources.Gerrit.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 34: sources.Gerrit.unauthenticated:type_name -> credentials.Unauthenticated
-	33, // 35: sources.Jenkins.basic_auth:type_name -> credentials.BasicAuth
+	32, // 35: sources.Jenkins.basic_auth:type_name -> credentials.BasicAuth
-	42, // 36: sources.Jenkins.header:type_name -> credentials.Header
+	41, // 36: sources.Jenkins.header:type_name -> credentials.Header
-	43, // 37: sources.Teams.authenticated:type_name -> credentials.ClientCredentials
+	42, // 37: sources.Teams.authenticated:type_name -> credentials.ClientCredentials
-	35, // 38: sources.Teams.oauth:type_name -> credentials.Oauth2
+	34, // 38: sources.Teams.oauth:type_name -> credentials.Oauth2
-	33, // 39: sources.Artifactory.basic_auth:type_name -> credentials.BasicAuth
+	32, // 39: sources.Artifactory.basic_auth:type_name -> credentials.BasicAuth
-	34, // 40: sources.PublicEventMonitoring.unauthenticated:type_name -> credentials.Unauthenticated
+	33, // 40: sources.PublicEventMonitoring.unauthenticated:type_name -> credentials.Unauthenticated
-	44, // 41: sources.PublicEventMonitoring.since:type_name -> google.protobuf.Timestamp
+	43, // 41: sources.PublicEventMonitoring.since:type_name -> google.protobuf.Timestamp
-	41, // 42: sources.SlackRealtime.tokens:type_name -> credentials.SlackTokens
+	40, // 42: sources.SlackRealtime.tokens:type_name -> credentials.SlackTokens
-	35, // 43: sources.Sharepoint.oauth:type_name -> credentials.Oauth2
+	34, // 43: sources.Sharepoint.oauth:type_name -> credentials.Oauth2
-	35, // 44: sources.AzureRepos.oauth:type_name -> credentials.Oauth2
+	44, // [44:44] is the sub-list for method output_type
-	45, // [45:45] is the sub-list for method output_type
+	44, // [44:44] is the sub-list for method input_type
-	45, // [45:45] is the sub-list for method input_type
+	44, // [44:44] is the sub-list for extension type_name
-	45, // [45:45] is the sub-list for extension type_name
+	44, // [44:44] is the sub-list for extension extendee
-	45, // [45:45] is the sub-list for extension extendee
+	0,  // [0:44] is the sub-list for field type_name
-	0,  // [0:45] is the sub-list for field type_name
 }
 
 func init() { file_sources_proto_init() }
@@ -4083,18 +3897,6 @@ func file_sources_proto_init() {
 				return nil
 			}
 		}
-		file_sources_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AzureRepos); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	file_sources_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*AzureStorage_ConnectionString)(nil),
@@ -4202,17 +4004,13 @@ func file_sources_proto_init() {
 	file_sources_proto_msgTypes[27].OneofWrappers = []interface{}{
 		(*Sharepoint_Oauth)(nil),
 	}
-	file_sources_proto_msgTypes[28].OneofWrappers = []interface{}{
-		(*AzureRepos_Token)(nil),
-		(*AzureRepos_Oauth)(nil),
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sources_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   29,
+			NumMessages:   28,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pkg/pb/sourcespb/sources.pb.validate.go

@@ -4459,154 +4459,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = SharepointValidationError{}
-
-// Validate checks the field values on AzureRepos with the rules defined in the
-// proto definition for this message. If any rules are violated, the first
-// error encountered is returned, or nil if there are no violations.
-func (m *AzureRepos) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on AzureRepos with the rules defined in
-// the proto definition for this message. If any rules are violated, the
-// result is a list of violation errors wrapped in AzureReposMultiError, or
-// nil if none found.
-func (m *AzureRepos) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *AzureRepos) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if _, err := url.Parse(m.GetEndpoint()); err != nil {
-		err = AzureReposValidationError{
-			field:  "Endpoint",
-			reason: "value must be a valid URI",
-			cause:  err,
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	// no validation rules for IncludeForks
-
-	switch m.Credential.(type) {
-
-	case *AzureRepos_Token:
-		// no validation rules for Token
-
-	case *AzureRepos_Oauth:
-
-		if all {
-			switch v := interface{}(m.GetOauth()).(type) {
-			case interface{ ValidateAll() error }:
-				if err := v.ValidateAll(); err != nil {
-					errors = append(errors, AzureReposValidationError{
-						field:  "Oauth",
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			case interface{ Validate() error }:
-				if err := v.Validate(); err != nil {
-					errors = append(errors, AzureReposValidationError{
-						field:  "Oauth",
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			}
-		} else if v, ok := interface{}(m.GetOauth()).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return AzureReposValidationError{
-					field:  "Oauth",
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	if len(errors) > 0 {
-		return AzureReposMultiError(errors)
-	}
-
-	return nil
-}
-
-// AzureReposMultiError is an error wrapping multiple validation errors
-// returned by AzureRepos.ValidateAll() if the designated constraints aren't met.
-type AzureReposMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m AzureReposMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m AzureReposMultiError) AllErrors() []error { return m }
-
-// AzureReposValidationError is the validation error returned by
-// AzureRepos.Validate if the designated constraints aren't met.
-type AzureReposValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e AzureReposValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e AzureReposValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e AzureReposValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e AzureReposValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e AzureReposValidationError) ErrorName() string { return "AzureReposValidationError" }
-
-// Error satisfies the builtin error interface
-func (e AzureReposValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sAzureRepos.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = AzureReposValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = AzureReposValidationError{}

pkg/sources/github/github.go

@@ -356,11 +356,11 @@ func (s *Source) enumerate(ctx context.Context, apiEndpoint string) (*github.Cli
 
 	switch cred := s.conn.GetCredential().(type) {
 	case *sourcespb.GitHub_BasicAuth:
-		if err = s.enumerateBasicAuth(ctx, apiEndpoint, cred.BasicAuth); err != nil {
+		if err = s.enumerateBasicAuth(ctx, cred.BasicAuth); err != nil {
 			return nil, err
 		}
 	case *sourcespb.GitHub_Unauthenticated:
-		s.enumerateUnauthenticated(ctx, apiEndpoint)
+		s.enumerateUnauthenticated(ctx)
 	case *sourcespb.GitHub_Token:
 		if err = s.enumerateWithToken(ctx, apiEndpoint, cred.Token); err != nil {
 			return nil, err
@@ -382,16 +382,11 @@ func (s *Source) enumerate(ctx context.Context, apiEndpoint string) (*github.Cli
 	return installationClient, nil
 }
 
-func (s *Source) enumerateBasicAuth(ctx context.Context, apiEndpoint string, basicAuth *credentialspb.BasicAuth) error {
+func (s *Source) enumerateBasicAuth(ctx context.Context, basicAuth *credentialspb.BasicAuth) error {
-	s.httpClient.Transport = &github.BasicAuthTransport{
+	s.apiClient = github.NewClient(&http.Client{Transport: &github.BasicAuthTransport{
 		Username: basicAuth.Username,
 		Password: basicAuth.Password,
-	}
+	}})
-	ghClient, err := createGitHubClient(s.httpClient, apiEndpoint)
-	if err != nil {
-		s.log.Error(err, "error creating GitHub client")
-	}
-	s.apiClient = ghClient
 
 	for _, org := range s.orgsCache.Keys() {
 		if err := s.getReposByOrg(ctx, org); err != nil {
@@ -402,12 +397,8 @@ func (s *Source) enumerateBasicAuth(ctx context.Context, apiEndpoint string, bas
 	return nil
 }
 
-func (s *Source) enumerateUnauthenticated(ctx context.Context, apiEndpoint string) {
+func (s *Source) enumerateUnauthenticated(ctx context.Context) {
-	ghClient, err := createGitHubClient(s.httpClient, apiEndpoint)
+	s.apiClient = github.NewClient(s.httpClient)
-	if err != nil {
-		s.log.Error(err, "error creating GitHub client")
-	}
-	s.apiClient = ghClient
 	if s.orgsCache.Count() > unauthGithubOrgRateLimt {
 		s.log.Info("You may experience rate limiting when using the unauthenticated GitHub api. Consider using an authenticated scan instead.")
 	}
@@ -441,14 +432,19 @@ func (s *Source) enumerateWithToken(ctx context.Context, apiEndpoint, token stri
 		Source: oauth2.ReuseTokenSource(nil, ts),
 	}
 
-	// If we're using public GitHub, make a regular client.
+	var err error
+	// If we're using public Github, make a regular client.
 	// Otherwise, make an enterprise client.
-	var isGHE bool = apiEndpoint != "https://api.github.com"
+	var isGHE bool
-	ghClient, err := createGitHubClient(s.httpClient, apiEndpoint)
+	if apiEndpoint == "https://api.github.com" {
-	if err != nil {
+		s.apiClient = github.NewClient(s.httpClient)
-		s.log.Error(err, "error creating GitHub client")
+	} else {
+		isGHE = true
+		s.apiClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, s.httpClient)
+		if err != nil {
+			return errors.New(err)
+		}
 	}
-	s.apiClient = ghClient
 
 	// TODO: this should support scanning users too
 
@@ -564,9 +560,7 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app *
 		return nil, errors.New(err)
 	}
 	itr.BaseURL = apiEndpoint
-
+	s.apiClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, &http.Client{Transport: itr})
-	s.httpClient.Transport = itr
-	s.apiClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, s.httpClient)
 	if err != nil {
 		return nil, errors.New(err)
 	}
@@ -581,11 +575,7 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app *
 		return nil, errors.New(err)
 	}
 	appItr.BaseURL = apiEndpoint
-
+	installationClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, &http.Client{Transport: appItr})
-	// Does this need to be separate from |s.httpClient|?
-	instHttpClient := common.RetryableHttpClientTimeout(60)
-	instHttpClient.Transport = appItr
-	installationClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, instHttpClient)
 	if err != nil {
 		return nil, errors.New(err)
 	}
@@ -618,21 +608,6 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app *
 	return installationClient, nil
 }
 
-func createGitHubClient(httpClient *http.Client, apiEndpoint string) (ghClient *github.Client, err error) {
-	// If we're using public GitHub, make a regular client.
-	// Otherwise, make an enterprise client.
-	if apiEndpoint == "https://api.github.com" {
-		ghClient = github.NewClient(httpClient)
-	} else {
-		ghClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, httpClient)
-		if err != nil {
-			return nil, errors.New(err)
-		}
-	}
-
-	return ghClient, err
-}
-
 func (s *Source) scan(ctx context.Context, installationClient *github.Client, chunksChan chan *sources.Chunk) error {
 	var scanned uint64
 
@@ -957,7 +932,7 @@ func (s *Source) setProgressCompleteWithRepo(index int, offset int, repoURL stri
 }
 
 func (s *Source) scanComments(ctx context.Context, repoPath string, chunksChan chan *sources.Chunk) error {
-	s.log.Info("scanning comments", "repository", repoPath)
+	s.log.Info("scanning comments")
 
 	// Support ssh and https URLs
 	repoURL, err := git.GitURLParse(repoPath)

pkg/sources/github/github_test.go

@@ -339,8 +339,7 @@ func TestHandleRateLimit(t *testing.T) {
 func TestEnumerateUnauthenticated(t *testing.T) {
 	defer gock.Off()
 
-	apiEndpoint := "https://api.github.com"
+	gock.New("https://api.github.com").
-	gock.New(apiEndpoint).
 		Get("/orgs/super-secret-org/repos").
 		Reply(200).
 		JSON([]map[string]string{{"clone_url": "https://github.com/super-secret-repo.git", "full_name": "super-secret-repo"}})
@@ -348,7 +347,7 @@ func TestEnumerateUnauthenticated(t *testing.T) {
 	s := initTestSource(nil)
 	s.orgsCache = memory.New()
 	s.orgsCache.Set("super-secret-org", "super-secret-org")
-	s.enumerateUnauthenticated(context.Background(), apiEndpoint)
+	s.enumerateUnauthenticated(context.Background())
 	assert.Equal(t, 1, s.filteredRepoCache.Count())
 	ok := s.filteredRepoCache.Exists("super-secret-repo")
 	assert.True(t, ok)

pkg/sources/job_report.go

@@ -1,37 +0,0 @@
-package sources
-
-import (
-	"errors"
-	"sync"
-	"time"
-)
-
-// JobReport aggregates information about a run of a Source.
-type JobReport struct {
-	SourceID    int64
-	JobID       int64
-	StartTime   time.Time
-	EndTime     time.Time
-	TotalChunks uint64
-	errors      []error
-	errorsLock  sync.Mutex
-}
-
-// AddError adds a non-nil error to the aggregate of errors encountered during
-// scanning.
-func (jr *JobReport) AddError(err error) {
-	if err == nil {
-		return
-	}
-	jr.errorsLock.Lock()
-	defer jr.errorsLock.Unlock()
-	jr.errors = append(jr.errors, err)
-}
-
-// Errors joins all aggregated errors into one. If there were no errors, nil is
-// returned. errors.Is can be used to check for specific errors.
-func (jr *JobReport) Errors() error {
-	jr.errorsLock.Lock()
-	defer jr.errorsLock.Unlock()
-	return errors.Join(jr.errors...)
-}

pkg/sources/source_manager.go

@@ -1,11 +1,9 @@
 package sources
 
 import (
-	"errors"
 	"fmt"
 	"sync"
 	"sync/atomic"
-	"time"
 
 	"github.com/trufflesecurity/trufflehog/v3/pkg/common"
 	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
@@ -20,27 +18,17 @@ type handle int64
 
 // SourceInitFunc is a function that takes a source and job ID and returns an
 // initialized Source.
-type SourceInitFunc func(ctx context.Context, sourceID int64, jobID int64) (Source, error)
+type SourceInitFunc func(sourceID int64, jobID int64) (Source, error)
 
 type SourceManager struct {
 	api apiClient
 	// Map of handle to source initializer.
 	handles     map[handle]SourceInitFunc
 	handlesLock sync.Mutex
-	// Map of handle to job reports.
-	// TODO: Manage culling and flushing to the API.
-	report     map[handle]*JobReport
-	reportLock sync.Mutex
 	// Pool limiting the amount of concurrent sources running.
-	pool            errgroup.Group
+	pool errgroup.Group
-	concurrentUnits int
-	// Run the sources using source unit enumeration / chunking if available.
-	useSourceUnits bool
 	// Downstream chunks channel to be scanned.
 	outputChunks chan *Chunk
-	// Set when Wait() returns.
-	done    bool
-	doneErr error
 }
 
 // apiClient is an interface for optionally communicating with an external API.
@@ -53,51 +41,30 @@ type apiClient interface {
 
 // WithAPI adds an API client to the manager for tracking jobs and progress.
 func WithAPI(api apiClient) func(*SourceManager) {
-	return func(mgr *SourceManager) { mgr.api = api }
+	return func(man *SourceManager) { man.api = api }
 }
 
 // WithConcurrency limits the concurrent number of sources a manager can run.
 func WithConcurrency(concurrency int) func(*SourceManager) {
-	return func(mgr *SourceManager) { mgr.pool.SetLimit(concurrency) }
+	return func(man *SourceManager) { man.pool.SetLimit(concurrency) }
-}
-
-// WithBufferedOutput sets the size of the buffer used for the Chunks() channel.
-func WithBufferedOutput(size int) func(*SourceManager) {
-	return func(mgr *SourceManager) { mgr.outputChunks = make(chan *Chunk, size) }
-}
-
-// WithSourceUnits enables using source unit enumeration and chunking if the
-// source supports it.
-func WithSourceUnits() func(*SourceManager) {
-	return func(mgr *SourceManager) { mgr.useSourceUnits = true }
-}
-
-// WithConcurrentUnits limits the number of units to be scanned concurrently.
-// The default is unlimited.
-func WithConcurrentUnits(n int) func(*SourceManager) {
-	return func(mgr *SourceManager) { mgr.concurrentUnits = n }
 }
 
 // NewManager creates a new manager with the provided options.
-func NewManager(opts ...func(*SourceManager)) *SourceManager {
+func NewManager(outputChunks chan *Chunk, opts ...func(*SourceManager)) *SourceManager {
-	mgr := SourceManager{
+	man := SourceManager{
 		// Default to the headless API. Can be overwritten by the WithAPI option.
 		api:          &headlessAPI{},
 		handles:      make(map[handle]SourceInitFunc),
-		report:       make(map[handle]*JobReport),
+		outputChunks: outputChunks,
-		outputChunks: make(chan *Chunk),
 	}
 	for _, opt := range opts {
-		opt(&mgr)
+		opt(&man)
 	}
-	return &mgr
+	return &man
 }
 
 // Enroll informs the SourceManager to track and manage a Source.
 func (s *SourceManager) Enroll(ctx context.Context, name string, kind sourcespb.SourceType, f SourceInitFunc) (handle, error) {
-	if s.done {
-		return 0, fmt.Errorf("manager is done")
-	}
 	id, err := s.api.RegisterSource(ctx, name, kind)
 	if err != nil {
 		return 0, err
@@ -110,236 +77,66 @@ func (s *SourceManager) Enroll(ctx context.Context, name string, kind sourcespb.
 		return 0, fmt.Errorf("handle ID '%d' already in use", handleID)
 	}
 	s.handles[handleID] = f
-	return handleID, nil
+	return 0, nil
 }
 
-// Run blocks until a resource is available to run the source, then
+// Run blocks until a resource is available to run the source, then synchronously runs it.
-// synchronously runs it.
 func (s *SourceManager) Run(ctx context.Context, handle handle) error {
-	// Do preflight checks before waiting on the pool.
+	// Check the handle is valid before waiting on the pool.
-	if err := s.preflightChecks(ctx, handle); err != nil {
+	if _, ok := s.getInitFunc(handle); !ok {
+		return fmt.Errorf("unrecognized handle")
+	}
+	if err := ctx.Err(); err != nil {
 		return err
 	}
 	ch := make(chan error)
 	s.pool.Go(func() error {
 		defer common.Recover(ctx)
-		report, err := s.run(ctx, handle)
+		// TODO: The manager should record these errors.
-		if report != nil {
+		ch <- s.run(ctx, handle)
-			s.reportLock.Lock()
-			s.report[handle] = report
-			s.reportLock.Unlock()
-		}
-		if err != nil {
-			ch <- err
-			return nil
-		}
-		ch <- report.Errors()
 		return nil
 	})
 	return <-ch
 }
 
 // ScheduleRun blocks until a resource is available to run the source, then
-// asynchronously runs it. Error information is stored and returned by Wait().
+// asynchronously runs it. Error information is lost in this case.
 func (s *SourceManager) ScheduleRun(ctx context.Context, handle handle) error {
-	// Do preflight checks before waiting on the pool.
+	// Check the handle is valid before waiting on the pool.
-	if err := s.preflightChecks(ctx, handle); err != nil {
+	if _, ok := s.getInitFunc(handle); !ok {
+		return fmt.Errorf("unrecognized handle")
+	}
+	if err := ctx.Err(); err != nil {
 		return err
 	}
 	s.pool.Go(func() error {
 		defer common.Recover(ctx)
-		// The error is already saved in the report, so we can ignore
+		// TODO: The manager should record these errors.
-		// it here.
+		_ = s.run(ctx, handle)
-		report, _ := s.run(ctx, handle)
-		if report != nil {
-			s.reportLock.Lock()
-			s.report[handle] = report
-			s.reportLock.Unlock()
-		}
 		return nil
 	})
 	// TODO: Maybe wait for a signal here that initialization was successful?
 	return nil
 }
 
-// Chunks returns the read only channel of all the chunks produced by all of
-// the sources managed by this manager.
-func (s *SourceManager) Chunks() <-chan *Chunk {
-	return s.outputChunks
-}
-
-// Wait blocks until all running sources are completed and returns an error if
-// any of the sources had fatal errors. It also closes the channel returned by
-// Chunks(). The manager should not be reused after calling this method.
-func (s *SourceManager) Wait() error {
-	// Check if the manager has been Waited.
-	if s.done {
-		return s.doneErr
-	}
-	defer close(s.outputChunks)
-	defer func() { s.done = true }()
-
-	// We are only using the errgroup for limiting concurrency.
-	// TODO: Maybe switch to using a semaphore.Weighted.
-	_ = s.pool.Wait()
-
-	// Aggregate all errors from all job reports.
-	// TODO: This should probably only be the fatal errors. We'll also need
-	//       to rewrite this for when the reports start getting culled.
-	s.reportLock.Lock()
-	defer s.reportLock.Unlock()
-	errs := make([]error, 0, len(s.report))
-	for _, report := range s.report {
-		errs = append(errs, report.Errors())
-	}
-	s.doneErr = errors.Join(errs...)
-	return s.doneErr
-}
-
-// Report retrieves a scan report for a given handle. If no report exists or
-// the Source has not finished, nil will be returned.
-func (s *SourceManager) Report(handle handle) *JobReport {
-	s.reportLock.Lock()
-	defer s.reportLock.Unlock()
-	return s.report[handle]
-}
-
-// preflightChecks is a helper method to check the Manager or the context isn't
-// done and that the handle is valid.
-func (s *SourceManager) preflightChecks(ctx context.Context, handle handle) error {
-	// Check if the manager has been Waited.
-	if s.done {
-		return fmt.Errorf("manager is done")
-	}
-	// Check the handle is valid.
-	if _, ok := s.getInitFunc(handle); !ok {
-		return fmt.Errorf("unrecognized handle")
-	}
-	return ctx.Err()
-}
-
 // run is a helper method to sychronously run the source. It does not check for
-// acquired resources. Possible return values are:
+// acquired resources.
-//
+func (s *SourceManager) run(ctx context.Context, handle handle) error {
-//   - *JobReport, nil
-//     Successfully ran the source, but the report could have errors.
-//
-//   - *JobReport, error
-//     There was an error calling Init or Chunks. This sort of error indicates
-//     a fatal error and is also recorded in the report.
-//
-//   - nil, error:
-//     There was an error from the API or the handle is invalid. The latter of
-//     which should never happen due to the preflightChecks.
-func (s *SourceManager) run(ctx context.Context, handle handle) (*JobReport, error) {
 	jobID, err := s.api.GetJobID(ctx, int64(handle))
 	if err != nil {
-		return nil, err
+		return err
 	}
 	initFunc, ok := s.getInitFunc(handle)
 	if !ok {
-		return nil, fmt.Errorf("unrecognized handle")
+		return fmt.Errorf("unrecognized handle")
 	}
-	// Create a report for this run.
+	source, err := initFunc(jobID, int64(handle))
-	report := &JobReport{
-		SourceID:  int64(handle),
-		JobID:     jobID,
-		StartTime: time.Now(),
-	}
-	defer func() { report.EndTime = time.Now() }()
-
-	// Initialize the source.
-	source, err := initFunc(ctx, jobID, int64(handle))
 	if err != nil {
-		report.AddError(err)
+		return err
-		return report, err
 	}
-	// Check for the preferred method of tracking source units.
+	// TODO: Support UnitChunker and SourceUnitEnumerator.
-	if enumChunker, ok := source.(SourceUnitEnumChunker); ok && s.useSourceUnits {
+	// TODO: This is where we can introspect on the chunks collected.
-		return s.runWithUnits(ctx, handle, enumChunker, report)
+	return source.Chunks(ctx, s.outputChunks)
-	}
-	return s.runWithoutUnits(ctx, handle, source, report)
-}
-
-// runWithoutUnits is a helper method to run a Source. It has coarse-grained
-// job reporting.
-func (s *SourceManager) runWithoutUnits(ctx context.Context, handle handle, source Source, report *JobReport) (*JobReport, error) {
-	// Introspect on the chunks we get from the Chunks method.
-	ch := make(chan *Chunk)
-	var wg sync.WaitGroup
-	// Consume chunks and export chunks.
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for chunk := range ch {
-			atomic.AddUint64(&report.TotalChunks, 1)
-			_ = common.CancellableWrite(ctx, s.outputChunks, chunk)
-		}
-	}()
-	// Don't return from this function until the goroutine has finished
-	// outputting chunks to the downstream channel. Closing the channel
-	// will stop the goroutine, so that needs to happen first in the defer
-	// stack.
-	defer wg.Wait()
-	defer close(ch)
-	if err := source.Chunks(ctx, ch); err != nil {
-		report.AddError(err)
-		return report, err
-	}
-	return report, nil
-}
-
-// runWithUnits is a helper method to run a Source that is also a
-// SourceUnitEnumChunker. This allows better introspection of what is getting
-// scanned and any errors encountered.
-func (s *SourceManager) runWithUnits(ctx context.Context, handle handle, source SourceUnitEnumChunker, report *JobReport) (*JobReport, error) {
-	reporter := &mgrUnitReporter{
-		unitCh: make(chan SourceUnit),
-	}
-	// Produce units.
-	go func() {
-		// TODO: Catch panics and add to report.
-		defer close(reporter.unitCh)
-		if err := source.Enumerate(ctx, reporter); err != nil {
-			report.AddError(err)
-		}
-	}()
-	var wg sync.WaitGroup
-	// TODO: Maybe switch to using a semaphore.Weighted.
-	var unitPool errgroup.Group
-	if s.concurrentUnits != 0 {
-		// Negative values indicated no limit.
-		unitPool.SetLimit(s.concurrentUnits)
-	}
-	for unit := range reporter.unitCh {
-		reporter := &mgrChunkReporter{
-			unitID:  unit.SourceUnitID(),
-			chunkCh: make(chan *Chunk),
-		}
-		unit := unit
-		// Consume units and produce chunks.
-		unitPool.Go(func() error {
-			// TODO: Catch panics and add to report.
-			defer close(reporter.chunkCh)
-			if err := source.ChunkUnit(ctx, unit, reporter); err != nil {
-				report.AddError(err)
-			}
-			return nil
-		})
-		// Consume chunks and export chunks.
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for chunk := range reporter.chunkCh {
-				// TODO: Introspect on the chunks we got from this unit.
-				atomic.AddUint64(&report.TotalChunks, 1)
-				_ = common.CancellableWrite(ctx, s.outputChunks, chunk)
-			}
-		}()
-	}
-	wg.Wait()
-	// TODO: Return fatal errors.
-	return report, nil
 }
 
 // getInitFunc is a helper method for safe concurrent access to the
@@ -365,40 +162,3 @@ func (api *headlessAPI) RegisterSource(ctx context.Context, name string, kind so
 func (api *headlessAPI) GetJobID(ctx context.Context, id int64) (int64, error) {
 	return atomic.AddInt64(&api.jobIDCounter, 1), nil
 }
-
-// mgrUnitReporter implements the UnitReporter interface.
-type mgrUnitReporter struct {
-	unitCh       chan SourceUnit
-	unitErrs     []error
-	unitErrsLock sync.Mutex
-}
-
-func (s *mgrUnitReporter) UnitOk(ctx context.Context, unit SourceUnit) error {
-	return common.CancellableWrite(ctx, s.unitCh, unit)
-}
-
-func (s *mgrUnitReporter) UnitErr(ctx context.Context, err error) error {
-	s.unitErrsLock.Lock()
-	defer s.unitErrsLock.Unlock()
-	s.unitErrs = append(s.unitErrs, err)
-	return nil
-}
-
-// mgrChunkReporter implements the ChunkReporter interface.
-type mgrChunkReporter struct {
-	unitID        string
-	chunkCh       chan *Chunk
-	chunkErrs     []error
-	chunkErrsLock sync.Mutex
-}
-
-func (s *mgrChunkReporter) ChunkOk(ctx context.Context, chunk Chunk) error {
-	return common.CancellableWrite(ctx, s.chunkCh, &chunk)
-}
-
-func (s *mgrChunkReporter) ChunkErr(ctx context.Context, err error) error {
-	s.chunkErrsLock.Lock()
-	defer s.chunkErrsLock.Unlock()
-	s.chunkErrs = append(s.chunkErrs, err)
-	return nil
-}

pkg/sources/source_manager_test.go

@@ -1,194 +0,0 @@
-package sources
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
-	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/sourcespb"
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// DummySource implements Source and is used for testing a SourceManager.
-type DummySource struct {
-	sourceID int64
-	jobID    int64
-	chunker
-}
-
-func (d *DummySource) Type() sourcespb.SourceType { return 1337 }
-func (d *DummySource) SourceID() int64            { return d.sourceID }
-func (d *DummySource) JobID() int64               { return d.jobID }
-func (d *DummySource) Init(_ context.Context, _ string, jobID, sourceID int64, _ bool, _ *anypb.Any, _ int) error {
-	d.sourceID = sourceID
-	d.jobID = jobID
-	return nil
-}
-func (d *DummySource) GetProgress() *Progress { return nil }
-
-// Interface to easily test different chunking methods.
-type chunker interface {
-	Chunks(context.Context, chan *Chunk) error
-	ChunkUnit(ctx context.Context, unit SourceUnit, reporter ChunkReporter) error
-	Enumerate(ctx context.Context, reporter UnitReporter) error
-}
-
-// Chunk method that writes count bytes to the channel before returning.
-type counterChunker struct {
-	chunkCounter byte
-	count        int
-}
-
-func (c *counterChunker) Chunks(_ context.Context, ch chan *Chunk) error {
-	for i := 0; i < c.count; i++ {
-		ch <- &Chunk{Data: []byte{c.chunkCounter}}
-		c.chunkCounter++
-	}
-	return nil
-}
-
-// countChunk implements SourceUnit.
-type countChunk byte
-
-func (c countChunk) SourceUnitID() string { return fmt.Sprintf("countChunk(%d)", c) }
-
-func (c *counterChunker) Enumerate(ctx context.Context, reporter UnitReporter) error {
-	for i := 0; i < c.count; i++ {
-		if err := reporter.UnitOk(ctx, countChunk(byte(i))); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *counterChunker) ChunkUnit(ctx context.Context, unit SourceUnit, reporter ChunkReporter) error {
-	return reporter.ChunkOk(ctx, Chunk{Data: []byte{byte(unit.(countChunk))}})
-}
-
-// Chunk method that always returns an error.
-type errorChunker struct{ error }
-
-func (c errorChunker) Chunks(context.Context, chan *Chunk) error                  { return c }
-func (c errorChunker) Enumerate(context.Context, UnitReporter) error              { return c }
-func (c errorChunker) ChunkUnit(context.Context, SourceUnit, ChunkReporter) error { return c }
-
-// enrollDummy is a helper function to enroll a DummySource with a SourceManager.
-func enrollDummy(mgr *SourceManager, chunkMethod chunker) (handle, error) {
-	return mgr.Enroll(context.Background(), "dummy", 1337,
-		func(ctx context.Context, jobID, sourceID int64) (Source, error) {
-			source := &DummySource{chunker: chunkMethod}
-			if err := source.Init(ctx, "dummy", jobID, sourceID, true, nil, 42); err != nil {
-				return nil, err
-			}
-			return source, nil
-		})
-}
-
-// tryRead is a helper function that will try to read from a channel and return
-// an error if it cannot.
-func tryRead(ch <-chan *Chunk) (*Chunk, error) {
-	select {
-	case chunk := <-ch:
-		return chunk, nil
-	default:
-		return nil, fmt.Errorf("no chunk available")
-	}
-}
-
-func TestSourceManagerRun(t *testing.T) {
-	mgr := NewManager(WithBufferedOutput(8))
-	handle, err := enrollDummy(mgr, &counterChunker{count: 1})
-	if err != nil {
-		t.Fatalf("unexpected error enrolling source: %v", err)
-	}
-	for i := 0; i < 3; i++ {
-		if err := mgr.Run(context.Background(), handle); err != nil {
-			t.Fatalf("unexpected error running source: %v", err)
-		}
-		chunk, err := tryRead(mgr.Chunks())
-		if err != nil {
-			t.Fatalf("reading chunk failed: %v", err)
-		}
-		if chunk.Data[0] != byte(i) {
-			t.Fatalf("unexpected chunk value, wanted %v, got: %v", chunk.Data[0], i)
-		}
-
-		// The Chunks channel should be empty now.
-		if chunk, err := tryRead(mgr.Chunks()); err == nil {
-			t.Fatalf("unexpected chunk found: %+v", chunk)
-		}
-	}
-}
-
-func TestSourceManagerWait(t *testing.T) {
-	mgr := NewManager()
-	handle, err := enrollDummy(mgr, &counterChunker{count: 1})
-	if err != nil {
-		t.Fatalf("unexpected error enrolling source: %v", err)
-	}
-	// Asynchronously run the source.
-	if err := mgr.ScheduleRun(context.Background(), handle); err != nil {
-		t.Fatalf("unexpected error scheduling run: %v", err)
-	}
-	// Read the 1 chunk we're expecting so Waiting completes.
-	<-mgr.Chunks()
-	// Wait for all resources to complete.
-	if err := mgr.Wait(); err != nil {
-		t.Fatalf("unexpected error waiting: %v", err)
-	}
-	// Enroll and run should return an error now.
-	if _, err := enrollDummy(mgr, &counterChunker{count: 1}); err == nil {
-		t.Fatalf("expected enroll to fail")
-	}
-	if err := mgr.ScheduleRun(context.Background(), handle); err == nil {
-		t.Fatalf("expected scheduling run to fail")
-	}
-}
-
-func TestSourceManagerError(t *testing.T) {
-	mgr := NewManager()
-	handle, err := enrollDummy(mgr, errorChunker{fmt.Errorf("oops")})
-	if err != nil {
-		t.Fatalf("unexpected error enrolling source: %v", err)
-	}
-	// A synchronous run should fail.
-	if err := mgr.Run(context.Background(), handle); err == nil {
-		t.Fatalf("expected run to fail")
-	}
-	// Scheduling a run should not fail, but the error should surface in
-	// Wait().
-	if err := mgr.ScheduleRun(context.Background(), handle); err != nil {
-		t.Fatalf("unexpected error scheduling run: %v", err)
-	}
-	if err := mgr.Wait(); err == nil {
-		t.Fatalf("expected wait to fail")
-	}
-}
-
-func TestSourceManagerReport(t *testing.T) {
-	for _, opts := range [][]func(*SourceManager){
-		{WithBufferedOutput(8)},
-		{WithBufferedOutput(8), WithSourceUnits()},
-		{WithBufferedOutput(8), WithSourceUnits(), WithConcurrentUnits(1)},
-	} {
-		mgr := NewManager(opts...)
-		handle, err := enrollDummy(mgr, &counterChunker{count: 4})
-		if err != nil {
-			t.Fatalf("unexpected error enrolling source: %v", err)
-		}
-		// Synchronously run the source.
-		if err := mgr.Run(context.Background(), handle); err != nil {
-			t.Fatalf("unexpected error running source: %v", err)
-		}
-		report := mgr.Report(handle)
-		if report == nil {
-			t.Fatalf("expected a report")
-		}
-		if err := report.Errors(); err != nil {
-			t.Fatalf("unexpected error in report: %v", err)
-		}
-		if report.TotalChunks != 4 {
-			t.Fatalf("expected report to have 4 chunks, got: %d", report.TotalChunks)
-		}
-	}
-}

pkg/sources/sources.go

@@ -21,7 +21,8 @@ type Chunk struct {
 	SourceType sourcespb.SourceType
 	// SourceMetadata holds the context of where the Chunk was found.
 	SourceMetadata *source_metadatapb.MetaData
-
+	// HandleMetadata holds the metadata from a handler if one was used.
+	HandleMetadata map[string]string
 	// Data is the data to decode and scan.
 	Data []byte
 	// Verify specifies whether any secrets in the Chunk should be verified.
@@ -44,13 +45,6 @@ type Source interface {
 	GetProgress() *Progress
 }
 
-// SourceUnitEnumChunker are the two required interfaces to support enumerating
-// and chunking of units.
-type SourceUnitEnumChunker interface {
-	SourceUnitEnumerator
-	SourceUnitChunker
-}
-
 // SourceUnitUnmarshaller defines an optional interface a Source can implement
 // to support units coming from an external source.
 type SourceUnitUnmarshaller interface {

proto/source_metadata.proto

@@ -248,21 +248,6 @@ message GoogleDrive {
   string timestamp = 4;
   bool shared = 5;
   string last_modified_by = 6;
-  string path = 7;
-}
-
-message AzureRepos {
-  string link = 1;
-  string username = 2;
-  string repository = 3;
-  string commit = 4;
-  string email = 5;
-  string file = 6;
-  string timestamp = 7;
-  int64 line = 8;
-  Visibility visibility = 9;
-  string project = 10;
-  string organization = 11;
 }
 
 message MetaData {
@@ -293,6 +278,5 @@ message MetaData {
     PublicEventMonitoring publicEventMonitoring = 24;
     SharePoint sharepoint = 25;
     GoogleDrive googleDrive = 26;
-    AzureRepos azureRepos = 27;
   }
 }

proto/sources.proto

@@ -43,7 +43,6 @@ enum SourceType {
   SOURCE_TYPE_GOOGLE_DRIVE = 28;
   SOURCE_TYPE_SHAREPOINT = 29;
   SOURCE_TYPE_GCS_UNAUTHED = 30;
-  SOURCE_TYPE_AZURE_REPOS = 31;
 }
 
 message LocalSource {
@@ -314,19 +313,3 @@ message Sharepoint {
   }
   string site_url = 2;
 }
-
-message AzureRepos {
-  string endpoint = 1 [(validate.rules).string.uri_ref = true];
-  oneof credential {
-    string token = 2;
-    credentials.Oauth2 oauth = 3;
-  }
-  repeated string repositories = 4;
-  repeated string organizations = 5;
-  repeated string projects = 6;
-  bool includeForks = 7;
-  repeated string ignoreRepos = 8;
-  repeated string includeRepos = 9;
-  repeated string includeProjects = 10;
-  repeated string ignoreProjects = 11;
-}