Skip to content

Commit

Permalink
Avoid copying configured skipDirs (#18)
Browse files Browse the repository at this point in the history
* dont copy configured skipDirs

* dont update deps

* use install
  • Loading branch information
chunter0 authored Oct 10, 2022
1 parent cd2bd5f commit b695762
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ init:
.PHONY: update-deps
update-deps: mod-download
mkdir -p $(DEPSGOBIN)
PATH=$(DEPSGOBIN):$$PATH go get -u golang.org/x/tools/cmd/goimports
PATH=$(DEPSGOBIN):$$PATH go get -u github.com/golang/protobuf/protoc-gen-go
PATH=$(DEPSGOBIN):$$PATH go get -u github.com/envoyproxy/protoc-gen-validate
PATH=$(DEPSGOBIN):$$PATH go install golang.org/x/tools/cmd/goimports
PATH=$(DEPSGOBIN):$$PATH go install github.com/golang/protobuf/protoc-gen-go
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/envoyproxy/protoc-gen-validate
PATH=$(DEPSGOBIN):$$PATH go get 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

Expand Down Expand Up @@ -63,4 +63,4 @@ run-tests:
-progress \
-race \
-compilers=4 \
-skipPackage=$(SKIP_PACKAGES) $(TEST_PKG)
-skipPackage=$(SKIP_PACKAGES) $(TEST_PKG)
4 changes: 4 additions & 0 deletions changelog/v0.0.5/skip-dirs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changelog:
- type: FIX
description: Don't copy configured skip directories.
issueLink: https://github.com/solo-io/anyvendor/issues/17
9 changes: 9 additions & 0 deletions pkg/manager/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log"
"os"
"path/filepath"
"strings"
"unicode"

"github.com/mattn/go-zglob"
Expand Down Expand Up @@ -112,6 +113,14 @@ func NewDefaultCopier() *copier {
}

func (c *copier) Copy(src, dst string) (int64, error) {
for _, skip := range c.skipDirs {
if !strings.Contains(src, skip) {
continue
}
// don't copy skip matches
return 0, nil
}

log.Printf("copying %v -> %v", src, dst)

if err := c.fs.MkdirAll(filepath.Dir(dst), os.ModePerm); err != nil {
Expand Down

0 comments on commit b695762

Please sign in to comment.