Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cmd/configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
22 changes: 11 additions & 11 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/selfupdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"time"

"github.com/pelican-dev/wings/system"
"github.com/pelican/wings/system"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion environment/allocations.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/docker/go-connections/nat"

"github.com/pelican-dev/wings/config"
"github.com/pelican/wings/config"
)


Expand Down
2 changes: 1 addition & 1 deletion environment/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion environment/docker/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions environment/docker/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions environment/docker/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions environment/docker/power.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion environment/docker/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion environment/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/pelican-dev/wings/events"
"github.com/pelican/wings/events"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion environment/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion events/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/pelican-dev/wings
module github.com/pelican/wings

go 1.25.0

Expand Down
8 changes: 4 additions & 4 deletions internal/cron/activity_cron.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions internal/cron/cron.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions internal/cron/sftp_cron.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions internal/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions internal/diagnostics/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/progress/progress.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/progress/progress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/ufs/fs_platform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/ufs/fs_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"testing"
"time"

"github.com/pelican-dev/wings/internal/ufs"
"github.com/pelican/wings/internal/ufs"
)

type testUnixFS struct {
Expand Down
8 changes: 4 additions & 4 deletions loggers/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions remote/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion remote/servers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading