Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

address review lint issues #4354

Merged
merged 2 commits into from
Nov 11, 2024
Merged

address review lint issues #4354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17d81e9
address review lint issues
6543 Nov 11, 2024
6a37f67
more
6543 Nov 11, 2024
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
6 changes: 3 additions & 3 deletions pipeline/backend/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,10 @@ func (e *kube) WaitStep(ctx context.Context, step *types.Step, taskUUID string)

finished := make(chan bool)

podUpdated := func(_, new any) {
pod, ok := new.(*v1.Pod)
podUpdated := func(_, newPod any) {
pod, ok := newPod.(*v1.Pod)
if !ok {
log.Error().Msgf("could not parse pod: %v", new)
log.Error().Msgf("could not parse pod: %v", newPod)
return
}

Expand Down
6 changes: 3 additions & 3 deletions server/store/datastore/migration/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"xorm.io/xorm/schemas"
)

func renameTable(sess *xorm.Session, old, new string) error {
func renameTable(sess *xorm.Session, oldTable, newTable string) error {
dialect := sess.Engine().Dialect().URI().DBType
switch dialect {
case schemas.MYSQL:
_, err := sess.Exec(fmt.Sprintf("RENAME TABLE `%s` TO `%s`;", old, new))
_, err := sess.Exec(fmt.Sprintf("RENAME TABLE `%s` TO `%s`;", oldTable, newTable))
return err
case schemas.POSTGRES, schemas.SQLITE:
_, err := sess.Exec(fmt.Sprintf("ALTER TABLE `%s` RENAME TO `%s`;", old, new))
_, err := sess.Exec(fmt.Sprintf("ALTER TABLE `%s` RENAME TO `%s`;", oldTable, newTable))
return err
default:
return fmt.Errorf("dialect '%s' not supported", dialect)
Expand Down
6 changes: 3 additions & 3 deletions server/store/datastore/migration/migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ func createSQLiteDB(t *testing.T) string {
return tmpF.Name()
}

func testDB(t *testing.T, new bool) (engine *xorm.Engine, closeDB func()) {
func testDB(t *testing.T, initNewDB bool) (engine *xorm.Engine, closeDB func()) {
driver := testDriver()
var err error
closeDB = func() {}
switch driver {
case "sqlite3":
config := ":memory:"
if !new {
if !initNewDB {
config = createSQLiteDB(t)
closeDB = func() {
_ = os.Remove(config)
Expand All @@ -77,7 +77,7 @@ func testDB(t *testing.T, new bool) (engine *xorm.Engine, closeDB func()) {
return
case "mysql", "postgres":
config := os.Getenv("WOODPECKER_DATABASE_DATASOURCE")
if !new {
if !initNewDB {
t.Logf("do not have dump to test against")
t.SkipNow()
}
Expand Down