Skip to content

Commit

Permalink
Merge pull request #44261 from thaJeztah/remove_deprecated_pkgs
Browse files Browse the repository at this point in the history
remove aliases for deprecated pkg/urlutil, pkg/fsutils, pkg/pubsub
  • Loading branch information
thaJeztah committed Oct 13, 2022
2 parents c0309cf + 76ce3fd commit ec3c08d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 58 deletions.
6 changes: 0 additions & 6 deletions hack/make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,6 @@ Function Validate-PkgImports($headCommit, $upstreamCommit) {
$files=@(); $files = Invoke-Expression "git diff $upstreamCommit...$headCommit --diff-filter=ACMR --name-only -- `'pkg\*.go`'"
$badFiles=@(); $files | ForEach-Object{
$file=$_
if ($file -eq "pkg\urlutil\deprecated.go") {
# pkg/urlutil is deprecated, but has a temporary alias to help migration,
# see https://github.com/moby/moby/pull/43477
# TODO(thaJeztah) remove this exception once pkg/urlutil aliases are removed
return
}
# For the current changed file, get its list of dependencies, sorted and uniqued.
$imports = Invoke-Expression "go list -e -f `'{{ .Deps }}`' $file"
if ($LASTEXITCODE -ne 0) { Throw "Failed go list for dependencies on $file" }
Expand Down
6 changes: 0 additions & 6 deletions hack/validate/pkg-imports
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ unset IFS

badFiles=()
for f in "${files[@]}"; do
if [ "$f" = "pkg/urlutil/deprecated.go" ]; then
# pkg/urlutil is deprecated, but has a temporary alias to help migration,
# see https://github.com/moby/moby/pull/43477
# TODO(thaJeztah) remove this exception once pkg/urlutil aliases are removed
continue
fi
IFS=$'\n'
badImports=($(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -vE '^github.com/docker/docker/vendor' | grep -E '^github.com/docker/docker' || true))
unset IFS
Expand Down
8 changes: 0 additions & 8 deletions pkg/fsutils/fsutils_linux.go

This file was deleted.

17 changes: 0 additions & 17 deletions pkg/pubsub/publisher.go

This file was deleted.

21 changes: 0 additions & 21 deletions pkg/urlutil/deprecated.go

This file was deleted.

0 comments on commit ec3c08d

Please sign in to comment.