From 584c9e8cd8f9124e0f2a83bf9556719aafe46e32 Mon Sep 17 00:00:00 2001 From: Eitan Yarmush Date: Mon, 12 Jul 2021 14:32:45 -0400 Subject: [PATCH] add github action (#16) * add github action * master branch * maybe fix * switch go version * go.sum * code-gen script * make the tests work without GOPATH --- .github/workflows/pull_request.yaml | 62 ++++++++++++ Makefile | 13 +++ cloudbuild-cache.yaml | 34 ------- cloudbuild.yaml | 61 +----------- go.mod | 23 +++-- go.sum | 124 +++++++----------------- pkg/manager/common_test.go | 12 ++- pkg/manager/mocks/afero.go | 142 ++++++++++++++-------------- pkg/manager/mocks/copier.go | 16 ++-- pkg/manager/mocks/fileinfo.go | 38 ++++---- 10 files changed, 231 insertions(+), 294 deletions(-) create mode 100644 .github/workflows/pull_request.yaml delete mode 100644 cloudbuild-cache.yaml diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml new file mode 100644 index 0000000..7e7dc64 --- /dev/null +++ b/.github/workflows/pull_request.yaml @@ -0,0 +1,62 @@ +name: pull_request + +on: + push: + branches: + - 'master' + pull_request: { } + +jobs: + check-code-gen: + name: check-code-gen + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - run: | + git fetch --prune --unshallow + - name: Set up Go 1.16 + uses: actions/setup-go@v1 + with: + go-version: 1.16.3 + - uses: actions/cache@v1 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - name: Install Protoc + uses: solo-io/setup-protoc@master + with: + version: '3.6.1' + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Check code gen + env: + GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + run: | + ./ci/check-code-gen.sh + + unit-tests: + name: unit-tests + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - run: | + git fetch --prune --unshallow + - name: Set up Go 1.16 + uses: actions/setup-go@v1 + with: + go-version: 1.16.3 + - uses: actions/cache@v1 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - name: Install Protoc + uses: solo-io/setup-protoc@master + with: + version: '3.6.1' + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Unit Tests + run: | + make update-deps run-tests diff --git a/Makefile b/Makefile index 69d17d6..3e8ba3f 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ update-deps: mod-download PATH=$(DEPSGOBIN):$$PATH go install github.com/envoyproxy/protoc-gen-validate PATH=$(DEPSGOBIN):$$PATH go get -u github.com/golang/mock/gomock PATH=$(DEPSGOBIN):$$PATH go install github.com/golang/mock/mockgen + PATH=$(DEPSGOBIN):$$PATH go install github.com/onsi/ginkgo/ginkgo .PHONY: mod-download @@ -51,3 +52,15 @@ $(OUTPUT_DIR)/.generated-code: PATH=$(DEPSGOBIN):$$PATH goimports -w $(SUBDIRS) PATH=$(DEPSGOBIN):$$PATH go mod tidy PATH=$(DEPSGOBIN):$$PATH touch $@ + +# run all tests +# set TEST_PKG to run a specific test package +.PHONY: run-tests +run-tests: + ginkgo -r -failFast -trace $(GINKGOFLAGS) \ + -ldflags=$(LDFLAGS) \ + -gcflags=$(GCFLAGS) \ + -progress \ + -race \ + -compilers=4 \ + -skipPackage=$(SKIP_PACKAGES) $(TEST_PKG) \ No newline at end of file diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml deleted file mode 100644 index 16b2c16..0000000 --- a/cloudbuild-cache.yaml +++ /dev/null @@ -1,34 +0,0 @@ -steps: -- name: gcr.io/cloud-builders/gsutil - entrypoint: 'bash' - args: ['-c', 'mkdir -p /go/pkg && cd /go/pkg && gsutil cat gs://$PROJECT_ID-cache/anyvendor/anyvendor-mod.tar.gz | tar -xzf -'] - env: - volumes: &vol - - name: 'gopath' - path: '/go/pkg' - id: 'untar-mod-cache' - -- name: 'golang:1.13' - args: ['go', 'mod', 'download'] - volumes: *vol - id: 'download' - -- name: 'golang:1.13' - args: ['go', 'mod', 'tidy'] - volumes: *vol - id: 'tidy' - -- name: 'golang:1.13' - entrypoint: 'bash' - volumes: *vol - args: ['-c', ' cd /go/pkg && tar -zvcf anyvendor-mod.tar.gz mod'] - id: 'tar-cache' - -- name: gcr.io/cloud-builders/gsutil - args: ['cp', '/go/pkg/anyvendor-mod.tar.gz', 'gs://$PROJECT_ID-cache/anyvendor/anyvendor-mod.tar.gz'] - volumes: *vol - id: 'upload-cache' - -options: - env: - - "GO111MODULE=on" \ No newline at end of file diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 648173c..0c95049 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,64 +2,5 @@ steps: - name: gcr.io/cloud-builders/gsutil entrypoint: 'bash' - args: ['-c', 'mkdir -p /go/pkg && cd /go/pkg && gsutil cat gs://$PROJECT_ID-cache/anyvendor/anyvendor-mod.tar.gz | tar -xzf -'] - id: 'untar-mod-cache' - dir: &dir '/workspace/repo/anyvendor' - -# prepare-workspace to set up the project so it can be built and tested -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.2.2' - args: - - "--repo-owner" - - "solo-io" - - "--repo-name" - - anyvendor - - "--repo-sha" - - "$COMMIT_SHA" - - "--repo-output-dir" - - "repo" - env: - - 'GIT_SSH_CONFIG=FALSE' - id: 'prepare-workspace' - -# download massive container in parallel -- name: 'gcr.io/$PROJECT_ID/go-mod-ginkgo:0.2.2' - entrypoint: 'bash' - dir: *dir args: ['-c', 'ls'] - waitFor: ['-'] - -# Installs go executables required by codegen tests -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.2.1' - args: ['update-deps'] - waitFor: ['prepare-workspace'] - id: 'update-deps' - dir: *dir - -# check code gen for kubernetes custom resources, should be no diff -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.2.1' - entrypoint: 'bash' - args: ['ci/check-code-gen.sh'] - env: - - 'PROJECT_ROOT=github.com/solo-io/anyvendor' - - 'TAGGED_VERSION=$TAG_NAME' - # waitFor: ['update-deps'] - dir: *dir - id: 'check-code-and-docs-gen' - - -# e2e-ginkgo is produced from https://github.com/solo-io/cloud-builders/e2e-ginkgo -# sets up redis, consul, kubectl, go with required environment variables -# need to use the provided entrypoint -- name: 'gcr.io/$PROJECT_ID/go-mod-ginkgo:0.2.2' - args: ['-r', '-v', '-race', '-p', '-compilers=2'] - dir: *dir - id: 'test' - - -timeout: 1500s -tags: ['anyvendor'] -options: - machineType: 'N1_HIGHCPU_32' - volumes: - - name: 'gopath' - path: '/go' \ No newline at end of file + id: 'ls' diff --git a/go.mod b/go.mod index 0b494fa..ce5b7d8 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,21 @@ module github.com/solo-io/anyvendor -go 1.13 +go 1.16 require ( - github.com/envoyproxy/protoc-gen-validate v0.4.1 - github.com/golang/mock v1.4.4 - github.com/golang/protobuf v1.4.3 + github.com/envoyproxy/protoc-gen-validate v0.6.1 + github.com/golang/mock v1.6.0 + github.com/golang/protobuf v1.5.2 github.com/iancoleman/strcase v0.1.3 // indirect - github.com/lyft/protoc-gen-star v0.5.2 // indirect + github.com/lyft/protoc-gen-star v0.5.3 // indirect github.com/mattn/go-zglob v0.0.3 github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.8.1 github.com/rotisserie/eris v0.1.1 - github.com/spf13/afero v1.5.1 - golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect - golang.org/x/mod v0.4.1 // indirect - golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect - golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect - golang.org/x/text v0.3.5 // indirect - golang.org/x/tools v0.1.0 // indirect + github.com/spf13/afero v1.6.0 + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect + golang.org/x/tools v0.1.4 // indirect + google.golang.org/protobuf v1.27.1 // indirect ) diff --git a/go.sum b/go.sum index ef58a19..d309ea1 100644 --- a/go.sum +++ b/go.sum @@ -1,48 +1,35 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.4.1 h1:7dLaJvASGRD7X49jSCSXXHwKPm0ZN9r9kJD+p+vS7dM= -github.com/envoyproxy/protoc-gen-validate v0.4.1/go.mod h1:E+IEazqdaWv3FrnGtZIu3b9fPFMK8AzeTTrk9SfVwWs= +github.com/envoyproxy/protoc-gen-validate v0.6.1 h1:4CF52PCseTFt4bE+Yk3dIpdVi7XWuPVMhPtm4FaIJPM= +github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/lyft/protoc-gen-star v0.5.1 h1:sImehRT+p7lW9n6R7MQc5hVgzWGEkDVZU4AsBQ4Isu8= github.com/lyft/protoc-gen-star v0.5.1/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU= -github.com/lyft/protoc-gen-star v0.5.2 h1:ICQPpOr4uO46eme1Y5Jj0fnJkc9/upQ9xxt0+2AmUDQ= -github.com/lyft/protoc-gen-star v0.5.2/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU= +github.com/lyft/protoc-gen-star v0.5.3 h1:zSGLzsUew8RT+ZKPHc3jnf8XLaVyHzTcAFBzHtCNR20= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/mattn/go-zglob v0.0.3 h1:6Ry4EYsScDyt5di4OI6xw1bYhOqfE5S33Z1OPy+d+To= github.com/mattn/go-zglob v0.0.3/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -54,112 +41,75 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rotisserie/eris v0.1.1 h1:C0wEdnJ6+3jYx2r8RS4xBM+ZW+mVrXGocIaFbTdRYCA= github.com/rotisserie/eris v0.1.1/go.mod h1:2ik3CyJrzlOjGyDGrKfqZivSfmkhCS3ktE+T1mNzzLk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= -github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/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-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86JNJe4spst6Ff8MjvPUdPg= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= @@ -171,5 +121,3 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/manager/common_test.go b/pkg/manager/common_test.go index 7772502..292ded7 100644 --- a/pkg/manager/common_test.go +++ b/pkg/manager/common_test.go @@ -30,14 +30,22 @@ var _ = Describe("common", func() { ctrl.Finish() }) Context("pkgModPath", func() { + var ( + goPath string + ) BeforeEach(func() { cp = &copier{} + goPath = os.Getenv("GOPATH") + if goPath == "" { + // the default GOPATH for go v1.11 + goPath = filepath.Join(os.Getenv("HOME"), "go") + } }) It("can translate a pkgModPath with a !", func() { importPath := "github.com/Microsoft/package" version := "this_is_a_hash" result := cp.PkgModPath(importPath, version) - resultTest := filepath.Join(os.Getenv("GOPATH"), "pkg", "mod", + resultTest := filepath.Join(goPath, "pkg", "mod", fmt.Sprintf("%s@%s", "github.com/!microsoft/package", version)) Expect(result).To(Equal(resultTest)) }) @@ -45,7 +53,7 @@ var _ = Describe("common", func() { importPath := "github.com/microsoft/package" version := "this_is_a_hash" result := cp.PkgModPath(importPath, version) - resultTest := filepath.Join(os.Getenv("GOPATH"), "pkg", "mod", + resultTest := filepath.Join(goPath, "pkg", "mod", fmt.Sprintf("%s@%s", importPath, version)) Expect(result).To(Equal(resultTest)) }) diff --git a/pkg/manager/mocks/afero.go b/pkg/manager/mocks/afero.go index 2519589..12db5a7 100644 --- a/pkg/manager/mocks/afero.go +++ b/pkg/manager/mocks/afero.go @@ -5,7 +5,7 @@ package mock_manager import ( - os "os" + fs "io/fs" reflect "reflect" time "time" @@ -13,44 +13,44 @@ import ( afero "github.com/spf13/afero" ) -// MockFs is a mock of Fs interface +// MockFs is a mock of Fs interface. type MockFs struct { ctrl *gomock.Controller recorder *MockFsMockRecorder } -// MockFsMockRecorder is the mock recorder for MockFs +// MockFsMockRecorder is the mock recorder for MockFs. type MockFsMockRecorder struct { mock *MockFs } -// NewMockFs creates a new mock instance +// NewMockFs creates a new mock instance. func NewMockFs(ctrl *gomock.Controller) *MockFs { mock := &MockFs{ctrl: ctrl} mock.recorder = &MockFsMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockFs) EXPECT() *MockFsMockRecorder { return m.recorder } -// Chmod mocks base method -func (m *MockFs) Chmod(arg0 string, arg1 os.FileMode) error { +// Chmod mocks base method. +func (m *MockFs) Chmod(arg0 string, arg1 fs.FileMode) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Chmod", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } -// Chmod indicates an expected call of Chmod +// Chmod indicates an expected call of Chmod. func (mr *MockFsMockRecorder) Chmod(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Chmod", reflect.TypeOf((*MockFs)(nil).Chmod), arg0, arg1) } -// Chown mocks base method +// Chown mocks base method. func (m *MockFs) Chown(arg0 string, arg1, arg2 int) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Chown", arg0, arg1, arg2) @@ -58,13 +58,13 @@ func (m *MockFs) Chown(arg0 string, arg1, arg2 int) error { return ret0 } -// Chown indicates an expected call of Chown +// Chown indicates an expected call of Chown. func (mr *MockFsMockRecorder) Chown(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Chown", reflect.TypeOf((*MockFs)(nil).Chown), arg0, arg1, arg2) } -// Chtimes mocks base method +// Chtimes mocks base method. func (m *MockFs) Chtimes(arg0 string, arg1, arg2 time.Time) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Chtimes", arg0, arg1, arg2) @@ -72,13 +72,13 @@ func (m *MockFs) Chtimes(arg0 string, arg1, arg2 time.Time) error { return ret0 } -// Chtimes indicates an expected call of Chtimes +// Chtimes indicates an expected call of Chtimes. func (mr *MockFsMockRecorder) Chtimes(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Chtimes", reflect.TypeOf((*MockFs)(nil).Chtimes), arg0, arg1, arg2) } -// Create mocks base method +// Create mocks base method. func (m *MockFs) Create(arg0 string) (afero.File, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Create", arg0) @@ -87,41 +87,41 @@ func (m *MockFs) Create(arg0 string) (afero.File, error) { return ret0, ret1 } -// Create indicates an expected call of Create +// Create indicates an expected call of Create. func (mr *MockFsMockRecorder) Create(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockFs)(nil).Create), arg0) } -// Mkdir mocks base method -func (m *MockFs) Mkdir(arg0 string, arg1 os.FileMode) error { +// Mkdir mocks base method. +func (m *MockFs) Mkdir(arg0 string, arg1 fs.FileMode) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Mkdir", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } -// Mkdir indicates an expected call of Mkdir +// Mkdir indicates an expected call of Mkdir. func (mr *MockFsMockRecorder) Mkdir(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Mkdir", reflect.TypeOf((*MockFs)(nil).Mkdir), arg0, arg1) } -// MkdirAll mocks base method -func (m *MockFs) MkdirAll(arg0 string, arg1 os.FileMode) error { +// MkdirAll mocks base method. +func (m *MockFs) MkdirAll(arg0 string, arg1 fs.FileMode) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MkdirAll", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } -// MkdirAll indicates an expected call of MkdirAll +// MkdirAll indicates an expected call of MkdirAll. func (mr *MockFsMockRecorder) MkdirAll(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MkdirAll", reflect.TypeOf((*MockFs)(nil).MkdirAll), arg0, arg1) } -// Name mocks base method +// Name mocks base method. func (m *MockFs) Name() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Name") @@ -129,13 +129,13 @@ func (m *MockFs) Name() string { return ret0 } -// Name indicates an expected call of Name +// Name indicates an expected call of Name. func (mr *MockFsMockRecorder) Name() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockFs)(nil).Name)) } -// Open mocks base method +// Open mocks base method. func (m *MockFs) Open(arg0 string) (afero.File, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Open", arg0) @@ -144,14 +144,14 @@ func (m *MockFs) Open(arg0 string) (afero.File, error) { return ret0, ret1 } -// Open indicates an expected call of Open +// Open indicates an expected call of Open. func (mr *MockFsMockRecorder) Open(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Open", reflect.TypeOf((*MockFs)(nil).Open), arg0) } -// OpenFile mocks base method -func (m *MockFs) OpenFile(arg0 string, arg1 int, arg2 os.FileMode) (afero.File, error) { +// OpenFile mocks base method. +func (m *MockFs) OpenFile(arg0 string, arg1 int, arg2 fs.FileMode) (afero.File, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "OpenFile", arg0, arg1, arg2) ret0, _ := ret[0].(afero.File) @@ -159,13 +159,13 @@ func (m *MockFs) OpenFile(arg0 string, arg1 int, arg2 os.FileMode) (afero.File, return ret0, ret1 } -// OpenFile indicates an expected call of OpenFile +// OpenFile indicates an expected call of OpenFile. func (mr *MockFsMockRecorder) OpenFile(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenFile", reflect.TypeOf((*MockFs)(nil).OpenFile), arg0, arg1, arg2) } -// Remove mocks base method +// Remove mocks base method. func (m *MockFs) Remove(arg0 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Remove", arg0) @@ -173,13 +173,13 @@ func (m *MockFs) Remove(arg0 string) error { return ret0 } -// Remove indicates an expected call of Remove +// Remove indicates an expected call of Remove. func (mr *MockFsMockRecorder) Remove(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Remove", reflect.TypeOf((*MockFs)(nil).Remove), arg0) } -// RemoveAll mocks base method +// RemoveAll mocks base method. func (m *MockFs) RemoveAll(arg0 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveAll", arg0) @@ -187,13 +187,13 @@ func (m *MockFs) RemoveAll(arg0 string) error { return ret0 } -// RemoveAll indicates an expected call of RemoveAll +// RemoveAll indicates an expected call of RemoveAll. func (mr *MockFsMockRecorder) RemoveAll(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveAll", reflect.TypeOf((*MockFs)(nil).RemoveAll), arg0) } -// Rename mocks base method +// Rename mocks base method. func (m *MockFs) Rename(arg0, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Rename", arg0, arg1) @@ -201,51 +201,51 @@ func (m *MockFs) Rename(arg0, arg1 string) error { return ret0 } -// Rename indicates an expected call of Rename +// Rename indicates an expected call of Rename. func (mr *MockFsMockRecorder) Rename(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rename", reflect.TypeOf((*MockFs)(nil).Rename), arg0, arg1) } -// Stat mocks base method -func (m *MockFs) Stat(arg0 string) (os.FileInfo, error) { +// Stat mocks base method. +func (m *MockFs) Stat(arg0 string) (fs.FileInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Stat", arg0) - ret0, _ := ret[0].(os.FileInfo) + ret0, _ := ret[0].(fs.FileInfo) ret1, _ := ret[1].(error) return ret0, ret1 } -// Stat indicates an expected call of Stat +// Stat indicates an expected call of Stat. func (mr *MockFsMockRecorder) Stat(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stat", reflect.TypeOf((*MockFs)(nil).Stat), arg0) } -// MockFile is a mock of File interface +// MockFile is a mock of File interface. type MockFile struct { ctrl *gomock.Controller recorder *MockFileMockRecorder } -// MockFileMockRecorder is the mock recorder for MockFile +// MockFileMockRecorder is the mock recorder for MockFile. type MockFileMockRecorder struct { mock *MockFile } -// NewMockFile creates a new mock instance +// NewMockFile creates a new mock instance. func NewMockFile(ctrl *gomock.Controller) *MockFile { mock := &MockFile{ctrl: ctrl} mock.recorder = &MockFileMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockFile) EXPECT() *MockFileMockRecorder { return m.recorder } -// Close mocks base method +// Close mocks base method. func (m *MockFile) Close() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Close") @@ -253,13 +253,13 @@ func (m *MockFile) Close() error { return ret0 } -// Close indicates an expected call of Close +// Close indicates an expected call of Close. func (mr *MockFileMockRecorder) Close() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockFile)(nil).Close)) } -// Name mocks base method +// Name mocks base method. func (m *MockFile) Name() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Name") @@ -267,13 +267,13 @@ func (m *MockFile) Name() string { return ret0 } -// Name indicates an expected call of Name +// Name indicates an expected call of Name. func (mr *MockFileMockRecorder) Name() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockFile)(nil).Name)) } -// Read mocks base method +// Read mocks base method. func (m *MockFile) Read(arg0 []byte) (int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Read", arg0) @@ -282,13 +282,13 @@ func (m *MockFile) Read(arg0 []byte) (int, error) { return ret0, ret1 } -// Read indicates an expected call of Read +// Read indicates an expected call of Read. func (mr *MockFileMockRecorder) Read(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockFile)(nil).Read), arg0) } -// ReadAt mocks base method +// ReadAt mocks base method. func (m *MockFile) ReadAt(arg0 []byte, arg1 int64) (int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ReadAt", arg0, arg1) @@ -297,28 +297,28 @@ func (m *MockFile) ReadAt(arg0 []byte, arg1 int64) (int, error) { return ret0, ret1 } -// ReadAt indicates an expected call of ReadAt +// ReadAt indicates an expected call of ReadAt. func (mr *MockFileMockRecorder) ReadAt(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadAt", reflect.TypeOf((*MockFile)(nil).ReadAt), arg0, arg1) } -// Readdir mocks base method -func (m *MockFile) Readdir(arg0 int) ([]os.FileInfo, error) { +// Readdir mocks base method. +func (m *MockFile) Readdir(arg0 int) ([]fs.FileInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Readdir", arg0) - ret0, _ := ret[0].([]os.FileInfo) + ret0, _ := ret[0].([]fs.FileInfo) ret1, _ := ret[1].(error) return ret0, ret1 } -// Readdir indicates an expected call of Readdir +// Readdir indicates an expected call of Readdir. func (mr *MockFileMockRecorder) Readdir(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Readdir", reflect.TypeOf((*MockFile)(nil).Readdir), arg0) } -// Readdirnames mocks base method +// Readdirnames mocks base method. func (m *MockFile) Readdirnames(arg0 int) ([]string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Readdirnames", arg0) @@ -327,13 +327,13 @@ func (m *MockFile) Readdirnames(arg0 int) ([]string, error) { return ret0, ret1 } -// Readdirnames indicates an expected call of Readdirnames +// Readdirnames indicates an expected call of Readdirnames. func (mr *MockFileMockRecorder) Readdirnames(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Readdirnames", reflect.TypeOf((*MockFile)(nil).Readdirnames), arg0) } -// Seek mocks base method +// Seek mocks base method. func (m *MockFile) Seek(arg0 int64, arg1 int) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Seek", arg0, arg1) @@ -342,28 +342,28 @@ func (m *MockFile) Seek(arg0 int64, arg1 int) (int64, error) { return ret0, ret1 } -// Seek indicates an expected call of Seek +// Seek indicates an expected call of Seek. func (mr *MockFileMockRecorder) Seek(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Seek", reflect.TypeOf((*MockFile)(nil).Seek), arg0, arg1) } -// Stat mocks base method -func (m *MockFile) Stat() (os.FileInfo, error) { +// Stat mocks base method. +func (m *MockFile) Stat() (fs.FileInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Stat") - ret0, _ := ret[0].(os.FileInfo) + ret0, _ := ret[0].(fs.FileInfo) ret1, _ := ret[1].(error) return ret0, ret1 } -// Stat indicates an expected call of Stat +// Stat indicates an expected call of Stat. func (mr *MockFileMockRecorder) Stat() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stat", reflect.TypeOf((*MockFile)(nil).Stat)) } -// Sync mocks base method +// Sync mocks base method. func (m *MockFile) Sync() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sync") @@ -371,13 +371,13 @@ func (m *MockFile) Sync() error { return ret0 } -// Sync indicates an expected call of Sync +// Sync indicates an expected call of Sync. func (mr *MockFileMockRecorder) Sync() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockFile)(nil).Sync)) } -// Truncate mocks base method +// Truncate mocks base method. func (m *MockFile) Truncate(arg0 int64) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Truncate", arg0) @@ -385,13 +385,13 @@ func (m *MockFile) Truncate(arg0 int64) error { return ret0 } -// Truncate indicates an expected call of Truncate +// Truncate indicates an expected call of Truncate. func (mr *MockFileMockRecorder) Truncate(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Truncate", reflect.TypeOf((*MockFile)(nil).Truncate), arg0) } -// Write mocks base method +// Write mocks base method. func (m *MockFile) Write(arg0 []byte) (int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Write", arg0) @@ -400,13 +400,13 @@ func (m *MockFile) Write(arg0 []byte) (int, error) { return ret0, ret1 } -// Write indicates an expected call of Write +// Write indicates an expected call of Write. func (mr *MockFileMockRecorder) Write(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockFile)(nil).Write), arg0) } -// WriteAt mocks base method +// WriteAt mocks base method. func (m *MockFile) WriteAt(arg0 []byte, arg1 int64) (int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "WriteAt", arg0, arg1) @@ -415,13 +415,13 @@ func (m *MockFile) WriteAt(arg0 []byte, arg1 int64) (int, error) { return ret0, ret1 } -// WriteAt indicates an expected call of WriteAt +// WriteAt indicates an expected call of WriteAt. func (mr *MockFileMockRecorder) WriteAt(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteAt", reflect.TypeOf((*MockFile)(nil).WriteAt), arg0, arg1) } -// WriteString mocks base method +// WriteString mocks base method. func (m *MockFile) WriteString(arg0 string) (int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "WriteString", arg0) @@ -430,7 +430,7 @@ func (m *MockFile) WriteString(arg0 string) (int, error) { return ret0, ret1 } -// WriteString indicates an expected call of WriteString +// WriteString indicates an expected call of WriteString. func (mr *MockFileMockRecorder) WriteString(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteString", reflect.TypeOf((*MockFile)(nil).WriteString), arg0) diff --git a/pkg/manager/mocks/copier.go b/pkg/manager/mocks/copier.go index d8d1f87..9e5f2b5 100644 --- a/pkg/manager/mocks/copier.go +++ b/pkg/manager/mocks/copier.go @@ -10,30 +10,30 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockFileCopier is a mock of FileCopier interface +// MockFileCopier is a mock of FileCopier interface. type MockFileCopier struct { ctrl *gomock.Controller recorder *MockFileCopierMockRecorder } -// MockFileCopierMockRecorder is the mock recorder for MockFileCopier +// MockFileCopierMockRecorder is the mock recorder for MockFileCopier. type MockFileCopierMockRecorder struct { mock *MockFileCopier } -// NewMockFileCopier creates a new mock instance +// NewMockFileCopier creates a new mock instance. func NewMockFileCopier(ctrl *gomock.Controller) *MockFileCopier { mock := &MockFileCopier{ctrl: ctrl} mock.recorder = &MockFileCopierMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockFileCopier) EXPECT() *MockFileCopierMockRecorder { return m.recorder } -// Copy mocks base method +// Copy mocks base method. func (m *MockFileCopier) Copy(src, dst string) (int64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Copy", src, dst) @@ -42,13 +42,13 @@ func (m *MockFileCopier) Copy(src, dst string) (int64, error) { return ret0, ret1 } -// Copy indicates an expected call of Copy +// Copy indicates an expected call of Copy. func (mr *MockFileCopierMockRecorder) Copy(src, dst interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Copy", reflect.TypeOf((*MockFileCopier)(nil).Copy), src, dst) } -// GetMatches mocks base method +// GetMatches mocks base method. func (m *MockFileCopier) GetMatches(copyPat []string, dir string) ([]string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetMatches", copyPat, dir) @@ -57,7 +57,7 @@ func (m *MockFileCopier) GetMatches(copyPat []string, dir string) ([]string, err return ret0, ret1 } -// GetMatches indicates an expected call of GetMatches +// GetMatches indicates an expected call of GetMatches. func (mr *MockFileCopierMockRecorder) GetMatches(copyPat, dir interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMatches", reflect.TypeOf((*MockFileCopier)(nil).GetMatches), copyPat, dir) diff --git a/pkg/manager/mocks/fileinfo.go b/pkg/manager/mocks/fileinfo.go index b2bb8d9..3067ac0 100644 --- a/pkg/manager/mocks/fileinfo.go +++ b/pkg/manager/mocks/fileinfo.go @@ -5,37 +5,37 @@ package mock_manager import ( - os "os" + fs "io/fs" reflect "reflect" time "time" gomock "github.com/golang/mock/gomock" ) -// MockFileInfo is a mock of FileInfo interface +// MockFileInfo is a mock of FileInfo interface. type MockFileInfo struct { ctrl *gomock.Controller recorder *MockFileInfoMockRecorder } -// MockFileInfoMockRecorder is the mock recorder for MockFileInfo +// MockFileInfoMockRecorder is the mock recorder for MockFileInfo. type MockFileInfoMockRecorder struct { mock *MockFileInfo } -// NewMockFileInfo creates a new mock instance +// NewMockFileInfo creates a new mock instance. func NewMockFileInfo(ctrl *gomock.Controller) *MockFileInfo { mock := &MockFileInfo{ctrl: ctrl} mock.recorder = &MockFileInfoMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockFileInfo) EXPECT() *MockFileInfoMockRecorder { return m.recorder } -// IsDir mocks base method +// IsDir mocks base method. func (m *MockFileInfo) IsDir() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsDir") @@ -43,13 +43,13 @@ func (m *MockFileInfo) IsDir() bool { return ret0 } -// IsDir indicates an expected call of IsDir +// IsDir indicates an expected call of IsDir. func (mr *MockFileInfoMockRecorder) IsDir() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsDir", reflect.TypeOf((*MockFileInfo)(nil).IsDir)) } -// ModTime mocks base method +// ModTime mocks base method. func (m *MockFileInfo) ModTime() time.Time { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ModTime") @@ -57,27 +57,27 @@ func (m *MockFileInfo) ModTime() time.Time { return ret0 } -// ModTime indicates an expected call of ModTime +// ModTime indicates an expected call of ModTime. func (mr *MockFileInfoMockRecorder) ModTime() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ModTime", reflect.TypeOf((*MockFileInfo)(nil).ModTime)) } -// Mode mocks base method -func (m *MockFileInfo) Mode() os.FileMode { +// Mode mocks base method. +func (m *MockFileInfo) Mode() fs.FileMode { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Mode") - ret0, _ := ret[0].(os.FileMode) + ret0, _ := ret[0].(fs.FileMode) return ret0 } -// Mode indicates an expected call of Mode +// Mode indicates an expected call of Mode. func (mr *MockFileInfoMockRecorder) Mode() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Mode", reflect.TypeOf((*MockFileInfo)(nil).Mode)) } -// Name mocks base method +// Name mocks base method. func (m *MockFileInfo) Name() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Name") @@ -85,13 +85,13 @@ func (m *MockFileInfo) Name() string { return ret0 } -// Name indicates an expected call of Name +// Name indicates an expected call of Name. func (mr *MockFileInfoMockRecorder) Name() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockFileInfo)(nil).Name)) } -// Size mocks base method +// Size mocks base method. func (m *MockFileInfo) Size() int64 { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Size") @@ -99,13 +99,13 @@ func (m *MockFileInfo) Size() int64 { return ret0 } -// Size indicates an expected call of Size +// Size indicates an expected call of Size. func (mr *MockFileInfoMockRecorder) Size() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Size", reflect.TypeOf((*MockFileInfo)(nil).Size)) } -// Sys mocks base method +// Sys mocks base method. func (m *MockFileInfo) Sys() interface{} { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sys") @@ -113,7 +113,7 @@ func (m *MockFileInfo) Sys() interface{} { return ret0 } -// Sys indicates an expected call of Sys +// Sys indicates an expected call of Sys. func (mr *MockFileInfoMockRecorder) Sys() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sys", reflect.TypeOf((*MockFileInfo)(nil).Sys))