From 0b31906852b530a7974377208c17bd83c8188471 Mon Sep 17 00:00:00 2001 From: softwaredevelop <61334390+softwaredevelop@users.noreply.github.com> Date: Sun, 22 Oct 2023 21:47:12 +0200 Subject: [PATCH] refaktor: Delete ci --- .github/workflows/test.yml | 22 ----- ci/go.mod | 25 ------ ci/go.sum | 142 ----------------------------- ci/lint/al.go | 25 ------ ci/lint/al_test.go | 40 --------- ci/lint/ec.go | 122 ------------------------- ci/lint/ec_test.go | 174 ------------------------------------ ci/lint/go.go | 40 --------- ci/lint/go_test.go | 64 -------------- ci/main.go | 78 ---------------- ci/main_test.go | 177 ------------------------------------- ci/util/mount.go | 17 ---- ci/util/mount_test.go | 128 --------------------------- 13 files changed, 1054 deletions(-) delete mode 100644 ci/go.mod delete mode 100644 ci/go.sum delete mode 100644 ci/lint/al.go delete mode 100644 ci/lint/al_test.go delete mode 100644 ci/lint/ec.go delete mode 100644 ci/lint/ec_test.go delete mode 100644 ci/lint/go.go delete mode 100644 ci/lint/go_test.go delete mode 100644 ci/main.go delete mode 100644 ci/main_test.go delete mode 100644 ci/util/mount.go delete mode 100644 ci/util/mount_test.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 04a4e4c..ffcc0ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,28 +24,6 @@ jobs: cancel_others: true concurrent_skipping: never - test-ci: - name: Test CI - if: ${{ github.event_name == 'pull_request' || contains(github.event.head_commit.modified, 'ci/**/*_test.go') }} - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Setup Go latest - uses: actions/setup-go@v4 - with: - go-version: stable - - - name: Download dependencies & run tests - run: | - go mod download - go test -v ./... - working-directory: ci - test-iac: name: Test IaC if: ${{ github.event_name == 'pull_request' || contains(github.event.head_commit.modified, 'iac/plm/**/*_test.go') || contains(github.event.head_commit.modified, 'iac/plm/util/**/*_test.go') }} diff --git a/ci/go.mod b/ci/go.mod deleted file mode 100644 index 4f6cf50..0000000 --- a/ci/go.mod +++ /dev/null @@ -1,25 +0,0 @@ -module ci - -go 1.20 - -require ( - dagger.io/dagger v0.6.3 - github.com/stretchr/testify v1.8.2 -) - -require ( - github.com/Khan/genqlient v0.6.0 // indirect - github.com/adrg/xdg v0.4.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/iancoleman/strcase v0.2.0 // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/sergi/go-diff v1.2.0 // indirect - github.com/vektah/gqlparser/v2 v2.5.1 // indirect - golang.org/x/mod v0.10.0 // indirect - golang.org/x/sync v0.2.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/tools v0.9.1 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/ci/go.sum b/ci/go.sum deleted file mode 100644 index 866f0ca..0000000 --- a/ci/go.sum +++ /dev/null @@ -1,142 +0,0 @@ -dagger.io/dagger v0.5.2 h1:xNMUnLWqcsb5UrvqOgJx4MJVfe7xDb50kBMXdC63Cjs= -dagger.io/dagger v0.5.2/go.mod h1:1nbGnLdIfoBV2ahbQjheI//SNGz+b5q1jqf0A+pJ+Oc= -dagger.io/dagger v0.6.3 h1:9SMqCjC+9GEVFUjOqTbDWJudwkJGKOWpnEzsGHBBDkA= -dagger.io/dagger v0.6.3/go.mod h1:/sSGPh+1LInVuHzTkkr1pZ5N0BAEDoqJ94eM2Xoh/iE= -github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Khan/genqlient v0.5.0 h1:TMZJ+tl/BpbmGyIBiXzKzUftDhw4ZWxQZ+1ydn0gyII= -github.com/Khan/genqlient v0.5.0/go.mod h1:EpIvDVXYm01GP6AXzjA7dKriPTH6GmtpmvTAwUUqIX8= -github.com/Khan/genqlient v0.6.0 h1:Bwb1170ekuNIVIwTJEqvO8y7RxBxXu639VJOkKSrwAk= -github.com/Khan/genqlient v0.6.0/go.mod h1:rvChwWVTqXhiapdhLDV4bp9tz/Xvtewwkon4DpWWCRM= -github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= -github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= -github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= -github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= -github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= -github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf2y2768kM= -github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= -github.com/bradleyjkemp/cupaloy/v2 v2.6.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= -github.com/kevinmbeaulieu/eq-go v1.0.0/go.mod h1:G3S8ajA56gKBZm4UB9AOyoOS37JO3roToPzKNM8dtdM= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc= -github.com/matryer/moq v0.2.3/go.mod h1:9RtPYjTnH1bSBIkpvtHkFN7nbWAnO7oRpdJkEIn6UtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mitchellh/mapstructure v1.2.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/vektah/gqlparser/v2 v2.4.0/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0= -github.com/vektah/gqlparser/v2 v2.4.5/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0= -github.com/vektah/gqlparser/v2 v2.5.1 h1:ZGu+bquAY23jsxDRcYpWjttRZrUz07LbiY77gUOHcr4= -github.com/vektah/gqlparser/v2 v2.5.1/go.mod h1:mPgqFBu/woKTVYWyNk8cO3kh4S/f4aRFZrvOnp3hmCs= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200815165600-90abf76919f3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/ci/lint/al.go b/ci/lint/al.go deleted file mode 100644 index c6d56c4..0000000 --- a/ci/lint/al.go +++ /dev/null @@ -1,25 +0,0 @@ -//revive:disable:package-comments,exported -package lint - -import "dagger.io/dagger" - -func Al(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - return al(c, id) -} - -func al(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - install := c. - Container(). - From("golang:alpine"). - WithExec([]string{"go", "install", - "github.com/rhysd/actionlint/cmd/actionlint@latest", - }) - - shellcheck := c. - Container(). - From("koalaman/shellcheck-alpine:stable") - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", install.File("/go/bin/actionlint")). - WithFile("/usr/bin", shellcheck.File("/bin/shellcheck")) -} diff --git a/ci/lint/al_test.go b/ci/lint/al_test.go deleted file mode 100644 index d6cbde7..0000000 --- a/ci/lint/al_test.go +++ /dev/null @@ -1,40 +0,0 @@ -package lint - -import ( - "context" - "os" - "testing" - - "dagger.io/dagger" - "github.com/stretchr/testify/require" -) - -func TestAl(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = Al(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/actionlint"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/actionlint\n", out) - - out, err = container. - WithExec([]string{"ls", "/usr/bin/shellcheck"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/shellcheck\n", out) -} diff --git a/ci/lint/ec.go b/ci/lint/ec.go deleted file mode 100644 index 6707216..0000000 --- a/ci/lint/ec.go +++ /dev/null @@ -1,122 +0,0 @@ -//revive:disable:package-comments,exported -package lint - -import ( - "context" - "log" - - "dagger.io/dagger" -) - -func Ec(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - return ec(c, id) -} - -func ec(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - install := c. - Container(). - From("golang:alpine"). - WithExec([]string{"go", "install", - "github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@latest", - }) - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", install.File("/go/bin/editorconfig-checker")) -} - -func ecVersion() (string, error) { - ctx := context.Background() - c, err := dagger.Connect(ctx) - if err != nil { - log.Println(err) - return "", err - } - repoURL := "https://github.com/editorconfig-checker/editorconfig-checker.git" - fileName := "VERSION" - version, err := gitCloneFileContent(ctx, c, repoURL, fileName) - if err != nil { - return "", err - } - return version, nil -} - -func Ec2(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - repoURL := "https://github.com/editorconfig-checker/editorconfig-checker.git" - version, err := ecVersion() - if err != nil { - log.Println(err) - return nil - } - build := c. - Container(). - From("alpine"). - WithExec([]string{"apk", "add", - "--no-cache", - "go", - "git"}). - WithWorkdir("/ec"). - WithExec([]string{"git", "clone", - "--single-branch", - "--branch", "main", - repoURL, - "/ec"}). - WithEnvVariable("GO111MODULE", "on"). - WithEnvVariable("CGO_ENABLED", "0"). - WithExec([]string{"go", "build", - "-ldflags", "-X main.version=" + version, - "-o", "bin/ec", - "./cmd/editorconfig-checker/main.go"}) - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", build.File("/ec/bin/ec")) -} - -func Ec1(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - return ec1(c, id) -} - -func ec1(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - repoURL := "https://github.com/editorconfig-checker/editorconfig-checker.git" - version, err := ecVersion() - if err != nil { - log.Println(err) - return nil - } - build := c. - Container(). - From("golang:alpine"). - WithExec([]string{"apk", "add", - "--no-cache", - "git"}). - WithWorkdir("/ec"). - WithExec([]string{"git", "clone", - "--single-branch", - "--branch", "main", - repoURL, - "/ec"}). - WithEnvVariable("GO111MODULE", "on"). - WithEnvVariable("CGO_ENABLED", "0"). - WithExec([]string{"go", "build", - "-ldflags", "-X main.version=" + version, - "-o", "bin/ec", - "./cmd/editorconfig-checker/main.go"}) - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", build.File("/ec/bin/ec")) -} - -func gitCloneFileContent(ctx context.Context, c *dagger.Client, repoURL, fileName string) (string, error) { - contents, err := gitClone(c, repoURL). - File(fileName).Contents(ctx) - if err != nil { - return "", err - } - return contents, nil -} - -func gitClone(c *dagger.Client, repoURL string) *dagger.Directory { - return c. - Git(repoURL, dagger.GitOpts{KeepGitDir: true}). - Branch("main"). - Tree() -} diff --git a/ci/lint/ec_test.go b/ci/lint/ec_test.go deleted file mode 100644 index 08e4d23..0000000 --- a/ci/lint/ec_test.go +++ /dev/null @@ -1,174 +0,0 @@ -package lint - -import ( - "context" - "os" - "testing" - - "dagger.io/dagger" - "github.com/stretchr/testify/require" -) - -func TestEc(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = Ec(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/editorconfig-checker"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/editorconfig-checker\n", out) -} - -func TestEcVersion(t *testing.T) { - t.Parallel() - - version, err := ecVersion() - require.NoError(t, err) - require.Contains(t, version, ".") -} - -func TestEc2(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = Ec2(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/ec"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/ec\n", out) - - _, err = container. - WithWorkdir("/tmp"). - WithExec([]string{"ec", "-debug"}). - Stdout(ctx) - require.NoError(t, err) -} - -func TestEc1(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = Ec1(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/ec"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/ec\n", out) - - _, err = container. - WithWorkdir("/tmp"). - WithExec([]string{"ec", "-debug"}). - Stdout(ctx) - require.NoError(t, err) -} - -func TestContainerIDBusybox(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - out, err := c.Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"busybox"}). - Stdout(ctx) - require.NoError(t, err) - require.Contains(t, out, "BusyBox") -} - -func TestContainerID(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("alpine") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - releaseName, err := c.Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"/bin/sh", "-c", "cat /etc/os-release | awk -F= '/^NAME/ {print $2}' | tr -d '\"'"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "Alpine Linux\n", releaseName) -} - -func TestGitCloneFileContent(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - repoURL := "https://github.com/editorconfig-checker/editorconfig-checker.git" - fileName := "VERSION" - content, err := gitCloneFileContent(ctx, c, repoURL, fileName) - require.NoError(t, err) - require.Contains(t, content, ".") -} - -func TestGitClone(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - repoURL := "https://github.com/editorconfig-checker/editorconfig-checker.git" - repo := gitClone(c, repoURL) - require.NotNil(t, repo) -} diff --git a/ci/lint/go.go b/ci/lint/go.go deleted file mode 100644 index 6cbe207..0000000 --- a/ci/lint/go.go +++ /dev/null @@ -1,40 +0,0 @@ -//revive:disable:package-comments,exported -package lint - -import "dagger.io/dagger" - -func Revive(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - return revive(c, id) -} - -func revive(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - install := c. - Container(). - From("golang:alpine"). - WithExec([]string{"go", "install", - "github.com/mgechev/revive@latest", - }) - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", install.File("/go/bin/revive")) -} - -func GoLint(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - return goLint(c, id) -} - -func goLint(c *dagger.Client, id dagger.ContainerID) *dagger.Container { - install := c. - Container(). - From("golang:alpine"). - WithExec([]string{"go", "install", - "golang.org/x/lint/golint@latest", - }). - WithExec([]string{"go", "install", - "github.com/GeertJohan/fgt@latest", - }) - - return c.Container(dagger.ContainerOpts{ID: id}). - WithFile("/usr/bin", install.File("/go/bin/golint")). - WithFile("/usr/bin", install.File("/go/bin/fgt")) -} diff --git a/ci/lint/go_test.go b/ci/lint/go_test.go deleted file mode 100644 index 8eeaa97..0000000 --- a/ci/lint/go_test.go +++ /dev/null @@ -1,64 +0,0 @@ -package lint - -import ( - "context" - "os" - "testing" - - "dagger.io/dagger" - "github.com/stretchr/testify/require" -) - -func TestRevive(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = Revive(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/revive"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/revive\n", out) -} - -func TestGoLint(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - container = GoLint(c, id) - require.NotNil(t, container) - out, err := container. - WithExec([]string{"ls", "/usr/bin/golint"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/golint\n", out) - - out, err = container. - WithExec([]string{"ls", "/usr/bin/fgt"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "/usr/bin/fgt\n", out) -} diff --git a/ci/main.go b/ci/main.go deleted file mode 100644 index e3ced09..0000000 --- a/ci/main.go +++ /dev/null @@ -1,78 +0,0 @@ -//revive:disable:package-comments -package main - -import ( - "ci/lint" - "ci/util" - "context" - "log" - "os" - "path/filepath" - - "dagger.io/dagger" -) - -func main() { - - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - if err != nil { - panic(err) - } - defer c.Close() - - c = c.Pipeline("ci") - id, err := c. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - if err != nil { - panic(err) - } - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..") - if err != nil { - panic(err) - } - - mountedDir := "/mountedtmp" - id, err = util.MountedHostDirectory(c, id, p, mountedDir). - ID(ctx) - if err != nil { - panic(err) - } - - ec, err := lint.Ec(c, id). - Pipeline("ec"). - WithWorkdir(mountedDir). - WithExec([]string{"editorconfig-checker", "-verbose"}). - Stdout(ctx) - if err != nil { - panic(err) - } - log.Println(ec) - - al, err := lint.Al(c, id). - Pipeline("actionlint"). - WithWorkdir(mountedDir). - WithExec([]string{"actionlint", "-pyflakes=", "-verbose", ".github/workflows/ci.yml"}). - WithExec([]string{"actionlint", "-pyflakes=", "-verbose", ".github/workflows/test.yml"}). - Stdout(ctx) - if err != nil { - panic(err) - } - log.Println(al) - - revive, err := lint.Revive(c, id). - Pipeline("revive"). - WithWorkdir(mountedDir). - WithExec([]string{"revive", "-set_exit_status", "./..."}). - Stdout(ctx) - if err != nil { - panic(err) - } - log.Println(revive) -} diff --git a/ci/main_test.go b/ci/main_test.go deleted file mode 100644 index b9aaa8a..0000000 --- a/ci/main_test.go +++ /dev/null @@ -1,177 +0,0 @@ -package main - -import ( - "ci/lint" - "ci/util" - "context" - "log" - "os" - "path/filepath" - "testing" - - "dagger.io/dagger" - "github.com/stretchr/testify/require" -) - -func TestRevive(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - c = c.Pipeline("ci-test") - require.NotNil(t, c) - - id, err := c. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..") - require.NoError(t, err) - require.NotEmpty(t, p) - - mountedDir := "/mountedtmp" - id, err = util.MountedHostDirectory(c, id, p, mountedDir). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - out, err := lint.Revive(c, id). - Pipeline("revive-test"). - WithWorkdir(mountedDir). - WithExec([]string{"ls", "-la"}). - WithExec([]string{"revive", "-set_exit_status", "./..."}). - Stdout(ctx) - require.NoError(t, err) - log.Println(out) -} - -func TestClientPipeline(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - p1 := c.Pipeline("lint-test") - require.NotNil(t, p1) - - id, err := p1. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..") - require.NoError(t, err) - require.NotEmpty(t, p) - - mountedDir := "/mountedtmp" - id, err = util.MountedHostDirectory(p1, id, p, mountedDir). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - ec, err := lint.Ec(p1, id). - Pipeline("ec-test"). - WithWorkdir(mountedDir). - WithExec([]string{"editorconfig-checker", "-verbose"}). - Stdout(ctx) - require.NoError(t, err) - require.NotEmpty(t, ec) - - al, err := lint.Al(p1, id). - Pipeline("actionlint-test"). - WithWorkdir(mountedDir). - WithExec([]string{"actionlint", "-pyflakes=", "-verbose", ".github/workflows/ci.yml"}). - Stdout(ctx) - require.NoError(t, err) - require.Empty(t, al) -} - -func TestMountedHostRootDirectory(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..") - require.NoError(t, err) - require.NotEmpty(t, p) - id, err := container. - WithMountedDirectory("/mountedtmp", c.Host().Directory(p)). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - mntdir, err := c. - Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"ls", "/mountedtmp"}). - Stdout(ctx) - require.NoError(t, err) - require.NotEmpty(t, mntdir) -} - -func TestContainerID(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("alpine") - require.NotNil(t, container) - - id, err := container.ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - releaseName, err := c.Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"/bin/sh", "-c", "cat /etc/os-release | awk -F= '/^NAME/ {print $2}' | tr -d '\"'"}). - Stdout(ctx) - require.NoError(t, err) - require.Equal(t, "Alpine Linux\n", releaseName) -} - -func TestErrorMessage(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - _, err = c. - Container(). - From("fake.invalid"). - ID(ctx) - require.Error(t, err) - require.ErrorContains(t, err, "not exist") -} - -func TestConnect(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() -} diff --git a/ci/util/mount.go b/ci/util/mount.go deleted file mode 100644 index 7994209..0000000 --- a/ci/util/mount.go +++ /dev/null @@ -1,17 +0,0 @@ -//revive:disable:package-comments,exported -package util - -import ( - "dagger.io/dagger" -) - -func MountedHostDirectory(c *dagger.Client, id dagger.ContainerID, hostDir, mountedDir string) *dagger.Container { - return mountedHostDirectory(c, id, hostDir, mountedDir) -} - -func mountedHostDirectory(c *dagger.Client, id dagger.ContainerID, hostDir, mountedDir string) *dagger.Container { - return c.Container(dagger.ContainerOpts{ID: id}). - WithMountedDirectory(mountedDir, c.Host().Directory(hostDir, dagger.HostDirectoryOpts{ - Exclude: []string{".git"}, - })) -} diff --git a/ci/util/mount_test.go b/ci/util/mount_test.go deleted file mode 100644 index 1a541f4..0000000 --- a/ci/util/mount_test.go +++ /dev/null @@ -1,128 +0,0 @@ -package util - -import ( - "context" - "log" - "os" - "path/filepath" - "testing" - - "dagger.io/dagger" - "github.com/stretchr/testify/require" -) - -func TestMountedHostDirectoryExcludeFiles(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - id, err := c. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..", "..") - require.NoError(t, err) - require.NotEmpty(t, p) - - mountedDir := "/mountedtmp" - id, err = MountedHostDirectory(c, id, p, mountedDir). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) - - mntdir, err := c. - Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"ls", "-la", "/mountedtmp"}). - Stdout(ctx) - require.NoError(t, err) - require.NotEmpty(t, mntdir) - log.Println(mntdir) -} - -func TestHostDirectoryPath(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - container := c.Container().From("busybox:uclibc") - require.NotNil(t, container) - - dir, _ := os.Getwd() - p := filepath.Join(dir, "..") - require.NoError(t, err) - require.NotEmpty(t, p) - id, err := container. - WithMountedDirectory("/mountedtmp", c.Host().Directory(p)). - ID(ctx) - require.NoError(t, err) - require.NotEmpty(t, id) -} - -func TestMountedTempDirectory(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - id, err := c. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - require.NoError(t, err) - - mntemp, err := c. - Container(dagger.ContainerOpts{ID: id}). - WithExec([]string{"ls", "/"}). - Stdout(ctx) - require.NoError(t, err) - require.Contains(t, mntemp, "mountedtmp") - - mntdir, err := c. - Container(dagger.ContainerOpts{ID: id}). - WithMountedDirectory("/mountedtmp", c.Host().Directory(".")). - WithExec([]string{"ls", "/mountedtmp"}). - Stdout(ctx) - require.NoError(t, err) - require.NotEmpty(t, mntdir) -} - -func TestMountedHostDirectory(t *testing.T) { - t.Parallel() - ctx := context.Background() - - c, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) - require.NoError(t, err) - defer c.Close() - - id, err := c. - Container(). - From("busybox:uclibc"). - WithMountedTemp("/mountedtmp"). - ID(ctx) - require.NoError(t, err) - - container := MountedHostDirectory(c, id, ".", "/mountedtmp") - require.NotNil(t, container) - - mntdir, err := c. - Container(dagger.ContainerOpts{ID: id}). - WithMountedDirectory("/mountedtmp", c.Host().Directory(".")). - WithExec([]string{"ls", "-la", "/mountedtmp"}). - Stdout(ctx) - require.NoError(t, err) - require.NotEmpty(t, mntdir) -}