From 8657a3b34e8a289ebdad70ece95ee24b4929d567 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Tue, 7 Apr 2026 20:27:30 +0300 Subject: [PATCH] PMM-14011 Migrate percona/saas to percona/platform --- .golangci.yml | 7 ++----- go.mod | 2 +- go.sum | 12 ++++++++---- managed/services/telemetry/datasource_envvars.go | 2 +- .../services/telemetry/datasource_envvars_test.go | 2 +- .../telemetry/datasource_grafanadb_select.go | 2 +- .../services/telemetry/datasource_pmmdb_select.go | 2 +- .../services/telemetry/datasource_qandb_select.go | 2 +- .../telemetry/datasource_victoria_metrics.go | 2 +- managed/services/telemetry/datasources.go | 2 +- managed/services/telemetry/deps.go | 4 ++-- managed/services/telemetry/extension.go | 2 +- managed/services/telemetry/mock_data_source_test.go | 2 +- .../telemetry/mock_distribution_util_service_test.go | 2 +- managed/services/telemetry/mock_sender_test.go | 2 +- managed/services/telemetry/telemetry.go | 4 ++-- managed/services/telemetry/telemetry_test.go | 4 ++-- managed/services/telemetry/transform.go | 2 +- managed/services/telemetry/transform_test.go | 2 +- managed/services/telemetry/uievents/uievents.go | 2 +- managed/utils/distribution/distribution_util.go | 2 +- managed/utils/distribution/distribution_util_test.go | 2 +- managed/utils/platform/client.go | 2 +- 23 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index a01d7d62260..e3d5e481340 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -38,10 +38,8 @@ linters: desc: use "github.com/golang/protobuf/proto" instead - pkg: github.com/percona/go-mysql/log/slow desc: only use the forked parser - - pkg: github.com/percona-platform/platform - desc: use "github.com/percona/saas" instead - - pkg: github.com/percona/platform - desc: use "github.com/percona/saas" instead + - pkg: github.com/percona/saas + desc: use "github.com/percona/platform" instead - pkg: gopkg.in/yaml.v2 desc: use "gopkg.in/yaml.v3" instead exhaustive: @@ -61,7 +59,6 @@ linters: - error - empty - stdlib - - github.com/charmbracelet/bubbletea.Model - github.com/percona/pmm/admin/commands.Result - github.com/percona/pmm/agent/runner/actions.Action - github.com/percona/pmm/managed/services/telemetry.DataSource diff --git a/go.mod b/go.mod index 90e592991a8..8cb90d41df9 100644 --- a/go.mod +++ b/go.mod @@ -47,8 +47,8 @@ require ( github.com/percona/exporter_shared v0.7.5 github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74 github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd + github.com/percona/platform v0.0.0-20260407153518-6e332c057963 github.com/percona/promconfig v0.3.0 - github.com/percona/saas v0.0.0-20260107224938-470337be1058 github.com/pganalyze/pg_query_go/v6 v6.2.2 github.com/pkg/errors v0.9.1 github.com/pkg/sftp v1.13.6 diff --git a/go.sum b/go.sum index 93053204936..24de2374465 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,9 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw= +github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/dhui/dktest v0.4.6 h1:+DPKyScKSEp3VLtbMDHcUq6V5Lm5zfZZVb0Sk7Ahom4= @@ -247,8 +248,11 @@ github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63Y github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang-migrate/migrate/v4 v4.19.1 h1:OCyb44lFuQfYXYLx1SCxPZQGU7mcaZ7gH9yH4jSFbBA= github.com/golang-migrate/migrate/v4 v4.19.1/go.mod h1:CTcgfjxhaUtsLipnLoQRWCrjYXycRz/g5+RWDuYgPrE= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= +github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= @@ -463,10 +467,10 @@ github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74 h1:uULelXfIrpmKtI github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74/go.mod h1:8n6mF3Igr3YYdh19ZUvyVyEH+hQr9LVSjG9hrlp0YTU= github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd h1:V5I+drJ8ZsCTBRlZZCS0BHPPTG+ZVuQHQtLCs+TA0J8= github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd/go.mod h1:r44H7VKB5Fvw5lZNw0v7IF7plpHMSpjg8f59QO0J9jg= +github.com/percona/platform v0.0.0-20260407153518-6e332c057963 h1:nD0+u6WHJktheHZlFRDb+jSBgq3DyodGsM/lV35q9MA= +github.com/percona/platform v0.0.0-20260407153518-6e332c057963/go.mod h1:avKEf3Ydt/2td7IIcvbrosOq0jzCaHryjUyxh4+u8xM= github.com/percona/promconfig v0.3.0 h1:uGNaHD9Hc+MbUyk24F4GsjEUZdvj/wpGGvvw0U7uDLM= github.com/percona/promconfig v0.3.0/go.mod h1:GQ3NeieiBFy0dCDtNTl/xR9L6spdzU1zfspT/HWNeMw= -github.com/percona/saas v0.0.0-20260107224938-470337be1058 h1:xoBIL9ylRJCrbZAH/MRotJFZMZg41m1MAp5qgr5VTo8= -github.com/percona/saas v0.0.0-20260107224938-470337be1058/go.mod h1:hiLKQAtFZ0b7vGQxb4rPk8hM1DN1X1oZRen3vccayYc= github.com/pganalyze/pg_query_go/v6 v6.2.2 h1:O0L6zMC226R82RF3X5n0Ki6HjytDsoAzuzp4ATVAHNo= github.com/pganalyze/pg_query_go/v6 v6.2.2/go.mod h1:Cn6+j4870kJz3iYNsb0VsNG04vpSWgEvBwc590J4qD0= github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0= diff --git a/managed/services/telemetry/datasource_envvars.go b/managed/services/telemetry/datasource_envvars.go index 0e2fe89a246..af7d9c046b5 100644 --- a/managed/services/telemetry/datasource_envvars.go +++ b/managed/services/telemetry/datasource_envvars.go @@ -20,7 +20,7 @@ import ( "context" "os" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/sirupsen/logrus" ) diff --git a/managed/services/telemetry/datasource_envvars_test.go b/managed/services/telemetry/datasource_envvars_test.go index 12ca638d701..3110939207b 100644 --- a/managed/services/telemetry/datasource_envvars_test.go +++ b/managed/services/telemetry/datasource_envvars_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/managed/services/telemetry/datasource_grafanadb_select.go b/managed/services/telemetry/datasource_grafanadb_select.go index 9d0c58dbff4..3e1e62a8086 100644 --- a/managed/services/telemetry/datasource_grafanadb_select.go +++ b/managed/services/telemetry/datasource_grafanadb_select.go @@ -21,7 +21,7 @@ import ( "database/sql" "net/url" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/managed/services/telemetry/datasource_pmmdb_select.go b/managed/services/telemetry/datasource_pmmdb_select.go index ddb57182b33..b1f294c58c0 100644 --- a/managed/services/telemetry/datasource_pmmdb_select.go +++ b/managed/services/telemetry/datasource_pmmdb_select.go @@ -21,7 +21,7 @@ import ( "database/sql" "net/url" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/managed/services/telemetry/datasource_qandb_select.go b/managed/services/telemetry/datasource_qandb_select.go index 3395c339221..456845fa46f 100644 --- a/managed/services/telemetry/datasource_qandb_select.go +++ b/managed/services/telemetry/datasource_qandb_select.go @@ -21,7 +21,7 @@ import ( "database/sql" "net/url" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/managed/services/telemetry/datasource_victoria_metrics.go b/managed/services/telemetry/datasource_victoria_metrics.go index 8a8efd3b890..931cd9ebd1f 100644 --- a/managed/services/telemetry/datasource_victoria_metrics.go +++ b/managed/services/telemetry/datasource_victoria_metrics.go @@ -20,7 +20,7 @@ import ( "context" "time" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/prometheus/client_golang/api" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" diff --git a/managed/services/telemetry/datasources.go b/managed/services/telemetry/datasources.go index 0529fb2ebe8..07a11e44d26 100644 --- a/managed/services/telemetry/datasources.go +++ b/managed/services/telemetry/datasources.go @@ -22,7 +22,7 @@ import ( "time" "github.com/AlekSi/pointer" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/managed/services/telemetry/deps.go b/managed/services/telemetry/deps.go index 8e97ec58fa2..6a082007b42 100644 --- a/managed/services/telemetry/deps.go +++ b/managed/services/telemetry/deps.go @@ -18,8 +18,8 @@ package telemetry import ( "context" - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" serverv1 "github.com/percona/pmm/api/server/v1" ) diff --git a/managed/services/telemetry/extension.go b/managed/services/telemetry/extension.go index ebe4e40c9f2..77896c2e7cf 100644 --- a/managed/services/telemetry/extension.go +++ b/managed/services/telemetry/extension.go @@ -18,7 +18,7 @@ package telemetry import ( "context" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" ) // Extension provides dynamic extension point for Telemetry. diff --git a/managed/services/telemetry/mock_data_source_test.go b/managed/services/telemetry/mock_data_source_test.go index 862647db629..12ba4d7403d 100644 --- a/managed/services/telemetry/mock_data_source_test.go +++ b/managed/services/telemetry/mock_data_source_test.go @@ -5,7 +5,7 @@ package telemetry import ( context "context" - genericv1 "github.com/percona/saas/gen/telemetry/generic" + genericv1 "github.com/percona/platform/gen/telemetry/generic" mock "github.com/stretchr/testify/mock" ) diff --git a/managed/services/telemetry/mock_distribution_util_service_test.go b/managed/services/telemetry/mock_distribution_util_service_test.go index 0304fd80720..cba8ff5c1b7 100644 --- a/managed/services/telemetry/mock_distribution_util_service_test.go +++ b/managed/services/telemetry/mock_distribution_util_service_test.go @@ -3,7 +3,7 @@ package telemetry import ( - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" mock "github.com/stretchr/testify/mock" serverv1 "github.com/percona/pmm/api/server/v1" diff --git a/managed/services/telemetry/mock_sender_test.go b/managed/services/telemetry/mock_sender_test.go index 3c943e8de4f..ac773ecc2bd 100644 --- a/managed/services/telemetry/mock_sender_test.go +++ b/managed/services/telemetry/mock_sender_test.go @@ -5,7 +5,7 @@ package telemetry import ( context "context" - genericv1 "github.com/percona/saas/gen/telemetry/generic" + genericv1 "github.com/percona/platform/gen/telemetry/generic" mock "github.com/stretchr/testify/mock" ) diff --git a/managed/services/telemetry/telemetry.go b/managed/services/telemetry/telemetry.go index 7da13b78ec3..993eb0f34ba 100644 --- a/managed/services/telemetry/telemetry.go +++ b/managed/services/telemetry/telemetry.go @@ -23,8 +23,8 @@ import ( "time" "github.com/google/uuid" - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" diff --git a/managed/services/telemetry/telemetry_test.go b/managed/services/telemetry/telemetry_test.go index 65345f13a18..2597eab2fe6 100644 --- a/managed/services/telemetry/telemetry_test.go +++ b/managed/services/telemetry/telemetry_test.go @@ -24,8 +24,8 @@ import ( _ "github.com/ClickHouse/clickhouse-go/v2" sqlmock "github.com/DATA-DOG/go-sqlmock" - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/managed/services/telemetry/transform.go b/managed/services/telemetry/transform.go index da20fa6508f..bac9060f474 100644 --- a/managed/services/telemetry/transform.go +++ b/managed/services/telemetry/transform.go @@ -18,7 +18,7 @@ package telemetry import ( "encoding/json" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" ) diff --git a/managed/services/telemetry/transform_test.go b/managed/services/telemetry/transform_test.go index 06018f3a871..bb5be072be8 100644 --- a/managed/services/telemetry/transform_test.go +++ b/managed/services/telemetry/transform_test.go @@ -18,7 +18,7 @@ package telemetry import ( "testing" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/stretchr/testify/assert" ) diff --git a/managed/services/telemetry/uievents/uievents.go b/managed/services/telemetry/uievents/uievents.go index e193a0ef394..72d0f9a4446 100644 --- a/managed/services/telemetry/uievents/uievents.go +++ b/managed/services/telemetry/uievents/uievents.go @@ -24,7 +24,7 @@ import ( "time" "github.com/HdrHistogram/hdrhistogram-go" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/sirupsen/logrus" uieventsv1 "github.com/percona/pmm/api/uievents/v1" diff --git a/managed/utils/distribution/distribution_util.go b/managed/utils/distribution/distribution_util.go index 4a84e4c402b..faec6abe276 100644 --- a/managed/utils/distribution/distribution_util.go +++ b/managed/utils/distribution/distribution_util.go @@ -21,7 +21,7 @@ import ( "os" "regexp" - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" "github.com/sirupsen/logrus" serverv1 "github.com/percona/pmm/api/server/v1" diff --git a/managed/utils/distribution/distribution_util_test.go b/managed/utils/distribution/distribution_util_test.go index 978bd5bb7a7..c5ff717d38f 100644 --- a/managed/utils/distribution/distribution_util_test.go +++ b/managed/utils/distribution/distribution_util_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm" + pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/managed/utils/platform/client.go b/managed/utils/platform/client.go index 15e969259b6..d81e20b7cae 100644 --- a/managed/utils/platform/client.go +++ b/managed/utils/platform/client.go @@ -23,7 +23,7 @@ import ( "io" "net/http" - telemetryv1 "github.com/percona/saas/gen/telemetry/generic" + telemetryv1 "github.com/percona/platform/gen/telemetry/generic" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes"