diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index cb889174..d15f5807 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -31,18 +31,18 @@ jobs: - name: Build for Linux/macOS x86_64 if: startsWith(matrix.os, 'windows-') != true - run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo - name: Build for macOS arm64 if: startsWith(matrix.os, 'macos-') == true - run: CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 SDKROOT=$(xcrun --sdk macosx --show-sdk-path) go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo_arm64 + run: CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 SDKROOT=$(xcrun --sdk macosx --show-sdk-path) go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo_arm64 - name: Build for Windows if: startsWith(matrix.os, 'windows-') run: | $GIT_COMMIT = (git describe --always --dirty) | Out-String $DATE_TIME = ([datetime]::Now.ToUniversalTime().toString("yyyy-MM-ddTHH:mm:ssZ")) | Out-String - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=$GIT_COMMIT -X github.com/drakkan/sftpgo/version.date=$DATE_TIME" -o sftpgo.exe + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=$GIT_COMMIT -X github.com/drakkan/sftpgo/v2/version.date=$DATE_TIME" -o sftpgo.exe - name: Run test cases using SQLite provider run: go test -v -p 1 -timeout 10m ./... -coverprofile=coverage.txt -covermode=atomic @@ -148,7 +148,7 @@ jobs: go-version: 1.16 - name: Build - run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo - name: Run tests using PostgreSQL provider run: | @@ -216,7 +216,7 @@ jobs: - name: Build on amd64 if: ${{ matrix.arch == 'amd64' }} run: | - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo mkdir -p output/{init,bash_completion,zsh_completion} cp sftpgo.json output/ cp -r templates output/ @@ -253,7 +253,7 @@ jobs: tar -C /usr/local -xzf go.tar.gz run: | export PATH=$PATH:/usr/local/go/bin - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo mkdir -p output/{init,bash_completion,zsh_completion} cp sftpgo.json output/ cp -r templates output/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc4009eb..6a56f70d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,18 +53,18 @@ jobs: - name: Build for macOS x86_64 if: startsWith(matrix.os, 'windows-') != true - run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + run: go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo - name: Build for macOS arm64 if: startsWith(matrix.os, 'macos-') == true - run: CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 SDKROOT=$(xcrun --sdk macosx --show-sdk-path) go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo_arm64 + run: CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 SDKROOT=$(xcrun --sdk macosx --show-sdk-path) go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo_arm64 - name: Build for Windows if: startsWith(matrix.os, 'windows-') run: | $GIT_COMMIT = (git describe --always --dirty) | Out-String $DATE_TIME = ([datetime]::Now.ToUniversalTime().toString("yyyy-MM-ddTHH:mm:ssZ")) | Out-String - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=$GIT_COMMIT -X github.com/drakkan/sftpgo/version.date=$DATE_TIME" -o sftpgo.exe + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=$GIT_COMMIT -X github.com/drakkan/sftpgo/v2/version.date=$DATE_TIME" -o sftpgo.exe - name: Initialize data provider run: ./sftpgo initprovider @@ -227,7 +227,7 @@ jobs: - name: Build on amd64 if: ${{ matrix.arch == 'amd64' }} run: | - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo mkdir -p output/{init,sqlite,bash_completion,zsh_completion} echo "For documentation please take a look here:" > output/README.txt echo "" >> output/README.txt @@ -269,7 +269,7 @@ jobs: tar -C /usr/local -xzf go.tar.gz run: | export PATH=$PATH:/usr/local/go/bin - go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo + go build -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo mkdir -p output/{init,sqlite,bash_completion,zsh_completion} echo "For documentation please take a look here:" > output/README.txt echo "" >> output/README.txt diff --git a/Dockerfile b/Dockerfile index c12e5357..418861d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY . . RUN set -xe && \ export COMMIT_SHA=${COMMIT_SHA:-$(git describe --always --dirty)} && \ - go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -v -o sftpgo + go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -v -o sftpgo FROM debian:buster-slim diff --git a/Dockerfile.alpine b/Dockerfile.alpine index f59d37a4..1914c9b2 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -23,7 +23,7 @@ COPY . . RUN set -xe && \ export COMMIT_SHA=${COMMIT_SHA:-$(git describe --always --dirty)} && \ - go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -v -o sftpgo + go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -v -o sftpgo FROM alpine:3.13 diff --git a/cmd/gencompletion.go b/cmd/gencompletion.go index 2cb3055d..b0c4e44e 100644 --- a/cmd/gencompletion.go +++ b/cmd/gencompletion.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) var genCompletionCmd = &cobra.Command{ diff --git a/cmd/genman.go b/cmd/genman.go index a23bbfaf..31f69cc6 100644 --- a/cmd/genman.go +++ b/cmd/genman.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/version" ) var ( diff --git a/cmd/initprovider.go b/cmd/initprovider.go index 028c71e6..10131850 100644 --- a/cmd/initprovider.go +++ b/cmd/initprovider.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/cmd/install_windows.go b/cmd/install_windows.go index 7e4dca19..4b781147 100644 --- a/cmd/install_windows.go +++ b/cmd/install_windows.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/service" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/cmd/portable.go b/cmd/portable.go index 50762395..267e5ef3 100644 --- a/cmd/portable.go +++ b/cmd/portable.go @@ -11,13 +11,13 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/service" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/service" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/cmd/portable_disabled.go b/cmd/portable_disabled.go index 516cd0d5..c4a378c5 100644 --- a/cmd/portable_disabled.go +++ b/cmd/portable_disabled.go @@ -2,7 +2,7 @@ package cmd -import "github.com/drakkan/sftpgo/version" +import "github.com/drakkan/sftpgo/v2/version" func init() { version.AddFeature("-portable") diff --git a/cmd/reload_windows.go b/cmd/reload_windows.go index 7e93a14a..0b98ac4e 100644 --- a/cmd/reload_windows.go +++ b/cmd/reload_windows.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" + "github.com/drakkan/sftpgo/v2/service" ) var ( diff --git a/cmd/revertprovider.go b/cmd/revertprovider.go index 0b7ece4a..ec02ee25 100644 --- a/cmd/revertprovider.go +++ b/cmd/revertprovider.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/cmd/root.go b/cmd/root.go index e5c0e20c..7129c3e0 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) const ( diff --git a/cmd/rotatelogs_windows.go b/cmd/rotatelogs_windows.go index 7fdbc409..8dcabdea 100644 --- a/cmd/rotatelogs_windows.go +++ b/cmd/rotatelogs_windows.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" + "github.com/drakkan/sftpgo/v2/service" ) var ( diff --git a/cmd/serve.go b/cmd/serve.go index 18ac7c34..68ba3677 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/service" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/cmd/start_windows.go b/cmd/start_windows.go index 2a66f370..6973c030 100644 --- a/cmd/start_windows.go +++ b/cmd/start_windows.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/service" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/cmd/startsubsys.go b/cmd/startsubsys.go index ce91b605..f53bfcd3 100644 --- a/cmd/startsubsys.go +++ b/cmd/startsubsys.go @@ -11,12 +11,12 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/version" ) var ( diff --git a/cmd/status_windows.go b/cmd/status_windows.go index fa6315b8..d431e2b6 100644 --- a/cmd/status_windows.go +++ b/cmd/status_windows.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" + "github.com/drakkan/sftpgo/v2/service" ) var ( diff --git a/cmd/stop_windows.go b/cmd/stop_windows.go index 93e47465..2f837448 100644 --- a/cmd/stop_windows.go +++ b/cmd/stop_windows.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" + "github.com/drakkan/sftpgo/v2/service" ) var ( diff --git a/cmd/uninstall_windows.go b/cmd/uninstall_windows.go index bcfeb007..4bbade81 100644 --- a/cmd/uninstall_windows.go +++ b/cmd/uninstall_windows.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/drakkan/sftpgo/service" + "github.com/drakkan/sftpgo/v2/service" ) var ( diff --git a/common/actions.go b/common/actions.go index aaf4391f..6bd3d970 100644 --- a/common/actions.go +++ b/common/actions.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/common/actions_test.go b/common/actions_test.go index 81028421..6d6101a6 100644 --- a/common/actions_test.go +++ b/common/actions_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/vfs" ) func TestNewActionNotification(t *testing.T) { diff --git a/common/clientsmap.go b/common/clientsmap.go index 93212a09..e768fec6 100644 --- a/common/clientsmap.go +++ b/common/clientsmap.go @@ -4,7 +4,7 @@ import ( "sync" "sync/atomic" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) // clienstMap is a struct containing the map of the connected clients diff --git a/common/common.go b/common/common.go index 6a672381..2d48b366 100644 --- a/common/common.go +++ b/common/common.go @@ -18,12 +18,12 @@ import ( "github.com/pires/go-proxyproto" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) // constants diff --git a/common/common_test.go b/common/common_test.go index 70050e65..33f79947 100644 --- a/common/common_test.go +++ b/common/common_test.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/bcrypt" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/common/connection.go b/common/connection.go index 6513a5ac..6fa02416 100644 --- a/common/connection.go +++ b/common/connection.go @@ -12,10 +12,10 @@ import ( "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) // BaseConnection defines common fields for a connection using any supported protocol diff --git a/common/connection_test.go b/common/connection_test.go index a4c63a73..85a1ae10 100644 --- a/common/connection_test.go +++ b/common/connection_test.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/sftp" "github.com/stretchr/testify/assert" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/vfs" ) // MockOsFs mockable OsFs diff --git a/common/defender.go b/common/defender.go index 5ddd301c..3ac0e01a 100644 --- a/common/defender.go +++ b/common/defender.go @@ -12,8 +12,8 @@ import ( "github.com/yl2chen/cidranger" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) // HostEvent is the enumerable for the support host event diff --git a/common/httpauth.go b/common/httpauth.go index 60540137..15e7e8f6 100644 --- a/common/httpauth.go +++ b/common/httpauth.go @@ -10,8 +10,8 @@ import ( "github.com/GehirnInc/crypt/md5_crypt" "golang.org/x/crypto/bcrypt" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) const ( diff --git a/common/protocol_test.go b/common/protocol_test.go index 4a574a8e..330af036 100644 --- a/common/protocol_test.go +++ b/common/protocol_test.go @@ -26,14 +26,14 @@ import ( "github.com/rs/zerolog" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/common/ratelimiter.go b/common/ratelimiter.go index 2c387508..1dc95545 100644 --- a/common/ratelimiter.go +++ b/common/ratelimiter.go @@ -10,7 +10,7 @@ import ( "golang.org/x/time/rate" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/common/tlsutils.go b/common/tlsutils.go index 4010e4bd..828db075 100644 --- a/common/tlsutils.go +++ b/common/tlsutils.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) // CertManager defines a TLS certificate manager diff --git a/common/transfer.go b/common/transfer.go index 5acdcd01..3d3db81a 100644 --- a/common/transfer.go +++ b/common/transfer.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "time" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/common/transfer_test.go b/common/transfer_test.go index dfcd6c5d..faa48002 100644 --- a/common/transfer_test.go +++ b/common/transfer_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/vfs" ) func TestTransferUpdateQuota(t *testing.T) { diff --git a/config/config.go b/config/config.go index 65c9bb4b..ac238d2b 100644 --- a/config/config.go +++ b/config/config.go @@ -11,18 +11,18 @@ import ( "github.com/spf13/viper" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/telemetry" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/telemetry" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/webdavd" ) const ( diff --git a/config/config_test.go b/config/config_test.go index 8043b1d2..48f09f49 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/utils" ) const ( diff --git a/dataprovider/admin.go b/dataprovider/admin.go index 56fbaf26..6011b6d6 100644 --- a/dataprovider/admin.go +++ b/dataprovider/admin.go @@ -12,7 +12,7 @@ import ( "github.com/alexedwards/argon2id" "golang.org/x/crypto/bcrypt" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/utils" ) // Available permissions for SFTPGo admins diff --git a/dataprovider/bolt.go b/dataprovider/bolt.go index 8c60a697..dda92830 100644 --- a/dataprovider/bolt.go +++ b/dataprovider/bolt.go @@ -12,10 +12,10 @@ import ( bolt "go.etcd.io/bbolt" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/bolt_disabled.go b/dataprovider/bolt_disabled.go index 69053794..32743675 100644 --- a/dataprovider/bolt_disabled.go +++ b/dataprovider/bolt_disabled.go @@ -5,7 +5,7 @@ package dataprovider import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/dataprovider/cacheduser.go b/dataprovider/cacheduser.go index cddba4de..96e8ce98 100644 --- a/dataprovider/cacheduser.go +++ b/dataprovider/cacheduser.go @@ -6,7 +6,7 @@ import ( "golang.org/x/net/webdav" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/dataprovider/dataprovider.go b/dataprovider/dataprovider.go index 9c820f04..1683ce04 100644 --- a/dataprovider/dataprovider.go +++ b/dataprovider/dataprovider.go @@ -43,12 +43,12 @@ import ( "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/memory.go b/dataprovider/memory.go index c54235b6..bc70524b 100644 --- a/dataprovider/memory.go +++ b/dataprovider/memory.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/dataprovider/mysql.go b/dataprovider/mysql.go index 20ad3b04..10c2b98f 100644 --- a/dataprovider/mysql.go +++ b/dataprovider/mysql.go @@ -14,9 +14,9 @@ import ( // we import go-sql-driver/mysql here to be able to disable MySQL support using a build tag _ "github.com/go-sql-driver/mysql" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/mysql_disabled.go b/dataprovider/mysql_disabled.go index e122e7d9..0c9772b3 100644 --- a/dataprovider/mysql_disabled.go +++ b/dataprovider/mysql_disabled.go @@ -5,7 +5,7 @@ package dataprovider import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/dataprovider/pgsql.go b/dataprovider/pgsql.go index ce3c5e22..cfe5ea8f 100644 --- a/dataprovider/pgsql.go +++ b/dataprovider/pgsql.go @@ -14,9 +14,9 @@ import ( // we import lib/pq here to be able to disable PostgreSQL support using a build tag _ "github.com/lib/pq" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/pgsql_disabled.go b/dataprovider/pgsql_disabled.go index 983c548f..3e603dd0 100644 --- a/dataprovider/pgsql_disabled.go +++ b/dataprovider/pgsql_disabled.go @@ -5,7 +5,7 @@ package dataprovider import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/dataprovider/quotaupdater.go b/dataprovider/quotaupdater.go index 5c2909dc..20c17815 100644 --- a/dataprovider/quotaupdater.go +++ b/dataprovider/quotaupdater.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) var delayedQuotaUpdater quotaUpdater diff --git a/dataprovider/sqlcommon.go b/dataprovider/sqlcommon.go index 22d7ec73..7dfdb82f 100644 --- a/dataprovider/sqlcommon.go +++ b/dataprovider/sqlcommon.go @@ -12,9 +12,9 @@ import ( "github.com/cockroachdb/cockroach-go/v2/crdb" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/sqlite.go b/dataprovider/sqlite.go index df38ffd8..8aa12116 100644 --- a/dataprovider/sqlite.go +++ b/dataprovider/sqlite.go @@ -14,10 +14,10 @@ import ( // we import go-sqlite3 here to be able to disable SQLite support using a build tag _ "github.com/mattn/go-sqlite3" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/sqlite_disabled.go b/dataprovider/sqlite_disabled.go index 636c70cc..37b7d8d7 100644 --- a/dataprovider/sqlite_disabled.go +++ b/dataprovider/sqlite_disabled.go @@ -5,7 +5,7 @@ package dataprovider import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/dataprovider/sqlqueries.go b/dataprovider/sqlqueries.go index fe716251..c51d2f8a 100644 --- a/dataprovider/sqlqueries.go +++ b/dataprovider/sqlqueries.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/dataprovider/user.go b/dataprovider/user.go index 76de9c40..9f8197c8 100644 --- a/dataprovider/user.go +++ b/dataprovider/user.go @@ -15,10 +15,10 @@ import ( "strings" "time" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) // Available permissions for SFTPGo users diff --git a/docs/build-from-source.md b/docs/build-from-source.md index 004501bf..c9e1af6f 100644 --- a/docs/build-from-source.md +++ b/docs/build-from-source.md @@ -26,13 +26,13 @@ The compiler is a build time only dependency. It is not required at runtime. Version info, such as git commit and build date, can be embedded setting the following string variables at build time: -- `github.com/drakkan/sftpgo/version.commit` -- `github.com/drakkan/sftpgo/version.date` +- `github.com/drakkan/sftpgo/v2/version.commit` +- `github.com/drakkan/sftpgo/v2/version.date` For example, you can build using the following command: ```bash -go build -tags nogcs,nos3,nosqlite -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo +go build -tags nogcs,nos3,nosqlite -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/v2/version.date=`date -u +%FT%TZ`" -o sftpgo ``` You should get a version that includes git commit, build date and available features like this one: diff --git a/ftpd/cryptfs_test.go b/ftpd/cryptfs_test.go index d16092f9..c297e047 100644 --- a/ftpd/cryptfs_test.go +++ b/ftpd/cryptfs_test.go @@ -15,11 +15,11 @@ import ( "github.com/minio/sio" "github.com/stretchr/testify/assert" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/vfs" ) func TestBasicFTPHandlingCryptFs(t *testing.T) { diff --git a/ftpd/ftpd.go b/ftpd/ftpd.go index 8900578d..d8798151 100644 --- a/ftpd/ftpd.go +++ b/ftpd/ftpd.go @@ -8,9 +8,9 @@ import ( ftpserver "github.com/fclairamb/ftpserverlib" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) const ( diff --git a/ftpd/ftpd_test.go b/ftpd/ftpd_test.go index bca4e046..08a6a4ff 100644 --- a/ftpd/ftpd_test.go +++ b/ftpd/ftpd_test.go @@ -24,15 +24,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/ftpd/handler.go b/ftpd/handler.go index 98abbe42..dc8ca3e7 100644 --- a/ftpd/handler.go +++ b/ftpd/handler.go @@ -10,10 +10,10 @@ import ( ftpserver "github.com/fclairamb/ftpserverlib" "github.com/spf13/afero" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/ftpd/internal_test.go b/ftpd/internal_test.go index b547e4f9..bd78a78b 100644 --- a/ftpd/internal_test.go +++ b/ftpd/internal_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/ftpd/server.go b/ftpd/server.go index 57b4ed7f..f14d0f57 100644 --- a/ftpd/server.go +++ b/ftpd/server.go @@ -12,12 +12,12 @@ import ( ftpserver "github.com/fclairamb/ftpserverlib" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" ) // Server implements the ftpserverlib MainDriver interface diff --git a/ftpd/transfer.go b/ftpd/transfer.go index 5ffcf680..26fb53fc 100644 --- a/ftpd/transfer.go +++ b/ftpd/transfer.go @@ -7,8 +7,8 @@ import ( "github.com/eikenb/pipeat" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/vfs" ) // transfer contains the transfer details for an upload or a download. diff --git a/go.mod b/go.mod index 14fb88bc..d7d79caf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/drakkan/sftpgo +module github.com/drakkan/sftpgo/v2 go 1.16 @@ -8,7 +8,7 @@ require ( github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect github.com/alexedwards/argon2id v0.0.0-20210511081203-7d35d68092b8 - github.com/aws/aws-sdk-go v1.38.64 + github.com/aws/aws-sdk-go v1.38.68 github.com/cockroachdb/cockroach-go/v2 v2.1.1 github.com/eikenb/pipeat v0.0.0-20210603033007-44fc3ffce52b github.com/fclairamb/ftpserverlib v0.13.3-0.20210614220040-27dccea41813 @@ -18,7 +18,7 @@ require ( github.com/go-chi/render v1.0.1 github.com/go-ole/go-ole v1.2.5 // indirect github.com/go-sql-driver/mysql v1.6.0 - github.com/goccy/go-json v0.7.1 // indirect + github.com/goccy/go-json v0.7.2 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/grandcat/zeroconf v1.0.0 github.com/hashicorp/go-retryablehttp v0.7.0 @@ -29,7 +29,7 @@ require ( github.com/lestrrat-go/jwx v1.2.1 github.com/lib/pq v1.10.2 github.com/mattn/go-sqlite3 v1.14.7 - github.com/miekg/dns v1.1.42 // indirect + github.com/miekg/dns v1.1.43 // indirect github.com/minio/sio v0.3.0 github.com/otiai10/copy v1.6.0 github.com/pires/go-proxyproto v0.5.0 @@ -43,7 +43,7 @@ require ( github.com/shirou/gopsutil/v3 v3.21.5 github.com/spf13/afero v1.6.0 github.com/spf13/cobra v1.1.3 - github.com/spf13/viper v1.8.0 + github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 github.com/studio-b12/gowebdav v0.0.0-20210427212133-86f8378cf140 github.com/yl2chen/cidranger v1.0.2 @@ -55,8 +55,8 @@ require ( golang.org/x/net v0.0.0-20210614182718-04defd469f4e golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 - google.golang.org/api v0.48.0 - google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect + google.golang.org/api v0.49.0 + google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) diff --git a/go.sum b/go.sum index eb7c4f05..2013335b 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,9 @@ cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPT cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0 h1:bAMqZidYkmIsUqe6PtkEPT7Q+vfizScn+jfNA6jwK9c= cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0 h1:hVhK90DwCdOAYGME/FJd9vNIZye9HBR6Yy3fu4js3N8= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -129,8 +130,8 @@ github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.38.64 h1:aE178SZNBpAT9T2U5hacKJiyiRE/Li2Hax6xddVuyGA= -github.com/aws/aws-sdk-go v1.38.64/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.38.68 h1:aOG8geU4SohNp659eKBHRBgbqSrZ6jNZlfimIuJAwL8= +github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -295,6 +296,8 @@ github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/E github.com/goccy/go-json v0.4.8/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.7.1 h1:VMhnh5gcc8De8f6m2DLvSqY1x8Jwl3btet+EqMP0QNs= github.com/goccy/go-json v0.7.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.7.2 h1:MY1gMmtCxRpaI8YGpeHCvXUb+FVIo09pnjqF9Rhh274= +github.com/goccy/go-json v0.7.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -634,8 +637,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.42 h1:gWGe42RGaIqXQZ+r3WUGEKBEtvPHY2SXo4dqixDNxuY= -github.com/miekg/dns v1.1.42/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= +github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= +github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/minio/sio v0.3.0 h1:syEFBewzOMOYVzSTFpp1MqpSZk8rUNbz8VIIc+PNzus= @@ -833,13 +836,14 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.0 h1:QRwDgoG8xX+kp69di68D+YYTCWfYEckbZRfUlEIAal0= -github.com/spf13/viper v1.8.0/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -962,8 +966,9 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c h1:pkQiBZBvdos9qq4wBAHqlzuZHEXo07pqV06ef90u1WI= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 h1:x622Z2o4hgCr/4CiKWc51jHVKaWdtVpBNmEI8wI9Qns= +golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1176,8 +1181,9 @@ google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1Avk google.golang.org/api v0.45.0/go.mod h1:ISLIJCedJolbZvDfAk+Ctuq5hf+aJ33WgtUsfyFoLXA= google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0 h1:RDAPWfNFY06dffEXfn7hZF5Fr1ZbnChzfQZAPyBd1+I= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.49.0 h1:gjIBDxlTG7vnzMmEnYwTnvLTF8Rjzo+ETCgEX1YZ/fY= +google.golang.org/api v0.49.0/go.mod h1:BECiH72wsfwUvOVn3+btPD5WHi0LzavZReBndi42L18= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1239,8 +1245,10 @@ google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2/go.mod h1:P3QM42oQ google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced h1:c5geK1iMU3cDKtFrCVQIcjR3W+JOZMuhIyICMCTbtus= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 h1:R1r5J0u6Cx+RNl/6mezTw6oA14cmKC96FeUwL6A9bd4= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= diff --git a/httpclient/httpclient.go b/httpclient/httpclient.go index c4dd0cb4..864cffa9 100644 --- a/httpclient/httpclient.go +++ b/httpclient/httpclient.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/go-retryablehttp" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) // TLSKeyPair defines the paths for a TLS key pair diff --git a/httpd/api_admin.go b/httpd/api_admin.go index 7cab4d01..34bdfa72 100644 --- a/httpd/api_admin.go +++ b/httpd/api_admin.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/jwtauth/v5" "github.com/go-chi/render" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/utils" ) func getAdmins(w http.ResponseWriter, r *http.Request) { diff --git a/httpd/api_defender.go b/httpd/api_defender.go index c558387f..0d534dcf 100644 --- a/httpd/api_defender.go +++ b/httpd/api_defender.go @@ -10,7 +10,7 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" + "github.com/drakkan/sftpgo/v2/common" ) func getDefenderHosts(w http.ResponseWriter, r *http.Request) { diff --git a/httpd/api_folder.go b/httpd/api_folder.go index e2238b4f..795b8d2a 100644 --- a/httpd/api_folder.go +++ b/httpd/api_folder.go @@ -6,8 +6,8 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/vfs" ) func getFolders(w http.ResponseWriter, r *http.Request) { diff --git a/httpd/api_http_user.go b/httpd/api_http_user.go index 790cc234..78ae2595 100644 --- a/httpd/api_http_user.go +++ b/httpd/api_http_user.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/render" "github.com/rs/xid" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/utils" ) func readUserFolder(w http.ResponseWriter, r *http.Request) { diff --git a/httpd/api_maintenance.go b/httpd/api_maintenance.go index 1dd4414f..420c4d5d 100644 --- a/httpd/api_maintenance.go +++ b/httpd/api_maintenance.go @@ -13,11 +13,11 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) func validateBackupFile(outputFile string) (string, error) { diff --git a/httpd/api_quota.go b/httpd/api_quota.go index dc30208e..c9f35399 100644 --- a/httpd/api_quota.go +++ b/httpd/api_quota.go @@ -6,10 +6,10 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/httpd/api_user.go b/httpd/api_user.go index a0225760..5258c330 100644 --- a/httpd/api_user.go +++ b/httpd/api_user.go @@ -9,10 +9,10 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/vfs" ) func getUsers(w http.ResponseWriter, r *http.Request) { diff --git a/httpd/api_utils.go b/httpd/api_utils.go index 35407228..723215a8 100644 --- a/httpd/api_utils.go +++ b/httpd/api_utils.go @@ -16,11 +16,11 @@ import ( "github.com/go-chi/render" "github.com/klauspost/compress/zip" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" ) type pwdChange struct { diff --git a/httpd/auth_utils.go b/httpd/auth_utils.go index a3f51912..7cf24e92 100644 --- a/httpd/auth_utils.go +++ b/httpd/auth_utils.go @@ -10,9 +10,9 @@ import ( "github.com/lestrrat-go/jwx/jwt" "github.com/rs/xid" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) type tokenAudience = string diff --git a/httpd/file.go b/httpd/file.go index a0713ca6..98aed8b7 100644 --- a/httpd/file.go +++ b/httpd/file.go @@ -7,7 +7,7 @@ import ( "github.com/eikenb/pipeat" - "github.com/drakkan/sftpgo/common" + "github.com/drakkan/sftpgo/v2/common" ) var errTransferAborted = errors.New("transfer aborted") diff --git a/httpd/handler.go b/httpd/handler.go index 6d201f0f..5c28dba8 100644 --- a/httpd/handler.go +++ b/httpd/handler.go @@ -7,10 +7,10 @@ import ( "path" "strings" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) // Connection details for a HTTP connection used to inteact with an SFTPGo filesystem diff --git a/httpd/httpd.go b/httpd/httpd.go index a746f81c..4187d88e 100644 --- a/httpd/httpd.go +++ b/httpd/httpd.go @@ -19,13 +19,13 @@ import ( "github.com/go-chi/jwtauth/v5" "github.com/lestrrat-go/jwx/jwa" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/webdavd" ) const ( diff --git a/httpd/httpd_test.go b/httpd/httpd_test.go index 8cf53541..21913279 100644 --- a/httpd/httpd_test.go +++ b/httpd/httpd_test.go @@ -32,17 +32,17 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/html" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/httpd/internal_test.go b/httpd/internal_test.go index daf37cbd..730e9bdb 100644 --- a/httpd/internal_test.go +++ b/httpd/internal_test.go @@ -29,11 +29,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/httpd/middleware.go b/httpd/middleware.go index 4489830f..86f40551 100644 --- a/httpd/middleware.go +++ b/httpd/middleware.go @@ -9,8 +9,8 @@ import ( "github.com/go-chi/jwtauth/v5" "github.com/lestrrat-go/jwx/jwt" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) var ( diff --git a/httpd/server.go b/httpd/server.go index d24fdda7..12154782 100644 --- a/httpd/server.go +++ b/httpd/server.go @@ -18,11 +18,11 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/rs/xid" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" ) var ( diff --git a/httpd/webadmin.go b/httpd/webadmin.go index 39368996..c2546be7 100644 --- a/httpd/webadmin.go +++ b/httpd/webadmin.go @@ -14,12 +14,12 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) type userPageMode int diff --git a/httpd/webclient.go b/httpd/webclient.go index 076e7103..c90ec237 100644 --- a/httpd/webclient.go +++ b/httpd/webclient.go @@ -14,11 +14,11 @@ import ( "github.com/go-chi/render" "github.com/rs/xid" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/httpdtest/httpdtest.go b/httpdtest/httpdtest.go index f56f31e3..db294a8e 100644 --- a/httpdtest/httpdtest.go +++ b/httpdtest/httpdtest.go @@ -16,14 +16,14 @@ import ( "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/kms/aws.go b/kms/aws.go index d656bee6..23bde487 100644 --- a/kms/aws.go +++ b/kms/aws.go @@ -6,7 +6,7 @@ import ( // we import awskms here to be able to disable AWS KMS support using a build tag _ "gocloud.dev/secrets/awskms" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) type awsSecret struct { diff --git a/kms/aws_disabled.go b/kms/aws_disabled.go index fadea93f..4cb9298b 100644 --- a/kms/aws_disabled.go +++ b/kms/aws_disabled.go @@ -5,7 +5,7 @@ package kms import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/kms/gcp.go b/kms/gcp.go index c58ba54d..6289b4b1 100644 --- a/kms/gcp.go +++ b/kms/gcp.go @@ -6,7 +6,7 @@ import ( // we import gcpkms here to be able to disable GCP KMS support using a build tag _ "gocloud.dev/secrets/gcpkms" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) type gcpSecret struct { diff --git a/kms/gcp_disabled.go b/kms/gcp_disabled.go index 5cbe505f..9b1df3a9 100644 --- a/kms/gcp_disabled.go +++ b/kms/gcp_disabled.go @@ -5,7 +5,7 @@ package kms import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/kms/kms.go b/kms/kms.go index 93b0405e..dc61a85f 100644 --- a/kms/kms.go +++ b/kms/kms.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/utils" ) // SecretProvider defines the interface for a KMS secrets provider diff --git a/kms/vault.go b/kms/vault.go index 6d19b66d..e9df29f3 100644 --- a/kms/vault.go +++ b/kms/vault.go @@ -6,7 +6,7 @@ import ( // we import hashivault here to be able to disable Vault support using a build tag _ "gocloud.dev/secrets/hashivault" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) type vaultSecret struct { diff --git a/kms/vault_disabled.go b/kms/vault_disabled.go index 55d36851..8ca26049 100644 --- a/kms/vault_disabled.go +++ b/kms/vault_disabled.go @@ -5,7 +5,7 @@ package kms import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/logger/request_logger.go b/logger/request_logger.go index 74e44665..535d8004 100644 --- a/logger/request_logger.go +++ b/logger/request_logger.go @@ -8,7 +8,7 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/rs/zerolog" - "github.com/drakkan/sftpgo/metrics" + "github.com/drakkan/sftpgo/v2/metrics" ) // StructuredLogger defines a simple wrapper around zerolog logger. diff --git a/main.go b/main.go index 67efff6d..4bdac6e5 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( "go.uber.org/automaxprocs/maxprocs" - "github.com/drakkan/sftpgo/cmd" + "github.com/drakkan/sftpgo/v2/cmd" ) func main() { diff --git a/metrics/metrics.go b/metrics/metrics.go index cf272a05..3f82c8d6 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) const ( diff --git a/metrics/metrics_disabled.go b/metrics/metrics_disabled.go index 2ef77dc5..a8bf6ecb 100644 --- a/metrics/metrics_disabled.go +++ b/metrics/metrics_disabled.go @@ -5,7 +5,7 @@ package metrics import ( "github.com/go-chi/chi/v5" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/service/service.go b/service/service.go index 3c6dd514..aa8b0f75 100644 --- a/service/service.go +++ b/service/service.go @@ -9,13 +9,13 @@ import ( "github.com/rs/zerolog" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" ) const ( diff --git a/service/service_portable.go b/service/service_portable.go index 9ad47d16..173dab20 100644 --- a/service/service_portable.go +++ b/service/service_portable.go @@ -13,16 +13,16 @@ import ( "github.com/grandcat/zeroconf" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" - "github.com/drakkan/sftpgo/vfs" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" + "github.com/drakkan/sftpgo/v2/vfs" + "github.com/drakkan/sftpgo/v2/webdavd" ) // StartPortableMode starts the service in portable mode diff --git a/service/service_windows.go b/service/service_windows.go index b42a3b33..3d11b149 100644 --- a/service/service_windows.go +++ b/service/service_windows.go @@ -11,13 +11,13 @@ import ( "golang.org/x/sys/windows/svc/eventlog" "golang.org/x/sys/windows/svc/mgr" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/telemetry" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/telemetry" + "github.com/drakkan/sftpgo/v2/webdavd" ) const ( diff --git a/service/signals_unix.go b/service/signals_unix.go index cb6bc044..3cd3f8d9 100644 --- a/service/signals_unix.go +++ b/service/signals_unix.go @@ -7,13 +7,13 @@ import ( "os/signal" "syscall" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/ftpd" - "github.com/drakkan/sftpgo/httpd" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/telemetry" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/ftpd" + "github.com/drakkan/sftpgo/v2/httpd" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/telemetry" + "github.com/drakkan/sftpgo/v2/webdavd" ) func registerSignals() { diff --git a/service/signals_windows.go b/service/signals_windows.go index 362711ec..f3e13af3 100644 --- a/service/signals_windows.go +++ b/service/signals_windows.go @@ -4,7 +4,7 @@ import ( "os" "os/signal" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) func registerSignals() { diff --git a/sftpd/cryptfs_test.go b/sftpd/cryptfs_test.go index 2936d2f1..ca5d050e 100644 --- a/sftpd/cryptfs_test.go +++ b/sftpd/cryptfs_test.go @@ -13,10 +13,10 @@ import ( "github.com/minio/sio" "github.com/stretchr/testify/assert" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/sftpd/handler.go b/sftpd/handler.go index a64a46b0..5a0ada38 100644 --- a/sftpd/handler.go +++ b/sftpd/handler.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/vfs" ) // Connection details for an authenticated user diff --git a/sftpd/internal_test.go b/sftpd/internal_test.go index 27b267cf..4424c35b 100644 --- a/sftpd/internal_test.go +++ b/sftpd/internal_test.go @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const osWindows = "windows" diff --git a/sftpd/scp.go b/sftpd/scp.go index d103031a..71df7745 100644 --- a/sftpd/scp.go +++ b/sftpd/scp.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) var ( diff --git a/sftpd/server.go b/sftpd/server.go index 37b078e2..e6cb9d49 100644 --- a/sftpd/server.go +++ b/sftpd/server.go @@ -16,12 +16,12 @@ import ( "github.com/pkg/sftp" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/sftpd/sftpd_test.go b/sftpd/sftpd_test.go index eb49f589..5621c1e9 100644 --- a/sftpd/sftpd_test.go +++ b/sftpd/sftpd_test.go @@ -36,15 +36,15 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/sftpd/ssh_cmd.go b/sftpd/ssh_cmd.go index 9fa0f712..bbd350df 100644 --- a/sftpd/ssh_cmd.go +++ b/sftpd/ssh_cmd.go @@ -20,12 +20,12 @@ import ( fscopy "github.com/otiai10/copy" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/sftpd/subsystem.go b/sftpd/subsystem.go index 1f6dc825..1e4cd0b4 100644 --- a/sftpd/subsystem.go +++ b/sftpd/subsystem.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" ) type subsystemChannel struct { diff --git a/sftpd/transfer.go b/sftpd/transfer.go index fcc3159c..fbb309d2 100644 --- a/sftpd/transfer.go +++ b/sftpd/transfer.go @@ -7,9 +7,9 @@ import ( "github.com/eikenb/pipeat" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/vfs" ) type writerAtCloser interface { diff --git a/telemetry/router.go b/telemetry/router.go index d11d036b..7a17c2b2 100644 --- a/telemetry/router.go +++ b/telemetry/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" ) func initializeRouter(enableProfiler bool) { diff --git a/telemetry/telemetry.go b/telemetry/telemetry.go index f2e3d63b..ffea043e 100644 --- a/telemetry/telemetry.go +++ b/telemetry/telemetry.go @@ -14,9 +14,9 @@ import ( "github.com/go-chi/chi/v5" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) const ( diff --git a/telemetry/telemetry_test.go b/telemetry/telemetry_test.go index 3f21420b..cda542b1 100644 --- a/telemetry/telemetry_test.go +++ b/telemetry/telemetry_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/drakkan/sftpgo/common" + "github.com/drakkan/sftpgo/v2/common" ) const ( diff --git a/utils/utils.go b/utils/utils.go index 6fdc1bd3..bbc399f2 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -31,7 +31,7 @@ import ( "github.com/rs/xid" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) const ( diff --git a/vfs/azblobfs.go b/vfs/azblobfs.go index d52f2db7..7dd742f0 100644 --- a/vfs/azblobfs.go +++ b/vfs/azblobfs.go @@ -23,9 +23,9 @@ import ( "github.com/eikenb/pipeat" "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/version" ) const azureDefaultEndpoint = "blob.core.windows.net" diff --git a/vfs/azblobfs_disabled.go b/vfs/azblobfs_disabled.go index 7a4869e0..2f7dd6ee 100644 --- a/vfs/azblobfs_disabled.go +++ b/vfs/azblobfs_disabled.go @@ -5,7 +5,7 @@ package vfs import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/vfs/cryptfs.go b/vfs/cryptfs.go index 57897bdc..472d8df7 100644 --- a/vfs/cryptfs.go +++ b/vfs/cryptfs.go @@ -13,7 +13,7 @@ import ( "github.com/minio/sio" "golang.org/x/crypto/hkdf" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) const ( diff --git a/vfs/filesystem.go b/vfs/filesystem.go index 5498d61c..267aee4b 100644 --- a/vfs/filesystem.go +++ b/vfs/filesystem.go @@ -3,8 +3,8 @@ package vfs import ( "fmt" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" ) // FilesystemProvider defines the supported storage filesystems diff --git a/vfs/folder.go b/vfs/folder.go index 29e7aa33..0b2494be 100644 --- a/vfs/folder.go +++ b/vfs/folder.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/utils" ) // BaseVirtualFolder defines the path for the virtual folder and the used quota limits. diff --git a/vfs/gcsfs.go b/vfs/gcsfs.go index 05d91a6d..b32c8365 100644 --- a/vfs/gcsfs.go +++ b/vfs/gcsfs.go @@ -22,10 +22,10 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/version" ) var ( diff --git a/vfs/gcsfs_disabled.go b/vfs/gcsfs_disabled.go index 8a6daf51..adac9b36 100644 --- a/vfs/gcsfs_disabled.go +++ b/vfs/gcsfs_disabled.go @@ -5,7 +5,7 @@ package vfs import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/vfs/osfs.go b/vfs/osfs.go index aad47cc9..2bfeee9e 100644 --- a/vfs/osfs.go +++ b/vfs/osfs.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/sftp" "github.com/rs/xid" - "github.com/drakkan/sftpgo/logger" + "github.com/drakkan/sftpgo/v2/logger" ) const ( diff --git a/vfs/s3fs.go b/vfs/s3fs.go index 7d0541aa..798991a2 100644 --- a/vfs/s3fs.go +++ b/vfs/s3fs.go @@ -22,10 +22,10 @@ import ( "github.com/eikenb/pipeat" "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" ) // using this mime type for directories improves compatibility with s3fs-fuse diff --git a/vfs/s3fs_disabled.go b/vfs/s3fs_disabled.go index 3fafee1d..4c7ddc6d 100644 --- a/vfs/s3fs_disabled.go +++ b/vfs/s3fs_disabled.go @@ -5,7 +5,7 @@ package vfs import ( "errors" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/version" ) func init() { diff --git a/vfs/sftpfs.go b/vfs/sftpfs.go index 813e2e61..792183f2 100644 --- a/vfs/sftpfs.go +++ b/vfs/sftpfs.go @@ -19,10 +19,10 @@ import ( "github.com/rs/xid" "golang.org/x/crypto/ssh" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/version" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/version" ) const ( diff --git a/vfs/vfs.go b/vfs/vfs.go index 47e022c2..cf245054 100644 --- a/vfs/vfs.go +++ b/vfs/vfs.go @@ -16,9 +16,9 @@ import ( "github.com/eikenb/pipeat" "github.com/pkg/sftp" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) const dirMimeType = "inode/directory" diff --git a/webdavd/file.go b/webdavd/file.go index 9b593e6d..ac081100 100644 --- a/webdavd/file.go +++ b/webdavd/file.go @@ -13,10 +13,10 @@ import ( "github.com/eikenb/pipeat" "golang.org/x/net/webdav" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/vfs" ) var errTransferAborted = errors.New("transfer aborted") diff --git a/webdavd/handler.go b/webdavd/handler.go index 05562074..3eebbfb5 100644 --- a/webdavd/handler.go +++ b/webdavd/handler.go @@ -10,11 +10,11 @@ import ( "github.com/eikenb/pipeat" "golang.org/x/net/webdav" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) // Connection details for a WebDav connection. diff --git a/webdavd/internal_test.go b/webdavd/internal_test.go index 2ccfdc14..16942dd5 100644 --- a/webdavd/internal_test.go +++ b/webdavd/internal_test.go @@ -20,11 +20,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/webdav" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/utils" - "github.com/drakkan/sftpgo/vfs" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/utils" + "github.com/drakkan/sftpgo/v2/vfs" ) const ( diff --git a/webdavd/server.go b/webdavd/server.go index 20a54dfc..22ef45d1 100644 --- a/webdavd/server.go +++ b/webdavd/server.go @@ -19,11 +19,11 @@ import ( "github.com/rs/xid" "golang.org/x/net/webdav" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/metrics" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/metrics" + "github.com/drakkan/sftpgo/v2/utils" ) type webDavServer struct { diff --git a/webdavd/webdavd.go b/webdavd/webdavd.go index 367f2cf4..99c3c9dc 100644 --- a/webdavd/webdavd.go +++ b/webdavd/webdavd.go @@ -8,10 +8,10 @@ import ( "github.com/go-chi/chi/v5/middleware" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/utils" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/utils" ) type ctxReqParams int diff --git a/webdavd/webdavd_test.go b/webdavd/webdavd_test.go index 62eb61e8..683f8141 100644 --- a/webdavd/webdavd_test.go +++ b/webdavd/webdavd_test.go @@ -25,16 +25,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/studio-b12/gowebdav" - "github.com/drakkan/sftpgo/common" - "github.com/drakkan/sftpgo/config" - "github.com/drakkan/sftpgo/dataprovider" - "github.com/drakkan/sftpgo/httpclient" - "github.com/drakkan/sftpgo/httpdtest" - "github.com/drakkan/sftpgo/kms" - "github.com/drakkan/sftpgo/logger" - "github.com/drakkan/sftpgo/sftpd" - "github.com/drakkan/sftpgo/vfs" - "github.com/drakkan/sftpgo/webdavd" + "github.com/drakkan/sftpgo/v2/common" + "github.com/drakkan/sftpgo/v2/config" + "github.com/drakkan/sftpgo/v2/dataprovider" + "github.com/drakkan/sftpgo/v2/httpclient" + "github.com/drakkan/sftpgo/v2/httpdtest" + "github.com/drakkan/sftpgo/v2/kms" + "github.com/drakkan/sftpgo/v2/logger" + "github.com/drakkan/sftpgo/v2/sftpd" + "github.com/drakkan/sftpgo/v2/vfs" + "github.com/drakkan/sftpgo/v2/webdavd" ) const (