diff options
| -rw-r--r-- | go.mod | 1 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | internal/vfs/zip/archive.go | 3 |
3 files changed, 1 insertions, 5 deletions
@@ -26,7 +26,6 @@ require ( github.com/tj/go-redirects v0.0.0-20180508180010-5c02ead0bbc5 gitlab.com/feistel/go-contentencoding v1.0.0 gitlab.com/gitlab-org/go-mimedb v1.45.0 - gitlab.com/gitlab-org/golang-archive-zip v0.1.1 gitlab.com/gitlab-org/labkit v1.16.0 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/net v0.0.0-20211008194852-3b03d305991f @@ -301,8 +301,6 @@ gitlab.com/feistel/go-contentencoding v1.0.0 h1:tBXZUv35f8AFsr7q7U38zZkhmPjSksfX gitlab.com/feistel/go-contentencoding v1.0.0/go.mod h1:xNYBUFP6IqNB5RX5NGm5IX+is7VvM3nBu2jBLADUOE4= gitlab.com/gitlab-org/go-mimedb v1.45.0 h1:PO8dx6HEWzPYU6MQTYnCbpQEJzhJLW/Bh43+2VUHTgc= gitlab.com/gitlab-org/go-mimedb v1.45.0/go.mod h1:wa9y/zOSFKmTXLyBs4clz2FNVhZQmmEQM9TxslPAjZ0= -gitlab.com/gitlab-org/golang-archive-zip v0.1.1 h1:35k9giivbxwF03+8A05Cm8YoxoakU8FBCj5gysjCTCE= -gitlab.com/gitlab-org/golang-archive-zip v0.1.1/go.mod h1:ZDtqpWPGPB9qBuZnZDrKQjIdJtkN7ZAoVwhT6H2o2kE= gitlab.com/gitlab-org/labkit v1.16.0 h1:Vm3NAMZ8RqAunXlvPWby3GJ2R35vsYGP6Uu0YjyMIlY= gitlab.com/gitlab-org/labkit v1.16.0/go.mod h1:bcxc4ZpAC+WyACgyKl7FcvT2XXAbl8CrzN6UY+w8cMc= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= diff --git a/internal/vfs/zip/archive.go b/internal/vfs/zip/archive.go index 2b04310d..1708f238 100644 --- a/internal/vfs/zip/archive.go +++ b/internal/vfs/zip/archive.go @@ -1,6 +1,7 @@ package zip import ( + "archive/zip" "context" "errors" "fmt" @@ -13,8 +14,6 @@ import ( "sync/atomic" "time" - // TODO: Revert back to zip/archive once we no longer support go1.17 (https://gitlab.com/gitlab-org/gitlab-pages/-/issues/673) - zip "gitlab.com/gitlab-org/golang-archive-zip" "gitlab.com/gitlab-org/labkit/log" "gitlab.com/gitlab-org/gitlab-pages/internal/httprange" |