.golangci.yml → .golangci.yml.bak 🔗
Fix import aliases to resolve typecheck issues and enable linting
copilot-swe-agent[bot] and caarlos0 created
Co-authored-by: caarlos0 <245435+caarlos0@users.noreply.github.com>Change summary
.golangci.yml.bak | 0
cmd/soft/browse/browse.go | 2 +-
cmd/soft/hook/hook.go | 2 +-
cmd/soft/serve/server.go | 2 +-
pkg/backend/auth.go | 2 +-
pkg/backend/backend.go | 2 +-
pkg/backend/webhooks.go | 2 +-
pkg/config/config.go | 4 ++--
pkg/cron/cron.go | 2 +-
pkg/cron/cron_test.go | 2 +-
pkg/daemon/daemon.go | 2 +-
pkg/db/db.go | 2 +-
pkg/db/logger.go | 2 +-
pkg/db/migrate/0003_migrate_lfs_objects.go | 2 +-
pkg/db/migrate/migrate.go | 2 +-
pkg/git/git.go | 2 +-
pkg/git/lfs.go | 2 +-
pkg/git/lfs_auth.go | 4 ++--
pkg/git/lfs_log.go | 2 +-
pkg/git/service.go | 2 +-
pkg/hooks/gen.go | 2 +-
pkg/jobs/mirror.go | 2 +-
pkg/jwk/jwk.go | 2 +-
pkg/lfs/basic_transfer.go | 2 +-
pkg/lfs/http_client.go | 2 +-
pkg/ssh/cmd/git.go | 2 +-
pkg/ssh/cmd/jwt.go | 2 +-
pkg/ssh/cmd/tag.go | 2 +-
pkg/ssh/cmd/token.go | 2 +-
pkg/ssh/cmd/tree.go | 2 +-
pkg/ssh/cmd/webhooks.go | 2 +-
pkg/ssh/session.go | 2 +-
pkg/ssh/session_test.go | 2 +-
pkg/ssh/ssh.go | 2 +-
pkg/ssh/ui.go | 2 +-
pkg/store/database/database.go | 2 +-
pkg/ui/common/common.go | 2 +-
pkg/ui/components/code/code.go | 2 +-
pkg/ui/components/footer/footer.go | 2 +-
pkg/ui/components/statusbar/statusbar.go | 2 +-
pkg/ui/components/tabs/tabs.go | 2 +-
pkg/ui/pages/repo/filesitem.go | 4 ++--
pkg/ui/pages/repo/log.go | 2 +-
pkg/ui/pages/repo/logitem.go | 2 +-
pkg/ui/pages/repo/refsitem.go | 4 ++--
pkg/ui/pages/repo/repo.go | 2 +-
pkg/ui/pages/repo/stash.go | 2 +-
pkg/ui/pages/selection/item.go | 4 ++--
pkg/ui/pages/selection/selection.go | 2 +-
pkg/ui/styles/styles.go | 2 +-
50 files changed, 54 insertions(+), 54 deletions(-)
Detailed changes
cmd/soft/browse/browse.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
cmd/soft/hook/hook.go 🔗
@@ -12,7 +12,7 @@ import (
"path/filepath"
"strings"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/cmd"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
cmd/soft/serve/server.go 🔗
@@ -6,7 +6,7 @@ import (
"fmt"
"net/http"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
pkg/backend/auth.go 🔗
@@ -5,7 +5,7 @@ import (
"crypto/sha256"
"encoding/hex"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"golang.org/x/crypto/bcrypt"
)
pkg/backend/backend.go 🔗
@@ -3,7 +3,7 @@ package backend
import (
"context"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/db"
"github.com/charmbracelet/soft-serve/pkg/store"
pkg/backend/webhooks.go 🔗
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/db"
"github.com/charmbracelet/soft-serve/pkg/db/models"
"github.com/charmbracelet/soft-serve/pkg/proto"
pkg/config/config.go 🔗
@@ -8,10 +8,10 @@ import (
"strings"
"time"
- "github.com/caarlos0/env/v11"
+ env "github.com/caarlos0/env/v11"
"github.com/charmbracelet/soft-serve/pkg/sshutils"
"golang.org/x/crypto/ssh"
- "gopkg.in/yaml.v3"
+ yaml "gopkg.in/yaml.v3"
)
var binPath = "soft"
pkg/cron/cron.go 🔗
@@ -4,7 +4,7 @@ import (
"context"
"time"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/robfig/cron/v3"
)
pkg/cron/cron_test.go 🔗
@@ -6,7 +6,7 @@ import (
"fmt"
"testing"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
)
func TestCronLogger(t *testing.T) {
pkg/daemon/daemon.go 🔗
@@ -12,7 +12,7 @@ import (
"sync/atomic"
"time"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/access"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
pkg/db/db.go 🔗
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq" // postgres driver
pkg/db/logger.go 🔗
@@ -5,7 +5,7 @@ import (
"database/sql"
"strings"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/jmoiron/sqlx"
)
pkg/db/migrate/0003_migrate_lfs_objects.go 🔗
@@ -6,7 +6,7 @@ import (
"path/filepath"
"strconv"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/db"
"github.com/charmbracelet/soft-serve/pkg/db/models"
pkg/db/migrate/migrate.go 🔗
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/db"
)
pkg/git/git.go 🔗
@@ -9,7 +9,7 @@ import (
"strings"
gitm "github.com/aymanbagabas/git-module"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/go-git/go-git/v5/plumbing/format/pktline"
)
pkg/git/lfs.go 🔗
@@ -12,7 +12,7 @@ import (
"time"
"github.com/charmbracelet/git-lfs-transfer/transfer"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/db"
"github.com/charmbracelet/soft-serve/pkg/db/models"
pkg/git/lfs_auth.go 🔗
@@ -7,12 +7,12 @@ import (
"fmt"
"time"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/jwk"
"github.com/charmbracelet/soft-serve/pkg/lfs"
"github.com/charmbracelet/soft-serve/pkg/proto"
- "github.com/golang-jwt/jwt/v5"
+ jwt "github.com/golang-jwt/jwt/v5"
)
// LFSAuthenticate implements the Git LFS SSH authentication command.
pkg/git/lfs_log.go 🔗
@@ -2,7 +2,7 @@ package git
import (
"github.com/charmbracelet/git-lfs-transfer/transfer"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
)
type lfsLogger struct {
pkg/git/service.go 🔗
@@ -10,7 +10,7 @@ import (
"strings"
"sync"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
)
// Service is a Git daemon service.
pkg/hooks/gen.go 🔗
@@ -7,7 +7,7 @@ import (
"path/filepath"
"text/template"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/utils"
)
pkg/jobs/mirror.go 🔗
@@ -7,7 +7,7 @@ import (
"runtime"
"strings"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
pkg/jwk/jwk.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/go-jose/go-jose/v3"
- "github.com/golang-jwt/jwt/v5"
+ jwt "github.com/golang-jwt/jwt/v5"
)
// SigningMethod is a JSON Web Token signing method. It uses Ed25519 keys to
pkg/lfs/basic_transfer.go 🔗
@@ -9,7 +9,7 @@ import (
"io"
"net/http"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
)
// BasicTransferAdapter implements the "basic" adapter.
pkg/lfs/http_client.go 🔗
@@ -8,7 +8,7 @@ import (
"fmt"
"net/http"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
)
// httpClient is a Git LFS client to communicate with a LFS source API.
pkg/ssh/cmd/git.go 🔗
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/access"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
pkg/ssh/cmd/jwt.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/jwk"
"github.com/charmbracelet/soft-serve/pkg/proto"
- "github.com/golang-jwt/jwt/v5"
+ jwt "github.com/golang-jwt/jwt/v5"
"github.com/spf13/cobra"
)
pkg/ssh/cmd/tag.go 🔗
@@ -3,7 +3,7 @@ package cmd
import (
"strings"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/proto"
pkg/ssh/cmd/token.go 🔗
@@ -9,7 +9,7 @@ import (
"github.com/charmbracelet/lipgloss/v2/table"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/proto"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
"github.com/spf13/cobra"
)
pkg/ssh/cmd/tree.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
"github.com/spf13/cobra"
)
pkg/ssh/cmd/webhooks.go 🔗
@@ -8,7 +8,7 @@ import (
"github.com/charmbracelet/lipgloss/v2/table"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/webhook"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
"github.com/google/uuid"
"github.com/spf13/cobra"
)
pkg/ssh/session.go 🔗
@@ -10,7 +10,7 @@ import (
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
"github.com/charmbracelet/ssh"
- "github.com/charmbracelet/wish/v2"
+ wish "github.com/charmbracelet/wish/v2"
bm "github.com/charmbracelet/wish/v2/bubbletea"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
pkg/ssh/session_test.go 🔗
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/db"
pkg/ssh/ssh.go 🔗
@@ -16,7 +16,7 @@ import (
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/store"
"github.com/charmbracelet/ssh"
- wish "github.com/charmbracelet/wish/v2"
+ wish "github.com/charmbracelet/wish/v2"
bm "github.com/charmbracelet/wish/v2/bubbletea"
rm "github.com/charmbracelet/wish/v2/recover"
"github.com/prometheus/client_golang/prometheus"
pkg/ssh/ui.go 🔗
@@ -6,7 +6,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
pkg/store/database/database.go 🔗
@@ -3,7 +3,7 @@ package database
import (
"context"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
"github.com/charmbracelet/soft-serve/pkg/db"
"github.com/charmbracelet/soft-serve/pkg/store"
pkg/ui/common/common.go 🔗
@@ -6,7 +6,7 @@ import (
"github.com/alecthomas/chroma/v2/lexers"
zone "github.com/aymanbagabas/bubblezone/v2"
- "github.com/charmbracelet/log/v2"
+ log "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/config"
pkg/ui/components/code/code.go 🔗
@@ -9,7 +9,7 @@ import (
tea "github.com/charmbracelet/bubbletea/v2"
"github.com/charmbracelet/glamour/v2"
gansi "github.com/charmbracelet/glamour/v2/ansi"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
vp "github.com/charmbracelet/soft-serve/pkg/ui/components/viewport"
)
pkg/ui/components/footer/footer.go 🔗
@@ -4,7 +4,7 @@ import (
"github.com/charmbracelet/bubbles/v2/help"
"github.com/charmbracelet/bubbles/v2/key"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
)
pkg/ui/components/statusbar/statusbar.go 🔗
@@ -2,7 +2,7 @@ package statusbar
import (
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
"github.com/charmbracelet/x/ansi"
)
pkg/ui/components/tabs/tabs.go 🔗
@@ -4,7 +4,7 @@ import (
"strings"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
)
pkg/ui/pages/repo/filesitem.go 🔗
@@ -9,10 +9,10 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
)
// FileItem is a list item for a file.
pkg/ui/pages/repo/log.go 🔗
@@ -9,7 +9,7 @@ import (
"github.com/charmbracelet/bubbles/v2/spinner"
tea "github.com/charmbracelet/bubbletea/v2"
gansi "github.com/charmbracelet/glamour/v2/ansi"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
pkg/ui/pages/repo/logitem.go 🔗
@@ -9,7 +9,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
"github.com/muesli/reflow/truncate"
pkg/ui/pages/repo/refsitem.go 🔗
@@ -9,10 +9,10 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
"github.com/muesli/reflow/truncate"
)
pkg/ui/pages/repo/repo.go 🔗
@@ -8,7 +8,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/spinner"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
pkg/ui/pages/repo/stash.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/spinner"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
pkg/ui/pages/selection/item.go 🔗
@@ -10,10 +10,10 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/proto"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
)
var _ sort.Interface = Items{}
pkg/ui/pages/selection/selection.go 🔗
@@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/bubbles/v2/key"
"github.com/charmbracelet/bubbles/v2/list"
tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
"github.com/charmbracelet/soft-serve/pkg/access"
"github.com/charmbracelet/soft-serve/pkg/backend"
"github.com/charmbracelet/soft-serve/pkg/ui/common"
pkg/ui/styles/styles.go 🔗
@@ -3,7 +3,7 @@ package styles
import (
"image/color"
- "github.com/charmbracelet/lipgloss/v2"
+ lipgloss "github.com/charmbracelet/lipgloss/v2"
)
// XXX: For now, this is in its own package so that it can be shared between