PMM-12673 Refactoring

percona · Nov 19, 2023 · dbad56a · dbad56a
1 parent 7a8b6be
commit dbad56a
Show file tree

Hide file tree

Showing 338 changed files with 9,895 additions and 9,952 deletions.
diff --git a/Makefile.include b/Makefile.include
@@ -49,7 +49,7 @@ gen-api:            ## Generate PMM API
 
 	bin/buf generate -v api
 
-	for API in api/agentlocalpb/v1 api/serverpb/v1 api/inventorypb/v1 api/managementpb/v1 api/managementpb/v1/alerting api/managementpb/v1/backup api/managementpb/v1/azure api/managementpb/v1/role api/qan/v1beta1 api/managementpb/v1/agent api/managementpb/v1/node api/managementpb/v1/service api/platformpb/v1 api/userpb/v1; do \
+	for API in api/agentlocalpb/v1 api/serverpb/v1 api/inventory/v1 api/managementpb/v1 api/managementpb/v1/alerting api/managementpb/v1/backup api/managementpb/v1/azure api/managementpb/v1/role api/qan/v1beta1 api/managementpb/v1/agent api/managementpb/v1/node api/managementpb/v1/service api/platformpb/v1 api/userpb/v1; do \
 		set -x ; \
 		bin/swagger mixin $$API/json/header.json $$API/*.swagger.json --output=$$API/json/$$(basename $$API).json --keep-spec-order; \
 		bin/swagger flatten --with-flatten=expand --with-flatten=remove-unused $$API/json/$$(basename $$API).json --output=$$API/json/$$(basename $$API).json ; \
@@ -74,7 +74,7 @@ gen-api:            ## Generate PMM API
 		api/swagger/header.json \
 		api/serverpb/v1/json/v1.json \
 		api/userpb/v1/json/v1.json \
-		api/inventorypb/v1/json/v1.json \
+		api/inventory/v1/json/v1.json \
 		api/managementpb/v1/json/v1.json \
 		api/managementpb/v1/backup/json/backup.json \
 		api/managementpb/v1/alerting/json/alerting.json
@@ -87,7 +87,7 @@ gen-api:            ## Generate PMM API
 		api/swagger/header-dev.json \
 		api/serverpb/v1/json/v1.json \
 		api/userpb/v1/json/v1.json \
-		api/inventorypb/v1/json/v1.json \
+		api/inventory/v1/json/v1.json \
 		api/managementpb/v1/json/v1.json \
 		api/managementpb/v1/alerting/json/alerting.json \
 		api/managementpb/v1/backup/json/backup.json \
@@ -127,7 +127,7 @@ clean: clean_swagger  ## Remove generated files
 	find api -name '*.pb.gw.go' -print -delete
 	find api -name '*.validate.go' -print -delete
 
-	for API in api/agentlocalpb/v1 api/serverpb/v1 api/inventorypb/v1 api/managementpb/v1 api/managementpb/v1/alerting api/managementpb/v1/backup api/managementpb/v1/role api/managementpb/v1/agent api/managementpb/v1/node api/managementpb/v1/service api/qan/v1beta1 api/platformpb/v1 api/userpb/v1 ; do \
+	for API in api/agentlocalpb/v1 api/serverpb/v1 api/inventory/v1 api/managementpb/v1 api/managementpb/v1/alerting api/managementpb/v1/backup api/managementpb/v1/role api/managementpb/v1/agent api/managementpb/v1/node api/managementpb/v1/service api/qan/v1beta1 api/platformpb/v1 api/userpb/v1 ; do \
 		rm -fr $$API/json/client $$API/json/models $$API/json/$$(basename $$API).json ; \
 	done
 	rm -f api/swagger/swagger.json api/swagger/swagger-dev.json

diff --git a/admin/commands/annotation.go b/admin/commands/annotation.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/percona/pmm/admin/agentlocal"
 	"github.com/percona/pmm/admin/helpers"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 	managementClient "github.com/percona/pmm/api/managementpb/v1/json/client"
 	annotation "github.com/percona/pmm/api/managementpb/v1/json/client/annotation_service"
 )

diff --git a/admin/commands/base/setup.go b/admin/commands/base/setup.go
@@ -29,9 +29,9 @@ import (
 
 	"github.com/percona/pmm/admin/agentlocal"
 	"github.com/percona/pmm/admin/cli/flags"
-	inventorypb "github.com/percona/pmm/api/inventorypb/v1/json/client"
-	managementpb "github.com/percona/pmm/api/managementpb/v1/json/client"
-	serverpb "github.com/percona/pmm/api/serverpb/v1/json/client"
+	inventoryClient "github.com/percona/pmm/api/inventory/v1/json/client"
+	managementClient "github.com/percona/pmm/api/managementpb/v1/json/client"
+	serverClient "github.com/percona/pmm/api/serverpb/v1/json/client"
 	"github.com/percona/pmm/utils/tlsconfig"
 )
 
@@ -121,7 +121,7 @@ func SetupClients(ctx context.Context, globalFlags *flags.GlobalFlags) {
 		httpTransport.TLSClientConfig.InsecureSkipVerify = globalFlags.SkipTLSCertificateCheck
 	}
 
-	inventorypb.Default.SetTransport(transport)
-	managementpb.Default.SetTransport(transport)
-	serverpb.Default.SetTransport(transport)
+	inventoryClient.Default.SetTransport(transport)
+	managementClient.Default.SetTransport(transport)
+	serverClient.Default.SetTransport(transport)
 }
diff --git a/admin/commands/inventory/add_agent_external_exporter.go b/admin/commands/inventory/add_agent_external_exporter.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentExternalExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_mongodb_exporter.go b/admin/commands/inventory/add_agent_mongodb_exporter.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentMongodbExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_mysqld_exporter.go b/admin/commands/inventory/add_agent_mysqld_exporter.go
@@ -19,8 +19,8 @@ import (
 	"strconv"
 
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentMysqldExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_mysqld_exporter_test.go b/admin/commands/inventory/add_agent_mysqld_exporter_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/AlekSi/pointer"
 	"github.com/stretchr/testify/assert"
 
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 func TestAddAgentMysqldExporter(t *testing.T) {

diff --git a/admin/commands/inventory/add_agent_node_exporter.go b/admin/commands/inventory/add_agent_node_exporter.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentNodeExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_pmm_agent.go b/admin/commands/inventory/add_agent_pmm_agent.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addPMMAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_postgres_exporter.go b/admin/commands/inventory/add_agent_postgres_exporter.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentPostgresExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_postgres_exporter_test.go b/admin/commands/inventory/add_agent_postgres_exporter_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/AlekSi/pointer"
 	"github.com/stretchr/testify/assert"
 
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 func TestAddAgentPostgresExporter(t *testing.T) {

diff --git a/admin/commands/inventory/add_agent_proxysql_exporter.go b/admin/commands/inventory/add_agent_proxysql_exporter.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentProxysqlExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go b/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentQANMongoDBProfilerAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go b/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentQANMySQLPerfSchemaAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go b/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go
@@ -20,8 +20,8 @@ import (
 	"github.com/alecthomas/units"
 
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentQANMySQLSlowlogAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go b/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentQANPostgreSQLPgStatementsAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go b/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentQANPostgreSQLPgStatMonitorAgentResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_agent_rds_exporter.go b/admin/commands/inventory/add_agent_rds_exporter.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	agents "github.com/percona/pmm/api/inventorypb/v1/json/client/agents_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	agents "github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 )
 
 var addAgentRDSExporterResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_node_container.go b/admin/commands/inventory/add_node_container.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
 )
 
 var addNodeContainerResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_node_generic.go b/admin/commands/inventory/add_node_generic.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
 )
 
 var addNodeGenericResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_node_remote.go b/admin/commands/inventory/add_node_remote.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
 )
 
 var addNodeRemoteResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_node_remote_rds.go b/admin/commands/inventory/add_node_remote_rds.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
 )
 
 var addNodeRemoteRDSResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_node_remote_rds_test.go b/admin/commands/inventory/add_node_remote_rds_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	nodes "github.com/percona/pmm/api/inventorypb/v1/json/client/nodes_service"
+	nodes "github.com/percona/pmm/api/inventory/v1/json/client/nodes_service"
 )
 
 func TestAddNodeRemoteRDS(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_external.go b/admin/commands/inventory/add_service_external.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addExternalServiceResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_service_external_test.go b/admin/commands/inventory/add_service_external_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 func TestAddServiceExternal(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_haproxy.go b/admin/commands/inventory/add_service_haproxy.go
@@ -17,8 +17,8 @@ package inventory
 import (
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/helpers"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addHAProxyServiceResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_service_haproxy_test.go b/admin/commands/inventory/add_service_haproxy_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 func TestAddServiceHAProxy(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_mongodb.go b/admin/commands/inventory/add_service_mongodb.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addServiceMongoDBResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_service_mongodb_test.go b/admin/commands/inventory/add_service_mongodb_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 func TestAddServiceMongoDB(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_mysql.go b/admin/commands/inventory/add_service_mysql.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addServiceMySQLResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_service_mysql_test.go b/admin/commands/inventory/add_service_mysql_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 func TestAddServiceMySQL(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_postgres_test.go b/admin/commands/inventory/add_service_postgres_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 func TestAddServicePostgreSQL(t *testing.T) {

diff --git a/admin/commands/inventory/add_service_postgresql.go b/admin/commands/inventory/add_service_postgresql.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addServicePostgreSQLResultT = commands.ParseTemplate(`

diff --git a/admin/commands/inventory/add_service_proxysql.go b/admin/commands/inventory/add_service_proxysql.go
@@ -16,8 +16,8 @@ package inventory
 
 import (
 	"github.com/percona/pmm/admin/commands"
-	"github.com/percona/pmm/api/inventorypb/v1/json/client"
-	services "github.com/percona/pmm/api/inventorypb/v1/json/client/services_service"
+	"github.com/percona/pmm/api/inventory/v1/json/client"
+	services "github.com/percona/pmm/api/inventory/v1/json/client/services_service"
 )
 
 var addServiceProxySQLResultT = commands.ParseTemplate(`