From f67b8415504c4760c5637ef61d623f3db15a5f19 Mon Sep 17 00:00:00 2001 From: William Andersson Date: Wed, 15 Mar 2023 09:30:46 +0100 Subject: [PATCH] Allow Empty List of Dependencies / No Build Files (#163) * allow empty dependencies Signed-off-by: anderssonw * log on no build files Signed-off-by: anderssonw * slightly better message Signed-off-by: anderssonw * fix gradle test, no longer causes error Signed-off-by: anderssonw --------- Signed-off-by: anderssonw --- pkg/build/jvm/gradle_test.go | 12 +- .../.gradle/8.0.1/checksums/checksums.lock | Bin 0 -> 17 bytes .../8.0.1/checksums/sha256-checksums.bin | Bin 0 -> 27407 bytes .../dependencies-accessors.lock | Bin 0 -> 17 bytes .../dependencies-accessors/gc.properties | 0 .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/8.0.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/8.0.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../gradle-kts/.gradle/8.0.1/gc.properties | 0 .../signature-verification.lock | Bin 0 -> 17 bytes .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 2 + .../gradle-kts/.gradle/vcs-1/gc.properties | 0 .../gradle/verification-metadata.xml | 562 ++++++++++++++++++ .../.gradle/8.0.1/checksums/checksums.lock | Bin 0 -> 17 bytes .../8.0.1/checksums/sha256-checksums.bin | Bin 0 -> 24305 bytes .../dependencies-accessors.lock | Bin 0 -> 17 bytes .../dependencies-accessors/gc.properties | 0 .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/8.0.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/8.0.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../jvm/gradle/.gradle/8.0.1/gc.properties | 0 .../signature-verification.lock | Bin 0 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/cache.properties | 4 +- .../gradle/gradle/verification-metadata.xml | 367 ++++++++++++ pkg/build/tool.go | 6 +- pkg/commands/scan.go | 10 +- 28 files changed, 948 insertions(+), 15 deletions(-) create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/checksums/checksums.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/checksums/sha256-checksums.bin create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/gc.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/executionHistory/executionHistory.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileChanges/last-build.bin create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileHashes/fileHashes.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/gc.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/signature-verification/signature-verification.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/cache.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/vcs-1/gc.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle-kts/gradle/verification-metadata.xml create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/checksums.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/sha256-checksums.bin create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/dependencies-accessors/gc.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/executionHistory/executionHistory.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/fileChanges/last-build.bin create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/fileHashes/fileHashes.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/gc.properties create mode 100644 pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/signature-verification/signature-verification.lock create mode 100644 pkg/build/jvm/testdata/jvm/gradle/gradle/verification-metadata.xml diff --git a/pkg/build/jvm/gradle_test.go b/pkg/build/jvm/gradle_test.go index 88dcc8b..1fedf6c 100644 --- a/pkg/build/jvm/gradle_test.go +++ b/pkg/build/jvm/gradle_test.go @@ -1,11 +1,12 @@ package jvm import ( - "github.com/nais/salsa/pkg/build" - "github.com/nais/salsa/pkg/build/test" "os" "testing" + "github.com/nais/salsa/pkg/build" + "github.com/nais/salsa/pkg/build/test" + "github.com/stretchr/testify/assert" ) @@ -74,13 +75,6 @@ func TestBuildGradle(t *testing.T) { Error: true, ErrorMessage: "could not find match, reading dir open testdata/whatever: no such file or directory", }, - { - Name: "cant find supported build type", - BuildType: BuildMaven(""), - WorkDir: "testdata/jvm/gradle-kts", - Error: true, - ErrorMessage: "no supported build files found: testdata/jvm/gradle-kts", - }, { Name: "support build.gradle file", BuildType: BuildGradle(), diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/checksums/checksums.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..9f1a88771f3c9011035392dc7b8a25c38affb215 GIT binary patch literal 17 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 literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..bd324a53192e66d39bb14ad23bad2c71f5767a37 GIT binary patch literal 17 ScmZQh?i0FlM9s*60SW*p`~xQd literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/gc.properties b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/executionHistory/executionHistory.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..2a531b9f37ab9161419a339567e615ad1425c7ab GIT binary patch literal 17 TcmZRcmgCVMnSXB$0~7!NGSmbw literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileChanges/last-build.bin b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileHashes/fileHashes.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..966d247c4634c523a6201daeb9338743fad4613b GIT binary patch literal 17 TcmZR+{%ZEAukU+bGe7|VQLF}r literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/gc.properties b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/signature-verification/signature-verification.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/8.0.1/signature-verification/signature-verification.lock new file mode 100644 index 0000000000000000000000000000000000000000..e2335a6e3060667ef39595669e542cf7812748b8 GIT binary patch literal 17 TcmZR6|I0DUL_=^Z0~7!NG5G_! literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..17520004926251f30cfe2384a8c64bdd90767e25 GIT binary patch literal 17 UcmZSnsuaHb_H98i1_)pT05k0a_W%F@ literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/cache.properties b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..891a844 --- /dev/null +++ b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Thu Mar 02 13:32:47 CET 2023 +gradle.version=8.0.1 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/vcs-1/gc.properties b/pkg/build/jvm/testdata/jvm/gradle-kts/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/pkg/build/jvm/testdata/jvm/gradle-kts/gradle/verification-metadata.xml b/pkg/build/jvm/testdata/jvm/gradle-kts/gradle/verification-metadata.xml new file mode 100644 index 0000000..4db0379 --- /dev/null +++ b/pkg/build/jvm/testdata/jvm/gradle-kts/gradle/verification-metadata.xml @@ -0,0 +1,562 @@ + + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/checksums.lock b/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..9dd586efcdc1c830aa551a83ee49c479fb4b9607 GIT binary patch literal 17 UcmZRUIlpV!>oWc;3=j|n0694X?EnA( literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/sha256-checksums.bin b/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/checksums/sha256-checksums.bin new file mode 100644 index 0000000000000000000000000000000000000000..ba299d588a1deca072d5e976ab0de9f2d89bf922 GIT binary patch literal 24305 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 z zqP@Z}l^fczyj$bhLCqoBrLd{<$Cx!v-R!gzF1iF8;HON3e{yN;9%0d_;cny8|#Rf+y}M9t4w)LdAOe9=n2mqfx5`yWkt+mE5PX%NXNZ0pG6u zh0EI+IS(12IoX^~sDY~F9;smpTXOCjw(YM|RAY4U39M~OlcFq|4(z56DWv+Zn|I?^ zd&tm1Mlf(tzaur2Eq6>NHsRdOhPYkL%N)eU=IjLe2I$syHw)3X*kYi)h|ggjUZdm{ zNDX4~g9$ycRhnYF4uyw2|8&cU+#g$h_HmNxD&7tgVUFI9*opjxk}e8|ySrx&>jwUV=d+^*5{BFPOPLEjr3OPh zPQABx-oC9@b+hx~?tZL1G=9Qy0j^=Nl|rO7xZm#KVir;v!t7<6=D>y1y!G?xC@7{m z$yqS@HFRJ)2R1;fKGbLqjFK9xk_?(dR~SPdQkckwZr(|0Rq>@6I^3%FUG|aqa>_Ei z%6$h-(6&=DEPOa*eE_IiwVQ_1+Wbq6Yan%p-krO2LHYg5(Sn`RAtrXlQ2W?*2!ALT@b z&i&`2=lV9sQ@M=JvrjIWhBxznnsqzd8dPuUUbk2RWluORFhD}RMuVm7t zD?@WXnvI6Bx~pCi-qwAWd~|vZy|u+#Sb<@olVG4T`^|Nfh2^kZ{sYNGm-b#<`lz@=??`xh78cGZiUt=sBvIbp)FAj&%Lu0+W6`21y^qOFEVxPR7qnH zFSVy@`pgjf>inV#{#p()wA{uEplg^!XhUSU+|l4Aw_8N?O&C{mzN*3E7KVlwe{m^Ht{$&5-%;z;esxsWAI^cBPy>b! z`piQ-imY`Hv6`vblU9lbY-DCfwjN5TDcV%IMAdw#`POHn0G+GxdvnHwV4&XmMrz3R zn$`C)Xz9KZq{m*F{=$M-8nJNpT7xV-(jGete4fEo_@ZOo!koBT-r<%d&5U;}iYRy)M`;#^n zMiNIBqARY&tPaF*X2FIHf`QC=iPUiMOiR{f6`}A1vB*yS*#^a&8=2lYpTlO=Z(QCr zA^iD07)47u!GJLsBsDm<7JbE~#~gJ{xyL7OyO~_Yyx?J{qGZ?Q9{45m$bDf@!z}b& z2)^mzXBN?nQqR*_^YLGoThsk9+AljiA8F6YY;YlTQnja1)XA5wfnd-VfaV3h{q9Q4 zGR8t+zb@txd1PV3eqj~2cX2kibt&EVy!-4P{jH-Nx_*TArao&lFi=5fAmSPh=v&8# zM9eS?yJsuxjvw)=N%%Zv__(j^bF|czxYS#QU=+i7z(Dz%^X4J!xs2ShuP*5+2VM=* zBTt%W{M{BI4^&@~Nl4GA_=qBGm_Nt_k^+{;lLz^i2l7?K%o=h>~2k`OeYU)t5o@bZ~GtR#%2rgqBN*-e>E9 zb5O0J-F!S;Lm@$cp}bCNaO7jzzRhH7`d(oB;z5q~2f}+h2W9LI$<;T9?90m^fQ}^m zCgbkMo0*vKv zKKmCAXEW9hw{ISdJMp1PStsII)ryHTLwsq|kJRi67FOt;_#CoN1B1rj&~Ks|gc)tTk5Mdfg}Yk z5d;_&T~dP?)pBnCSl&n9oHW7654ZcZi|<6_4b*j$RfKz6W#mCK2tT9P@(BhG@@Z0o z%%wtRks-e#=6g1k?;U=gc8_9Cj8XdQU~$5jad_BK=sJ>M$R!vg>~W-qgvQt@jSboz z6OFcS(_P7}u^IcX%t&DL-7g%kY)`uiRgX7tfmto%`JB|?w5G<)qlwwEM(gzQO{6RR zu#8$fRd=UTsD({|a{mb(fi=h=3szGm&a5YH2Ryv3`{0AoyoBIF& literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock b/pkg/build/jvm/testdata/jvm/gradle/.gradle/8.0.1/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..d9be32436e56281562ca47467b5dfc999f45ff10 GIT binary patch literal 17 TcmZQpzBRBb&w0~7!NDUJgk literal 0 HcmV?d00001 diff --git a/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b88821f9f3918dbe29d811e86d7ef83a32f67e5e..3127fd907653c7e0d0600a2141b397654d12ea07 100644 GIT binary patch literal 17 UcmZR6yt^is-FW9i1_-DG05{tN*Z=?k literal 17 UcmZR6yt^is-FW9i1_-DC05{qM*8l(j diff --git a/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/cache.properties b/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/cache.properties index 70ed881..6c894a2 100644 --- a/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/cache.properties +++ b/pkg/build/jvm/testdata/jvm/gradle/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Fri Oct 14 10:00:23 CEST 2022 -gradle.version=7.5.1 +#Thu Mar 02 13:32:48 CET 2023 +gradle.version=8.0.1 diff --git a/pkg/build/jvm/testdata/jvm/gradle/gradle/verification-metadata.xml b/pkg/build/jvm/testdata/jvm/gradle/gradle/verification-metadata.xml new file mode 100644 index 0000000..798f5b7 --- /dev/null +++ b/pkg/build/jvm/testdata/jvm/gradle/gradle/verification-metadata.xml @@ -0,0 +1,367 @@ + + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkg/build/tool.go b/pkg/build/tool.go index b06f089..5b430a5 100644 --- a/pkg/build/tool.go +++ b/pkg/build/tool.go @@ -2,8 +2,9 @@ package build import ( "fmt" - log "github.com/sirupsen/logrus" "os" + + log "github.com/sirupsen/logrus" ) const ( @@ -38,7 +39,8 @@ func (t Tools) DetectDeps(workDir string) (*ArtifactDependencies, error) { return deps, nil } } - return nil, fmt.Errorf(fmt.Sprintf("no supported build files found: %s", workDir)) + + return nil, nil } func match(t Tool, workDir string) (bool, string, error) { diff --git a/pkg/commands/scan.go b/pkg/commands/scan.go index 975c295..f836b6f 100644 --- a/pkg/commands/scan.go +++ b/pkg/commands/scan.go @@ -4,6 +4,8 @@ import ( "encoding/json" "errors" "fmt" + "os" + "github.com/nais/salsa/pkg/build" "github.com/nais/salsa/pkg/build/golang" "github.com/nais/salsa/pkg/build/jvm" @@ -15,7 +17,6 @@ import ( "github.com/nais/salsa/pkg/vcs" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "os" ) var ( @@ -55,7 +56,12 @@ var scanCmd = &cobra.Command{ if err != nil { return fmt.Errorf("detecting dependecies: %v", err) } - deps = generatedDeps + + if generatedDeps != nil { + deps = generatedDeps + } else { + log.Infof("no supported build files found for directory: %s, proceeding", workDir) + } } contextEnvironment, err := vcs.ResolveBuildContext(&buildContext, &runnerContext, &envContext)