public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Replace xorm.io/xorm imports (#104458)

Browse Source 
* replace xorm.io/xorm imports

* replace xorm from other go.mod files

* clean up workspace

* nolint does not make sense anymore as it is not a module

* try if nolint directive helps

* use nolint:all for xorm

* add more nolints

* try to skip xorm in linter config

* exclude xorm differently

* retrigger ci
This commit is contained in:
Serge Zaitsev
2025-05-02 17:13:01 +02:00
committed by GitHub
parent 847b07dee2
commit 694b9dfe50
65 changed files with 58 additions and 1780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/accesscontrol/action_migrator.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/action_set_migration.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/admin_only.go
+1 -1
View File
@@ -3,7 +3,7 @@ package accesscontrol
import (
"strings"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/alerting.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboards"
pkg/services/sqlstore/migrations/accesscontrol/datasource_drilldown_removal.go
+1 -1
View File
@@ -3,7 +3,7 @@ package accesscontrol
import (
"fmt"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/accesscontrol/disabled_migration.go
+1 -1
View File
@@ -3,7 +3,7 @@ package accesscontrol
import (
"fmt"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/accesscontrol/managed_permission_migrator.go
+1 -1
View File
@@ -12,9 +12,9 @@ import (
"strings"
"time"
"github.com/grafana/grafana/pkg/util/xorm"
"golang.org/x/text/cases"
"golang.org/x/text/language"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/accesscontrol"
pkg/services/sqlstore/migrations/accesscontrol/orphaned.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strconv"
"strings"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/scope_migrator.go
+1 -1
View File
@@ -1,7 +1,7 @@
package accesscontrol
import (
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go
+1 -1
View File
@@ -1,7 +1,7 @@
package accesscontrol
import (
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/accesscontrol/team_membership.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strconv"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/org"
pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go
+1 -1
View File
@@ -10,9 +10,9 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"xorm.io/xorm"
)
type rawPermission struct {
pkg/services/sqlstore/migrations/accesscontrol/test/managed_permission_migrator_test.go
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"strings"
"testing"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/stretchr/testify/require"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/accesscontrol"
pkg/services/sqlstore/migrations/annotation_mig.go
+1 -1
View File
@@ -1,7 +1,7 @@
package migrations
import (
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/dashboard_mig.go
+1 -1
View File
@@ -3,7 +3,7 @@ package migrations
import (
"fmt"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/external_alertmanagers.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/sqlstore/migrations/migrations_test.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
pkg/services/sqlstore/migrations/star_mig.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
// does not rely on dashboard table existing, can be run before dashboard migrations
pkg/services/sqlstore/migrations/temp_user.go
+1 -1
View File
@@ -3,7 +3,7 @@ package migrations
import (
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/alert_rule_version_guid_mig.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/util"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
// AddAlertRuleGuidMigration sets up migrations for adding and managing GUID columns in alert_rule and alert_rule_version tables.
pkg/services/sqlstore/migrations/ualert/created_folders_mig.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/migration_service_migration.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strconv"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/org_upgrade_state_mig.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/receiver_scope_mig.go
+1 -1
View File
@@ -1,7 +1,7 @@
package ualert
import (
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/rule_group_index_migration.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/ualert/tables.go
+1 -1
View File
@@ -3,7 +3,7 @@ package ualert
import (
"fmt"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
pkg/services/sqlstore/migrations/ualert/test/testing.go
+1 -1
View File
@@ -3,9 +3,9 @@ package test
import (
"testing"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
pkg/services/sqlstore/migrations/ualert/ualert.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path/filepath"
"strconv"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/user_mig.go
+1 -1
View File
@@ -3,7 +3,7 @@ package migrations
import (
"fmt"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/usermig"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
pkg/services/sqlstore/migrations/usermig/service_account_multiple_org_login_migrator.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
const (
pkg/services/sqlstore/migrations/usermig/test/user_test.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"testing"
"time"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
pkg/services/sqlstore/migrations/usermig/user_lowercase_login_and_email.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/user"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
const (
pkg/services/sqlstore/migrator/dialect.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"golang.org/x/exp/slices"
"github.com/grafana/grafana/pkg/services/sqlstore/session"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
var (
pkg/services/sqlstore/migrator/migrator.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/atomic"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
pkg/services/sqlstore/migrator/mysql_dialect.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/VividCortex/mysqlerr"
"github.com/go-sql-driver/mysql"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type MySQLDialect struct {
pkg/services/sqlstore/migrator/postgres_dialect.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/lib/pq"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type PostgresDialect struct {
pkg/services/sqlstore/migrator/spanner_dialect.go
+1 -1
View File
@@ -16,8 +16,8 @@ import (
"cloud.google.com/go/spanner/admin/database/apiv1/databasepb"
"github.com/googleapis/gax-go/v2"
spannerdriver "github.com/googleapis/go-sql-spanner"
"github.com/grafana/grafana/pkg/util/xorm"
"google.golang.org/grpc/codes"
"xorm.io/xorm"
"github.com/grafana/dskit/concurrency"
utilspanner "github.com/grafana/grafana/pkg/util/spanner"
pkg/services/sqlstore/migrator/sqlite_dialect.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/mattn/go-sqlite3"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type SQLite3 struct {
pkg/services/sqlstore/migrator/types.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
const (
pkg/services/sqlstore/session.go
+1 -1
View File
@@ -10,8 +10,8 @@ import (
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/sqlstore/sqlstore.go
+1 -1
View File
@@ -16,8 +16,8 @@ import (
_ "github.com/lib/pq"
"github.com/prometheus/client_golang/prometheus"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/fs"
pkg/services/sqlstore/sqlstore_testinfra.go
+1 -1
View File
@@ -27,7 +27,7 @@ import (
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
"github.com/grafana/grafana/pkg/setting"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
// TestingTB is an interface that is implemented by *testing.T and *testing.B. Similar to testing.TB.
pkg/services/sqlstore/sqlstore_testinfra_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
// Ensure that we can get any connection at all.
pkg/services/sqlstore/transactions.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"