From 33f22470e3e7bc53d64659797728bd690d81047d Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 13 Aug 2026 23:05:50 -0400 Subject: [PATCH 1/2] Rename the Go module to github.com/pelican/wings Nothing outside this repo imports wings, so the imports are all self-referential and this builds the same either way; the point is just to have the module path match where the code lives. The version stamping has to agree with the module path or it silently stops working, so SRC_PATH, the release ldflags, the Dockerfile and the Makefile move in the same commit. --- .github/workflows/push.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- Dockerfile | 2 +- Makefile | 4 ++-- cmd/configure.go | 2 +- cmd/diagnostics.go | 4 ++-- cmd/root.go | 22 +++++++++++----------- cmd/selfupdate.go | 2 +- config/config.go | 2 +- environment/allocations.go | 2 +- environment/docker.go | 2 +- environment/docker/api.go | 2 +- environment/docker/container.go | 6 +++--- environment/docker/environment.go | 8 ++++---- environment/docker/power.go | 4 ++-- environment/docker/stats.go | 2 +- environment/environment.go | 2 +- environment/settings.go | 2 +- events/events.go | 2 +- go.mod | 2 +- internal/cron/activity_cron.go | 8 ++++---- internal/cron/cron.go | 6 +++--- internal/cron/sftp_cron.go | 8 ++++---- internal/database/database.go | 6 +++--- internal/diagnostics/logs.go | 6 +++--- internal/progress/progress.go | 2 +- internal/progress/progress_test.go | 2 +- internal/ufs/fs_platform_test.go | 2 +- internal/ufs/fs_unix_test.go | 2 +- loggers/cli/cli.go | 8 ++++---- parser/parser.go | 4 ++-- remote/http.go | 4 ++-- remote/servers.go | 2 +- remote/types.go | 2 +- router/downloader/downloader.go | 4 ++-- router/middleware.go | 4 ++-- router/middleware/middleware.go | 8 ++++---- router/middleware/request_error.go | 4 ++-- router/router.go | 8 ++++---- router/router_download.go | 6 +++--- router/router_server.go | 16 ++++++++-------- router/router_server_backup.go | 8 ++++---- router/router_server_backup_test.go | 12 ++++++------ router/router_server_files.go | 16 ++++++++-------- router/router_server_files_search.go | 10 +++++----- router/router_server_transfer.go | 10 +++++----- router/router_server_ws.go | 6 +++--- router/router_system.go | 14 +++++++------- router/router_transfer.go | 12 ++++++------ router/tokens/parser.go | 2 +- router/websocket/listeners.go | 6 +++--- router/websocket/websocket.go | 16 ++++++++-------- server/activity.go | 4 ++-- server/backup.go | 6 +++--- server/backup/backup.go | 6 +++--- server/backup/backup_local.go | 6 +++--- server/backup/backup_s3.go | 6 +++--- server/backup/backup_test.go | 4 ++-- server/config_parser.go | 2 +- server/configuration.go | 2 +- server/connections.go | 2 +- server/console.go | 4 ++-- server/crash.go | 6 +++--- server/events.go | 4 ++-- server/filesystem/archive.go | 6 +++--- server/filesystem/compress.go | 4 ++-- server/filesystem/disk_space.go | 2 +- server/filesystem/errors.go | 2 +- server/filesystem/filesystem.go | 4 ++-- server/filesystem/filesystem_test.go | 4 ++-- server/filesystem/path_test.go | 2 +- server/filesystem/quota_file.go | 2 +- server/filesystem/quotas/exfs.go | 2 +- server/filesystem/quotas/functions.go | 2 +- server/filesystem/stat.go | 2 +- server/install.go | 8 ++++---- server/installer/installer.go | 4 ++-- server/listeners.go | 8 ++++---- server/manager.go | 12 ++++++------ server/mounts.go | 4 ++-- server/power.go | 6 +++--- server/power_test.go | 2 +- server/resources.go | 8 ++++---- server/server.go | 16 ++++++++-------- server/transfer/archive.go | 6 +++--- server/transfer/source.go | 2 +- server/transfer/transfer.go | 4 ++-- server/update.go | 4 ++-- sftp/event.go | 4 ++-- sftp/handler.go | 6 +++--- sftp/handler_test.go | 2 +- sftp/server.go | 6 +++--- wings.go | 2 +- 93 files changed, 246 insertions(+), 246 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 19fdad80..bf19d312 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -42,7 +42,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} CGO_ENABLED: 0 - SRC_PATH: github.com/pelican-dev/wings + SRC_PATH: github.com/pelican/wings run: | go build -v -trimpath -ldflags="-s -w -X ${SRC_PATH}/system.Version=dev-${GITHUB_SHA:0:7}" -o dist/wings ${SRC_PATH} go build -v -trimpath -ldflags="-X ${SRC_PATH}/system.Version=dev-${GITHUB_SHA:0:7}" -o dist/wings_debug ${SRC_PATH} @@ -104,7 +104,7 @@ jobs: - name: Build env: CGO_ENABLED: 0 - SRC_PATH: github.com/pelican-dev/wings + SRC_PATH: github.com/pelican/wings run: | go build -v -trimpath -ldflags="-s -w -X ${SRC_PATH}/system.Version=dev-${GITHUB_SHA:0:7}" -o dist/wings ${SRC_PATH} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ec3a8e08..0db3fe93 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,9 +27,9 @@ jobs: CGO_ENABLED: 0 REF: ${{ github.ref }} run: | - GOARCH=amd64 go build -o dist/wings_linux_amd64 -v -trimpath -ldflags="-s -w -X github.com/pelican-dev/wings/system.Version=${REF:11}" github.com/pelican-dev/wings + GOARCH=amd64 go build -o dist/wings_linux_amd64 -v -trimpath -ldflags="-s -w -X github.com/pelican/wings/system.Version=${REF:11}" github.com/pelican/wings chmod 755 dist/wings_linux_amd64 - GOARCH=arm64 go build -o dist/wings_linux_arm64 -v -trimpath -ldflags="-s -w -X github.com/pelican-dev/wings/system.Version=${REF:11}" github.com/pelican-dev/wings + GOARCH=arm64 go build -o dist/wings_linux_arm64 -v -trimpath -ldflags="-s -w -X github.com/pelican/wings/system.Version=${REF:11}" github.com/pelican/wings chmod 755 dist/wings_linux_arm64 - name: Extract changelog diff --git a/Dockerfile b/Dockerfile index 4e2e6e77..3e4152a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY go.mod go.sum /app/ RUN go mod download COPY . /app/ RUN CGO_ENABLED=0 go build \ - -ldflags="-s -w -X github.com/pelican-dev/wings/system.Version=$VERSION" \ + -ldflags="-s -w -X github.com/pelican/wings/system.Version=$VERSION" \ -v \ -trimpath \ -o wings \ diff --git a/Makefile b/Makefile index 7632f75a..faf7986e 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,13 @@ test: go test -race ./... debug: - go build -ldflags="-X github.com/pelican-dev/wings/system.Version=$(GIT_HEAD)" + go build -ldflags="-X github.com/pelican/wings/system.Version=$(GIT_HEAD)" sudo ./wings --debug --ignore-certificate-errors --config config.yml --pprof --pprof-block-rate 1 # Runs a remotly debuggable session for Wings allowing an IDE to connect and target # different breakpoints. rmdebug: - go build -gcflags "all=-N -l" -ldflags="-X github.com/pelican-dev/wings/system.Version=$(GIT_HEAD)" -race + go build -gcflags "all=-N -l" -ldflags="-X github.com/pelican/wings/system.Version=$(GIT_HEAD)" -race sudo dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec ./wings -- --debug --ignore-certificate-errors --config config.yml build-darwin: diff --git a/cmd/configure.go b/cmd/configure.go index 792c7215..aa2e81ab 100644 --- a/cmd/configure.go +++ b/cmd/configure.go @@ -13,7 +13,7 @@ import ( "github.com/charmbracelet/huh" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" "github.com/spf13/cobra" ) diff --git a/cmd/diagnostics.go b/cmd/diagnostics.go index 5954a379..1351b5db 100644 --- a/cmd/diagnostics.go +++ b/cmd/diagnostics.go @@ -14,8 +14,8 @@ import ( "github.com/goccy/go-json" "github.com/spf13/cobra" - "github.com/pelican-dev/wings/internal/diagnostics" - "github.com/pelican-dev/wings/loggers/cli" + "github.com/pelican/wings/internal/diagnostics" + "github.com/pelican/wings/loggers/cli" ) const ( diff --git a/cmd/root.go b/cmd/root.go index 55a8e417..adae350b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -22,22 +22,22 @@ import ( "github.com/docker/docker/client" "github.com/gammazero/workerpool" "github.com/mitchellh/colorstring" - "github.com/pelican-dev/wings/server/filesystem/quotas" + "github.com/pelican/wings/server/filesystem/quotas" "github.com/spf13/cobra" "golang.org/x/crypto/acme" "golang.org/x/crypto/acme/autocert" "golang.org/x/sys/unix" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/internal/cron" - "github.com/pelican-dev/wings/internal/database" - "github.com/pelican-dev/wings/loggers/cli" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/router" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/sftp" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/internal/cron" + "github.com/pelican/wings/internal/database" + "github.com/pelican/wings/loggers/cli" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/router" + "github.com/pelican/wings/server" + "github.com/pelican/wings/sftp" + "github.com/pelican/wings/system" ) var ( diff --git a/cmd/selfupdate.go b/cmd/selfupdate.go index 1f8f1684..a65e8fc1 100644 --- a/cmd/selfupdate.go +++ b/cmd/selfupdate.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" "github.com/spf13/cobra" ) diff --git a/config/config.go b/config/config.go index c235ee4d..16097fde 100644 --- a/config/config.go +++ b/config/config.go @@ -24,7 +24,7 @@ import ( "github.com/gbrlsnchs/jwt/v3" "gopkg.in/yaml.v2" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) const DefaultLocation = "/etc/pelican/config.yml" diff --git a/environment/allocations.go b/environment/allocations.go index 61ca87fa..441fb35d 100644 --- a/environment/allocations.go +++ b/environment/allocations.go @@ -6,7 +6,7 @@ import ( "github.com/docker/go-connections/nat" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) diff --git a/environment/docker.go b/environment/docker.go index 20081f42..8e7d9b03 100644 --- a/environment/docker.go +++ b/environment/docker.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) var ( diff --git a/environment/docker/api.go b/environment/docker/api.go index 9dfc28d7..6dda939e 100644 --- a/environment/docker/api.go +++ b/environment/docker/api.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) var ( diff --git a/environment/docker/container.go b/environment/docker/container.go index 7cc2190b..541923ac 100644 --- a/environment/docker/container.go +++ b/environment/docker/container.go @@ -19,9 +19,9 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/system" ) var ErrNotAttached = errors.Sentinel("not attached to instance") diff --git a/environment/docker/environment.go b/environment/docker/environment.go index 8bd12563..df964b42 100644 --- a/environment/docker/environment.go +++ b/environment/docker/environment.go @@ -11,10 +11,10 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/events" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/system" ) type Metadata struct { diff --git a/environment/docker/power.go b/environment/docker/power.go index c56adea4..72c26fa2 100644 --- a/environment/docker/power.go +++ b/environment/docker/power.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/remote" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/remote" ) // OnBeforeStart run before the container starts and get the process diff --git a/environment/docker/stats.go b/environment/docker/stats.go index 37b0fa22..e161c73b 100644 --- a/environment/docker/stats.go +++ b/environment/docker/stats.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/environment" + "github.com/pelican/wings/environment" ) // Uptime returns the current uptime of the container in milliseconds. If the diff --git a/environment/environment.go b/environment/environment.go index ba6b7dd8..36b33fe4 100644 --- a/environment/environment.go +++ b/environment/environment.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/pelican-dev/wings/events" + "github.com/pelican/wings/events" ) const ( diff --git a/environment/settings.go b/environment/settings.go index 421665ef..d090ae77 100644 --- a/environment/settings.go +++ b/environment/settings.go @@ -10,7 +10,7 @@ import ( "github.com/apex/log" "github.com/docker/docker/api/types/container" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) type Mount struct { diff --git a/events/events.go b/events/events.go index e9620282..463b76b4 100644 --- a/events/events.go +++ b/events/events.go @@ -6,7 +6,7 @@ import ( "emperror.dev/errors" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) // Event represents an Event sent over a Bus. diff --git a/go.mod b/go.mod index 36cf27c4..33821004 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pelican-dev/wings +module github.com/pelican/wings go 1.25.0 diff --git a/internal/cron/activity_cron.go b/internal/cron/activity_cron.go index 2dbea2c9..611d971a 100644 --- a/internal/cron/activity_cron.go +++ b/internal/cron/activity_cron.go @@ -6,10 +6,10 @@ import ( "emperror.dev/errors" - "github.com/pelican-dev/wings/internal/database" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/internal/database" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/server" + "github.com/pelican/wings/system" ) type activityCron struct { diff --git a/internal/cron/cron.go b/internal/cron/cron.go index 0814fbd9..d3d23497 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -8,9 +8,9 @@ import ( "github.com/apex/log" "github.com/go-co-op/gocron/v2" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/server" + "github.com/pelican/wings/system" ) const ErrCronRunning = errors.Sentinel("cron: job already running") diff --git a/internal/cron/sftp_cron.go b/internal/cron/sftp_cron.go index 1569d3a7..83e6b883 100644 --- a/internal/cron/sftp_cron.go +++ b/internal/cron/sftp_cron.go @@ -7,10 +7,10 @@ import ( "emperror.dev/errors" "gorm.io/gorm" - "github.com/pelican-dev/wings/internal/database" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/internal/database" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/server" + "github.com/pelican/wings/system" ) type sftpCron struct { diff --git a/internal/database/database.go b/internal/database/database.go index 5e76c4bc..06361139 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -9,9 +9,9 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/system" ) var ( diff --git a/internal/diagnostics/logs.go b/internal/diagnostics/logs.go index 489a27ce..26a648c9 100644 --- a/internal/diagnostics/logs.go +++ b/internal/diagnostics/logs.go @@ -14,9 +14,9 @@ import ( dockerSystem "github.com/docker/docker/api/types/system" // Alias the correct system package "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/operatingsystem" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/system" ) // GenerateDiagnosticsReport collects diagnostic data and returns it as a string. diff --git a/internal/progress/progress.go b/internal/progress/progress.go index 30e4c0a2..87a1630f 100644 --- a/internal/progress/progress.go +++ b/internal/progress/progress.go @@ -5,7 +5,7 @@ import ( "strings" "sync/atomic" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) // Progress is used to track the progress of any I/O operation that are being diff --git a/internal/progress/progress_test.go b/internal/progress/progress_test.go index 8d8ef8ba..d7b191f0 100644 --- a/internal/progress/progress_test.go +++ b/internal/progress/progress_test.go @@ -6,7 +6,7 @@ import ( "github.com/franela/goblin" - "github.com/pelican-dev/wings/internal/progress" + "github.com/pelican/wings/internal/progress" ) func TestProgress(t *testing.T) { diff --git a/internal/ufs/fs_platform_test.go b/internal/ufs/fs_platform_test.go index 6ef5a1b1..190f8816 100644 --- a/internal/ufs/fs_platform_test.go +++ b/internal/ufs/fs_platform_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) func TestFillFileStatFromSys(t *testing.T) { diff --git a/internal/ufs/fs_unix_test.go b/internal/ufs/fs_unix_test.go index 7d2a27fa..3abf47c3 100644 --- a/internal/ufs/fs_unix_test.go +++ b/internal/ufs/fs_unix_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) type testUnixFS struct { diff --git a/loggers/cli/cli.go b/loggers/cli/cli.go index 862b58e1..c0746964 100644 --- a/loggers/cli/cli.go +++ b/loggers/cli/cli.go @@ -90,15 +90,15 @@ func (h *Handler) HandleLog(e *log.Entry) error { // Stacktrace: // readlink test: no such file or directory // failed to read symlink target for 'test' - // github.com/pelican-dev/wings/server/filesystem.(*Archive).addToArchive - // github.com/pelican-dev/wings/server/filesystem/archive.go:166 + // github.com/pelican/wings/server/filesystem.(*Archive).addToArchive + // github.com/pelican/wings/server/filesystem/archive.go:166 // ... (Truncated the stack for easier reading) // runtime.goexit // runtime/asm_amd64.s:1374 // **NEW LINE INSERTED HERE** // backup: error while generating server backup - // github.com/pelican-dev/wings/server.(*Server).Backup - // github.com/pelican-dev/wings/server/backup.go:84 + // github.com/pelican/wings/server.(*Server).Backup + // github.com/pelican/wings/server/backup.go:84 // ... (Truncated the stack for easier reading) // runtime.goexit // runtime/asm_amd64.s:1374 diff --git a/parser/parser.go b/parser/parser.go index 2df82cec..3238181c 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -20,8 +20,8 @@ import ( "gopkg.in/ini.v1" "gopkg.in/yaml.v3" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/ufs" ) // The file parsing options that are available for a server configuration file. diff --git a/remote/http.go b/remote/http.go index 855f697a..5893ebc5 100644 --- a/remote/http.go +++ b/remote/http.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "github.com/pelican-dev/wings/internal/models" + "github.com/pelican/wings/internal/models" "emperror.dev/errors" "github.com/apex/log" "github.com/cenkalti/backoff/v4" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) type Client interface { diff --git a/remote/servers.go b/remote/servers.go index 832afe07..87648f89 100644 --- a/remote/servers.go +++ b/remote/servers.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/pelican-dev/wings/internal/models" + "github.com/pelican/wings/internal/models" "emperror.dev/errors" "github.com/apex/log" diff --git a/remote/types.go b/remote/types.go index beac2462..2a11d434 100644 --- a/remote/types.go +++ b/remote/types.go @@ -8,7 +8,7 @@ import ( "github.com/apex/log" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/parser" + "github.com/pelican/wings/parser" ) const ( diff --git a/router/downloader/downloader.go b/router/downloader/downloader.go index 01302672..69b81cc2 100644 --- a/router/downloader/downloader.go +++ b/router/downloader/downloader.go @@ -17,8 +17,8 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/config" + "github.com/pelican/wings/server" ) var client *http.Client diff --git a/router/middleware.go b/router/middleware.go index cc6bc873..e1206eab 100644 --- a/router/middleware.go +++ b/router/middleware.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/server" ) // ExtractServer returns the server instance from the gin context. If there is diff --git a/router/middleware/middleware.go b/router/middleware/middleware.go index 921ba107..6ff0717d 100644 --- a/router/middleware/middleware.go +++ b/router/middleware/middleware.go @@ -12,10 +12,10 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server" + "github.com/pelican/wings/system" ) // AttachRequestID attaches a unique ID to the incoming HTTP request so that any diff --git a/router/middleware/request_error.go b/router/middleware/request_error.go index ee23bb03..019bb7ac 100644 --- a/router/middleware/request_error.go +++ b/router/middleware/request_error.go @@ -10,8 +10,8 @@ import ( "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/filesystem" ) // RequestError is a custom error type returned when something goes wrong with diff --git a/router/router.go b/router/router.go index ae33d31b..a696a373 100644 --- a/router/router.go +++ b/router/router.go @@ -6,10 +6,10 @@ import ( "emperror.dev/errors" "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/router/middleware" - wserver "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/router/middleware" + wserver "github.com/pelican/wings/server" ) var tokenRegex = regexp.MustCompile(`([?|&]token=)([^&]+)($|&)`) diff --git a/router/router_download.go b/router/router_download.go index 34c1c82a..20e63972 100644 --- a/router/router_download.go +++ b/router/router_download.go @@ -10,9 +10,9 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server/backup" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server/backup" ) // Handle a download request for a server backup. diff --git a/router/router_server.go b/router/router_server.go index f8232114..b80001d8 100644 --- a/router/router_server.go +++ b/router/router_server.go @@ -11,14 +11,14 @@ import ( "emperror.dev/errors" "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/server/filesystem/quotas" - - "github.com/pelican-dev/wings/router/downloader" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/transfer" + "github.com/pelican/wings/config" + "github.com/pelican/wings/server/filesystem/quotas" + + "github.com/pelican/wings/router/downloader" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/transfer" ) // Returns a single server from the collection of servers. diff --git a/router/router_server_backup.go b/router/router_server_backup.go index 0135686b..96007328 100644 --- a/router/router_server_backup.go +++ b/router/router_server_backup.go @@ -17,10 +17,10 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/backup" + "github.com/pelican/wings/config" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/backup" ) var blockedBackupRestorePrefixes = []netip.Prefix{ diff --git a/router/router_server_backup_test.go b/router/router_server_backup_test.go index 2e56e95f..68dd9e84 100644 --- a/router/router_server_backup_test.go +++ b/router/router_server_backup_test.go @@ -13,12 +13,12 @@ import ( "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/remote" - wserver "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/events" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/remote" + wserver "github.com/pelican/wings/server" ) func init() { diff --git a/router/router_server_files.go b/router/router_server_files.go index a428741d..63fea2ce 100644 --- a/router/router_server_files.go +++ b/router/router_server_files.go @@ -18,14 +18,14 @@ import ( "github.com/gin-gonic/gin" "golang.org/x/sync/errgroup" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/internal/ufs" - "github.com/pelican-dev/wings/router/downloader" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/internal/ufs" + "github.com/pelican/wings/router/downloader" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/filesystem" ) // getServerFileContents returns the contents of a file on the server. diff --git a/router/router_server_files_search.go b/router/router_server_files_search.go index 987e2d40..82ad9999 100644 --- a/router/router_server_files_search.go +++ b/router/router_server_files_search.go @@ -7,11 +7,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/ufs" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/ufs" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/filesystem" ) // Structs needed to respond with the matched files and all their info diff --git a/router/router_server_transfer.go b/router/router_server_transfer.go index 852ee4e7..4d98c32b 100644 --- a/router/router_server_transfer.go +++ b/router/router_server_transfer.go @@ -9,11 +9,11 @@ import ( "emperror.dev/errors" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/installer" - "github.com/pelican-dev/wings/server/transfer" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/installer" + "github.com/pelican/wings/server/transfer" ) // Data passed over to initiate a server transfer. diff --git a/router/router_server_ws.go b/router/router_server_ws.go index 952356aa..cf563b50 100644 --- a/router/router_server_ws.go +++ b/router/router_server_ws.go @@ -9,9 +9,9 @@ import ( "emperror.dev/errors" "github.com/gin-gonic/gin" ws "github.com/gorilla/websocket" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/websocket" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/websocket" + "github.com/pelican/wings/server" "golang.org/x/time/rate" ) diff --git a/router/router_system.go b/router/router_system.go index cdc5bd58..c27eb289 100644 --- a/router/router_system.go +++ b/router/router_system.go @@ -11,13 +11,13 @@ import ( "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/diagnostics" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/installer" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/diagnostics" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/installer" + "github.com/pelican/wings/system" ) // Returns information about the system that wings is running on. diff --git a/router/router_transfer.go b/router/router_transfer.go index e1837316..4a2da12d 100644 --- a/router/router_transfer.go +++ b/router/router_transfer.go @@ -18,12 +18,12 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/router/middleware" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/installer" - "github.com/pelican-dev/wings/server/transfer" + "github.com/pelican/wings/config" + "github.com/pelican/wings/router/middleware" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/installer" + "github.com/pelican/wings/server/transfer" ) // postTransfers . diff --git a/router/tokens/parser.go b/router/tokens/parser.go index ae16eba5..fb262903 100644 --- a/router/tokens/parser.go +++ b/router/tokens/parser.go @@ -5,7 +5,7 @@ import ( "github.com/gbrlsnchs/jwt/v3" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) type TokenData interface { diff --git a/router/websocket/listeners.go b/router/websocket/listeners.go index f6815c14..4bd7a6ad 100644 --- a/router/websocket/listeners.go +++ b/router/websocket/listeners.go @@ -8,10 +8,10 @@ import ( "emperror.dev/errors" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/events" + "github.com/pelican/wings/system" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/server" ) // RegisterListenerEvents will setup the server event listeners and expiration diff --git a/router/websocket/websocket.go b/router/websocket/websocket.go index 6e7a69a9..190ef18e 100644 --- a/router/websocket/websocket.go +++ b/router/websocket/websocket.go @@ -16,14 +16,14 @@ import ( "github.com/google/uuid" "github.com/gorilla/websocket" - "github.com/pelican-dev/wings/system" - - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/environment/docker" - "github.com/pelican-dev/wings/internal/models" - "github.com/pelican-dev/wings/router/tokens" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/system" + + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/environment/docker" + "github.com/pelican/wings/internal/models" + "github.com/pelican/wings/router/tokens" + "github.com/pelican/wings/server" ) const ( diff --git a/server/activity.go b/server/activity.go index 271d022f..5c885722 100644 --- a/server/activity.go +++ b/server/activity.go @@ -6,8 +6,8 @@ import ( "emperror.dev/errors" - "github.com/pelican-dev/wings/internal/database" - "github.com/pelican-dev/wings/internal/models" + "github.com/pelican/wings/internal/database" + "github.com/pelican/wings/internal/models" ) const ActivityPowerPrefix = "server:power." diff --git a/server/backup.go b/server/backup.go index d48afd33..0479cde1 100644 --- a/server/backup.go +++ b/server/backup.go @@ -10,9 +10,9 @@ import ( "github.com/apex/log" "github.com/docker/docker/client" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/backup" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/backup" ) // Notifies the panel of a backup's state and returns an error if one is encountered diff --git a/server/backup/backup.go b/server/backup/backup.go index 541b322a..823750e7 100644 --- a/server/backup/backup.go +++ b/server/backup/backup.go @@ -16,9 +16,9 @@ import ( "github.com/mholt/archives" "golang.org/x/sync/errgroup" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/filesystem" ) var format = archives.CompressedArchive{ diff --git a/server/backup/backup_local.go b/server/backup/backup_local.go index 53b9b5fe..dfdbf98b 100644 --- a/server/backup/backup_local.go +++ b/server/backup/backup_local.go @@ -10,9 +10,9 @@ import ( "github.com/juju/ratelimit" "github.com/mholt/archives" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/filesystem" ) type LocalBackup struct { diff --git a/server/backup/backup_s3.go b/server/backup/backup_s3.go index 30cb70f0..3f4df5fa 100644 --- a/server/backup/backup_s3.go +++ b/server/backup/backup_s3.go @@ -15,9 +15,9 @@ import ( "github.com/juju/ratelimit" "github.com/mholt/archives" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/filesystem" ) type S3Backup struct { diff --git a/server/backup/backup_test.go b/server/backup/backup_test.go index c0cf4e7d..6c6138bb 100644 --- a/server/backup/backup_test.go +++ b/server/backup/backup_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/server/filesystem" ) func TestBackupGenerateRequiresUuidIdentifier(t *testing.T) { diff --git a/server/config_parser.go b/server/config_parser.go index cec79cb9..203fc120 100644 --- a/server/config_parser.go +++ b/server/config_parser.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/gammazero/workerpool" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) // Helper function to replace variables in the file path of the configuration parser diff --git a/server/configuration.go b/server/configuration.go index 41bd51da..6dbab4d6 100644 --- a/server/configuration.go +++ b/server/configuration.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sync" - "github.com/pelican-dev/wings/environment" + "github.com/pelican/wings/environment" ) type EggConfiguration struct { diff --git a/server/connections.go b/server/connections.go index 846ae444..58b99800 100644 --- a/server/connections.go +++ b/server/connections.go @@ -1,7 +1,7 @@ package server import ( - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) // Sftp returns the SFTP connection bag for the server instance. This bag tracks diff --git a/server/console.go b/server/console.go index d61f5f09..8872f1bc 100644 --- a/server/console.go +++ b/server/console.go @@ -7,8 +7,8 @@ import ( "github.com/mitchellh/colorstring" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/system" ) // appName is a local cache variable to avoid having to make expensive copies of diff --git a/server/crash.go b/server/crash.go index 2e7b3ee0..d31b4d52 100644 --- a/server/crash.go +++ b/server/crash.go @@ -9,9 +9,9 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/internal/models" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/internal/models" ) type CrashHandler struct { diff --git a/server/events.go b/server/events.go index 6dd02b4a..f91dd6b4 100644 --- a/server/events.go +++ b/server/events.go @@ -1,8 +1,8 @@ package server import ( - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/events" + "github.com/pelican/wings/system" ) // Defines all the possible output events for a server. diff --git a/server/filesystem/archive.go b/server/filesystem/archive.go index 67407ade..34256521 100644 --- a/server/filesystem/archive.go +++ b/server/filesystem/archive.go @@ -16,9 +16,9 @@ import ( "github.com/klauspost/pgzip" ignore "github.com/sabhiram/go-gitignore" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/progress" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/progress" + "github.com/pelican/wings/internal/ufs" ) const memory = 4 * 1024 diff --git a/server/filesystem/compress.go b/server/filesystem/compress.go index e6975faa..ab76dfba 100644 --- a/server/filesystem/compress.go +++ b/server/filesystem/compress.go @@ -16,8 +16,8 @@ import ( "github.com/klauspost/compress/zip" "github.com/mholt/archives" - "github.com/pelican-dev/wings/internal/ufs" - "github.com/pelican-dev/wings/server/filesystem/archiverext" + "github.com/pelican/wings/internal/ufs" + "github.com/pelican/wings/server/filesystem/archiverext" ) // CompressFiles compresses all the files matching the given paths in the diff --git a/server/filesystem/disk_space.go b/server/filesystem/disk_space.go index d3a5dca8..763e5605 100644 --- a/server/filesystem/disk_space.go +++ b/server/filesystem/disk_space.go @@ -12,7 +12,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) type SpaceCheckingOpts struct { diff --git a/server/filesystem/errors.go b/server/filesystem/errors.go index c3676dd0..25ddb3bf 100644 --- a/server/filesystem/errors.go +++ b/server/filesystem/errors.go @@ -7,7 +7,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) type ErrorCode string diff --git a/server/filesystem/filesystem.go b/server/filesystem/filesystem.go index 2ef8238d..5430e307 100644 --- a/server/filesystem/filesystem.go +++ b/server/filesystem/filesystem.go @@ -17,8 +17,8 @@ import ( "github.com/gabriel-vasile/mimetype" ignore "github.com/sabhiram/go-gitignore" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/ufs" ) type Filesystem struct { diff --git a/server/filesystem/filesystem_test.go b/server/filesystem/filesystem_test.go index f84dd4be..f1ed0739 100644 --- a/server/filesystem/filesystem_test.go +++ b/server/filesystem/filesystem_test.go @@ -13,9 +13,9 @@ import ( . "github.com/franela/goblin" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) func NewFs() (*Filesystem, *rootFs) { diff --git a/server/filesystem/path_test.go b/server/filesystem/path_test.go index 098588f5..d6f8323b 100644 --- a/server/filesystem/path_test.go +++ b/server/filesystem/path_test.go @@ -9,7 +9,7 @@ import ( "emperror.dev/errors" . "github.com/franela/goblin" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) func TestFilesystem_Path(t *testing.T) { diff --git a/server/filesystem/quota_file.go b/server/filesystem/quota_file.go index b6619957..7e622350 100644 --- a/server/filesystem/quota_file.go +++ b/server/filesystem/quota_file.go @@ -5,7 +5,7 @@ import ( "math" "sync" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) type quotaFile struct { diff --git a/server/filesystem/quotas/exfs.go b/server/filesystem/quotas/exfs.go index f99c40d2..155e899a 100644 --- a/server/filesystem/quotas/exfs.go +++ b/server/filesystem/quotas/exfs.go @@ -12,7 +12,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" "github.com/parkervcp/fsquota" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) var exfs struct { diff --git a/server/filesystem/quotas/functions.go b/server/filesystem/quotas/functions.go index 799aa3ee..1e6dbd5d 100644 --- a/server/filesystem/quotas/functions.go +++ b/server/filesystem/quotas/functions.go @@ -10,7 +10,7 @@ import ( "emperror.dev/errors" "github.com/apex/log" "github.com/parkervcp/fsquota" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) const ( diff --git a/server/filesystem/stat.go b/server/filesystem/stat.go index 015fff9e..a3e4561c 100644 --- a/server/filesystem/stat.go +++ b/server/filesystem/stat.go @@ -8,7 +8,7 @@ import ( "github.com/gabriel-vasile/mimetype" - "github.com/pelican-dev/wings/internal/ufs" + "github.com/pelican/wings/internal/ufs" ) type Stat struct { diff --git a/server/install.go b/server/install.go index d3956ab3..e1237b8e 100644 --- a/server/install.go +++ b/server/install.go @@ -22,10 +22,10 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/system" ) // Install executes the installation stack for a server process. Bubbles any diff --git a/server/installer/installer.go b/server/installer/installer.go index 1d94a6b9..e012517d 100644 --- a/server/installer/installer.go +++ b/server/installer/installer.go @@ -5,8 +5,8 @@ import ( "emperror.dev/errors" "github.com/asaskevich/govalidator" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server" ) type Installer struct { diff --git a/server/listeners.go b/server/listeners.go index bce8162d..188461e6 100644 --- a/server/listeners.go +++ b/server/listeners.go @@ -10,11 +10,11 @@ import ( "github.com/apex/log" - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/events" + "github.com/pelican/wings/system" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/remote" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/remote" ) var dockerEvents = []string{ diff --git a/server/manager.go b/server/manager.go index e6dd3a7f..ca8f33aa 100644 --- a/server/manager.go +++ b/server/manager.go @@ -14,12 +14,12 @@ import ( "github.com/apex/log" "github.com/gammazero/workerpool" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/environment/docker" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/filesystem" - "github.com/pelican-dev/wings/server/filesystem/quotas" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/environment/docker" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/filesystem" + "github.com/pelican/wings/server/filesystem/quotas" ) type Manager struct { diff --git a/server/mounts.go b/server/mounts.go index a0a53cc7..4033afc7 100644 --- a/server/mounts.go +++ b/server/mounts.go @@ -7,8 +7,8 @@ import ( "github.com/apex/log" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" ) // To avoid confusion when working with mounts, assume that a server.Mount has not been properly diff --git a/server/power.go b/server/power.go index 921cd7de..3a17b0fa 100644 --- a/server/power.go +++ b/server/power.go @@ -8,9 +8,9 @@ import ( "emperror.dev/errors" "github.com/apex/log" "github.com/google/uuid" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/server/filesystem/quotas" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/server/filesystem/quotas" ) type PowerAction string diff --git a/server/power_test.go b/server/power_test.go index b3ff9dc8..65539b76 100644 --- a/server/power_test.go +++ b/server/power_test.go @@ -5,7 +5,7 @@ import ( . "github.com/franela/goblin" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/system" ) func TestPower(t *testing.T) { diff --git a/server/resources.go b/server/resources.go index 0991c6b7..c88e7ad6 100644 --- a/server/resources.go +++ b/server/resources.go @@ -5,10 +5,10 @@ import ( "sync/atomic" "github.com/apex/log" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/server/filesystem/quotas" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/server/filesystem/quotas" + "github.com/pelican/wings/system" ) // ResourceUsage defines the current resource usage for a given server instance. If a server is offline you diff --git a/server/server.go b/server/server.go index 2a6fcd6d..bb31f114 100644 --- a/server/server.go +++ b/server/server.go @@ -17,14 +17,14 @@ import ( "github.com/apex/log" "github.com/creasty/defaults" "github.com/goccy/go-json" - "github.com/pelican-dev/wings/server/filesystem/quotas" - - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/environment" - "github.com/pelican-dev/wings/events" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server/filesystem" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/server/filesystem/quotas" + + "github.com/pelican/wings/config" + "github.com/pelican/wings/environment" + "github.com/pelican/wings/events" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server/filesystem" + "github.com/pelican/wings/system" ) // Server is the high level definition for a server instance being controlled diff --git a/server/transfer/archive.go b/server/transfer/archive.go index 366750d4..1f393788 100644 --- a/server/transfer/archive.go +++ b/server/transfer/archive.go @@ -12,9 +12,9 @@ import ( "strings" "github.com/apex/log" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/internal/progress" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/internal/progress" + "github.com/pelican/wings/server/filesystem" ) // Archive returns an archive that can be used to stream the contents of the diff --git a/server/transfer/source.go b/server/transfer/source.go index c8ffeded..b1fcf9d7 100644 --- a/server/transfer/source.go +++ b/server/transfer/source.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/pelican-dev/wings/config" + "github.com/pelican/wings/config" ) // PushArchiveToTarget POSTs the archive to the target node and returns the diff --git a/server/transfer/transfer.go b/server/transfer/transfer.go index 8fe5ce47..9f89a27f 100644 --- a/server/transfer/transfer.go +++ b/server/transfer/transfer.go @@ -7,8 +7,8 @@ import ( "github.com/apex/log" "github.com/mitchellh/colorstring" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/system" + "github.com/pelican/wings/server" + "github.com/pelican/wings/system" ) // Status represents the current status of a transfer. diff --git a/server/update.go b/server/update.go index 1bf603f3..6a168df6 100644 --- a/server/update.go +++ b/server/update.go @@ -3,9 +3,9 @@ package server import ( "time" - "github.com/pelican-dev/wings/environment/docker" + "github.com/pelican/wings/environment/docker" - "github.com/pelican-dev/wings/environment" + "github.com/pelican/wings/environment" ) // SyncWithEnvironment updates the environment for the server to match any of diff --git a/sftp/event.go b/sftp/event.go index a262f827..ecfedcbc 100644 --- a/sftp/event.go +++ b/sftp/event.go @@ -4,8 +4,8 @@ import ( "emperror.dev/errors" "github.com/apex/log" - "github.com/pelican-dev/wings/internal/database" - "github.com/pelican-dev/wings/internal/models" + "github.com/pelican/wings/internal/database" + "github.com/pelican/wings/internal/models" ) type eventHandler struct { diff --git a/sftp/handler.go b/sftp/handler.go index 94996594..4a1ceaf9 100644 --- a/sftp/handler.go +++ b/sftp/handler.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/sftp" "golang.org/x/crypto/ssh" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/server" - "github.com/pelican-dev/wings/server/filesystem" + "github.com/pelican/wings/config" + "github.com/pelican/wings/server" + "github.com/pelican/wings/server/filesystem" ) const ( diff --git a/sftp/handler_test.go b/sftp/handler_test.go index 5eb940fc..08c8bf49 100644 --- a/sftp/handler_test.go +++ b/sftp/handler_test.go @@ -7,7 +7,7 @@ import ( pkgsftp "github.com/pkg/sftp" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/server" ) type writeAtFunc func([]byte, int64) (int, error) diff --git a/sftp/server.go b/sftp/server.go index e9fa3d7f..d40cf3c4 100644 --- a/sftp/server.go +++ b/sftp/server.go @@ -19,9 +19,9 @@ import ( "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh" - "github.com/pelican-dev/wings/config" - "github.com/pelican-dev/wings/remote" - "github.com/pelican-dev/wings/server" + "github.com/pelican/wings/config" + "github.com/pelican/wings/remote" + "github.com/pelican/wings/server" ) // Usernames all follow the same format, so don't even bother hitting the API if the username is not diff --git a/wings.go b/wings.go index ff04ba36..09add1a2 100644 --- a/wings.go +++ b/wings.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "github.com/pelican-dev/wings/cmd" + "github.com/pelican/wings/cmd" ) func main() { From 7eede1fffdd28f95af0232b42363de1fa76b42d1 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sun, 16 Aug 2026 17:17:00 -0400 Subject: [PATCH 2/2] Point the remaining wings org references at pelican (#208) Everything left after the module rename: the --repo-owner default that self-update uses to find releases, the CODEOWNERS team, the image in the compose example, and the links in the README, SECURITY and CHANGELOG. --- .github/CODEOWNERS | 2 +- CHANGELOG.md | 4 ++-- README.md | 2 +- SECURITY.md | 4 ++-- cmd/selfupdate.go | 2 +- docker-compose.example.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c7aa22dd..61373ec0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,4 +12,4 @@ # This should make it easy to add new rules without breaking existing ones. # Global -* @pelican-dev/wings \ No newline at end of file +* @pelican/wings \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e41b2a0..4e1b3302 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,13 +34,13 @@ ## v1.11.5 ### Added -* Added a config option to disable Wings config.yml updates from the Panel (https://github.com/pelican-dev/wings/commit/ec6d6d83ea3eb14995c24f001233e85b37ffb87b) +* Added a config option to disable Wings config.yml updates from the Panel (https://github.com/pelican/wings/commit/ec6d6d83ea3eb14995c24f001233e85b37ffb87b) ### Changed * Wings is now built with Go 1.19.7 ### Fixed -* Fixed archives containing partially matched file names (https://github.com/pelican-dev/wings/commit/43b3496f0001cec231c80af1f9a9b3417d04e8d4) +* Fixed archives containing partially matched file names (https://github.com/pelican/wings/commit/43b3496f0001cec231c80af1f9a9b3417d04e8d4) ## v1.11.4 ### Fixed diff --git a/README.md b/README.md index b164cdfb..a51249c9 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ dependencies, and allowing users to authenticate with the same credentials they ## Reporting Issues -Feel free to report any wings specific issues or feature requests in [GitHub Issues](https://github.com/pelican-dev/wings/issues/new). +Feel free to report any wings specific issues or feature requests in [GitHub Issues](https://github.com/pelican/wings/issues/new). diff --git a/SECURITY.md b/SECURITY.md index 3168cc6f..9331e8b0 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,13 +3,13 @@ ## Supported Versions While Pelican is in beta, we only provide security fixes for the most recent beta release. Older beta releases are unsupported. -![](https://img.shields.io/github/v/release/pelican-dev/wings?label=latest-release) +![](https://img.shields.io/github/v/release/pelican/wings?label=latest-release) ## Reporting a Vulnerability Please report any vulnerabilities via _one_ of the following methods: -- [Create a security advisory on GitHub](https://github.com/pelican-dev/wings/security/advisories/new) +- [Create a security advisory on GitHub](https://github.com/pelican/wings/security/advisories/new) - Send an e-mail to Include steps to reproduce, affected versions, impact, and a proof of concept if available. diff --git a/cmd/selfupdate.go b/cmd/selfupdate.go index a65e8fc1..8c47a072 100644 --- a/cmd/selfupdate.go +++ b/cmd/selfupdate.go @@ -29,7 +29,7 @@ func newSelfupdateCommand() *cobra.Command { Run: selfupdateCmdRun, } - command.Flags().StringVar(&updateArgs.repoOwner, "repo-owner", "pelican-dev", "GitHub repository owner") + command.Flags().StringVar(&updateArgs.repoOwner, "repo-owner", "pelican", "GitHub repository owner") command.Flags().StringVar(&updateArgs.repoName, "repo-name", "wings", "GitHub repository name") command.Flags().BoolVar(&updateArgs.force, "force", false, "Force update even if on latest version") diff --git a/docker-compose.example.yml b/docker-compose.example.yml index d1c85a1f..4abae3c0 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -1,6 +1,6 @@ services: wings: - image: ghcr.io/pelican-dev/wings:latest + image: ghcr.io/pelican/wings:latest restart: always networks: - wings0