Sync upstream main through 090841d by engels74 · Pull Request #12 · edbfi/wings-vpn

engels74 · 2026-08-17T06:55:24Z

Upstream sync: `upstream/main@090841d`

Field	Value
Commits merged	2
Files changed	98 (+254 / -254)
Conflicts	1 (1 auto-resolved, 0 manual)
Status	Ready for review

Summary

This sync brings in two upstream commits that finish the wings organization rename, including the Go module path change to github.com/pelican/wings. It touches 98 files with 254 insertions and 254 deletions, and one conflicted file was resolved automatically.

Conflict resolution

File	Type	Resolution
`README.md`	both modified	Combined fork title and documentation with upstream's updated GitHub Issues URL.

Per-file detail

README.md — both modified

Upstream: Upstream updated the GitHub Issues link from github.com/pelican-dev/wings to github.com/pelican/wings.
Fork: The fork changed the README title to include a wings-vpn fork label and added an About this fork section documenting container network mode.
Resolution: Combined fork title and documentation with upstream's updated GitHub Issues URL.

Merged commits (2)

090841d Finish the wings org rename (the part Rename pelican-dev org references to pelican pelican/wings#208 missed) (Finish the wings org rename (the part #208 missed) pelican/wings#212)
5bd4d7e Rename the Go module to github.com/pelican/wings (Rename the Go module to github.com/pelican/wings pelican/wings#209)

Changed files (98)

 .github/CODEOWNERS                    |  2 +-
 .github/workflows/push.yaml           |  4 ++--
 .github/workflows/release.yaml        |  4 ++--
 CHANGELOG.md                          |  4 ++--
 Dockerfile                            |  2 +-
 Makefile                              |  4 ++--
 README.md                             |  2 +-
 SECURITY.md                           |  4 ++--
 cmd/configure.go                      |  2 +-
 cmd/diagnostics.go                    |  4 ++--
 cmd/root.go                           | 22 +++++++++++-----------
 cmd/selfupdate.go                     |  4 ++--
 config/config.go                      |  2 +-
 docker-compose.example.yml            |  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 +-
 98 files changed, 254 insertions(+), 254 deletions(-)

Review checklist

Conflict resolutions preserve fork-specific behaviour
make build and make test pass

Greptile Summary

This PR completes the upstream Pelican organization and Go module rename while preserving the fork-specific README content.

Renames the module and internal imports from github.com/pelican-dev/wings to github.com/pelican/wings.
Updates build workflows, linker paths, release links, image references, and self-update defaults to the new organization.
Keeps the fork issue tracker and container-network-mode documentation in README.md.

Confidence Score: 5/5

The PR appears safe to merge, with no changed-code-triggered defects identified.

The module declaration, source imports, build targets, linker flags, release configuration, and organization references are consistently renamed, while the fork-specific README resolution is preserved.

Important Files Changed

Filename	Overview
go.mod	Renames the Go module to `github.com/pelican/wings`, consistently matching the updated imports and build configuration.
cmd/selfupdate.go	Updates the default upstream release owner to `pelican`; artifact naming remains aligned with the release workflow.
.github/workflows/push.yaml	Updates build package and linker-symbol paths to the renamed Go module.
.github/workflows/release.yaml	Updates release build and version linker paths while retaining the existing Linux artifact contract.
Dockerfile	Updates the version linker target to the renamed module path.
docker-compose.example.yml	Updates the existing upstream container image reference to the renamed Pelican organization.
README.md	Preserves fork-specific documentation and adds the renamed upstream issue tracker.

_{Reviews (1): Last reviewed commit: "sync upstream/main" | Re-trigger Greptile}

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.

lancepioch and others added 3 commits August 16, 2026 17:14

Finish the wings org rename (the part pelican#208 missed) (pelican#212)

090841d

sync upstream/main

098a3c1

engels74 added the upstream-sync label Aug 17, 2026

engels74 merged commit 9568ee7 into main Aug 18, 2026
9 checks passed

edbfi deleted the sync/upstream-20260817-065458-32003551806-1 branch September 24, 2026 11:48

Navigation Menu

Sync upstream main through 090841d - #12

Sync upstream main through 090841d#12
engels74 merged 3 commits into
mainfrom
sync/upstream-20260817-065458-32003551806-1

engels74 commented Aug 17, 2026 •

edited by greptile-apps Bot

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

engels74 commented Aug 17, 2026 • edited by greptile-apps Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Upstream sync: upstream/main@090841d

Summary

Conflict resolution

Review checklist

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

engels74 commented Aug 17, 2026 •

edited by greptile-apps Bot

Loading

Upstream sync: `upstream/main@090841d`