aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-04-08 09:33:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: tweak version utils

Browse Source
This commit is contained in:
Steven 2024-08-26 22:52:58 +08:00
parent 643a6051b2
commit ff035d25ba
9 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backend-tests.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.54.1
version: v1.56.1
args: --verbose --timeout=3m
skip-cache: true

9
.golangci.yaml
View File

@ -19,12 +19,7 @@ issues:
include:
# https://golangci-lint.run/usage/configuration/#command-line-options
exclude:
- Rollback
- logger.Sync
- pgInstance.Stop
- fmt.Printf
- Enter(.*)_(.*)
- Exit(.*)_(.*)
linters-settings:
goimports:
@ -69,6 +64,10 @@ linters-settings:
disabled: true
- name: var-naming
disabled: true
- name: unchecked-type-assertion
disabled: true
- name: max-control-nesting
disabled: true
- name: exported
arguments:
- "disableStutteringCheck"

4
bin/slash/main.go
View File

@ -13,9 +13,9 @@ import (
"github.com/spf13/viper"
"github.com/yourselfhosted/slash/server"
"github.com/yourselfhosted/slash/server/common"
"github.com/yourselfhosted/slash/server/metric"
"github.com/yourselfhosted/slash/server/profile"
"github.com/yourselfhosted/slash/server/version"
"github.com/yourselfhosted/slash/store"
"github.com/yourselfhosted/slash/store/db"
)
@ -35,7 +35,7 @@ var (
Data: viper.GetString("data"),
DSN: viper.GetString("dsn"),
Driver: viper.GetString("driver"),
Version: version.GetCurrentVersion(viper.GetString("mode")),
Version: common.GetCurrentVersion(viper.GetString("mode")),
}
if err := serverProfile.Validate(); err != nil {
panic(err)

2
plugin/idp/oauth2/oauth2_test.go
View File

@ -98,7 +98,7 @@ func newMockServer(t *testing.T, code, accessToken string, userinfo []byte) *htt
})
require.NoError(t, err)
})
mux.HandleFunc("/oauth2/userinfo", func(w http.ResponseWriter, r *http.Request) {
mux.HandleFunc("/oauth2/userinfo", func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "application/json")
_, err := w.Write(userinfo)
require.NoError(t, err)

2
server/version/version.go → server/common/version.go
View File

@ -1,4 +1,4 @@
package version
package common
import (
"fmt"

2
server/version/version_test.go → server/common/version_test.go
View File

@ -1,4 +1,4 @@
package version
package common
import (
"sort"

12
store/db/postgres/migrator.go
View File

@ -11,7 +11,7 @@ import (
"github.com/pkg/errors"
"github.com/yourselfhosted/slash/server/version"
"github.com/yourselfhosted/slash/server/common"
"github.com/yourselfhosted/slash/store"
)
@ -68,7 +68,7 @@ func (d *DB) nonProdMigrate(ctx context.Context) error {
}
func (d *DB) prodMigrate(ctx context.Context) error {
currentVersion := version.GetCurrentVersion(d.profile.Mode)
currentVersion := common.GetCurrentVersion(d.profile.Mode)
migrationHistoryList, err := d.ListMigrationHistories(ctx, &store.FindMigrationHistory{})
// If there is no migration history, we should apply the latest schema.
if err != nil || len(migrationHistoryList) == 0 {
@ -94,17 +94,17 @@ func (d *DB) prodMigrate(ctx context.Context) error {
for _, migrationHistory := range migrationHistoryList {
migrationHistoryVersionList = append(migrationHistoryVersionList, migrationHistory.Version)
}
sort.Sort(version.SortVersion(migrationHistoryVersionList))
sort.Sort(common.SortVersion(migrationHistoryVersionList))
latestMigrationHistoryVersion := migrationHistoryVersionList[len(migrationHistoryVersionList)-1]
// If the latest migration history version is greater than or equal to the current version, we will not apply any migration.
if !version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), latestMigrationHistoryVersion) {
if !common.IsVersionGreaterThan(common.GetSchemaVersion(currentVersion), latestMigrationHistoryVersion) {
return nil
}
println("start migrate")
for _, minorVersion := range getMinorVersionList() {
normalizedVersion := minorVersion + ".0"
if version.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && version.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
if common.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && common.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
println("applying migration for", normalizedVersion)
if err := d.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {
return errors.Wrap(err, "failed to apply minor version migration")
@ -166,6 +166,6 @@ func getMinorVersionList() []string {
panic(err)
}
sort.Sort(version.SortVersion(minorVersionList))
sort.Sort(common.SortVersion(minorVersionList))
return minorVersionList
}

14
store/db/sqlite/migrator.go
View File

@ -12,7 +12,7 @@ import (
"github.com/pkg/errors"
"github.com/yourselfhosted/slash/server/version"
"github.com/yourselfhosted/slash/server/common"
"github.com/yourselfhosted/slash/store"
)
@ -24,7 +24,7 @@ var seedFS embed.FS
// Migrate applies the latest schema to the database.
func (d *DB) Migrate(ctx context.Context) error {
currentVersion := version.GetCurrentVersion(d.profile.Mode)
currentVersion := common.GetCurrentVersion(d.profile.Mode)
if d.profile.Mode == "prod" {
_, err := os.Stat(d.profile.DSN)
if err != nil {
@ -50,7 +50,7 @@ func (d *DB) Migrate(ctx context.Context) error {
}
// If no migration history, we should apply the latest version migration and upsert the migration history.
if len(migrationHistoryList) == 0 {
minorVersion := version.GetMinorVersion(currentVersion)
minorVersion := common.GetMinorVersion(currentVersion)
if err := d.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {
return errors.Wrapf(err, "failed to apply version %s migration", minorVersion)
}
@ -67,10 +67,10 @@ func (d *DB) Migrate(ctx context.Context) error {
for _, migrationHistory := range migrationHistoryList {
migrationHistoryVersionList = append(migrationHistoryVersionList, migrationHistory.Version)
}
sort.Sort(version.SortVersion(migrationHistoryVersionList))
sort.Sort(common.SortVersion(migrationHistoryVersionList))
latestMigrationHistoryVersion := migrationHistoryVersionList[len(migrationHistoryVersionList)-1]
if version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), latestMigrationHistoryVersion) {
if common.IsVersionGreaterThan(common.GetSchemaVersion(currentVersion), latestMigrationHistoryVersion) {
minorVersionList := getMinorVersionList()
// backup the raw database file before migration
rawBytes, err := os.ReadFile(d.profile.DSN)
@ -85,7 +85,7 @@ func (d *DB) Migrate(ctx context.Context) error {
println("start migrate")
for _, minorVersion := range minorVersionList {
normalizedVersion := minorVersion + ".0"
if version.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && version.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
if common.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && common.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
println("applying migration for", normalizedVersion)
if err := d.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {
return errors.Wrap(err, "failed to apply minor version migration")
@ -228,6 +228,6 @@ func getMinorVersionList() []string {
panic(err)
}
sort.Sort(version.SortVersion(minorVersionList))
sort.Sort(common.SortVersion(minorVersionList))
return minorVersionList
}

4
test/test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/joho/godotenv"
"github.com/yourselfhosted/slash/server/common"
"github.com/yourselfhosted/slash/server/profile"
"github.com/yourselfhosted/slash/server/version"
)
func getUnusedPort() int {
@ -45,7 +45,7 @@ func GetTestingProfile(t *testing.T) *profile.Profile {
Data: dir,
DSN: dsn,
Driver: driver,
Version: version.GetCurrentVersion(mode),
Version: common.GetCurrentVersion(mode),
}
}