From 465870a22ee12219ec4ccb3011db9ac69697d749 Mon Sep 17 00:00:00 2001 From: Yagnesh Mistry Date: Sun, 20 Oct 2019 13:00:09 +0530 Subject: [PATCH] Move third_party/fs to internal/third_party/fs and update scripts/validate-license.sh Signed-off-by: Yagnesh Mistry --- {third_party => internal/third_party}/dep/fs/fs.go | 13 ------------- .../third_party}/dep/fs/fs_test.go | 13 ------------- .../third_party}/dep/fs/rename.go | 13 ------------- .../third_party}/dep/fs/rename_windows.go | 13 ------------- .../dep/fs/testdata/symlinks/file-symlink | 0 .../dep/fs/testdata/symlinks/invalid-symlink | 0 .../dep/fs/testdata/symlinks/windows-file-symlink | 0 .../third_party}/dep/fs/testdata/test.file | 0 pkg/downloader/manager.go | 2 +- scripts/validate-license.sh | 1 + 10 files changed, 2 insertions(+), 53 deletions(-) rename {third_party => internal/third_party}/dep/fs/fs.go (94%) rename {third_party => internal/third_party}/dep/fs/fs_test.go (96%) rename {third_party => internal/third_party}/dep/fs/rename.go (80%) rename {third_party => internal/third_party}/dep/fs/rename_windows.go (82%) rename {third_party => internal/third_party}/dep/fs/testdata/symlinks/file-symlink (100%) rename {third_party => internal/third_party}/dep/fs/testdata/symlinks/invalid-symlink (100%) rename {third_party => internal/third_party}/dep/fs/testdata/symlinks/windows-file-symlink (100%) rename {third_party => internal/third_party}/dep/fs/testdata/test.file (100%) diff --git a/third_party/dep/fs/fs.go b/internal/third_party/dep/fs/fs.go similarity index 94% rename from third_party/dep/fs/fs.go rename to internal/third_party/dep/fs/fs.go index cd5f70b74..c8b41a098 100644 --- a/third_party/dep/fs/fs.go +++ b/internal/third_party/dep/fs/fs.go @@ -27,19 +27,6 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright The Helm Authors. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ package fs diff --git a/third_party/dep/fs/fs_test.go b/internal/third_party/dep/fs/fs_test.go similarity index 96% rename from third_party/dep/fs/fs_test.go rename to internal/third_party/dep/fs/fs_test.go index 687a45040..bf4b803f8 100644 --- a/third_party/dep/fs/fs_test.go +++ b/internal/third_party/dep/fs/fs_test.go @@ -27,19 +27,6 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright The Helm Authors. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ package fs diff --git a/third_party/dep/fs/rename.go b/internal/third_party/dep/fs/rename.go similarity index 80% rename from third_party/dep/fs/rename.go rename to internal/third_party/dep/fs/rename.go index a697c48d4..0bb600949 100644 --- a/third_party/dep/fs/rename.go +++ b/internal/third_party/dep/fs/rename.go @@ -29,19 +29,6 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright The Helm Authors. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ package fs diff --git a/third_party/dep/fs/rename_windows.go b/internal/third_party/dep/fs/rename_windows.go similarity index 82% rename from third_party/dep/fs/rename_windows.go rename to internal/third_party/dep/fs/rename_windows.go index f3731157e..14f017d09 100644 --- a/third_party/dep/fs/rename_windows.go +++ b/internal/third_party/dep/fs/rename_windows.go @@ -29,19 +29,6 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright The Helm Authors. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ package fs diff --git a/third_party/dep/fs/testdata/symlinks/file-symlink b/internal/third_party/dep/fs/testdata/symlinks/file-symlink similarity index 100% rename from third_party/dep/fs/testdata/symlinks/file-symlink rename to internal/third_party/dep/fs/testdata/symlinks/file-symlink diff --git a/third_party/dep/fs/testdata/symlinks/invalid-symlink b/internal/third_party/dep/fs/testdata/symlinks/invalid-symlink similarity index 100% rename from third_party/dep/fs/testdata/symlinks/invalid-symlink rename to internal/third_party/dep/fs/testdata/symlinks/invalid-symlink diff --git a/third_party/dep/fs/testdata/symlinks/windows-file-symlink b/internal/third_party/dep/fs/testdata/symlinks/windows-file-symlink similarity index 100% rename from third_party/dep/fs/testdata/symlinks/windows-file-symlink rename to internal/third_party/dep/fs/testdata/symlinks/windows-file-symlink diff --git a/third_party/dep/fs/testdata/test.file b/internal/third_party/dep/fs/testdata/test.file similarity index 100% rename from third_party/dep/fs/testdata/test.file rename to internal/third_party/dep/fs/testdata/test.file diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index 8e4f57072..ce2e2ef07 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -30,6 +30,7 @@ import ( "github.com/Masterminds/semver" "github.com/ghodss/yaml" + "k8s.io/helm/internal/third_party/dep/fs" "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/getter" "k8s.io/helm/pkg/helm/helmpath" @@ -37,7 +38,6 @@ import ( "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/resolver" "k8s.io/helm/pkg/urlutil" - "k8s.io/helm/third_party/dep/fs" ) // Manager handles the lifecycle of fetching, resolving, and storing dependencies. diff --git a/scripts/validate-license.sh b/scripts/validate-license.sh index c4f02ba3e..c9d59c723 100755 --- a/scripts/validate-license.sh +++ b/scripts/validate-license.sh @@ -22,6 +22,7 @@ find_files() { -wholename './vendor' \ -o -wholename './pkg/proto' \ -o -wholename '*testdata*' \ + -o -wholename '*third_party*' \ \) -prune \ \) \ \( -name '*.go' -o -name '*.sh' -o -name 'Dockerfile' \)