From f4693566727bc9aae7c192c5c3a06c04107da64b Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 22 Feb 2024 11:53:05 +0000 Subject: [PATCH] PMM-12429 Use a configuration file for mockery (v2) --- .mockery.yaml | 129 + Makefile.include | 6 + admin/Makefile | 1 - admin/commands/pmm/server/docker/deps.go | 2 - .../pmm/server/docker/mock_functions_test.go | 2 +- agent/Makefile | 1 - agent/agentlocal/deps.go | 3 - agent/agentlocal/mock_client_test.go | 2 +- agent/agentlocal/mock_supervisor_test.go | 2 +- agent/client/deps.go | 4 - agent/client/mock_connection_checker_test.go | 2 +- agent/client/mock_service_info_broker_test.go | 2 +- agent/client/mock_supervisor_test.go | 2 +- agent/versioner/mock_exec_functions_test.go | 2 +- agent/versioner/versioner.go | 2 - api/agentlocalpb/agentlocal.pb.gw.go | 24 +- api/inventorypb/agents.pb.gw.go | 372 +- api/inventorypb/nodes.pb.gw.go | 108 +- api/inventorypb/services.pb.gw.go | 156 +- api/managementpb/actions.pb.gw.go | 180 +- api/managementpb/agent/agent.pb.gw.go | 12 +- api/managementpb/alerting/alerting.pb.gw.go | 60 +- api/managementpb/annotation.pb.gw.go | 12 +- api/managementpb/azure/azure.pb.gw.go | 24 +- api/managementpb/backup/artifacts.pb.gw.go | 36 +- api/managementpb/backup/backups.pb.gw.go | 96 +- api/managementpb/backup/locations.pb.gw.go | 60 +- api/managementpb/backup/restores.pb.gw.go | 12 +- api/managementpb/checks.pb.gw.go | 96 +- api/managementpb/dbaas/components.pb.gw.go | 72 +- api/managementpb/dbaas/db_clusters.pb.gw.go | 72 +- api/managementpb/dbaas/kubernetes.pb.gw.go | 72 +- api/managementpb/dbaas/logs.pb.gw.go | 12 +- .../dbaas/psmdb_clusters.pb.gw.go | 48 +- api/managementpb/dbaas/pxc_clusters.pb.gw.go | 48 +- api/managementpb/dbaas/templates.pb.gw.go | 12 +- api/managementpb/dump/dump.pb.gw.go | 60 +- api/managementpb/external.pb.gw.go | 12 +- api/managementpb/haproxy.pb.gw.go | 12 +- api/managementpb/ia/alerts.pb.gw.go | 24 +- api/managementpb/ia/channels.pb.gw.go | 48 +- api/managementpb/ia/rules.pb.gw.go | 60 +- api/managementpb/mongodb.pb.gw.go | 12 +- api/managementpb/mysql.pb.gw.go | 12 +- api/managementpb/node.pb.gw.go | 12 +- api/managementpb/node/node.pb.gw.go | 24 +- api/managementpb/postgresql.pb.gw.go | 12 +- api/managementpb/proxysql.pb.gw.go | 12 +- api/managementpb/rds.pb.gw.go | 24 +- api/managementpb/role/role.pb.gw.go | 84 +- api/managementpb/service.pb.gw.go | 12 +- api/managementpb/service/service.pb.gw.go | 12 +- api/platformpb/platform.pb.gw.go | 84 +- api/qanpb/filters.pb.gw.go | 12 +- api/qanpb/metrics_names.pb.gw.go | 12 +- api/qanpb/object_details.pb.gw.go | 96 +- api/qanpb/profile.pb.gw.go | 12 +- api/serverpb/server.pb.gw.go | 96 +- api/uieventspb/server.pb.gw.go | 12 +- api/userpb/user.pb.gw.go | 12 +- managed/Makefile | 1 - managed/services/backup/deps.go | 8 - .../backup/mock_agent_service_test.go | 2 +- .../backup/mock_compatibility_service_test.go | 2 +- .../services/backup/mock_jobs_service_test.go | 2 +- .../backup/mock_pbm_pitr_service_test.go | 2 +- .../backup/mock_removal_service_test.go | 2 +- managed/services/backup/mock_storage_test.go | 2 +- .../services/backup/mock_versioner_test.go | 2 +- managed/services/checks/deps.go | 2 - .../checks/mock_agents_registry_test.go | 2 +- .../services/dbaas/kubernetes/client/gen.go | 1 - .../client/mock_kube_client_connector.go | 846 ---- managed/services/grafana/deps.go | 2 - .../grafana/mock_aws_instance_checker_test.go | 2 +- managed/services/inventory/deps.go | 9 - .../inventory/mock_agent_service_test.go | 2 +- .../inventory/mock_agents_registry_test.go | 2 +- .../mock_agents_state_updater_test.go | 2 +- .../inventory/mock_connection_checker_test.go | 2 +- .../inventory/mock_inventory_metrics_test.go | 2 +- .../inventory/mock_prometheus_service_test.go | 2 +- .../mock_service_info_broker_test.go | 2 +- .../inventory/mock_version_cache_test.go | 2 +- managed/services/management/alerting/deps.go | 2 - .../alerting/mock_grafana_client_test.go | 2 +- managed/services/management/backup/deps.go | 6 - .../management/backup/mock_aws_s3_test.go | 2 +- .../backup/mock_backup_service_test.go | 2 +- .../backup/mock_pbm_pitr_service_test.go | 2 +- .../backup/mock_removal_service_test.go | 2 +- .../backup/mock_schedule_service_test.go | 2 +- managed/services/management/dbaas/deps.go | 7 - .../dbaas/mock_components_service_test.go | 2 +- .../dbaas/mock_dbaas_client_test.go | 2 +- .../dbaas/mock_grafana_client_test.go | 2 +- .../dbaas/mock_kube_storage_manager_test.go | 2 +- .../dbaas/mock_kubernetes_client_test.go | 2 +- .../dbaas/mock_version_service_test.go | 2 +- managed/services/management/deps.go | 17 +- managed/services/management/dump/deps.go | 2 - .../management/dump/mock_dump_service_test.go | 2 +- managed/services/management/ia/deps.go | 4 - .../management/ia/mock_alert_manager_test.go | 2 +- .../ia/mock_templates_service_test.go | 2 +- .../management/ia/mock_vm_alert_test.go | 2 +- .../management/mock_agents_registry_test.go | 2 +- .../mock_agents_state_updater_test.go | 2 +- .../management/mock_api_key_provider_test.go | 2 +- .../management/mock_checks_service_test.go | 2 +- .../mock_connection_checker_test.go | 2 +- .../management/mock_grafana_client_test.go | 2 +- .../management/mock_jobs_service_test.go | 2 +- .../mock_prometheus_service_test.go | 2 +- .../mock_service_info_broker_test.go | 2 +- .../management/mock_version_cache_test.go | 2 +- .../mock_victoria_metrics_client_test.go | 2 +- managed/services/management/node.go | 7 - managed/services/qan/deps.go | 2 - .../qan/mock_qan_collector_client_test.go | 2 +- managed/services/scheduler/deps.go | 2 - .../scheduler/mock_backup_service_test.go | 2 +- managed/services/server/deps.go | 12 - .../server/mock_agents_state_updater_test.go | 2 +- .../server/mock_alertmanager_service_test.go | 2 +- .../server/mock_checks_service_test.go | 2 +- managed/services/server/mock_emailer_test.go | 2 +- .../server/mock_grafana_client_test.go | 2 +- .../server/mock_prometheus_service_test.go | 2 +- .../server/mock_rules_service_test.go | 2 +- .../server/mock_supervisord_service_test.go | 2 +- .../server/mock_telemetry_service_test.go | 2 +- .../server/mock_templates_service_test.go | 2 +- .../mock_vm_alert_external_rules_test.go | 2 +- managed/services/telemetry/deps.go | 5 - .../mock_data_source_locator_test.go | 16 +- .../telemetry/mock_data_source_test.go | 22 +- .../mock_distribution_util_service_test.go | 2 +- .../services/telemetry/mock_sender_test.go | 2 +- .../versioncache/mock_versioner_test.go | 2 +- managed/services/versioncache/versioncache.go | 2 - my_changes.patch | 3734 ----------------- 142 files changed, 2187 insertions(+), 5156 deletions(-) create mode 100644 .mockery.yaml delete mode 100644 managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go delete mode 100644 my_changes.patch diff --git a/.mockery.yaml b/.mockery.yaml new file mode 100644 index 0000000000..cf5a20a098 --- /dev/null +++ b/.mockery.yaml @@ -0,0 +1,129 @@ +# This is the top-level configuration file for mockery. +disable-version-string: True +with-expecter: False +inpackage: True +dir: "{{.InterfaceDir}}" +filename: "mock_{{ .InterfaceName | snakecase }}_test.go" +mockname: "mock{{ .InterfaceName | camelcase }}" +packages: + # managed + github.com/percona/pmm/managed/services/backup: + interfaces: + agentService: + compatibilityService: + jobsService: + pbmPITRService: + removalService: + Storage: + config: + mockname: "Mock{{ .InterfaceName | camelcase }}" + versioner: + github.com/percona/pmm/managed/services/checks: + interfaces: + agentsRegistry: + github.com/percona/pmm/managed/services/grafana: + interfaces: + awsInstanceChecker: + github.com/percona/pmm/managed/services/inventory: + interfaces: + agentService: + agentsRegistry: + agentsStateUpdater: + connectionChecker: + inventoryMetrics: + prometheusService: + serviceInfoBroker: + versionCache: + github.com/percona/pmm/managed/services/management: + interfaces: + agentsRegistry: + agentsStateUpdater: + apiKeyProvider: + checksService: + connectionChecker: + grafanaClient: + jobsService: + prometheusService: + serviceInfoBroker: + versionCache: + victoriaMetricsClient: + github.com/percona/pmm/managed/services/management/alerting: + interfaces: + grafanaClient: + github.com/percona/pmm/managed/services/management/dbaas: + interfaces: + KubeClientConnector: + config: + mockname: "Mock{{ .InterfaceName | camelcase }}" + dbaasClient: + versionService: + grafanaClient: + componentsService: + kubernetesClient: + kubeStorageManager: + github.com/percona/pmm/managed/services/management/dump: + interfaces: + dumpService: + github.com/percona/pmm/managed/services/management/ia: + interfaces: + alertManager: + vmAlert: + templatesService: + github.com/percona/pmm/managed/services/management/backup: + interfaces: + awsS3: + backupService: + scheduleService: + removalService: + pbmPITRService: + github.com/percona/pmm/managed/services/qan: + interfaces: + qanCollectorClient: + github.com/percona/pmm/managed/services/scheduler: + interfaces: + backupService: + github.com/percona/pmm/managed/services/server: + interfaces: + agentsStateUpdater: + alertmanagerService: + checksService: + emailer: + grafanaClient: + prometheusService: + rulesService: + supervisordService: + telemetryService: + templatesService: + vmAlertExternalRules: + github.com/percona/pmm/managed/services/versioncache: + interfaces: + Versioner: + config: + mockname: "Mock{{ .InterfaceName | camelcase }}" + github.com/percona/pmm/managed/services/telemetry: + interfaces: + DataSource: + DataSourceLocator: + distributionUtilService: + sender: + # admin + github.com/percona/pmm/admin/commands/pmm/server/docker: + interfaces: + Functions: + config: + mockname: "Mock{{ .InterfaceName | camelcase }}" + # agent + github.com/percona/pmm/agent/agentlocal: + interfaces: + client: + supervisor: + github.com/percona/pmm/agent/client: + interfaces: + connectionChecker: + serviceInfoBroker: + supervisor: + github.com/percona/pmm/agent/versioner: + interfaces: + ExecFunctions: + config: + mockname: "Mock{{ .InterfaceName | camelcase }}" diff --git a/Makefile.include b/Makefile.include index cd81c5f994..089ebfde1a 100644 --- a/Makefile.include +++ b/Makefile.include @@ -37,10 +37,16 @@ gen: clean ## Generate files make -C admin gen make -C managed gen + make gen-mocks ## Generate mocks + make format make format ## TODO: One formatting run is not enough, figure out why. go install -v ./... +gen-mocks: + find . -name mock_*.go -delete + ./bin/mockery --config .mockery.yaml + gen-api: ## Generate PMM API # generated by descriptors target bin/buf breaking --against descriptor.bin api diff --git a/admin/Makefile b/admin/Makefile index 41c2d06895..59e7b4c6d0 100644 --- a/admin/Makefile +++ b/admin/Makefile @@ -29,7 +29,6 @@ gen: clean ## Generate files clean: ## Remove generated files find . -name *_reform.go -delete - find . -name mock_*.go -delete release: ## Build pmm-admin release binary env CGO_ENABLED=0 go build -v $(LD_FLAGS) -o $(PMM_RELEASE_PATH)/pmm-admin ./cmd/pmm-admin/ diff --git a/admin/commands/pmm/server/docker/deps.go b/admin/commands/pmm/server/docker/deps.go index f87ce886c6..38ba1780f4 100644 --- a/admin/commands/pmm/server/docker/deps.go +++ b/admin/commands/pmm/server/docker/deps.go @@ -27,8 +27,6 @@ import ( "github.com/percona/pmm/admin/pkg/docker" ) -//go:generate ../../../../../bin/mockery --name=Functions --case=snake --inpackage --testonly - // Functions contain methods required to interact with Docker. type Functions interface { //nolint:interfacebloat Imager diff --git a/admin/commands/pmm/server/docker/mock_functions_test.go b/admin/commands/pmm/server/docker/mock_functions_test.go index 7cfd5cbbe2..a3597bd045 100644 --- a/admin/commands/pmm/server/docker/mock_functions_test.go +++ b/admin/commands/pmm/server/docker/mock_functions_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package docker diff --git a/agent/Makefile b/agent/Makefile index a2334a7e7d..c170223a4d 100644 --- a/agent/Makefile +++ b/agent/Makefile @@ -38,7 +38,6 @@ gen: clean ## Generate files clean: ## Remove generated files find . -name *_reform.go -delete - find . -name mock_*.go -delete # generate stub models for perfschema QAN agent; hidden from help as it is not generally useful gen-init: diff --git a/agent/agentlocal/deps.go b/agent/agentlocal/deps.go index a727541b82..b96af4880b 100644 --- a/agent/agentlocal/deps.go +++ b/agent/agentlocal/deps.go @@ -23,9 +23,6 @@ import ( "github.com/percona/pmm/api/agentpb" ) -//go:generate ../../bin/mockery --name=client --case=snake --inpackage --testonly -//go:generate ../../bin/mockery --name=supervisor --case=snake --inpackage --testonly - // client is a subset of methods of client.Client used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type client interface { diff --git a/agent/agentlocal/mock_client_test.go b/agent/agentlocal/mock_client_test.go index adeac2c1ef..003ec210c8 100644 --- a/agent/agentlocal/mock_client_test.go +++ b/agent/agentlocal/mock_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package agentlocal diff --git a/agent/agentlocal/mock_supervisor_test.go b/agent/agentlocal/mock_supervisor_test.go index 60d2471eef..c153e7cb16 100644 --- a/agent/agentlocal/mock_supervisor_test.go +++ b/agent/agentlocal/mock_supervisor_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package agentlocal diff --git a/agent/client/deps.go b/agent/client/deps.go index 112a92bf57..0287e13c77 100644 --- a/agent/client/deps.go +++ b/agent/client/deps.go @@ -23,10 +23,6 @@ import ( "github.com/percona/pmm/api/agentpb" ) -//go:generate ../../bin/mockery --name=connectionChecker --case=snake --inpackage --testonly -//go:generate ../../bin/mockery --name=serviceInfoBroker --case=snake --inpackage --testonly -//go:generate ../../bin/mockery --name=supervisor --case=snake --inpackage --testonly - // connectionChecker is a subset of methods of connectionchecker.ConnectionChecker used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type connectionChecker interface { diff --git a/agent/client/mock_connection_checker_test.go b/agent/client/mock_connection_checker_test.go index d0255823ba..71d381276e 100644 --- a/agent/client/mock_connection_checker_test.go +++ b/agent/client/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package client diff --git a/agent/client/mock_service_info_broker_test.go b/agent/client/mock_service_info_broker_test.go index 4dc4e7fb33..9f3f4f8221 100644 --- a/agent/client/mock_service_info_broker_test.go +++ b/agent/client/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package client diff --git a/agent/client/mock_supervisor_test.go b/agent/client/mock_supervisor_test.go index 1e38945785..4656d057f2 100644 --- a/agent/client/mock_supervisor_test.go +++ b/agent/client/mock_supervisor_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package client diff --git a/agent/versioner/mock_exec_functions_test.go b/agent/versioner/mock_exec_functions_test.go index 87ac13c88b..2a1fc08539 100644 --- a/agent/versioner/mock_exec_functions_test.go +++ b/agent/versioner/mock_exec_functions_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package versioner diff --git a/agent/versioner/versioner.go b/agent/versioner/versioner.go index 6da2eaa099..74bf3440c7 100644 --- a/agent/versioner/versioner.go +++ b/agent/versioner/versioner.go @@ -51,8 +51,6 @@ type CombinedOutputer interface { CombinedOutput() ([]byte, error) } -//go:generate ../../bin/mockery --name=ExecFunctions --case=snake --inpackage --testonly - // ExecFunctions is an interface for the LookPath() and CommandContext() functions. type ExecFunctions interface { LookPath(file string) (string, error) diff --git a/api/agentlocalpb/agentlocal.pb.gw.go b/api/agentlocalpb/agentlocal.pb.gw.go index ad53fdf449..b21fe20e57 100644 --- a/api/agentlocalpb/agentlocal.pb.gw.go +++ b/api/agentlocalpb/agentlocal.pb.gw.go @@ -37,7 +37,11 @@ func request_AgentLocal_Status_0(ctx context.Context, marshaler runtime.Marshale var protoReq StatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_AgentLocal_Status_0(ctx context.Context, marshaler runtime.Ma var protoReq StatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -93,7 +101,11 @@ func request_AgentLocal_Reload_0(ctx context.Context, marshaler runtime.Marshale var protoReq ReloadRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -105,7 +117,11 @@ func local_request_AgentLocal_Reload_0(ctx context.Context, marshaler runtime.Ma var protoReq ReloadRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/inventorypb/agents.pb.gw.go b/api/inventorypb/agents.pb.gw.go index 73084b65e7..1c45bf9c26 100644 --- a/api/inventorypb/agents.pb.gw.go +++ b/api/inventorypb/agents.pb.gw.go @@ -37,7 +37,11 @@ func request_Agents_ListAgents_0(ctx context.Context, marshaler runtime.Marshale var protoReq ListAgentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Agents_ListAgents_0(ctx context.Context, marshaler runtime.Ma var protoReq ListAgentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Agents_GetAgent_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq GetAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Agents_GetAgent_0(ctx context.Context, marshaler runtime.Mars var protoReq GetAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Agents_GetAgentLogs_0(ctx context.Context, marshaler runtime.Marsha var protoReq GetAgentLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Agents_GetAgentLogs_0(ctx context.Context, marshaler runtime. var protoReq GetAgentLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Agents_AddPMMAgent_0(ctx context.Context, marshaler runtime.Marshal var protoReq AddPMMAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Agents_AddPMMAgent_0(ctx context.Context, marshaler runtime.M var protoReq AddPMMAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Agents_AddNodeExporter_0(ctx context.Context, marshaler runtime.Mar var protoReq AddNodeExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Agents_AddNodeExporter_0(ctx context.Context, marshaler runti var protoReq AddNodeExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Agents_ChangeNodeExporter_0(ctx context.Context, marshaler runtime. var protoReq ChangeNodeExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Agents_ChangeNodeExporter_0(ctx context.Context, marshaler ru var protoReq ChangeNodeExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Agents_AddMySQLdExporter_0(ctx context.Context, marshaler runtime.M var protoReq AddMySQLdExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Agents_AddMySQLdExporter_0(ctx context.Context, marshaler run var protoReq AddMySQLdExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_Agents_ChangeMySQLdExporter_0(ctx context.Context, marshaler runtim var protoReq ChangeMySQLdExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_Agents_ChangeMySQLdExporter_0(ctx context.Context, marshaler var protoReq ChangeMySQLdExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -229,7 +293,11 @@ func request_Agents_AddMongoDBExporter_0(ctx context.Context, marshaler runtime. var protoReq AddMongoDBExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -241,7 +309,11 @@ func local_request_Agents_AddMongoDBExporter_0(ctx context.Context, marshaler ru var protoReq AddMongoDBExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -253,7 +325,11 @@ func request_Agents_ChangeMongoDBExporter_0(ctx context.Context, marshaler runti var protoReq ChangeMongoDBExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -265,7 +341,11 @@ func local_request_Agents_ChangeMongoDBExporter_0(ctx context.Context, marshaler var protoReq ChangeMongoDBExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -277,7 +357,11 @@ func request_Agents_AddPostgresExporter_0(ctx context.Context, marshaler runtime var protoReq AddPostgresExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -289,7 +373,11 @@ func local_request_Agents_AddPostgresExporter_0(ctx context.Context, marshaler r var protoReq AddPostgresExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -301,7 +389,11 @@ func request_Agents_ChangePostgresExporter_0(ctx context.Context, marshaler runt var protoReq ChangePostgresExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -313,7 +405,11 @@ func local_request_Agents_ChangePostgresExporter_0(ctx context.Context, marshale var protoReq ChangePostgresExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -325,7 +421,11 @@ func request_Agents_AddProxySQLExporter_0(ctx context.Context, marshaler runtime var protoReq AddProxySQLExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -337,7 +437,11 @@ func local_request_Agents_AddProxySQLExporter_0(ctx context.Context, marshaler r var protoReq AddProxySQLExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -349,7 +453,11 @@ func request_Agents_ChangeProxySQLExporter_0(ctx context.Context, marshaler runt var protoReq ChangeProxySQLExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -361,7 +469,11 @@ func local_request_Agents_ChangeProxySQLExporter_0(ctx context.Context, marshale var protoReq ChangeProxySQLExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -373,7 +485,11 @@ func request_Agents_AddQANMySQLPerfSchemaAgent_0(ctx context.Context, marshaler var protoReq AddQANMySQLPerfSchemaAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -385,7 +501,11 @@ func local_request_Agents_AddQANMySQLPerfSchemaAgent_0(ctx context.Context, mars var protoReq AddQANMySQLPerfSchemaAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -397,7 +517,11 @@ func request_Agents_ChangeQANMySQLPerfSchemaAgent_0(ctx context.Context, marshal var protoReq ChangeQANMySQLPerfSchemaAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -409,7 +533,11 @@ func local_request_Agents_ChangeQANMySQLPerfSchemaAgent_0(ctx context.Context, m var protoReq ChangeQANMySQLPerfSchemaAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -421,7 +549,11 @@ func request_Agents_AddQANMySQLSlowlogAgent_0(ctx context.Context, marshaler run var protoReq AddQANMySQLSlowlogAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -433,7 +565,11 @@ func local_request_Agents_AddQANMySQLSlowlogAgent_0(ctx context.Context, marshal var protoReq AddQANMySQLSlowlogAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -445,7 +581,11 @@ func request_Agents_ChangeQANMySQLSlowlogAgent_0(ctx context.Context, marshaler var protoReq ChangeQANMySQLSlowlogAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -457,7 +597,11 @@ func local_request_Agents_ChangeQANMySQLSlowlogAgent_0(ctx context.Context, mars var protoReq ChangeQANMySQLSlowlogAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -469,7 +613,11 @@ func request_Agents_AddQANMongoDBProfilerAgent_0(ctx context.Context, marshaler var protoReq AddQANMongoDBProfilerAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -481,7 +629,11 @@ func local_request_Agents_AddQANMongoDBProfilerAgent_0(ctx context.Context, mars var protoReq AddQANMongoDBProfilerAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -493,7 +645,11 @@ func request_Agents_ChangeQANMongoDBProfilerAgent_0(ctx context.Context, marshal var protoReq ChangeQANMongoDBProfilerAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -505,7 +661,11 @@ func local_request_Agents_ChangeQANMongoDBProfilerAgent_0(ctx context.Context, m var protoReq ChangeQANMongoDBProfilerAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -517,7 +677,11 @@ func request_Agents_AddQANPostgreSQLPgStatementsAgent_0(ctx context.Context, mar var protoReq AddQANPostgreSQLPgStatementsAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -529,7 +693,11 @@ func local_request_Agents_AddQANPostgreSQLPgStatementsAgent_0(ctx context.Contex var protoReq AddQANPostgreSQLPgStatementsAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -541,7 +709,11 @@ func request_Agents_ChangeQANPostgreSQLPgStatementsAgent_0(ctx context.Context, var protoReq ChangeQANPostgreSQLPgStatementsAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -553,7 +725,11 @@ func local_request_Agents_ChangeQANPostgreSQLPgStatementsAgent_0(ctx context.Con var protoReq ChangeQANPostgreSQLPgStatementsAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -565,7 +741,11 @@ func request_Agents_AddQANPostgreSQLPgStatMonitorAgent_0(ctx context.Context, ma var protoReq AddQANPostgreSQLPgStatMonitorAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -577,7 +757,11 @@ func local_request_Agents_AddQANPostgreSQLPgStatMonitorAgent_0(ctx context.Conte var protoReq AddQANPostgreSQLPgStatMonitorAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -589,7 +773,11 @@ func request_Agents_ChangeQANPostgreSQLPgStatMonitorAgent_0(ctx context.Context, var protoReq ChangeQANPostgreSQLPgStatMonitorAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -601,7 +789,11 @@ func local_request_Agents_ChangeQANPostgreSQLPgStatMonitorAgent_0(ctx context.Co var protoReq ChangeQANPostgreSQLPgStatMonitorAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -613,7 +805,11 @@ func request_Agents_AddRDSExporter_0(ctx context.Context, marshaler runtime.Mars var protoReq AddRDSExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -625,7 +821,11 @@ func local_request_Agents_AddRDSExporter_0(ctx context.Context, marshaler runtim var protoReq AddRDSExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -637,7 +837,11 @@ func request_Agents_ChangeRDSExporter_0(ctx context.Context, marshaler runtime.M var protoReq ChangeRDSExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -649,7 +853,11 @@ func local_request_Agents_ChangeRDSExporter_0(ctx context.Context, marshaler run var protoReq ChangeRDSExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -661,7 +869,11 @@ func request_Agents_AddExternalExporter_0(ctx context.Context, marshaler runtime var protoReq AddExternalExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -673,7 +885,11 @@ func local_request_Agents_AddExternalExporter_0(ctx context.Context, marshaler r var protoReq AddExternalExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -685,7 +901,11 @@ func request_Agents_ChangeExternalExporter_0(ctx context.Context, marshaler runt var protoReq ChangeExternalExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -697,7 +917,11 @@ func local_request_Agents_ChangeExternalExporter_0(ctx context.Context, marshale var protoReq ChangeExternalExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -709,7 +933,11 @@ func request_Agents_AddAzureDatabaseExporter_0(ctx context.Context, marshaler ru var protoReq AddAzureDatabaseExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -721,7 +949,11 @@ func local_request_Agents_AddAzureDatabaseExporter_0(ctx context.Context, marsha var protoReq AddAzureDatabaseExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -733,7 +965,11 @@ func request_Agents_ChangeAzureDatabaseExporter_0(ctx context.Context, marshaler var protoReq ChangeAzureDatabaseExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -745,7 +981,11 @@ func local_request_Agents_ChangeAzureDatabaseExporter_0(ctx context.Context, mar var protoReq ChangeAzureDatabaseExporterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -757,7 +997,11 @@ func request_Agents_RemoveAgent_0(ctx context.Context, marshaler runtime.Marshal var protoReq RemoveAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -769,7 +1013,11 @@ func local_request_Agents_RemoveAgent_0(ctx context.Context, marshaler runtime.M var protoReq RemoveAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/inventorypb/nodes.pb.gw.go b/api/inventorypb/nodes.pb.gw.go index 8c7dbb33f2..9789ecfcb6 100644 --- a/api/inventorypb/nodes.pb.gw.go +++ b/api/inventorypb/nodes.pb.gw.go @@ -37,7 +37,11 @@ func request_Nodes_ListNodes_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq ListNodesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Nodes_ListNodes_0(ctx context.Context, marshaler runtime.Mars var protoReq ListNodesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Nodes_GetNode_0(ctx context.Context, marshaler runtime.Marshaler, c var protoReq GetNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Nodes_GetNode_0(ctx context.Context, marshaler runtime.Marsha var protoReq GetNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Nodes_AddNode_0(ctx context.Context, marshaler runtime.Marshaler, c var protoReq AddNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Nodes_AddNode_0(ctx context.Context, marshaler runtime.Marsha var protoReq AddNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Nodes_AddGenericNode_0(ctx context.Context, marshaler runtime.Marsh var protoReq AddGenericNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Nodes_AddGenericNode_0(ctx context.Context, marshaler runtime var protoReq AddGenericNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Nodes_AddContainerNode_0(ctx context.Context, marshaler runtime.Mar var protoReq AddContainerNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Nodes_AddContainerNode_0(ctx context.Context, marshaler runti var protoReq AddContainerNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Nodes_AddRemoteNode_0(ctx context.Context, marshaler runtime.Marsha var protoReq AddRemoteNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Nodes_AddRemoteNode_0(ctx context.Context, marshaler runtime. var protoReq AddRemoteNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Nodes_AddRemoteRDSNode_0(ctx context.Context, marshaler runtime.Mar var protoReq AddRemoteRDSNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Nodes_AddRemoteRDSNode_0(ctx context.Context, marshaler runti var protoReq AddRemoteRDSNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_Nodes_AddRemoteAzureDatabaseNode_0(ctx context.Context, marshaler r var protoReq AddRemoteAzureDatabaseNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_Nodes_AddRemoteAzureDatabaseNode_0(ctx context.Context, marsh var protoReq AddRemoteAzureDatabaseNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -229,7 +293,11 @@ func request_Nodes_RemoveNode_0(ctx context.Context, marshaler runtime.Marshaler var protoReq RemoveNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -241,7 +309,11 @@ func local_request_Nodes_RemoveNode_0(ctx context.Context, marshaler runtime.Mar var protoReq RemoveNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/inventorypb/services.pb.gw.go b/api/inventorypb/services.pb.gw.go index 86c751ab6d..d9964442e0 100644 --- a/api/inventorypb/services.pb.gw.go +++ b/api/inventorypb/services.pb.gw.go @@ -37,7 +37,11 @@ func request_Services_ListServices_0(ctx context.Context, marshaler runtime.Mars var protoReq ListServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Services_ListServices_0(ctx context.Context, marshaler runtim var protoReq ListServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Services_ListActiveServiceTypes_0(ctx context.Context, marshaler ru var protoReq ListActiveServiceTypesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Services_ListActiveServiceTypes_0(ctx context.Context, marsha var protoReq ListActiveServiceTypesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Services_GetService_0(ctx context.Context, marshaler runtime.Marsha var protoReq GetServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Services_GetService_0(ctx context.Context, marshaler runtime. var protoReq GetServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Services_AddMySQLService_0(ctx context.Context, marshaler runtime.M var protoReq AddMySQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Services_AddMySQLService_0(ctx context.Context, marshaler run var protoReq AddMySQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Services_AddMongoDBService_0(ctx context.Context, marshaler runtime var protoReq AddMongoDBServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Services_AddMongoDBService_0(ctx context.Context, marshaler r var protoReq AddMongoDBServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Services_AddPostgreSQLService_0(ctx context.Context, marshaler runt var protoReq AddPostgreSQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Services_AddPostgreSQLService_0(ctx context.Context, marshale var protoReq AddPostgreSQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Services_AddProxySQLService_0(ctx context.Context, marshaler runtim var protoReq AddProxySQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Services_AddProxySQLService_0(ctx context.Context, marshaler var protoReq AddProxySQLServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_Services_AddHAProxyService_0(ctx context.Context, marshaler runtime var protoReq AddHAProxyServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_Services_AddHAProxyService_0(ctx context.Context, marshaler r var protoReq AddHAProxyServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -229,7 +293,11 @@ func request_Services_AddExternalService_0(ctx context.Context, marshaler runtim var protoReq AddExternalServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -241,7 +309,11 @@ func local_request_Services_AddExternalService_0(ctx context.Context, marshaler var protoReq AddExternalServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -253,7 +325,11 @@ func request_Services_RemoveService_0(ctx context.Context, marshaler runtime.Mar var protoReq RemoveServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -265,7 +341,11 @@ func local_request_Services_RemoveService_0(ctx context.Context, marshaler runti var protoReq RemoveServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -277,7 +357,11 @@ func request_Services_AddCustomLabels_0(ctx context.Context, marshaler runtime.M var protoReq AddCustomLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -289,7 +373,11 @@ func local_request_Services_AddCustomLabels_0(ctx context.Context, marshaler run var protoReq AddCustomLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -301,7 +389,11 @@ func request_Services_RemoveCustomLabels_0(ctx context.Context, marshaler runtim var protoReq RemoveCustomLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -313,7 +405,11 @@ func local_request_Services_RemoveCustomLabels_0(ctx context.Context, marshaler var protoReq RemoveCustomLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -325,7 +421,11 @@ func request_Services_ChangeService_0(ctx context.Context, marshaler runtime.Mar var protoReq ChangeServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -337,7 +437,11 @@ func local_request_Services_ChangeService_0(ctx context.Context, marshaler runti var protoReq ChangeServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/actions.pb.gw.go b/api/managementpb/actions.pb.gw.go index e46087f895..afb3efb2f4 100644 --- a/api/managementpb/actions.pb.gw.go +++ b/api/managementpb/actions.pb.gw.go @@ -37,7 +37,11 @@ func request_Actions_GetAction_0(ctx context.Context, marshaler runtime.Marshale var protoReq GetActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Actions_GetAction_0(ctx context.Context, marshaler runtime.Ma var protoReq GetActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Actions_StartMySQLExplainAction_0(ctx context.Context, marshaler ru var protoReq StartMySQLExplainActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Actions_StartMySQLExplainAction_0(ctx context.Context, marsha var protoReq StartMySQLExplainActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Actions_StartMySQLExplainJSONAction_0(ctx context.Context, marshale var protoReq StartMySQLExplainJSONActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Actions_StartMySQLExplainJSONAction_0(ctx context.Context, ma var protoReq StartMySQLExplainJSONActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Actions_StartMySQLExplainTraditionalJSONAction_0(ctx context.Contex var protoReq StartMySQLExplainTraditionalJSONActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Actions_StartMySQLExplainTraditionalJSONAction_0(ctx context. var protoReq StartMySQLExplainTraditionalJSONActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Actions_StartMySQLShowCreateTableAction_0(ctx context.Context, mars var protoReq StartMySQLShowCreateTableActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Actions_StartMySQLShowCreateTableAction_0(ctx context.Context var protoReq StartMySQLShowCreateTableActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Actions_StartMySQLShowTableStatusAction_0(ctx context.Context, mars var protoReq StartMySQLShowTableStatusActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Actions_StartMySQLShowTableStatusAction_0(ctx context.Context var protoReq StartMySQLShowTableStatusActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Actions_StartMySQLShowIndexAction_0(ctx context.Context, marshaler var protoReq StartMySQLShowIndexActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Actions_StartMySQLShowIndexAction_0(ctx context.Context, mars var protoReq StartMySQLShowIndexActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_Actions_StartPostgreSQLShowCreateTableAction_0(ctx context.Context, var protoReq StartPostgreSQLShowCreateTableActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_Actions_StartPostgreSQLShowCreateTableAction_0(ctx context.Co var protoReq StartPostgreSQLShowCreateTableActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -229,7 +293,11 @@ func request_Actions_StartPostgreSQLShowIndexAction_0(ctx context.Context, marsh var protoReq StartPostgreSQLShowIndexActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -241,7 +309,11 @@ func local_request_Actions_StartPostgreSQLShowIndexAction_0(ctx context.Context, var protoReq StartPostgreSQLShowIndexActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -253,7 +325,11 @@ func request_Actions_StartMongoDBExplainAction_0(ctx context.Context, marshaler var protoReq StartMongoDBExplainActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -265,7 +341,11 @@ func local_request_Actions_StartMongoDBExplainAction_0(ctx context.Context, mars var protoReq StartMongoDBExplainActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -277,7 +357,11 @@ func request_Actions_StartPTSummaryAction_0(ctx context.Context, marshaler runti var protoReq StartPTSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -289,7 +373,11 @@ func local_request_Actions_StartPTSummaryAction_0(ctx context.Context, marshaler var protoReq StartPTSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -301,7 +389,11 @@ func request_Actions_StartPTPgSummaryAction_0(ctx context.Context, marshaler run var protoReq StartPTPgSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -313,7 +405,11 @@ func local_request_Actions_StartPTPgSummaryAction_0(ctx context.Context, marshal var protoReq StartPTPgSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -325,7 +421,11 @@ func request_Actions_StartPTMongoDBSummaryAction_0(ctx context.Context, marshale var protoReq StartPTMongoDBSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -337,7 +437,11 @@ func local_request_Actions_StartPTMongoDBSummaryAction_0(ctx context.Context, ma var protoReq StartPTMongoDBSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -349,7 +453,11 @@ func request_Actions_StartPTMySQLSummaryAction_0(ctx context.Context, marshaler var protoReq StartPTMySQLSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -361,7 +469,11 @@ func local_request_Actions_StartPTMySQLSummaryAction_0(ctx context.Context, mars var protoReq StartPTMySQLSummaryActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -373,7 +485,11 @@ func request_Actions_CancelAction_0(ctx context.Context, marshaler runtime.Marsh var protoReq CancelActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -385,7 +501,11 @@ func local_request_Actions_CancelAction_0(ctx context.Context, marshaler runtime var protoReq CancelActionRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/agent/agent.pb.gw.go b/api/managementpb/agent/agent.pb.gw.go index b323fbec6b..9329b46d39 100644 --- a/api/managementpb/agent/agent.pb.gw.go +++ b/api/managementpb/agent/agent.pb.gw.go @@ -37,7 +37,11 @@ func request_Agent_ListAgents_0(ctx context.Context, marshaler runtime.Marshaler var protoReq ListAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Agent_ListAgents_0(ctx context.Context, marshaler runtime.Mar var protoReq ListAgentRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/alerting/alerting.pb.gw.go b/api/managementpb/alerting/alerting.pb.gw.go index 4c41f9acdf..419b71ea2f 100644 --- a/api/managementpb/alerting/alerting.pb.gw.go +++ b/api/managementpb/alerting/alerting.pb.gw.go @@ -37,7 +37,11 @@ func request_Alerting_ListTemplates_0(ctx context.Context, marshaler runtime.Mar var protoReq ListTemplatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Alerting_ListTemplates_0(ctx context.Context, marshaler runti var protoReq ListTemplatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Alerting_CreateTemplate_0(ctx context.Context, marshaler runtime.Ma var protoReq CreateTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Alerting_CreateTemplate_0(ctx context.Context, marshaler runt var protoReq CreateTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Alerting_UpdateTemplate_0(ctx context.Context, marshaler runtime.Ma var protoReq UpdateTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Alerting_UpdateTemplate_0(ctx context.Context, marshaler runt var protoReq UpdateTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Alerting_DeleteTemplate_0(ctx context.Context, marshaler runtime.Ma var protoReq DeleteTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Alerting_DeleteTemplate_0(ctx context.Context, marshaler runt var protoReq DeleteTemplateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Alerting_CreateRule_0(ctx context.Context, marshaler runtime.Marsha var protoReq CreateRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Alerting_CreateRule_0(ctx context.Context, marshaler runtime. var protoReq CreateRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/annotation.pb.gw.go b/api/managementpb/annotation.pb.gw.go index e251b9b1b5..ebcf79c3f5 100644 --- a/api/managementpb/annotation.pb.gw.go +++ b/api/managementpb/annotation.pb.gw.go @@ -37,7 +37,11 @@ func request_Annotation_AddAnnotation_0(ctx context.Context, marshaler runtime.M var protoReq AddAnnotationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Annotation_AddAnnotation_0(ctx context.Context, marshaler run var protoReq AddAnnotationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/azure/azure.pb.gw.go b/api/managementpb/azure/azure.pb.gw.go index fb8c0f2248..07de32ff10 100644 --- a/api/managementpb/azure/azure.pb.gw.go +++ b/api/managementpb/azure/azure.pb.gw.go @@ -37,7 +37,11 @@ func request_AzureDatabase_DiscoverAzureDatabase_0(ctx context.Context, marshale var protoReq DiscoverAzureDatabaseRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_AzureDatabase_DiscoverAzureDatabase_0(ctx context.Context, ma var protoReq DiscoverAzureDatabaseRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_AzureDatabase_AddAzureDatabase_0(ctx context.Context, marshaler run var protoReq AddAzureDatabaseRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_AzureDatabase_AddAzureDatabase_0(ctx context.Context, marshal var protoReq AddAzureDatabaseRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/backup/artifacts.pb.gw.go b/api/managementpb/backup/artifacts.pb.gw.go index ddcb1d1c7c..f80aa72372 100644 --- a/api/managementpb/backup/artifacts.pb.gw.go +++ b/api/managementpb/backup/artifacts.pb.gw.go @@ -37,7 +37,11 @@ func request_Artifacts_ListArtifacts_0(ctx context.Context, marshaler runtime.Ma var protoReq ListArtifactsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Artifacts_ListArtifacts_0(ctx context.Context, marshaler runt var protoReq ListArtifactsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Artifacts_DeleteArtifact_0(ctx context.Context, marshaler runtime.M var protoReq DeleteArtifactRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Artifacts_DeleteArtifact_0(ctx context.Context, marshaler run var protoReq DeleteArtifactRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Artifacts_ListPitrTimeranges_0(ctx context.Context, marshaler runti var protoReq ListPitrTimerangesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Artifacts_ListPitrTimeranges_0(ctx context.Context, marshaler var protoReq ListPitrTimerangesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/backup/backups.pb.gw.go b/api/managementpb/backup/backups.pb.gw.go index edf589bbfd..ad56562fe5 100644 --- a/api/managementpb/backup/backups.pb.gw.go +++ b/api/managementpb/backup/backups.pb.gw.go @@ -37,7 +37,11 @@ func request_Backups_StartBackup_0(ctx context.Context, marshaler runtime.Marsha var protoReq StartBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Backups_StartBackup_0(ctx context.Context, marshaler runtime. var protoReq StartBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Backups_ListArtifactCompatibleServices_0(ctx context.Context, marsh var protoReq ListArtifactCompatibleServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Backups_ListArtifactCompatibleServices_0(ctx context.Context, var protoReq ListArtifactCompatibleServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Backups_RestoreBackup_0(ctx context.Context, marshaler runtime.Mars var protoReq RestoreBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Backups_RestoreBackup_0(ctx context.Context, marshaler runtim var protoReq RestoreBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Backups_ScheduleBackup_0(ctx context.Context, marshaler runtime.Mar var protoReq ScheduleBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Backups_ScheduleBackup_0(ctx context.Context, marshaler runti var protoReq ScheduleBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Backups_ListScheduledBackups_0(ctx context.Context, marshaler runti var protoReq ListScheduledBackupsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Backups_ListScheduledBackups_0(ctx context.Context, marshaler var protoReq ListScheduledBackupsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Backups_ChangeScheduledBackup_0(ctx context.Context, marshaler runt var protoReq ChangeScheduledBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Backups_ChangeScheduledBackup_0(ctx context.Context, marshale var protoReq ChangeScheduledBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Backups_RemoveScheduledBackup_0(ctx context.Context, marshaler runt var protoReq RemoveScheduledBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Backups_RemoveScheduledBackup_0(ctx context.Context, marshale var protoReq RemoveScheduledBackupRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_Backups_GetLogs_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_Backups_GetLogs_0(ctx context.Context, marshaler runtime.Mars var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/backup/locations.pb.gw.go b/api/managementpb/backup/locations.pb.gw.go index 0cdc541361..04abab82c8 100644 --- a/api/managementpb/backup/locations.pb.gw.go +++ b/api/managementpb/backup/locations.pb.gw.go @@ -37,7 +37,11 @@ func request_Locations_ListLocations_0(ctx context.Context, marshaler runtime.Ma var protoReq ListLocationsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Locations_ListLocations_0(ctx context.Context, marshaler runt var protoReq ListLocationsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Locations_AddLocation_0(ctx context.Context, marshaler runtime.Mars var protoReq AddLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Locations_AddLocation_0(ctx context.Context, marshaler runtim var protoReq AddLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Locations_ChangeLocation_0(ctx context.Context, marshaler runtime.M var protoReq ChangeLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Locations_ChangeLocation_0(ctx context.Context, marshaler run var protoReq ChangeLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Locations_RemoveLocation_0(ctx context.Context, marshaler runtime.M var protoReq RemoveLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Locations_RemoveLocation_0(ctx context.Context, marshaler run var protoReq RemoveLocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Locations_TestLocationConfig_0(ctx context.Context, marshaler runti var protoReq TestLocationConfigRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Locations_TestLocationConfig_0(ctx context.Context, marshaler var protoReq TestLocationConfigRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/backup/restores.pb.gw.go b/api/managementpb/backup/restores.pb.gw.go index 3fe9900838..cab260bb0e 100644 --- a/api/managementpb/backup/restores.pb.gw.go +++ b/api/managementpb/backup/restores.pb.gw.go @@ -37,7 +37,11 @@ func request_RestoreHistory_ListRestoreHistory_0(ctx context.Context, marshaler var protoReq ListRestoreHistoryRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_RestoreHistory_ListRestoreHistory_0(ctx context.Context, mars var protoReq ListRestoreHistoryRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/checks.pb.gw.go b/api/managementpb/checks.pb.gw.go index 8e92fcd1c4..ab78dffe20 100644 --- a/api/managementpb/checks.pb.gw.go +++ b/api/managementpb/checks.pb.gw.go @@ -37,7 +37,11 @@ func request_SecurityChecks_ListFailedServices_0(ctx context.Context, marshaler var protoReq ListFailedServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_SecurityChecks_ListFailedServices_0(ctx context.Context, mars var protoReq ListFailedServicesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_SecurityChecks_GetFailedChecks_0(ctx context.Context, marshaler run var protoReq GetFailedChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_SecurityChecks_GetFailedChecks_0(ctx context.Context, marshal var protoReq GetFailedChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_SecurityChecks_ToggleCheckAlert_0(ctx context.Context, marshaler ru var protoReq ToggleCheckAlertRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_SecurityChecks_ToggleCheckAlert_0(ctx context.Context, marsha var protoReq ToggleCheckAlertRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_SecurityChecks_GetSecurityCheckResults_0(ctx context.Context, marsh var protoReq GetSecurityCheckResultsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_SecurityChecks_GetSecurityCheckResults_0(ctx context.Context, var protoReq GetSecurityCheckResultsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_SecurityChecks_StartSecurityChecks_0(ctx context.Context, marshaler var protoReq StartSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_SecurityChecks_StartSecurityChecks_0(ctx context.Context, mar var protoReq StartSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_SecurityChecks_ListSecurityChecks_0(ctx context.Context, marshaler var protoReq ListSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_SecurityChecks_ListSecurityChecks_0(ctx context.Context, mars var protoReq ListSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_SecurityChecks_ListAdvisors_0(ctx context.Context, marshaler runtim var protoReq ListAdvisorsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_SecurityChecks_ListAdvisors_0(ctx context.Context, marshaler var protoReq ListAdvisorsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_SecurityChecks_ChangeSecurityChecks_0(ctx context.Context, marshale var protoReq ChangeSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_SecurityChecks_ChangeSecurityChecks_0(ctx context.Context, ma var protoReq ChangeSecurityChecksRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/components.pb.gw.go b/api/managementpb/dbaas/components.pb.gw.go index e5cd9c6510..84abfde921 100644 --- a/api/managementpb/dbaas/components.pb.gw.go +++ b/api/managementpb/dbaas/components.pb.gw.go @@ -37,7 +37,11 @@ func request_Components_GetPSMDBComponents_0(ctx context.Context, marshaler runt var protoReq GetPSMDBComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Components_GetPSMDBComponents_0(ctx context.Context, marshale var protoReq GetPSMDBComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Components_GetPXCComponents_0(ctx context.Context, marshaler runtim var protoReq GetPXCComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Components_GetPXCComponents_0(ctx context.Context, marshaler var protoReq GetPXCComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Components_ChangePSMDBComponents_0(ctx context.Context, marshaler r var protoReq ChangePSMDBComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Components_ChangePSMDBComponents_0(ctx context.Context, marsh var protoReq ChangePSMDBComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Components_ChangePXCComponents_0(ctx context.Context, marshaler run var protoReq ChangePXCComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Components_ChangePXCComponents_0(ctx context.Context, marshal var protoReq ChangePXCComponentsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Components_InstallOperator_0(ctx context.Context, marshaler runtime var protoReq InstallOperatorRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Components_InstallOperator_0(ctx context.Context, marshaler r var protoReq InstallOperatorRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Components_CheckForOperatorUpdate_0(ctx context.Context, marshaler var protoReq CheckForOperatorUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Components_CheckForOperatorUpdate_0(ctx context.Context, mars var protoReq CheckForOperatorUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/db_clusters.pb.gw.go b/api/managementpb/dbaas/db_clusters.pb.gw.go index b488e901b9..db8d99ae82 100644 --- a/api/managementpb/dbaas/db_clusters.pb.gw.go +++ b/api/managementpb/dbaas/db_clusters.pb.gw.go @@ -37,7 +37,11 @@ func request_DBClusters_ListDBClusters_0(ctx context.Context, marshaler runtime. var protoReq ListDBClustersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_DBClusters_ListDBClusters_0(ctx context.Context, marshaler ru var protoReq ListDBClustersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_DBClusters_GetDBCluster_0(ctx context.Context, marshaler runtime.Ma var protoReq GetDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_DBClusters_GetDBCluster_0(ctx context.Context, marshaler runt var protoReq GetDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_DBClusters_RestartDBCluster_0(ctx context.Context, marshaler runtim var protoReq RestartDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_DBClusters_RestartDBCluster_0(ctx context.Context, marshaler var protoReq RestartDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_DBClusters_DeleteDBCluster_0(ctx context.Context, marshaler runtime var protoReq DeleteDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_DBClusters_DeleteDBCluster_0(ctx context.Context, marshaler r var protoReq DeleteDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_DBClusters_ListS3Backups_0(ctx context.Context, marshaler runtime.M var protoReq ListS3BackupsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_DBClusters_ListS3Backups_0(ctx context.Context, marshaler run var protoReq ListS3BackupsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_DBClusters_ListSecrets_0(ctx context.Context, marshaler runtime.Mar var protoReq ListSecretsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_DBClusters_ListSecrets_0(ctx context.Context, marshaler runti var protoReq ListSecretsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/kubernetes.pb.gw.go b/api/managementpb/dbaas/kubernetes.pb.gw.go index 299d908df5..6e48eb285c 100644 --- a/api/managementpb/dbaas/kubernetes.pb.gw.go +++ b/api/managementpb/dbaas/kubernetes.pb.gw.go @@ -37,7 +37,11 @@ func request_Kubernetes_ListKubernetesClusters_0(ctx context.Context, marshaler var protoReq ListKubernetesClustersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Kubernetes_ListKubernetesClusters_0(ctx context.Context, mars var protoReq ListKubernetesClustersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Kubernetes_RegisterKubernetesCluster_0(ctx context.Context, marshal var protoReq RegisterKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Kubernetes_RegisterKubernetesCluster_0(ctx context.Context, m var protoReq RegisterKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Kubernetes_UnregisterKubernetesCluster_0(ctx context.Context, marsh var protoReq UnregisterKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Kubernetes_UnregisterKubernetesCluster_0(ctx context.Context, var protoReq UnregisterKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Kubernetes_GetKubernetesCluster_0(ctx context.Context, marshaler ru var protoReq GetKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Kubernetes_GetKubernetesCluster_0(ctx context.Context, marsha var protoReq GetKubernetesClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Kubernetes_GetResources_0(ctx context.Context, marshaler runtime.Ma var protoReq GetResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Kubernetes_GetResources_0(ctx context.Context, marshaler runt var protoReq GetResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Kubernetes_ListStorageClasses_0(ctx context.Context, marshaler runt var protoReq ListStorageClassesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Kubernetes_ListStorageClasses_0(ctx context.Context, marshale var protoReq ListStorageClassesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/logs.pb.gw.go b/api/managementpb/dbaas/logs.pb.gw.go index 7336cad6d8..e6161d8e30 100644 --- a/api/managementpb/dbaas/logs.pb.gw.go +++ b/api/managementpb/dbaas/logs.pb.gw.go @@ -37,7 +37,11 @@ func request_LogsAPI_GetLogs_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_LogsAPI_GetLogs_0(ctx context.Context, marshaler runtime.Mars var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/psmdb_clusters.pb.gw.go b/api/managementpb/dbaas/psmdb_clusters.pb.gw.go index 2c554f75ec..74d5c1eb87 100644 --- a/api/managementpb/dbaas/psmdb_clusters.pb.gw.go +++ b/api/managementpb/dbaas/psmdb_clusters.pb.gw.go @@ -37,7 +37,11 @@ func request_PSMDBClusters_GetPSMDBClusterCredentials_0(ctx context.Context, mar var protoReq GetPSMDBClusterCredentialsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_PSMDBClusters_GetPSMDBClusterCredentials_0(ctx context.Contex var protoReq GetPSMDBClusterCredentialsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_PSMDBClusters_CreatePSMDBCluster_0(ctx context.Context, marshaler r var protoReq CreatePSMDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_PSMDBClusters_CreatePSMDBCluster_0(ctx context.Context, marsh var protoReq CreatePSMDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_PSMDBClusters_UpdatePSMDBCluster_0(ctx context.Context, marshaler r var protoReq UpdatePSMDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_PSMDBClusters_UpdatePSMDBCluster_0(ctx context.Context, marsh var protoReq UpdatePSMDBClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_PSMDBClusters_GetPSMDBClusterResources_0(ctx context.Context, marsh var protoReq GetPSMDBClusterResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_PSMDBClusters_GetPSMDBClusterResources_0(ctx context.Context, var protoReq GetPSMDBClusterResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/pxc_clusters.pb.gw.go b/api/managementpb/dbaas/pxc_clusters.pb.gw.go index a6335d598a..65165a778a 100644 --- a/api/managementpb/dbaas/pxc_clusters.pb.gw.go +++ b/api/managementpb/dbaas/pxc_clusters.pb.gw.go @@ -37,7 +37,11 @@ func request_PXCClusters_GetPXCClusterCredentials_0(ctx context.Context, marshal var protoReq GetPXCClusterCredentialsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_PXCClusters_GetPXCClusterCredentials_0(ctx context.Context, m var protoReq GetPXCClusterCredentialsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_PXCClusters_CreatePXCCluster_0(ctx context.Context, marshaler runti var protoReq CreatePXCClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_PXCClusters_CreatePXCCluster_0(ctx context.Context, marshaler var protoReq CreatePXCClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_PXCClusters_UpdatePXCCluster_0(ctx context.Context, marshaler runti var protoReq UpdatePXCClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_PXCClusters_UpdatePXCCluster_0(ctx context.Context, marshaler var protoReq UpdatePXCClusterRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_PXCClusters_GetPXCClusterResources_0(ctx context.Context, marshaler var protoReq GetPXCClusterResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_PXCClusters_GetPXCClusterResources_0(ctx context.Context, mar var protoReq GetPXCClusterResourcesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dbaas/templates.pb.gw.go b/api/managementpb/dbaas/templates.pb.gw.go index 1550b7da84..bf46c4b9ef 100644 --- a/api/managementpb/dbaas/templates.pb.gw.go +++ b/api/managementpb/dbaas/templates.pb.gw.go @@ -37,7 +37,11 @@ func request_Templates_ListTemplates_0(ctx context.Context, marshaler runtime.Ma var protoReq ListTemplatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Templates_ListTemplates_0(ctx context.Context, marshaler runt var protoReq ListTemplatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/dump/dump.pb.gw.go b/api/managementpb/dump/dump.pb.gw.go index 796eff39b0..97f94a9292 100644 --- a/api/managementpb/dump/dump.pb.gw.go +++ b/api/managementpb/dump/dump.pb.gw.go @@ -37,7 +37,11 @@ func request_Dumps_StartDump_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq StartDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Dumps_StartDump_0(ctx context.Context, marshaler runtime.Mars var protoReq StartDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Dumps_ListDumps_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq ListDumpsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Dumps_ListDumps_0(ctx context.Context, marshaler runtime.Mars var protoReq ListDumpsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Dumps_DeleteDump_0(ctx context.Context, marshaler runtime.Marshaler var protoReq DeleteDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Dumps_DeleteDump_0(ctx context.Context, marshaler runtime.Mar var protoReq DeleteDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Dumps_GetDumpLogs_0(ctx context.Context, marshaler runtime.Marshale var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Dumps_GetDumpLogs_0(ctx context.Context, marshaler runtime.Ma var protoReq GetLogsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Dumps_UploadDump_0(ctx context.Context, marshaler runtime.Marshaler var protoReq UploadDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Dumps_UploadDump_0(ctx context.Context, marshaler runtime.Mar var protoReq UploadDumpRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/external.pb.gw.go b/api/managementpb/external.pb.gw.go index d225a6a8fb..315f8a4d17 100644 --- a/api/managementpb/external.pb.gw.go +++ b/api/managementpb/external.pb.gw.go @@ -37,7 +37,11 @@ func request_External_AddExternal_0(ctx context.Context, marshaler runtime.Marsh var protoReq AddExternalRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_External_AddExternal_0(ctx context.Context, marshaler runtime var protoReq AddExternalRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/haproxy.pb.gw.go b/api/managementpb/haproxy.pb.gw.go index 0b93307efa..dba51d5a1e 100644 --- a/api/managementpb/haproxy.pb.gw.go +++ b/api/managementpb/haproxy.pb.gw.go @@ -37,7 +37,11 @@ func request_HAProxy_AddHAProxy_0(ctx context.Context, marshaler runtime.Marshal var protoReq AddHAProxyRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_HAProxy_AddHAProxy_0(ctx context.Context, marshaler runtime.M var protoReq AddHAProxyRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/ia/alerts.pb.gw.go b/api/managementpb/ia/alerts.pb.gw.go index 922f815ace..00ed66298e 100644 --- a/api/managementpb/ia/alerts.pb.gw.go +++ b/api/managementpb/ia/alerts.pb.gw.go @@ -37,7 +37,11 @@ func request_Alerts_ListAlerts_0(ctx context.Context, marshaler runtime.Marshale var protoReq ListAlertsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Alerts_ListAlerts_0(ctx context.Context, marshaler runtime.Ma var protoReq ListAlertsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Alerts_ToggleAlerts_0(ctx context.Context, marshaler runtime.Marsha var protoReq ToggleAlertsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Alerts_ToggleAlerts_0(ctx context.Context, marshaler runtime. var protoReq ToggleAlertsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/ia/channels.pb.gw.go b/api/managementpb/ia/channels.pb.gw.go index 3807c08220..f47eb473a1 100644 --- a/api/managementpb/ia/channels.pb.gw.go +++ b/api/managementpb/ia/channels.pb.gw.go @@ -37,7 +37,11 @@ func request_Channels_ListChannels_0(ctx context.Context, marshaler runtime.Mars var protoReq ListChannelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Channels_ListChannels_0(ctx context.Context, marshaler runtim var protoReq ListChannelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Channels_AddChannel_0(ctx context.Context, marshaler runtime.Marsha var protoReq AddChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Channels_AddChannel_0(ctx context.Context, marshaler runtime. var protoReq AddChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Channels_ChangeChannel_0(ctx context.Context, marshaler runtime.Mar var protoReq ChangeChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Channels_ChangeChannel_0(ctx context.Context, marshaler runti var protoReq ChangeChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Channels_RemoveChannel_0(ctx context.Context, marshaler runtime.Mar var protoReq RemoveChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Channels_RemoveChannel_0(ctx context.Context, marshaler runti var protoReq RemoveChannelRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/ia/rules.pb.gw.go b/api/managementpb/ia/rules.pb.gw.go index 3dd53da032..8458714bcb 100644 --- a/api/managementpb/ia/rules.pb.gw.go +++ b/api/managementpb/ia/rules.pb.gw.go @@ -37,7 +37,11 @@ func request_Rules_ListAlertRules_0(ctx context.Context, marshaler runtime.Marsh var protoReq ListAlertRulesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Rules_ListAlertRules_0(ctx context.Context, marshaler runtime var protoReq ListAlertRulesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Rules_CreateAlertRule_0(ctx context.Context, marshaler runtime.Mars var protoReq CreateAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Rules_CreateAlertRule_0(ctx context.Context, marshaler runtim var protoReq CreateAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Rules_UpdateAlertRule_0(ctx context.Context, marshaler runtime.Mars var protoReq UpdateAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Rules_UpdateAlertRule_0(ctx context.Context, marshaler runtim var protoReq UpdateAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Rules_ToggleAlertRule_0(ctx context.Context, marshaler runtime.Mars var protoReq ToggleAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Rules_ToggleAlertRule_0(ctx context.Context, marshaler runtim var protoReq ToggleAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Rules_DeleteAlertRule_0(ctx context.Context, marshaler runtime.Mars var protoReq DeleteAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Rules_DeleteAlertRule_0(ctx context.Context, marshaler runtim var protoReq DeleteAlertRuleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/mongodb.pb.gw.go b/api/managementpb/mongodb.pb.gw.go index 04a494dfbf..bf71ae102f 100644 --- a/api/managementpb/mongodb.pb.gw.go +++ b/api/managementpb/mongodb.pb.gw.go @@ -37,7 +37,11 @@ func request_MongoDB_AddMongoDB_0(ctx context.Context, marshaler runtime.Marshal var protoReq AddMongoDBRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_MongoDB_AddMongoDB_0(ctx context.Context, marshaler runtime.M var protoReq AddMongoDBRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/mysql.pb.gw.go b/api/managementpb/mysql.pb.gw.go index 446217a8df..bde4f775fe 100644 --- a/api/managementpb/mysql.pb.gw.go +++ b/api/managementpb/mysql.pb.gw.go @@ -37,7 +37,11 @@ func request_MySQL_AddMySQL_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq AddMySQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_MySQL_AddMySQL_0(ctx context.Context, marshaler runtime.Marsh var protoReq AddMySQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/node.pb.gw.go b/api/managementpb/node.pb.gw.go index e6c176b244..3107389032 100644 --- a/api/managementpb/node.pb.gw.go +++ b/api/managementpb/node.pb.gw.go @@ -37,7 +37,11 @@ func request_Node_RegisterNode_0(ctx context.Context, marshaler runtime.Marshale var protoReq RegisterNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Node_RegisterNode_0(ctx context.Context, marshaler runtime.Ma var protoReq RegisterNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/node/node.pb.gw.go b/api/managementpb/node/node.pb.gw.go index 6a13fbf480..13c3ff3c92 100644 --- a/api/managementpb/node/node.pb.gw.go +++ b/api/managementpb/node/node.pb.gw.go @@ -37,7 +37,11 @@ func request_MgmtNode_ListNodes_0(ctx context.Context, marshaler runtime.Marshal var protoReq ListNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_MgmtNode_ListNodes_0(ctx context.Context, marshaler runtime.M var protoReq ListNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_MgmtNode_GetNode_0(ctx context.Context, marshaler runtime.Marshaler var protoReq GetNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_MgmtNode_GetNode_0(ctx context.Context, marshaler runtime.Mar var protoReq GetNodeRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/postgresql.pb.gw.go b/api/managementpb/postgresql.pb.gw.go index 9a38e8aed6..85b4b2ee38 100644 --- a/api/managementpb/postgresql.pb.gw.go +++ b/api/managementpb/postgresql.pb.gw.go @@ -37,7 +37,11 @@ func request_PostgreSQL_AddPostgreSQL_0(ctx context.Context, marshaler runtime.M var protoReq AddPostgreSQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_PostgreSQL_AddPostgreSQL_0(ctx context.Context, marshaler run var protoReq AddPostgreSQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/proxysql.pb.gw.go b/api/managementpb/proxysql.pb.gw.go index 76d01d4d09..3101c325a3 100644 --- a/api/managementpb/proxysql.pb.gw.go +++ b/api/managementpb/proxysql.pb.gw.go @@ -37,7 +37,11 @@ func request_ProxySQL_AddProxySQL_0(ctx context.Context, marshaler runtime.Marsh var protoReq AddProxySQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_ProxySQL_AddProxySQL_0(ctx context.Context, marshaler runtime var protoReq AddProxySQLRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/rds.pb.gw.go b/api/managementpb/rds.pb.gw.go index ebb010a7da..b07e7b7196 100644 --- a/api/managementpb/rds.pb.gw.go +++ b/api/managementpb/rds.pb.gw.go @@ -37,7 +37,11 @@ func request_RDS_DiscoverRDS_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq DiscoverRDSRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_RDS_DiscoverRDS_0(ctx context.Context, marshaler runtime.Mars var protoReq DiscoverRDSRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_RDS_AddRDS_0(ctx context.Context, marshaler runtime.Marshaler, clie var protoReq AddRDSRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_RDS_AddRDS_0(ctx context.Context, marshaler runtime.Marshaler var protoReq AddRDSRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/role/role.pb.gw.go b/api/managementpb/role/role.pb.gw.go index 41f56e50c1..08f67280cf 100644 --- a/api/managementpb/role/role.pb.gw.go +++ b/api/managementpb/role/role.pb.gw.go @@ -37,7 +37,11 @@ func request_Role_CreateRole_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq CreateRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Role_CreateRole_0(ctx context.Context, marshaler runtime.Mars var protoReq CreateRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Role_UpdateRole_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq UpdateRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Role_UpdateRole_0(ctx context.Context, marshaler runtime.Mars var protoReq UpdateRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Role_DeleteRole_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq DeleteRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Role_DeleteRole_0(ctx context.Context, marshaler runtime.Mars var protoReq DeleteRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Role_GetRole_0(ctx context.Context, marshaler runtime.Marshaler, cl var protoReq GetRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Role_GetRole_0(ctx context.Context, marshaler runtime.Marshal var protoReq GetRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Role_ListRoles_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq ListRolesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Role_ListRoles_0(ctx context.Context, marshaler runtime.Marsh var protoReq ListRolesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Role_AssignRoles_0(ctx context.Context, marshaler runtime.Marshaler var protoReq AssignRolesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Role_AssignRoles_0(ctx context.Context, marshaler runtime.Mar var protoReq AssignRolesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Role_SetDefaultRole_0(ctx context.Context, marshaler runtime.Marsha var protoReq SetDefaultRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Role_SetDefaultRole_0(ctx context.Context, marshaler runtime. var protoReq SetDefaultRoleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/service.pb.gw.go b/api/managementpb/service.pb.gw.go index 526cded652..c8998723c2 100644 --- a/api/managementpb/service.pb.gw.go +++ b/api/managementpb/service.pb.gw.go @@ -37,7 +37,11 @@ func request_Service_RemoveService_0(ctx context.Context, marshaler runtime.Mars var protoReq RemoveServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Service_RemoveService_0(ctx context.Context, marshaler runtim var protoReq RemoveServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/managementpb/service/service.pb.gw.go b/api/managementpb/service/service.pb.gw.go index bce9792f1d..12ebf2d2db 100644 --- a/api/managementpb/service/service.pb.gw.go +++ b/api/managementpb/service/service.pb.gw.go @@ -37,7 +37,11 @@ func request_MgmtService_ListServices_0(ctx context.Context, marshaler runtime.M var protoReq ListServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_MgmtService_ListServices_0(ctx context.Context, marshaler run var protoReq ListServiceRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/platformpb/platform.pb.gw.go b/api/platformpb/platform.pb.gw.go index 8e6187c064..914bb13a95 100644 --- a/api/platformpb/platform.pb.gw.go +++ b/api/platformpb/platform.pb.gw.go @@ -37,7 +37,11 @@ func request_Platform_Connect_0(ctx context.Context, marshaler runtime.Marshaler var protoReq ConnectRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Platform_Connect_0(ctx context.Context, marshaler runtime.Mar var protoReq ConnectRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_Platform_Disconnect_0(ctx context.Context, marshaler runtime.Marsha var protoReq DisconnectRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_Platform_Disconnect_0(ctx context.Context, marshaler runtime. var protoReq DisconnectRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_Platform_SearchOrganizationTickets_0(ctx context.Context, marshaler var protoReq SearchOrganizationTicketsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_Platform_SearchOrganizationTickets_0(ctx context.Context, mar var protoReq SearchOrganizationTicketsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_Platform_SearchOrganizationEntitlements_0(ctx context.Context, mars var protoReq SearchOrganizationEntitlementsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_Platform_SearchOrganizationEntitlements_0(ctx context.Context var protoReq SearchOrganizationEntitlementsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_Platform_GetContactInformation_0(ctx context.Context, marshaler run var protoReq GetContactInformationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_Platform_GetContactInformation_0(ctx context.Context, marshal var protoReq GetContactInformationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_Platform_ServerInfo_0(ctx context.Context, marshaler runtime.Marsha var protoReq ServerInfoRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_Platform_ServerInfo_0(ctx context.Context, marshaler runtime. var protoReq ServerInfoRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_Platform_UserStatus_0(ctx context.Context, marshaler runtime.Marsha var protoReq UserStatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_Platform_UserStatus_0(ctx context.Context, marshaler runtime. var protoReq UserStatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/qanpb/filters.pb.gw.go b/api/qanpb/filters.pb.gw.go index 06834af53b..74cec79c58 100644 --- a/api/qanpb/filters.pb.gw.go +++ b/api/qanpb/filters.pb.gw.go @@ -37,7 +37,11 @@ func request_Filters_Get_0(ctx context.Context, marshaler runtime.Marshaler, cli var protoReq FiltersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Filters_Get_0(ctx context.Context, marshaler runtime.Marshale var protoReq FiltersRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/qanpb/metrics_names.pb.gw.go b/api/qanpb/metrics_names.pb.gw.go index c74c921e8a..fbe185c590 100644 --- a/api/qanpb/metrics_names.pb.gw.go +++ b/api/qanpb/metrics_names.pb.gw.go @@ -37,7 +37,11 @@ func request_MetricsNames_GetMetricsNames_0(ctx context.Context, marshaler runti var protoReq MetricsNamesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_MetricsNames_GetMetricsNames_0(ctx context.Context, marshaler var protoReq MetricsNamesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/qanpb/object_details.pb.gw.go b/api/qanpb/object_details.pb.gw.go index 18286bd649..08f454da3e 100644 --- a/api/qanpb/object_details.pb.gw.go +++ b/api/qanpb/object_details.pb.gw.go @@ -37,7 +37,11 @@ func request_ObjectDetails_GetMetrics_0(ctx context.Context, marshaler runtime.M var protoReq MetricsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_ObjectDetails_GetMetrics_0(ctx context.Context, marshaler run var protoReq MetricsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,7 +69,11 @@ func request_ObjectDetails_GetQueryExample_0(ctx context.Context, marshaler runt var protoReq QueryExampleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -73,7 +85,11 @@ func local_request_ObjectDetails_GetQueryExample_0(ctx context.Context, marshale var protoReq QueryExampleRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -85,7 +101,11 @@ func request_ObjectDetails_GetLabels_0(ctx context.Context, marshaler runtime.Ma var protoReq ObjectDetailsLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +117,11 @@ func local_request_ObjectDetails_GetLabels_0(ctx context.Context, marshaler runt var protoReq ObjectDetailsLabelsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +133,11 @@ func request_ObjectDetails_GetQueryPlan_0(ctx context.Context, marshaler runtime var protoReq QueryPlanRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +149,11 @@ func local_request_ObjectDetails_GetQueryPlan_0(ctx context.Context, marshaler r var protoReq QueryPlanRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +165,11 @@ func request_ObjectDetails_GetHistogram_0(ctx context.Context, marshaler runtime var protoReq HistogramRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +181,11 @@ func local_request_ObjectDetails_GetHistogram_0(ctx context.Context, marshaler r var protoReq HistogramRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +197,11 @@ func request_ObjectDetails_QueryExists_0(ctx context.Context, marshaler runtime. var protoReq QueryExistsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +213,11 @@ func local_request_ObjectDetails_QueryExists_0(ctx context.Context, marshaler ru var protoReq QueryExistsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +229,11 @@ func request_ObjectDetails_ExplainFingerprintByQueryID_0(ctx context.Context, ma var protoReq ExplainFingerprintByQueryIDRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +245,11 @@ func local_request_ObjectDetails_ExplainFingerprintByQueryID_0(ctx context.Conte var protoReq ExplainFingerprintByQueryIDRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +261,11 @@ func request_ObjectDetails_SchemaByQueryID_0(ctx context.Context, marshaler runt var protoReq SchemaByQueryIDRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +277,11 @@ func local_request_ObjectDetails_SchemaByQueryID_0(ctx context.Context, marshale var protoReq SchemaByQueryIDRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/qanpb/profile.pb.gw.go b/api/qanpb/profile.pb.gw.go index dd6d54183d..ae55db87db 100644 --- a/api/qanpb/profile.pb.gw.go +++ b/api/qanpb/profile.pb.gw.go @@ -37,7 +37,11 @@ func request_Profile_GetReport_0(ctx context.Context, marshaler runtime.Marshale var protoReq ReportRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_Profile_GetReport_0(ctx context.Context, marshaler runtime.Ma var protoReq ReportRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/serverpb/server.pb.gw.go b/api/serverpb/server.pb.gw.go index a04f221f4d..4ffe35ac64 100644 --- a/api/serverpb/server.pb.gw.go +++ b/api/serverpb/server.pb.gw.go @@ -85,7 +85,11 @@ func request_Server_LeaderHealthCheck_0(ctx context.Context, marshaler runtime.M var protoReq LeaderHealthCheckRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -97,7 +101,11 @@ func local_request_Server_LeaderHealthCheck_0(ctx context.Context, marshaler run var protoReq LeaderHealthCheckRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -109,7 +117,11 @@ func request_Server_CheckUpdates_0(ctx context.Context, marshaler runtime.Marsha var protoReq CheckUpdatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +133,11 @@ func local_request_Server_CheckUpdates_0(ctx context.Context, marshaler runtime. var protoReq CheckUpdatesRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -133,7 +149,11 @@ func request_Server_StartUpdate_0(ctx context.Context, marshaler runtime.Marshal var protoReq StartUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -145,7 +165,11 @@ func local_request_Server_StartUpdate_0(ctx context.Context, marshaler runtime.M var protoReq StartUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -157,7 +181,11 @@ func request_Server_UpdateStatus_0(ctx context.Context, marshaler runtime.Marsha var protoReq UpdateStatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -169,7 +197,11 @@ func local_request_Server_UpdateStatus_0(ctx context.Context, marshaler runtime. var protoReq UpdateStatusRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -181,7 +213,11 @@ func request_Server_GetSettings_0(ctx context.Context, marshaler runtime.Marshal var protoReq GetSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,7 +229,11 @@ func local_request_Server_GetSettings_0(ctx context.Context, marshaler runtime.M var protoReq GetSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -205,7 +245,11 @@ func request_Server_ChangeSettings_0(ctx context.Context, marshaler runtime.Mars var protoReq ChangeSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -217,7 +261,11 @@ func local_request_Server_ChangeSettings_0(ctx context.Context, marshaler runtim var protoReq ChangeSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -229,7 +277,11 @@ func request_Server_TestEmailAlertingSettings_0(ctx context.Context, marshaler r var protoReq TestEmailAlertingSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -241,7 +293,11 @@ func local_request_Server_TestEmailAlertingSettings_0(ctx context.Context, marsh var protoReq TestEmailAlertingSettingsRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -253,7 +309,11 @@ func request_Server_AWSInstanceCheck_0(ctx context.Context, marshaler runtime.Ma var protoReq AWSInstanceCheckRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -265,7 +325,11 @@ func local_request_Server_AWSInstanceCheck_0(ctx context.Context, marshaler runt var protoReq AWSInstanceCheckRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/uieventspb/server.pb.gw.go b/api/uieventspb/server.pb.gw.go index f11e823e3e..44705a12f0 100644 --- a/api/uieventspb/server.pb.gw.go +++ b/api/uieventspb/server.pb.gw.go @@ -37,7 +37,11 @@ func request_UIEvents_Store_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq StoreRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -49,7 +53,11 @@ func local_request_UIEvents_Store_0(ctx context.Context, marshaler runtime.Marsh var protoReq StoreRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/api/userpb/user.pb.gw.go b/api/userpb/user.pb.gw.go index 0260c29b7e..1355ff4a7f 100644 --- a/api/userpb/user.pb.gw.go +++ b/api/userpb/user.pb.gw.go @@ -53,7 +53,11 @@ func request_User_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, var protoReq UserUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -65,7 +69,11 @@ func local_request_User_UpdateUser_0(ctx context.Context, marshaler runtime.Mars var protoReq UserUpdateRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/managed/Makefile b/managed/Makefile index 5c3722002d..6acc85905f 100644 --- a/managed/Makefile +++ b/managed/Makefile @@ -30,7 +30,6 @@ gen: clean ## Generate files clean: ## Remove generated files find . -name *_reform.go -delete - find . -name mock_*.go -delete release: ## Build pmm-managed release binaries env CGO_ENABLED=0 go build -v $(PMM_LD_FLAGS) -o $(PMM_RELEASE_PATH)/ ./cmd/... diff --git a/managed/services/backup/deps.go b/managed/services/backup/deps.go index b0197c62a5..d0b86a799c 100644 --- a/managed/services/backup/deps.go +++ b/managed/services/backup/deps.go @@ -24,14 +24,6 @@ import ( "github.com/percona/pmm/managed/services/minio" ) -//go:generate ../../../bin/mockery --name=jobsService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=agentService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=versioner --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=compatibilityService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=pbmPITRService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=Storage --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=removalService --case=snake --inpackage --testonly - // jobsService is a subset of methods of agents.JobsService used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type jobsService interface { diff --git a/managed/services/backup/mock_agent_service_test.go b/managed/services/backup/mock_agent_service_test.go index aff551a91a..8c94ca89f5 100644 --- a/managed/services/backup/mock_agent_service_test.go +++ b/managed/services/backup/mock_agent_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_compatibility_service_test.go b/managed/services/backup/mock_compatibility_service_test.go index d822950b27..8573887dfb 100644 --- a/managed/services/backup/mock_compatibility_service_test.go +++ b/managed/services/backup/mock_compatibility_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_jobs_service_test.go b/managed/services/backup/mock_jobs_service_test.go index f8a0fb10da..dcfea96adb 100644 --- a/managed/services/backup/mock_jobs_service_test.go +++ b/managed/services/backup/mock_jobs_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_pbm_pitr_service_test.go b/managed/services/backup/mock_pbm_pitr_service_test.go index ffe2655d58..f082a303ce 100644 --- a/managed/services/backup/mock_pbm_pitr_service_test.go +++ b/managed/services/backup/mock_pbm_pitr_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_removal_service_test.go b/managed/services/backup/mock_removal_service_test.go index 84d8b00542..710a5691ca 100644 --- a/managed/services/backup/mock_removal_service_test.go +++ b/managed/services/backup/mock_removal_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_storage_test.go b/managed/services/backup/mock_storage_test.go index 8f16c6f505..f39dd8a564 100644 --- a/managed/services/backup/mock_storage_test.go +++ b/managed/services/backup/mock_storage_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/backup/mock_versioner_test.go b/managed/services/backup/mock_versioner_test.go index 84b7b83569..649d52c382 100644 --- a/managed/services/backup/mock_versioner_test.go +++ b/managed/services/backup/mock_versioner_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/checks/deps.go b/managed/services/checks/deps.go index 8e9912ba16..6c91fca4c8 100644 --- a/managed/services/checks/deps.go +++ b/managed/services/checks/deps.go @@ -21,8 +21,6 @@ import ( "github.com/percona/pmm/managed/models" ) -//go:generate ../../../bin/mockery --name=agentsRegistry --case=snake --inpackage --testonly - // agentsRegistry is a subset of methods of agents.Registry used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type agentsRegistry interface { diff --git a/managed/services/checks/mock_agents_registry_test.go b/managed/services/checks/mock_agents_registry_test.go index f1365ed4b2..c1b5b37b7f 100644 --- a/managed/services/checks/mock_agents_registry_test.go +++ b/managed/services/checks/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package checks diff --git a/managed/services/dbaas/kubernetes/client/gen.go b/managed/services/dbaas/kubernetes/client/gen.go index 1b9eddf585..b2667ff341 100644 --- a/managed/services/dbaas/kubernetes/client/gen.go +++ b/managed/services/dbaas/kubernetes/client/gen.go @@ -16,4 +16,3 @@ package client //go:generate ../../../../../bin/ifacemaker -f client.go -s Client -i KubeClientConnector -p client -o kubeclient_interface.go -//go:generate ../../../../../bin/mockery --name=KubeClientConnector --case=snake --inpackage diff --git a/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go b/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go deleted file mode 100644 index b421db29c5..0000000000 --- a/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go +++ /dev/null @@ -1,846 +0,0 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. - -package client - -import ( - context "context" - - v1 "github.com/operator-framework/api/pkg/operators/v1" - v1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" - apiv1 "github.com/percona/dbaas-operator/api/v1" - mock "github.com/stretchr/testify/mock" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - storagev1 "k8s.io/api/storage/v1" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - types "k8s.io/apimachinery/pkg/types" - version "k8s.io/apimachinery/pkg/version" -) - -// MockKubeClientConnector is an autogenerated mock type for the KubeClientConnector type -type MockKubeClientConnector struct { - mock.Mock -} - -// ApplyFile provides a mock function with given fields: fileBytes -func (_m *MockKubeClientConnector) ApplyFile(fileBytes []byte) error { - ret := _m.Called(fileBytes) - - if len(ret) == 0 { - panic("no return value specified for ApplyFile") - } - - var r0 error - if rf, ok := ret.Get(0).(func([]byte) error); ok { - r0 = rf(fileBytes) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// ApplyObject provides a mock function with given fields: obj -func (_m *MockKubeClientConnector) ApplyObject(obj runtime.Object) error { - ret := _m.Called(obj) - - if len(ret) == 0 { - panic("no return value specified for ApplyObject") - } - - var r0 error - if rf, ok := ret.Get(0).(func(runtime.Object) error); ok { - r0 = rf(obj) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// CreateOperatorGroup provides a mock function with given fields: ctx, namespace, name -func (_m *MockKubeClientConnector) CreateOperatorGroup(ctx context.Context, namespace string, name string) (*v1.OperatorGroup, error) { - ret := _m.Called(ctx, namespace, name) - - if len(ret) == 0 { - panic("no return value specified for CreateOperatorGroup") - } - - var r0 *v1.OperatorGroup - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1.OperatorGroup, error)); ok { - return rf(ctx, namespace, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *v1.OperatorGroup); ok { - r0 = rf(ctx, namespace, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1.OperatorGroup) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, namespace, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// CreateSubscriptionForCatalog provides a mock function with given fields: ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval -func (_m *MockKubeClientConnector) CreateSubscriptionForCatalog(ctx context.Context, namespace string, name string, catalogNamespace string, catalog string, packageName string, channel string, startingCSV string, approval v1alpha1.Approval) (*v1alpha1.Subscription, error) { - ret := _m.Called(ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval) - - if len(ret) == 0 { - panic("no return value specified for CreateSubscriptionForCatalog") - } - - var r0 *v1alpha1.Subscription - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, string, string, v1alpha1.Approval) (*v1alpha1.Subscription, error)); ok { - return rf(ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, string, string, v1alpha1.Approval) *v1alpha1.Subscription); ok { - r0 = rf(ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.Subscription) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string, string, string, string, string, string, v1alpha1.Approval) error); ok { - r1 = rf(ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// DeleteObject provides a mock function with given fields: obj -func (_m *MockKubeClientConnector) DeleteObject(obj runtime.Object) error { - ret := _m.Called(obj) - - if len(ret) == 0 { - panic("no return value specified for DeleteObject") - } - - var r0 error - if rf, ok := ret.Get(0).(func(runtime.Object) error); ok { - r0 = rf(obj) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// DoCSVWait provides a mock function with given fields: ctx, key -func (_m *MockKubeClientConnector) DoCSVWait(ctx context.Context, key types.NamespacedName) error { - ret := _m.Called(ctx, key) - - if len(ret) == 0 { - panic("no return value specified for DoCSVWait") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) error); ok { - r0 = rf(ctx, key) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// DoRolloutWait provides a mock function with given fields: ctx, key -func (_m *MockKubeClientConnector) DoRolloutWait(ctx context.Context, key types.NamespacedName) error { - ret := _m.Called(ctx, key) - - if len(ret) == 0 { - panic("no return value specified for DoRolloutWait") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) error); ok { - r0 = rf(ctx, key) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// GenerateKubeConfig provides a mock function with given fields: secret -func (_m *MockKubeClientConnector) GenerateKubeConfig(secret *corev1.Secret) ([]byte, error) { - ret := _m.Called(secret) - - if len(ret) == 0 { - panic("no return value specified for GenerateKubeConfig") - } - - var r0 []byte - var r1 error - if rf, ok := ret.Get(0).(func(*corev1.Secret) ([]byte, error)); ok { - return rf(secret) - } - if rf, ok := ret.Get(0).(func(*corev1.Secret) []byte); ok { - r0 = rf(secret) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]byte) - } - } - - if rf, ok := ret.Get(1).(func(*corev1.Secret) error); ok { - r1 = rf(secret) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetDatabaseCluster provides a mock function with given fields: ctx, name -func (_m *MockKubeClientConnector) GetDatabaseCluster(ctx context.Context, name string) (*apiv1.DatabaseCluster, error) { - ret := _m.Called(ctx, name) - - if len(ret) == 0 { - panic("no return value specified for GetDatabaseCluster") - } - - var r0 *apiv1.DatabaseCluster - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*apiv1.DatabaseCluster, error)); ok { - return rf(ctx, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string) *apiv1.DatabaseCluster); ok { - r0 = rf(ctx, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*apiv1.DatabaseCluster) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetDeployment provides a mock function with given fields: ctx, name -func (_m *MockKubeClientConnector) GetDeployment(ctx context.Context, name string) (*appsv1.Deployment, error) { - ret := _m.Called(ctx, name) - - if len(ret) == 0 { - panic("no return value specified for GetDeployment") - } - - var r0 *appsv1.Deployment - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*appsv1.Deployment, error)); ok { - return rf(ctx, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string) *appsv1.Deployment); ok { - r0 = rf(ctx, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*appsv1.Deployment) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetEvents provides a mock function with given fields: ctx, name -func (_m *MockKubeClientConnector) GetEvents(ctx context.Context, name string) (string, error) { - ret := _m.Called(ctx, name) - - if len(ret) == 0 { - panic("no return value specified for GetEvents") - } - - var r0 string - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (string, error)); ok { - return rf(ctx, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string) string); ok { - r0 = rf(ctx, name) - } else { - r0 = ret.Get(0).(string) - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetInstallPlan provides a mock function with given fields: ctx, namespace, name -func (_m *MockKubeClientConnector) GetInstallPlan(ctx context.Context, namespace string, name string) (*v1alpha1.InstallPlan, error) { - ret := _m.Called(ctx, namespace, name) - - if len(ret) == 0 { - panic("no return value specified for GetInstallPlan") - } - - var r0 *v1alpha1.InstallPlan - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1alpha1.InstallPlan, error)); ok { - return rf(ctx, namespace, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *v1alpha1.InstallPlan); ok { - r0 = rf(ctx, namespace, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.InstallPlan) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, namespace, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetLogs provides a mock function with given fields: ctx, pod, container -func (_m *MockKubeClientConnector) GetLogs(ctx context.Context, pod string, container string) (string, error) { - ret := _m.Called(ctx, pod, container) - - if len(ret) == 0 { - panic("no return value specified for GetLogs") - } - - var r0 string - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (string, error)); ok { - return rf(ctx, pod, container) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string) string); ok { - r0 = rf(ctx, pod, container) - } else { - r0 = ret.Get(0).(string) - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, pod, container) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetNodes provides a mock function with given fields: ctx -func (_m *MockKubeClientConnector) GetNodes(ctx context.Context) (*corev1.NodeList, error) { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for GetNodes") - } - - var r0 *corev1.NodeList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context) (*corev1.NodeList, error)); ok { - return rf(ctx) - } - if rf, ok := ret.Get(0).(func(context.Context) *corev1.NodeList); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.NodeList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetOperatorGroup provides a mock function with given fields: ctx, namespace, name -func (_m *MockKubeClientConnector) GetOperatorGroup(ctx context.Context, namespace string, name string) (*v1.OperatorGroup, error) { - ret := _m.Called(ctx, namespace, name) - - if len(ret) == 0 { - panic("no return value specified for GetOperatorGroup") - } - - var r0 *v1.OperatorGroup - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1.OperatorGroup, error)); ok { - return rf(ctx, namespace, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *v1.OperatorGroup); ok { - r0 = rf(ctx, namespace, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1.OperatorGroup) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, namespace, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetPersistentVolumes provides a mock function with given fields: ctx -func (_m *MockKubeClientConnector) GetPersistentVolumes(ctx context.Context) (*corev1.PersistentVolumeList, error) { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for GetPersistentVolumes") - } - - var r0 *corev1.PersistentVolumeList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context) (*corev1.PersistentVolumeList, error)); ok { - return rf(ctx) - } - if rf, ok := ret.Get(0).(func(context.Context) *corev1.PersistentVolumeList); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.PersistentVolumeList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetPods provides a mock function with given fields: ctx, namespace, labelSelector -func (_m *MockKubeClientConnector) GetPods(ctx context.Context, namespace string, labelSelector *metav1.LabelSelector) (*corev1.PodList, error) { - ret := _m.Called(ctx, namespace, labelSelector) - - if len(ret) == 0 { - panic("no return value specified for GetPods") - } - - var r0 *corev1.PodList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, *metav1.LabelSelector) (*corev1.PodList, error)); ok { - return rf(ctx, namespace, labelSelector) - } - if rf, ok := ret.Get(0).(func(context.Context, string, *metav1.LabelSelector) *corev1.PodList); ok { - r0 = rf(ctx, namespace, labelSelector) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.PodList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, *metav1.LabelSelector) error); ok { - r1 = rf(ctx, namespace, labelSelector) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetSecret provides a mock function with given fields: ctx, name -func (_m *MockKubeClientConnector) GetSecret(ctx context.Context, name string) (*corev1.Secret, error) { - ret := _m.Called(ctx, name) - - if len(ret) == 0 { - panic("no return value specified for GetSecret") - } - - var r0 *corev1.Secret - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*corev1.Secret, error)); ok { - return rf(ctx, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string) *corev1.Secret); ok { - r0 = rf(ctx, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.Secret) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetSecretsForServiceAccount provides a mock function with given fields: ctx, accountName -func (_m *MockKubeClientConnector) GetSecretsForServiceAccount(ctx context.Context, accountName string) (*corev1.Secret, error) { - ret := _m.Called(ctx, accountName) - - if len(ret) == 0 { - panic("no return value specified for GetSecretsForServiceAccount") - } - - var r0 *corev1.Secret - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*corev1.Secret, error)); ok { - return rf(ctx, accountName) - } - if rf, ok := ret.Get(0).(func(context.Context, string) *corev1.Secret); ok { - r0 = rf(ctx, accountName) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.Secret) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, accountName) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetServerVersion provides a mock function with given fields: -func (_m *MockKubeClientConnector) GetServerVersion() (*version.Info, error) { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for GetServerVersion") - } - - var r0 *version.Info - var r1 error - if rf, ok := ret.Get(0).(func() (*version.Info, error)); ok { - return rf() - } - if rf, ok := ret.Get(0).(func() *version.Info); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*version.Info) - } - } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetStorageClasses provides a mock function with given fields: ctx -func (_m *MockKubeClientConnector) GetStorageClasses(ctx context.Context) (*storagev1.StorageClassList, error) { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for GetStorageClasses") - } - - var r0 *storagev1.StorageClassList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context) (*storagev1.StorageClassList, error)); ok { - return rf(ctx) - } - if rf, ok := ret.Get(0).(func(context.Context) *storagev1.StorageClassList); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*storagev1.StorageClassList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetSubscription provides a mock function with given fields: ctx, namespace, name -func (_m *MockKubeClientConnector) GetSubscription(ctx context.Context, namespace string, name string) (*v1alpha1.Subscription, error) { - ret := _m.Called(ctx, namespace, name) - - if len(ret) == 0 { - panic("no return value specified for GetSubscription") - } - - var r0 *v1alpha1.Subscription - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1alpha1.Subscription, error)); ok { - return rf(ctx, namespace, name) - } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *v1alpha1.Subscription); ok { - r0 = rf(ctx, namespace, name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.Subscription) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, namespace, name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetSubscriptionCSV provides a mock function with given fields: ctx, subKey -func (_m *MockKubeClientConnector) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedName) (types.NamespacedName, error) { - ret := _m.Called(ctx, subKey) - - if len(ret) == 0 { - panic("no return value specified for GetSubscriptionCSV") - } - - var r0 types.NamespacedName - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) (types.NamespacedName, error)); ok { - return rf(ctx, subKey) - } - if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) types.NamespacedName); ok { - r0 = rf(ctx, subKey) - } else { - r0 = ret.Get(0).(types.NamespacedName) - } - - if rf, ok := ret.Get(1).(func(context.Context, types.NamespacedName) error); ok { - r1 = rf(ctx, subKey) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ListCRDs provides a mock function with given fields: ctx, labelSelector -func (_m *MockKubeClientConnector) ListCRDs(ctx context.Context, labelSelector *metav1.LabelSelector) (*apiextensionsv1.CustomResourceDefinitionList, error) { - ret := _m.Called(ctx, labelSelector) - - if len(ret) == 0 { - panic("no return value specified for ListCRDs") - } - - var r0 *apiextensionsv1.CustomResourceDefinitionList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *metav1.LabelSelector) (*apiextensionsv1.CustomResourceDefinitionList, error)); ok { - return rf(ctx, labelSelector) - } - if rf, ok := ret.Get(0).(func(context.Context, *metav1.LabelSelector) *apiextensionsv1.CustomResourceDefinitionList); ok { - r0 = rf(ctx, labelSelector) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*apiextensionsv1.CustomResourceDefinitionList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, *metav1.LabelSelector) error); ok { - r1 = rf(ctx, labelSelector) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ListCRs provides a mock function with given fields: ctx, namespace, gvr, labelSelector -func (_m *MockKubeClientConnector) ListCRs(ctx context.Context, namespace string, gvr schema.GroupVersionResource, labelSelector *metav1.LabelSelector) (*unstructured.UnstructuredList, error) { - ret := _m.Called(ctx, namespace, gvr, labelSelector) - - if len(ret) == 0 { - panic("no return value specified for ListCRs") - } - - var r0 *unstructured.UnstructuredList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, schema.GroupVersionResource, *metav1.LabelSelector) (*unstructured.UnstructuredList, error)); ok { - return rf(ctx, namespace, gvr, labelSelector) - } - if rf, ok := ret.Get(0).(func(context.Context, string, schema.GroupVersionResource, *metav1.LabelSelector) *unstructured.UnstructuredList); ok { - r0 = rf(ctx, namespace, gvr, labelSelector) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*unstructured.UnstructuredList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, schema.GroupVersionResource, *metav1.LabelSelector) error); ok { - r1 = rf(ctx, namespace, gvr, labelSelector) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ListDatabaseClusters provides a mock function with given fields: ctx -func (_m *MockKubeClientConnector) ListDatabaseClusters(ctx context.Context) (*apiv1.DatabaseClusterList, error) { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for ListDatabaseClusters") - } - - var r0 *apiv1.DatabaseClusterList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context) (*apiv1.DatabaseClusterList, error)); ok { - return rf(ctx) - } - if rf, ok := ret.Get(0).(func(context.Context) *apiv1.DatabaseClusterList); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*apiv1.DatabaseClusterList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ListSecrets provides a mock function with given fields: ctx -func (_m *MockKubeClientConnector) ListSecrets(ctx context.Context) (*corev1.SecretList, error) { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for ListSecrets") - } - - var r0 *corev1.SecretList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context) (*corev1.SecretList, error)); ok { - return rf(ctx) - } - if rf, ok := ret.Get(0).(func(context.Context) *corev1.SecretList); ok { - r0 = rf(ctx) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*corev1.SecretList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context) error); ok { - r1 = rf(ctx) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ListSubscriptions provides a mock function with given fields: ctx, namespace -func (_m *MockKubeClientConnector) ListSubscriptions(ctx context.Context, namespace string) (*v1alpha1.SubscriptionList, error) { - ret := _m.Called(ctx, namespace) - - if len(ret) == 0 { - panic("no return value specified for ListSubscriptions") - } - - var r0 *v1alpha1.SubscriptionList - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*v1alpha1.SubscriptionList, error)); ok { - return rf(ctx, namespace) - } - if rf, ok := ret.Get(0).(func(context.Context, string) *v1alpha1.SubscriptionList); ok { - r0 = rf(ctx, namespace) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.SubscriptionList) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, namespace) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// UpdateInstallPlan provides a mock function with given fields: ctx, namespace, installPlan -func (_m *MockKubeClientConnector) UpdateInstallPlan(ctx context.Context, namespace string, installPlan *v1alpha1.InstallPlan) (*v1alpha1.InstallPlan, error) { - ret := _m.Called(ctx, namespace, installPlan) - - if len(ret) == 0 { - panic("no return value specified for UpdateInstallPlan") - } - - var r0 *v1alpha1.InstallPlan - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, *v1alpha1.InstallPlan) (*v1alpha1.InstallPlan, error)); ok { - return rf(ctx, namespace, installPlan) - } - if rf, ok := ret.Get(0).(func(context.Context, string, *v1alpha1.InstallPlan) *v1alpha1.InstallPlan); ok { - r0 = rf(ctx, namespace, installPlan) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*v1alpha1.InstallPlan) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, string, *v1alpha1.InstallPlan) error); ok { - r1 = rf(ctx, namespace, installPlan) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// NewMockKubeClientConnector creates a new instance of MockKubeClientConnector. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewMockKubeClientConnector(t interface { - mock.TestingT - Cleanup(func()) -}, -) *MockKubeClientConnector { - mock := &MockKubeClientConnector{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/managed/services/grafana/deps.go b/managed/services/grafana/deps.go index 496065a021..fe4f32012e 100644 --- a/managed/services/grafana/deps.go +++ b/managed/services/grafana/deps.go @@ -15,8 +15,6 @@ package grafana -//go:generate ../../../bin/mockery --name=awsInstanceChecker --case=snake --inpackage --testonly - // checker is a subset of methods of server.AWSInstanceChecker used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type awsInstanceChecker interface { diff --git a/managed/services/grafana/mock_aws_instance_checker_test.go b/managed/services/grafana/mock_aws_instance_checker_test.go index 13c00fdd93..f502ba06d3 100644 --- a/managed/services/grafana/mock_aws_instance_checker_test.go +++ b/managed/services/grafana/mock_aws_instance_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package grafana diff --git a/managed/services/inventory/deps.go b/managed/services/inventory/deps.go index caa8ee81b8..761f531878 100644 --- a/managed/services/inventory/deps.go +++ b/managed/services/inventory/deps.go @@ -23,15 +23,6 @@ import ( "github.com/percona/pmm/managed/models" ) -//go:generate ../../../bin/mockery --name=agentsRegistry --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=agentService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=agentsStateUpdater --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=prometheusService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=connectionChecker --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=serviceInfoBroker --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=versionCache --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=inventoryMetrics --case=snake --inpackage --testonly - // agentsRegistry is a subset of methods of agents.Registry used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type agentsRegistry interface { diff --git a/managed/services/inventory/mock_agent_service_test.go b/managed/services/inventory/mock_agent_service_test.go index c5d632c487..e529b62739 100644 --- a/managed/services/inventory/mock_agent_service_test.go +++ b/managed/services/inventory/mock_agent_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_agents_registry_test.go b/managed/services/inventory/mock_agents_registry_test.go index 3a50f56ad6..6fd0ab4aa6 100644 --- a/managed/services/inventory/mock_agents_registry_test.go +++ b/managed/services/inventory/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_agents_state_updater_test.go b/managed/services/inventory/mock_agents_state_updater_test.go index 43f33ebfce..2791d7718b 100644 --- a/managed/services/inventory/mock_agents_state_updater_test.go +++ b/managed/services/inventory/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_connection_checker_test.go b/managed/services/inventory/mock_connection_checker_test.go index a5f9d71e08..b7f27f1bdb 100644 --- a/managed/services/inventory/mock_connection_checker_test.go +++ b/managed/services/inventory/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_inventory_metrics_test.go b/managed/services/inventory/mock_inventory_metrics_test.go index ffa0204dbd..8fdd570b86 100644 --- a/managed/services/inventory/mock_inventory_metrics_test.go +++ b/managed/services/inventory/mock_inventory_metrics_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_prometheus_service_test.go b/managed/services/inventory/mock_prometheus_service_test.go index 8119e414c8..fc1e1e2144 100644 --- a/managed/services/inventory/mock_prometheus_service_test.go +++ b/managed/services/inventory/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_service_info_broker_test.go b/managed/services/inventory/mock_service_info_broker_test.go index 193c15d16d..0329393a2e 100644 --- a/managed/services/inventory/mock_service_info_broker_test.go +++ b/managed/services/inventory/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_version_cache_test.go b/managed/services/inventory/mock_version_cache_test.go index 8febfbccf7..5957bb2798 100644 --- a/managed/services/inventory/mock_version_cache_test.go +++ b/managed/services/inventory/mock_version_cache_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package inventory diff --git a/managed/services/management/alerting/deps.go b/managed/services/management/alerting/deps.go index 42ea52543c..5b09e90958 100644 --- a/managed/services/management/alerting/deps.go +++ b/managed/services/management/alerting/deps.go @@ -23,8 +23,6 @@ import ( "github.com/percona/pmm/managed/services" ) -//go:generate ../../../../bin/mockery --name=grafanaClient --case=snake --inpackage --testonly - type grafanaClient interface { CreateAlertRule(ctx context.Context, folderName, groupName string, rule *services.Rule) error GetDatasourceUIDByID(ctx context.Context, id int64) (string, error) diff --git a/managed/services/management/alerting/mock_grafana_client_test.go b/managed/services/management/alerting/mock_grafana_client_test.go index a85c13eab4..79ff8f0f6d 100644 --- a/managed/services/management/alerting/mock_grafana_client_test.go +++ b/managed/services/management/alerting/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package alerting diff --git a/managed/services/management/backup/deps.go b/managed/services/management/backup/deps.go index 0938e3aa5c..a065adc9b1 100644 --- a/managed/services/management/backup/deps.go +++ b/managed/services/management/backup/deps.go @@ -24,12 +24,6 @@ import ( "github.com/percona/pmm/managed/services/scheduler" ) -//go:generate ../../../../bin/mockery --name=awsS3 --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=backupService --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=scheduleService --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=removalService --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=pbmPITRService --case=snake --inpackage --testonly - type awsS3 interface { GetBucketLocation(ctx context.Context, host string, accessKey, secretKey, name string) (string, error) BucketExists(ctx context.Context, host string, accessKey, secretKey, name string) (bool, error) diff --git a/managed/services/management/backup/mock_aws_s3_test.go b/managed/services/management/backup/mock_aws_s3_test.go index 700ae5325f..87a2f17d1a 100644 --- a/managed/services/management/backup/mock_aws_s3_test.go +++ b/managed/services/management/backup/mock_aws_s3_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/management/backup/mock_backup_service_test.go b/managed/services/management/backup/mock_backup_service_test.go index c17512fea0..da3008674d 100644 --- a/managed/services/management/backup/mock_backup_service_test.go +++ b/managed/services/management/backup/mock_backup_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/management/backup/mock_pbm_pitr_service_test.go b/managed/services/management/backup/mock_pbm_pitr_service_test.go index f2488e5aad..fdb7789adf 100644 --- a/managed/services/management/backup/mock_pbm_pitr_service_test.go +++ b/managed/services/management/backup/mock_pbm_pitr_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/management/backup/mock_removal_service_test.go b/managed/services/management/backup/mock_removal_service_test.go index 6c4040917e..5c584ca301 100644 --- a/managed/services/management/backup/mock_removal_service_test.go +++ b/managed/services/management/backup/mock_removal_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/management/backup/mock_schedule_service_test.go b/managed/services/management/backup/mock_schedule_service_test.go index 593a547d23..524fd66d88 100644 --- a/managed/services/management/backup/mock_schedule_service_test.go +++ b/managed/services/management/backup/mock_schedule_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package backup diff --git a/managed/services/management/dbaas/deps.go b/managed/services/management/dbaas/deps.go index 3f9be6d5f5..23b519ba15 100644 --- a/managed/services/management/dbaas/deps.go +++ b/managed/services/management/dbaas/deps.go @@ -34,13 +34,6 @@ import ( "github.com/percona/pmm/managed/services/dbaas/kubernetes" ) -//go:generate ../../../../bin/mockery --name=dbaasClient --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=versionService --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=grafanaClient --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=componentsService --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=kubernetesClient --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=kubeStorageManager --case=snake --inpackage --testonly - type dbaasClient interface { // Connect connects the client to dbaas-controller API. Connect(ctx context.Context) error diff --git a/managed/services/management/dbaas/mock_components_service_test.go b/managed/services/management/dbaas/mock_components_service_test.go index 7871a38f26..31988ce9d4 100644 --- a/managed/services/management/dbaas/mock_components_service_test.go +++ b/managed/services/management/dbaas/mock_components_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/dbaas/mock_dbaas_client_test.go b/managed/services/management/dbaas/mock_dbaas_client_test.go index 4aeb6a2abc..8a23d84319 100644 --- a/managed/services/management/dbaas/mock_dbaas_client_test.go +++ b/managed/services/management/dbaas/mock_dbaas_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/dbaas/mock_grafana_client_test.go b/managed/services/management/dbaas/mock_grafana_client_test.go index ddf6fab6df..249a7c1784 100644 --- a/managed/services/management/dbaas/mock_grafana_client_test.go +++ b/managed/services/management/dbaas/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/dbaas/mock_kube_storage_manager_test.go b/managed/services/management/dbaas/mock_kube_storage_manager_test.go index 37c234f7ed..f88cecfcd7 100644 --- a/managed/services/management/dbaas/mock_kube_storage_manager_test.go +++ b/managed/services/management/dbaas/mock_kube_storage_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/dbaas/mock_kubernetes_client_test.go b/managed/services/management/dbaas/mock_kubernetes_client_test.go index 31e3603eab..fcd60b9dcb 100644 --- a/managed/services/management/dbaas/mock_kubernetes_client_test.go +++ b/managed/services/management/dbaas/mock_kubernetes_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/dbaas/mock_version_service_test.go b/managed/services/management/dbaas/mock_version_service_test.go index d88a219874..13ecc6d5a4 100644 --- a/managed/services/management/dbaas/mock_version_service_test.go +++ b/managed/services/management/dbaas/mock_version_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dbaas diff --git a/managed/services/management/deps.go b/managed/services/management/deps.go index 012cbd5fd6..0da0dffe03 100644 --- a/managed/services/management/deps.go +++ b/managed/services/management/deps.go @@ -17,6 +17,7 @@ package management import ( "context" + "net/http" "time" "github.com/percona-platform/saas/pkg/check" @@ -28,17 +29,6 @@ import ( "github.com/percona/pmm/managed/services" ) -//go:generate ../../../bin/mockery --name=agentsRegistry --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=agentsStateUpdater --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=prometheusService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=checksService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=grafanaClient --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=jobsService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=connectionChecker --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=serviceInfoBroker --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=versionCache --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=victoriaMetricsClient --case=snake --inpackage --testonly - // agentsRegistry is a subset of methods of agents.Registry used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type agentsRegistry interface { @@ -108,3 +98,8 @@ type versionCache interface { type victoriaMetricsClient interface { Query(ctx context.Context, query string, ts time.Time, opts ...v1.Option) (model.Value, v1.Warnings, error) } + +type apiKeyProvider interface { + CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error) + IsAPIKeyAuth(headers http.Header) bool +} diff --git a/managed/services/management/dump/deps.go b/managed/services/management/dump/deps.go index b774f32065..2fab853bff 100644 --- a/managed/services/management/dump/deps.go +++ b/managed/services/management/dump/deps.go @@ -17,8 +17,6 @@ package dump import "github.com/percona/pmm/managed/services/dump" -//go:generate ../../../../bin/mockery --name=dumpService --case=snake --inpackage --testonly - type dumpService interface { StartDump(params *dump.Params) (string, error) DeleteDump(dumpID string) error diff --git a/managed/services/management/dump/mock_dump_service_test.go b/managed/services/management/dump/mock_dump_service_test.go index 7867ab92f5..137a00f8e6 100644 --- a/managed/services/management/dump/mock_dump_service_test.go +++ b/managed/services/management/dump/mock_dump_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package dump diff --git a/managed/services/management/ia/deps.go b/managed/services/management/ia/deps.go index 02ed8f676c..7f0098445a 100644 --- a/managed/services/management/ia/deps.go +++ b/managed/services/management/ia/deps.go @@ -23,10 +23,6 @@ import ( "github.com/percona/pmm/managed/services" ) -//go:generate ../../../../bin/mockery --name=alertManager --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=vmAlert --case=snake --inpackage --testonly -//go:generate ../../../../bin/mockery --name=templatesService --case=snake --inpackage --testonly - // alertManager is a subset of methods of alertmanager.Service used by this package. // We use it instead of real type for testing and to avoid dependency cycle. type alertManager interface { diff --git a/managed/services/management/ia/mock_alert_manager_test.go b/managed/services/management/ia/mock_alert_manager_test.go index db9254fcd3..bedeb2e19c 100644 --- a/managed/services/management/ia/mock_alert_manager_test.go +++ b/managed/services/management/ia/mock_alert_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package ia diff --git a/managed/services/management/ia/mock_templates_service_test.go b/managed/services/management/ia/mock_templates_service_test.go index fa30d10929..83d23175d3 100644 --- a/managed/services/management/ia/mock_templates_service_test.go +++ b/managed/services/management/ia/mock_templates_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package ia diff --git a/managed/services/management/ia/mock_vm_alert_test.go b/managed/services/management/ia/mock_vm_alert_test.go index bdc4c044a9..028a13d0bf 100644 --- a/managed/services/management/ia/mock_vm_alert_test.go +++ b/managed/services/management/ia/mock_vm_alert_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package ia diff --git a/managed/services/management/mock_agents_registry_test.go b/managed/services/management/mock_agents_registry_test.go index ecf7e32153..964290878f 100644 --- a/managed/services/management/mock_agents_registry_test.go +++ b/managed/services/management/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_agents_state_updater_test.go b/managed/services/management/mock_agents_state_updater_test.go index ccff927f3e..369404d302 100644 --- a/managed/services/management/mock_agents_state_updater_test.go +++ b/managed/services/management/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_api_key_provider_test.go b/managed/services/management/mock_api_key_provider_test.go index f520f7d353..f7aed1af97 100644 --- a/managed/services/management/mock_api_key_provider_test.go +++ b/managed/services/management/mock_api_key_provider_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_checks_service_test.go b/managed/services/management/mock_checks_service_test.go index c4c1d663e5..3a050ea10e 100644 --- a/managed/services/management/mock_checks_service_test.go +++ b/managed/services/management/mock_checks_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_connection_checker_test.go b/managed/services/management/mock_connection_checker_test.go index bedf336ec9..b0ea5d8d68 100644 --- a/managed/services/management/mock_connection_checker_test.go +++ b/managed/services/management/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_grafana_client_test.go b/managed/services/management/mock_grafana_client_test.go index 1f2b1b2bee..ec7617fff8 100644 --- a/managed/services/management/mock_grafana_client_test.go +++ b/managed/services/management/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_jobs_service_test.go b/managed/services/management/mock_jobs_service_test.go index 1862bb7eae..1c781180de 100644 --- a/managed/services/management/mock_jobs_service_test.go +++ b/managed/services/management/mock_jobs_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_prometheus_service_test.go b/managed/services/management/mock_prometheus_service_test.go index 6b3a9e16d1..1648abb75b 100644 --- a/managed/services/management/mock_prometheus_service_test.go +++ b/managed/services/management/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_service_info_broker_test.go b/managed/services/management/mock_service_info_broker_test.go index 6d3a98eedf..d3bcf6aa12 100644 --- a/managed/services/management/mock_service_info_broker_test.go +++ b/managed/services/management/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_version_cache_test.go b/managed/services/management/mock_version_cache_test.go index 507ff1d685..1c30b27082 100644 --- a/managed/services/management/mock_version_cache_test.go +++ b/managed/services/management/mock_version_cache_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/mock_victoria_metrics_client_test.go b/managed/services/management/mock_victoria_metrics_client_test.go index b30fd3c708..e3ee63ad93 100644 --- a/managed/services/management/mock_victoria_metrics_client_test.go +++ b/managed/services/management/mock_victoria_metrics_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package management diff --git a/managed/services/management/node.go b/managed/services/management/node.go index 8b07808445..26f3c54381 100644 --- a/managed/services/management/node.go +++ b/managed/services/management/node.go @@ -34,13 +34,6 @@ import ( "github.com/percona/pmm/managed/services" ) -//go:generate ../../../bin/mockery --name=apiKeyProvider --case=snake --inpackage --testonly - -type apiKeyProvider interface { - CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error) - IsAPIKeyAuth(headers http.Header) bool -} - // NodeService represents service for working with nodes. type NodeService struct { db *reform.DB diff --git a/managed/services/qan/deps.go b/managed/services/qan/deps.go index 77ce35a6e6..b62bc9980f 100644 --- a/managed/services/qan/deps.go +++ b/managed/services/qan/deps.go @@ -23,8 +23,6 @@ import ( qanpb "github.com/percona/pmm/api/qanpb" ) -//go:generate ../../../bin/mockery --name=qanCollectorClient --case=snake --inpackage --testonly - // qanClient is a subset of methods of qanpb.CollectorClient used by this package. // We use it instead of real type for testing. type qanCollectorClient interface { diff --git a/managed/services/qan/mock_qan_collector_client_test.go b/managed/services/qan/mock_qan_collector_client_test.go index 9e69d36db1..0ac019b0c7 100644 --- a/managed/services/qan/mock_qan_collector_client_test.go +++ b/managed/services/qan/mock_qan_collector_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package qan diff --git a/managed/services/scheduler/deps.go b/managed/services/scheduler/deps.go index e0faed3bbf..bfc157e90d 100644 --- a/managed/services/scheduler/deps.go +++ b/managed/services/scheduler/deps.go @@ -21,8 +21,6 @@ import ( "github.com/percona/pmm/managed/services/backup" ) -//go:generate ../../../bin/mockery --name=backupService --case=snake --inpackage --testonly - type backupService interface { PerformBackup(ctx context.Context, params backup.PerformBackupParams) (string, error) } diff --git a/managed/services/scheduler/mock_backup_service_test.go b/managed/services/scheduler/mock_backup_service_test.go index 3a44fc865f..d9862f38f2 100644 --- a/managed/services/scheduler/mock_backup_service_test.go +++ b/managed/services/scheduler/mock_backup_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package scheduler diff --git a/managed/services/server/deps.go b/managed/services/server/deps.go index 82ff40bad1..cec98be441 100644 --- a/managed/services/server/deps.go +++ b/managed/services/server/deps.go @@ -24,18 +24,6 @@ import ( "github.com/percona/pmm/version" ) -//go:generate ../../../bin/mockery --name=grafanaClient --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=prometheusService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=alertmanagerService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=checksService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=vmAlertExternalRules --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=supervisordService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=telemetryService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=agentsStateUpdater --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=rulesService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=emailer --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=templatesService --case=snake --inpackage --testonly - // healthChecker interface wraps all services that implements the IsReady method to report the // service health for the Readiness check. type healthChecker interface { diff --git a/managed/services/server/mock_agents_state_updater_test.go b/managed/services/server/mock_agents_state_updater_test.go index 1645598a63..5ed1085f3f 100644 --- a/managed/services/server/mock_agents_state_updater_test.go +++ b/managed/services/server/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_alertmanager_service_test.go b/managed/services/server/mock_alertmanager_service_test.go index 400f30a160..8b80e72efd 100644 --- a/managed/services/server/mock_alertmanager_service_test.go +++ b/managed/services/server/mock_alertmanager_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_checks_service_test.go b/managed/services/server/mock_checks_service_test.go index fc935b74fb..2f2e1d04e8 100644 --- a/managed/services/server/mock_checks_service_test.go +++ b/managed/services/server/mock_checks_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_emailer_test.go b/managed/services/server/mock_emailer_test.go index fd16b12e86..71033e51fb 100644 --- a/managed/services/server/mock_emailer_test.go +++ b/managed/services/server/mock_emailer_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_grafana_client_test.go b/managed/services/server/mock_grafana_client_test.go index c58397ee3a..ae782b1e40 100644 --- a/managed/services/server/mock_grafana_client_test.go +++ b/managed/services/server/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_prometheus_service_test.go b/managed/services/server/mock_prometheus_service_test.go index 235db970fc..352ea8b250 100644 --- a/managed/services/server/mock_prometheus_service_test.go +++ b/managed/services/server/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_rules_service_test.go b/managed/services/server/mock_rules_service_test.go index 02291f9d81..1e2c03fc94 100644 --- a/managed/services/server/mock_rules_service_test.go +++ b/managed/services/server/mock_rules_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_supervisord_service_test.go b/managed/services/server/mock_supervisord_service_test.go index 61ba8c187b..b958fc55b3 100644 --- a/managed/services/server/mock_supervisord_service_test.go +++ b/managed/services/server/mock_supervisord_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_telemetry_service_test.go b/managed/services/server/mock_telemetry_service_test.go index 55c0c53b91..0ad1b05201 100644 --- a/managed/services/server/mock_telemetry_service_test.go +++ b/managed/services/server/mock_telemetry_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_templates_service_test.go b/managed/services/server/mock_templates_service_test.go index 315cbd8671..e0f75bcf0c 100644 --- a/managed/services/server/mock_templates_service_test.go +++ b/managed/services/server/mock_templates_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/server/mock_vm_alert_external_rules_test.go b/managed/services/server/mock_vm_alert_external_rules_test.go index baf009e9aa..80b12640e9 100644 --- a/managed/services/server/mock_vm_alert_external_rules_test.go +++ b/managed/services/server/mock_vm_alert_external_rules_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package server diff --git a/managed/services/telemetry/deps.go b/managed/services/telemetry/deps.go index e2f47d9100..92a9d0007d 100644 --- a/managed/services/telemetry/deps.go +++ b/managed/services/telemetry/deps.go @@ -24,11 +24,6 @@ import ( "github.com/percona/pmm/api/serverpb" ) -//go:generate ../../../bin/mockery --name=distributionUtilService --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=sender --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=DataSourceLocator --case=snake --inpackage --testonly -//go:generate ../../../bin/mockery --name=DataSource --case=snake --inpackage --testonly - // distributionUtilService service to get info about OS on which pmm server is running. type distributionUtilService interface { getDistributionMethodAndOS() (serverpb.DistributionMethod, pmmv1.DistributionMethod, string) diff --git a/managed/services/telemetry/mock_data_source_locator_test.go b/managed/services/telemetry/mock_data_source_locator_test.go index 6809f8e013..8663cd5ee0 100644 --- a/managed/services/telemetry/mock_data_source_locator_test.go +++ b/managed/services/telemetry/mock_data_source_locator_test.go @@ -1,16 +1,16 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package telemetry import mock "github.com/stretchr/testify/mock" -// MockDataSourceLocator is an autogenerated mock type for the DataSourceLocator type -type MockDataSourceLocator struct { +// mockDataSourceLocator is an autogenerated mock type for the DataSourceLocator type +type mockDataSourceLocator struct { mock.Mock } // LocateTelemetryDataSource provides a mock function with given fields: name -func (_m *MockDataSourceLocator) LocateTelemetryDataSource(name string) (DataSource, error) { +func (_m *mockDataSourceLocator) LocateTelemetryDataSource(name string) (DataSource, error) { ret := _m.Called(name) if len(ret) == 0 { @@ -39,14 +39,14 @@ func (_m *MockDataSourceLocator) LocateTelemetryDataSource(name string) (DataSou return r0, r1 } -// NewMockDataSourceLocator creates a new instance of MockDataSourceLocator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// newMockDataSourceLocator creates a new instance of mockDataSourceLocator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. -func NewMockDataSourceLocator(t interface { +func newMockDataSourceLocator(t interface { mock.TestingT Cleanup(func()) }, -) *MockDataSourceLocator { - mock := &MockDataSourceLocator{} +) *mockDataSourceLocator { + mock := &mockDataSourceLocator{} mock.Mock.Test(t) t.Cleanup(func() { mock.AssertExpectations(t) }) diff --git a/managed/services/telemetry/mock_data_source_test.go b/managed/services/telemetry/mock_data_source_test.go index eafceb4892..a84586e7e1 100644 --- a/managed/services/telemetry/mock_data_source_test.go +++ b/managed/services/telemetry/mock_data_source_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package telemetry @@ -9,13 +9,13 @@ import ( mock "github.com/stretchr/testify/mock" ) -// MockDataSource is an autogenerated mock type for the DataSource type -type MockDataSource struct { +// mockDataSource is an autogenerated mock type for the DataSource type +type mockDataSource struct { mock.Mock } // Dispose provides a mock function with given fields: ctx -func (_m *MockDataSource) Dispose(ctx context.Context) error { +func (_m *mockDataSource) Dispose(ctx context.Context) error { ret := _m.Called(ctx) if len(ret) == 0 { @@ -33,7 +33,7 @@ func (_m *MockDataSource) Dispose(ctx context.Context) error { } // Enabled provides a mock function with given fields: -func (_m *MockDataSource) Enabled() bool { +func (_m *mockDataSource) Enabled() bool { ret := _m.Called() if len(ret) == 0 { @@ -51,7 +51,7 @@ func (_m *MockDataSource) Enabled() bool { } // FetchMetrics provides a mock function with given fields: ctx, config -func (_m *MockDataSource) FetchMetrics(ctx context.Context, config Config) ([]*pmmv1.ServerMetric_Metric, error) { +func (_m *mockDataSource) FetchMetrics(ctx context.Context, config Config) ([]*pmmv1.ServerMetric_Metric, error) { ret := _m.Called(ctx, config) if len(ret) == 0 { @@ -81,7 +81,7 @@ func (_m *MockDataSource) FetchMetrics(ctx context.Context, config Config) ([]*p } // Init provides a mock function with given fields: ctx -func (_m *MockDataSource) Init(ctx context.Context) error { +func (_m *mockDataSource) Init(ctx context.Context) error { ret := _m.Called(ctx) if len(ret) == 0 { @@ -98,14 +98,14 @@ func (_m *MockDataSource) Init(ctx context.Context) error { return r0 } -// NewMockDataSource creates a new instance of MockDataSource. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// newMockDataSource creates a new instance of mockDataSource. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. -func NewMockDataSource(t interface { +func newMockDataSource(t interface { mock.TestingT Cleanup(func()) }, -) *MockDataSource { - mock := &MockDataSource{} +) *mockDataSource { + mock := &mockDataSource{} mock.Mock.Test(t) t.Cleanup(func() { mock.AssertExpectations(t) }) diff --git a/managed/services/telemetry/mock_distribution_util_service_test.go b/managed/services/telemetry/mock_distribution_util_service_test.go index c689702c31..a98e31648d 100644 --- a/managed/services/telemetry/mock_distribution_util_service_test.go +++ b/managed/services/telemetry/mock_distribution_util_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package telemetry diff --git a/managed/services/telemetry/mock_sender_test.go b/managed/services/telemetry/mock_sender_test.go index af119ddfa0..41e73bd34e 100644 --- a/managed/services/telemetry/mock_sender_test.go +++ b/managed/services/telemetry/mock_sender_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package telemetry diff --git a/managed/services/versioncache/mock_versioner_test.go b/managed/services/versioncache/mock_versioner_test.go index 092842d2b9..ce2ca7190c 100644 --- a/managed/services/versioncache/mock_versioner_test.go +++ b/managed/services/versioncache/mock_versioner_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.40.2. DO NOT EDIT. +// Code generated by mockery. DO NOT EDIT. package versioncache diff --git a/managed/services/versioncache/versioncache.go b/managed/services/versioncache/versioncache.go index e51dfe6506..34028665c0 100644 --- a/managed/services/versioncache/versioncache.go +++ b/managed/services/versioncache/versioncache.go @@ -36,8 +36,6 @@ var ( minCheckInterval = 5 * time.Second ) -//go:generate ../../../bin/mockery --name=Versioner --case=snake --inpackage --testonly - // Versioner contains method for retrieving versions of different software. type Versioner interface { GetVersions(pmmAgentID string, softwares []agents.Software) ([]agents.Version, error) diff --git a/my_changes.patch b/my_changes.patch deleted file mode 100644 index 7be53d90a2..0000000000 --- a/my_changes.patch +++ /dev/null @@ -1,3734 +0,0 @@ -From c0ebbc60be42078324843e9396f04332b29970cf Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Tue, 9 Jan 2024 07:26:16 +0530 -Subject: [PATCH 01/15] enabled revive rule - ---- - .golangci.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.golangci.yml b/.golangci.yml -index ac80308c..6f14244a 100644 ---- a/.golangci.yml -+++ b/.golangci.yml -@@ -116,7 +116,7 @@ linters: - # TODO: carefully review all the rules below and either fix the code - # or leave disabled and provide a reason why - - tagliatelle -- - revive -+ #- revive - - paralleltest - - gocognit - - tagalign --- -2.34.1 - - -From 2351da4171ed16c58c5473fe5aaaa5dbcd56f65d Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:20:49 +0530 -Subject: [PATCH 02/15] parameter 't' seems to be unused renaming it as _ - ---- - agent/utils/backoff/backoff_test.go | 2 +- - managed/data/gen.go | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/agent/utils/backoff/backoff_test.go b/agent/utils/backoff/backoff_test.go -index fe10a7e0..fd68d0b7 100644 ---- a/agent/utils/backoff/backoff_test.go -+++ b/agent/utils/backoff/backoff_test.go -@@ -16,6 +16,6 @@ package backoff - - import "testing" - --func TestBackoff(t *testing.T) { -+func TestBackoff(_ *testing.T) { - // we need at least one test per package to correctly calculate coverage - } -diff --git a/managed/data/gen.go b/managed/data/gen.go -index 13a2804e..ebc918e5 100644 ---- a/managed/data/gen.go -+++ b/managed/data/gen.go -@@ -23,5 +23,6 @@ import "embed" - //go:embed iatemplates/* - var IATemplates embed.FS - -+// OLMCRDs ... - //go:embed crds/* - var OLMCRDs embed.FS --- -2.34.1 - - -From bf49ede640783186cdcb04b8bf27588e494578ff Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:22:05 +0530 -Subject: [PATCH 03/15] parameter 'l' seems to be unused, consider removing or - renaming it as _ - ---- - qan-api2/utils/logger/grpc.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qan-api2/utils/logger/grpc.go b/qan-api2/utils/logger/grpc.go -index 7fa6342b..5c97a6e6 100644 ---- a/qan-api2/utils/logger/grpc.go -+++ b/qan-api2/utils/logger/grpc.go -@@ -26,7 +26,7 @@ type GRPC struct { - } - - // V reports whether verbosity level l is at least the requested verbose level. --func (v *GRPC) V(l int) bool { -+func (v *GRPC) V(_ int) bool { - // we don't need real implementation ATM - return true - } --- -2.34.1 - - -From 5d5e81e92213f8d3950523d1550702e5b8ae0085 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:38:20 +0530 -Subject: [PATCH 04/15] comment on exported method - ---- - qan-api2/utils/logger/grpc.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/qan-api2/utils/logger/grpc.go b/qan-api2/utils/logger/grpc.go -index 5c97a6e6..c9bff487 100644 ---- a/qan-api2/utils/logger/grpc.go -+++ b/qan-api2/utils/logger/grpc.go -@@ -34,8 +34,11 @@ func (v *GRPC) V(_ int) bool { - // Override InfoXXX methods with TraceXXX to keep gRPC and logrus levels in sync. - // - //nolint:stylecheck -+// Info logs a message at the Info level. - func (v *GRPC) Info(args ...interface{}) { v.Trace(args...) } -+// Infoln logs a message at the Info level - func (v *GRPC) Infoln(args ...interface{}) { v.Traceln(args...) } -+// Infof logs a formatted message at the Info level. - func (v *GRPC) Infof(format string, args ...interface{}) { v.Tracef(format, args...) } - - // check interfaces. --- -2.34.1 - - -From 8156995d75d0c72b567ee64e4f7b0141e9bdbd95 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:40:27 +0530 -Subject: [PATCH 05/15] parameter 'l' seems to be unused, consider removing or - renaming it as _ - ---- - qan-api2/utils/logger/grpc.go | 2 +- - utils/logger/grpc.go | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qan-api2/utils/logger/grpc.go b/qan-api2/utils/logger/grpc.go -index c9bff487..e5b29790 100644 ---- a/qan-api2/utils/logger/grpc.go -+++ b/qan-api2/utils/logger/grpc.go -@@ -30,7 +30,7 @@ func (v *GRPC) V(_ int) bool { - // we don't need real implementation ATM - return true - } -- -+// Info logs a message at the Info level. - // Override InfoXXX methods with TraceXXX to keep gRPC and logrus levels in sync. - // - //nolint:stylecheck -diff --git a/utils/logger/grpc.go b/utils/logger/grpc.go -index fcc4f221..c8b285a0 100644 ---- a/utils/logger/grpc.go -+++ b/utils/logger/grpc.go -@@ -26,7 +26,7 @@ type GRPC struct { - } - - // V reports whether verbosity level l is at least the requested verbose level. --func (v *GRPC) V(l int) bool { -+func (v *GRPC) V(_ int) bool { - // we don't need real implementation ATM - return true - } --- -2.34.1 - - -From 567d45eace7d01d37881993148223f864e8ca0fc Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:42:23 +0530 -Subject: [PATCH 06/15] comment on exported method - ---- - utils/logger/grpc.go | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/utils/logger/grpc.go b/utils/logger/grpc.go -index c8b285a0..ee4e3dc7 100644 ---- a/utils/logger/grpc.go -+++ b/utils/logger/grpc.go -@@ -30,12 +30,14 @@ func (v *GRPC) V(_ int) bool { - // we don't need real implementation ATM - return true - } -- -+// Info logs a message at the Info level. - // override InfoXXX methods with TraceXXX to keep gRPC and logrus levels in sync - // - //nolint:stylecheck - func (v *GRPC) Info(args ...interface{}) { v.Trace(args...) } -+// Infoln logs a message at the Info level. - func (v *GRPC) Infoln(args ...interface{}) { v.Traceln(args...) } -+// Infof logs a formatted message at the Info level. - func (v *GRPC) Infof(format string, args ...interface{}) { v.Tracef(format, args...) } - - // check interfaces. --- -2.34.1 - - -From fb8234d9c8a1fff3d11af51bc2260b9b85de1621 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Thu, 11 Jan 2024 04:44:50 +0530 -Subject: [PATCH 07/15] comment for package main - ---- - agent/cmd/pmm-agent-entrypoint/main.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/agent/cmd/pmm-agent-entrypoint/main.go b/agent/cmd/pmm-agent-entrypoint/main.go -index a8d22267..820a886c 100644 ---- a/agent/cmd/pmm-agent-entrypoint/main.go -+++ b/agent/cmd/pmm-agent-entrypoint/main.go -@@ -11,7 +11,7 @@ - // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - // See the License for the specific language governing permissions and - // limitations under the License. -- -+// Package main provides the entry point for the PMM Agent. - package main - - import ( --- -2.34.1 - - -From be55d95271db963b19207cb946209d85cb5eb4bc Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Fri, 12 Jan 2024 04:13:34 +0530 -Subject: [PATCH 08/15] added nolint for these warnings - ---- - managed/utils/validators/validators.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/managed/utils/validators/validators.go b/managed/utils/validators/validators.go -index 8a4fd3d9..89fc58d6 100644 ---- a/managed/utils/validators/validators.go -+++ b/managed/utils/validators/validators.go -@@ -25,15 +25,15 @@ import ( - - const ( - // MetricsResolutionMin is the smallest value metric resolution can accept. -- MetricsResolutionMin = time.Second -+ MetricsResolutionMin = time.Second //nolint:revive - // MetricsResolutionMultipleOf is value metrics resolution should be multiple of. - MetricsResolutionMultipleOf = time.Second - // STTCheckIntervalMin is the smallest value STT check intervals can accept. -- STTCheckIntervalMin = time.Second -+ STTCheckIntervalMin = time.Second //nolint:revive - // STTCheckIntervalMultipleOf is value STT check intervals should be multiple of. - STTCheckIntervalMultipleOf = time.Second - // DataRetentionMin is the smallest value data retention can accept. -- DataRetentionMin = 24 * time.Hour -+ DataRetentionMin = 24 * time.Hour //nolint:revive - // DataRetentionMultipleOf is a value of data retention should be multiple of. - DataRetentionMultipleOf = 24 * time.Hour - ) --- -2.34.1 - - -From d1e2d2fdf01b0118afed65ca8199431b7d79ed26 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Fri, 12 Jan 2024 04:28:35 +0530 -Subject: [PATCH 09/15] added nolint for these warnings because required code - change - ---- - admin/pkg/client/tarball/tarball.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/admin/pkg/client/tarball/tarball.go b/admin/pkg/client/tarball/tarball.go -index cadd02e7..b1fd26b6 100644 ---- a/admin/pkg/client/tarball/tarball.go -+++ b/admin/pkg/client/tarball/tarball.go -@@ -87,7 +87,7 @@ func (b *Base) Install(ctx context.Context) error { - extractedPath := path.Join(os.TempDir(), fmt.Sprintf("pmm2-client-%s", b.Version)) - defer os.RemoveAll(extractedPath) //nolint:errcheck - -- if err := b.installTarball(ctx, extractedPath); err != nil { -+ if err := b.installTarball(ctx, extractedPath); err != nil { //nolint:revive - return err - } - -@@ -195,7 +195,7 @@ func (b *Base) extractTarball(tarPath string) error { - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - -- if err := cmd.Run(); err != nil { -+ if err := cmd.Run(); err != nil { //nolint:revive - return err - } - -@@ -228,7 +228,7 @@ func (b *Base) installTarball(ctx context.Context, extractedPath string) error { - cmd.Env = append(cmd.Env, "PMM_DIR="+b.InstallPath) - } - -- if err := cmd.Run(); err != nil { -+ if err := cmd.Run(); err != nil { //nolint:revive - return err - } - --- -2.34.1 - - -From 1f91ada852c52080817c7043bbd28c054fd2ede0 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Fri, 12 Jan 2024 04:42:51 +0530 -Subject: [PATCH 10/15] comment for the warnings - ---- - admin/pkg/docker/docker.go | 2 +- - agent/agents/mysql/slowlog/parser/logger.go | 2 +- - agent/utils/version/postgresql.go | 2 +- - update/main.go | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/admin/pkg/docker/docker.go b/admin/pkg/docker/docker.go -index 569bdb2f..cd7d5482 100644 ---- a/admin/pkg/docker/docker.go -+++ b/admin/pkg/docker/docker.go -@@ -35,7 +35,7 @@ import ( - - "github.com/percona/pmm/admin/pkg/common" - ) -- -+// ErrPasswordChangeFailed represents an error indicating that password change failed. - var ErrPasswordChangeFailed = errors.New("ErrPasswordChangeFailed") - - // Base contains methods to interact with Docker. -diff --git a/agent/agents/mysql/slowlog/parser/logger.go b/agent/agents/mysql/slowlog/parser/logger.go -index 2dd916f8..46e4f8af 100644 ---- a/agent/agents/mysql/slowlog/parser/logger.go -+++ b/agent/agents/mysql/slowlog/parser/logger.go -@@ -13,7 +13,7 @@ - // limitations under the License. - - package parser -- -+// Logger defines the interface for a MySQL slow log parser logger. - type Logger interface { - Warnf(format string, v ...interface{}) - Infof(format string, v ...interface{}) -diff --git a/agent/utils/version/postgresql.go b/agent/utils/version/postgresql.go -index f88f906a..6ea24025 100644 ---- a/agent/utils/version/postgresql.go -+++ b/agent/utils/version/postgresql.go -@@ -23,7 +23,7 @@ import ( - var ( - postgresDBRegexp = regexp.MustCompile(`PostgreSQL ([\d\.]+)`) - ) -- -+// ParsePostgreSQLVersion parses the given PostgreSQL version string. - func ParsePostgreSQLVersion(v string) string { - m := postgresDBRegexp.FindStringSubmatch(v) - if len(m) != 2 { -diff --git a/update/main.go b/update/main.go -index e1f87f92..4ecffaf3 100644 ---- a/update/main.go -+++ b/update/main.go -@@ -12,7 +12,7 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- -+// Package main provides the entry point for the update application. - package main - - import ( --- -2.34.1 - - -From 39b2900fc9e32d2025f23c425b7b850d7de39433 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Fri, 12 Jan 2024 04:55:38 +0530 -Subject: [PATCH 11/15] made the changes for the warnings - ---- - agent/agents/mysql/slowlog/parser/parser_bench_test.go | 2 +- - agent/config/config.go | 2 +- - agent/config/logger.go | 2 +- - agent/utils/mongo_fix/mongo_fix.go | 4 ++-- - agent/utils/mongo_fix/mongo_fix_test.go | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/agent/agents/mysql/slowlog/parser/parser_bench_test.go b/agent/agents/mysql/slowlog/parser/parser_bench_test.go -index 26f466dd..947827f1 100644 ---- a/agent/agents/mysql/slowlog/parser/parser_bench_test.go -+++ b/agent/agents/mysql/slowlog/parser/parser_bench_test.go -@@ -54,7 +54,7 @@ func benchmarkFile(b *testing.B, name string) { - b.StartTimer() - - go p.Run() -- for p.Parse() != nil { -+ for p.Parse() != nil { //nolint:revive - } - - b.StopTimer() -diff --git a/agent/config/config.go b/agent/config/config.go -index 551ce451..9ba26d69 100644 ---- a/agent/config/config.go -+++ b/agent/config/config.go -@@ -169,7 +169,7 @@ type Config struct { //nolint:musttag - - // ConfigFileDoesNotExistError error is returned from Get method if configuration file is expected, - // but does not exist. --type ConfigFileDoesNotExistError string -+type ConfigFileDoesNotExistError string //nolint:revive - - func (e ConfigFileDoesNotExistError) Error() string { - return fmt.Sprintf("configuration file %s does not exist", string(e)) -diff --git a/agent/config/logger.go b/agent/config/logger.go -index a2930f37..6915fb0e 100644 ---- a/agent/config/logger.go -+++ b/agent/config/logger.go -@@ -27,7 +27,7 @@ type gRPCLogger struct { - } - - // V reports whether verbosity level l is at least the requested verbose level. --func (v *gRPCLogger) V(l int) bool { -+func (v *gRPCLogger) V(_ int) bool { - // we don't need real implementation ATM - return true - } -diff --git a/agent/utils/mongo_fix/mongo_fix.go b/agent/utils/mongo_fix/mongo_fix.go -index ea56431b..66784e1f 100644 ---- a/agent/utils/mongo_fix/mongo_fix.go -+++ b/agent/utils/mongo_fix/mongo_fix.go -@@ -12,8 +12,8 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - --//nolint:stylecheck --package mongo_fix -+//nolint:stylecheck,revive -+package mongo_fix //nolint:revive - - import ( - "net/url" -diff --git a/agent/utils/mongo_fix/mongo_fix_test.go b/agent/utils/mongo_fix/mongo_fix_test.go -index 146a6135..6716e489 100644 ---- a/agent/utils/mongo_fix/mongo_fix_test.go -+++ b/agent/utils/mongo_fix/mongo_fix_test.go -@@ -13,7 +13,7 @@ - // limitations under the License. - - //nolint:stylecheck --package mongo_fix -+package mongo_fix //nolint:revive - - import ( - "net/url" --- -2.34.1 - - -From 9cf495cf975ad5127329ef5e983044fea8228c06 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Tue, 16 Jan 2024 04:00:00 +0530 -Subject: [PATCH 12/15] added comments and used nolint were required - ---- - admin/agentlocal/agentlocal.go | 12 +++++------ - api-tests/helpers.go | 20 +++++++++---------- - managed/models/agent_model.go | 2 +- - managed/models/artifact_model.go | 2 +- - managed/models/database.go | 6 +++--- - managed/models/dump.go | 2 +- - managed/models/dump_helpers.go | 2 +- - managed/models/models.go | 2 +- - managed/models/percona_sso_model_helpers.go | 1 + - managed/models/scheduled_tasks_helpers.go | 2 +- - managed/models/service_model.go | 2 +- - managed/models/victoriametrics_params.go | 1 + - managed/services/dump/dump.go | 16 +++++++-------- - managed/services/ha/highavailability.go | 20 +++++++++---------- - managed/services/ha/leaderservice.go | 22 ++++++++++----------- - managed/utils/envvars/parser.go | 3 ++- - utils/sqlmetrics/sqlmetrics.go | 4 ++-- - 17 files changed, 61 insertions(+), 58 deletions(-) - -diff --git a/admin/agentlocal/agentlocal.go b/admin/agentlocal/agentlocal.go -index 26a7aa18..feca0599 100644 ---- a/admin/agentlocal/agentlocal.go -+++ b/admin/agentlocal/agentlocal.go -@@ -45,14 +45,14 @@ func SetTransport(ctx context.Context, debug bool, port uint32) { - - client.Default.SetTransport(transport) - } -- -+// NetworkInfo represents information about the network. - type NetworkInfo bool - - const ( -- RequestNetworkInfo NetworkInfo = true -- DoNotRequestNetworkInfo NetworkInfo = false -- Localhost = "127.0.0.1" -- DefaultPMMAgentListenPort = 7777 -+ RequestNetworkInfo NetworkInfo = true //nolint:revive -+ DoNotRequestNetworkInfo NetworkInfo = false //nolint:revive -+ Localhost = "127.0.0.1"//nolint:revive -+ DefaultPMMAgentListenPort = 7777//nolint:revive - ) - - // ErrNotSetUp is returned by GetStatus when pmm-agent is running, but not set up. -@@ -80,7 +80,7 @@ type Status struct { - - ConnectionUptime float32 `json:"connection_uptime"` - } -- -+// AgentStatus represents the status of the agent. - type AgentStatus struct { - AgentID string `json:"agent_id"` - AgentType string `json:"agent_type"` -diff --git a/api-tests/helpers.go b/api-tests/helpers.go -index 5ef69250..47a6bc40 100644 ---- a/api-tests/helpers.go -+++ b/api-tests/helpers.go -@@ -31,7 +31,7 @@ import ( - "github.com/percona/pmm/api/inventorypb/json/client/nodes" - "github.com/percona/pmm/api/inventorypb/json/client/services" - ) -- -+// ErrorResponse represents the response structure for error scenarios. - type ErrorResponse interface { - Code() int - } -@@ -79,8 +79,8 @@ func AssertAPIErrorf(t TestingT, actual error, httpStatus int, grpcCode codes.Co - // (e.g. the line number in the proto file). - assert.Contains(t, errorField.String(), format) - } -- --func ExpectFailure(t *testing.T, link string) *expectedFailureTestingT { -+// ExpectFailure sets up expectations for a test case to fail. -+func ExpectFailure(t *testing.T, link string) *expectedFailureTestingT {//nolint:revive - t.Helper() - return &expectedFailureTestingT{ - t: t, -@@ -127,7 +127,7 @@ func (tt *expectedFailureTestingT) Check() { - - tt.t.Fatalf("%s expected to fail, but didn't: %s", tt.Name(), tt.link) - } -- -+// RemoveNodes removes specified nodes. - func RemoveNodes(t TestingT, nodeIDs ...string) { - t.Helper() - -@@ -143,7 +143,7 @@ func RemoveNodes(t TestingT, nodeIDs ...string) { - assert.NotNil(t, res) - } - } -- -+// RemoveServices removes specified services. - func RemoveServices(t TestingT, serviceIDs ...string) { - t.Helper() - -@@ -160,7 +160,7 @@ func RemoveServices(t TestingT, serviceIDs ...string) { - assert.NotNil(t, res) - } - } -- -+// RemoveAgents removes specified agents - func RemoveAgents(t TestingT, agentIDs ...string) { - t.Helper() - -@@ -176,7 +176,7 @@ func RemoveAgents(t TestingT, agentIDs ...string) { - assert.NotNil(t, res) - } - } -- -+// AddGenericNode adds a generic node. - func AddGenericNode(t TestingT, nodeName string) *nodes.AddGenericNodeOKBodyGeneric { - t.Helper() - -@@ -194,7 +194,7 @@ func AddGenericNode(t TestingT, nodeName string) *nodes.AddGenericNodeOKBodyGene - require.NotNil(t, res.Payload.Generic) - return res.Payload.Generic - } -- -+// AddRemoteNode adds a remote node. - func AddRemoteNode(t TestingT, nodeName string) *nodes.AddRemoteNodeOKBody { - t.Helper() - -@@ -210,7 +210,7 @@ func AddRemoteNode(t TestingT, nodeName string) *nodes.AddRemoteNodeOKBody { - require.NotNil(t, res) - return res.Payload - } -- -+// AddNode adds a node. - func AddNode(t TestingT, nodeBody *nodes.AddNodeBody) *nodes.AddNodeOKBody { - t.Helper() - -@@ -225,7 +225,7 @@ func AddNode(t TestingT, nodeBody *nodes.AddNodeBody) *nodes.AddNodeOKBody { - - return res.Payload - } -- -+// AddPMMAgent adds a PMM agent. - func AddPMMAgent(t TestingT, nodeID string) *agents.AddPMMAgentOKBody { - t.Helper() - -diff --git a/managed/models/agent_model.go b/managed/models/agent_model.go -index 0233183e..c556b26b 100644 ---- a/managed/models/agent_model.go -+++ b/managed/models/agent_model.go -@@ -300,7 +300,7 @@ func (s *Agent) DBConfig(service *Service) *DBConfig { - Socket: pointer.GetString(service.Socket), - } - } -- -+// DSNParams represents the parameters for configuring a Data Source Name (DSN). - type DSNParams struct { - DialTimeout time.Duration - Database string -diff --git a/managed/models/artifact_model.go b/managed/models/artifact_model.go -index 2ec01b4c..e7e90895 100644 ---- a/managed/models/artifact_model.go -+++ b/managed/models/artifact_model.go -@@ -141,7 +141,7 @@ type Metadata struct { - RestoreTo *time.Time `json:"restore_to"` - BackupToolData *BackupToolData `json:"backup_tool_data"` - } -- -+// MetadataList is a list of metadata associated with artifacts. - type MetadataList []Metadata - - // Value implements database/sql/driver.Valuer interface. Should be defined on the value. -diff --git a/managed/models/database.go b/managed/models/database.go -index 4880f07f..a512ea61 100644 ---- a/managed/models/database.go -+++ b/managed/models/database.go -@@ -12,7 +12,7 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- -+// Package models provides functionality for handling database models and related tasks. - //nolint:lll - package models - -@@ -1156,7 +1156,7 @@ func migrateDB(db *reform.DB, params SetupDBParams) error { - if err = setupFixture1(tx.Querier, params); err != nil { - return err - } -- if err = setupFixture2(tx.Querier, params.Username, params.Password); err != nil { -+ if err = setupFixture2(tx.Querier, params.Username, params.Password); err != nil {//nolint:revive - return err - } - return nil -@@ -1246,7 +1246,7 @@ func setupFixture1(q *reform.Querier, params SetupDBParams) error { - return nil - } - --func setupFixture2(q *reform.Querier, username, password string) error { -+func setupFixture2(q *reform.Querier, username, password string) error {//nolint:revive - // TODO add clickhouse_exporter - - return nil -diff --git a/managed/models/dump.go b/managed/models/dump.go -index d7adcee5..dfcbedeb 100644 ---- a/managed/models/dump.go -+++ b/managed/models/dump.go -@@ -23,7 +23,7 @@ import ( - ) - - //go:generate ../../bin/reform -- -+// DumpStatus represents the status of a dump process. - type DumpStatus string - - const ( -diff --git a/managed/models/dump_helpers.go b/managed/models/dump_helpers.go -index b5c0626e..65c307a8 100644 ---- a/managed/models/dump_helpers.go -+++ b/managed/models/dump_helpers.go -@@ -49,7 +49,7 @@ type DumpFilters struct { - // Return only dumps by specified status. - Status DumpStatus - } -- -+// CreateDumpParams represents the parameters for creating a dump. - type CreateDumpParams struct { - ServiceNames []string - StartTime *time.Time -diff --git a/managed/models/models.go b/managed/models/models.go -index 2ee68f37..c1024ea4 100644 ---- a/managed/models/models.go -+++ b/managed/models/models.go -@@ -230,7 +230,7 @@ const ( - Bool = ParamType("bool") - String = ParamType("string") - ) -- -+// ParamUnit represents the unit of a parameter. - type ParamUnit string - - const ( -diff --git a/managed/models/percona_sso_model_helpers.go b/managed/models/percona_sso_model_helpers.go -index 4f9b6a11..5fdd313f 100644 ---- a/managed/models/percona_sso_model_helpers.go -+++ b/managed/models/percona_sso_model_helpers.go -@@ -32,6 +32,7 @@ import ( - - var ( - perconaSSOMtx sync.Mutex -+ // ErrNotConnectedToPortal is an error indicating that PMM Server is not connected to the Portal. - ErrNotConnectedToPortal = errors.New("PMM Server is not connected to Portal") - ) - -diff --git a/managed/models/scheduled_tasks_helpers.go b/managed/models/scheduled_tasks_helpers.go -index be58f5ea..18a7e4b2 100644 ---- a/managed/models/scheduled_tasks_helpers.go -+++ b/managed/models/scheduled_tasks_helpers.go -@@ -382,7 +382,7 @@ func (s *ScheduledTask) ServiceID() (string, error) { - } - return data.ServiceID, nil - } -- -+// CommonBackupData returns the common backup data for the scheduled task. - func (s *ScheduledTask) CommonBackupData() (*CommonBackupTaskData, error) { - if s.Data != nil { - switch s.Type { -diff --git a/managed/models/service_model.go b/managed/models/service_model.go -index f05446e9..7a8e4b27 100644 ---- a/managed/models/service_model.go -+++ b/managed/models/service_model.go -@@ -26,7 +26,7 @@ import ( - // ServiceType represents Service type as stored in databases: - // pmm-managed's PostgreSQL, qan-api's ClickHouse, and VictoriaMetrics. - type ServiceType string -- -+// ServiceStandardLabelsParams represents the parameters for standard labels in a service. - type ServiceStandardLabelsParams struct { - Cluster *string - Environment *string -diff --git a/managed/models/victoriametrics_params.go b/managed/models/victoriametrics_params.go -index 14a86a5d..112467ce 100644 ---- a/managed/models/victoriametrics_params.go -+++ b/managed/models/victoriametrics_params.go -@@ -29,6 +29,7 @@ const ( - // BasePrometheusConfigPath - basic path with prometheus config, - // that user can mount to container. - BasePrometheusConfigPath = "/srv/prometheus/prometheus.base.yml" -+ // VMBaseURL is the base URL for VictoriaMetrics. - VMBaseURL = "http://127.0.0.1:9090/prometheus/" - ) - -diff --git a/managed/services/dump/dump.go b/managed/services/dump/dump.go -index 4f028eb4..7d9faf92 100644 ---- a/managed/services/dump/dump.go -+++ b/managed/services/dump/dump.go -@@ -36,14 +36,14 @@ import ( - - "github.com/percona/pmm/managed/models" - ) -- -+// ErrDumpAlreadyRunning is an exported error indicating that pmm-dump is already running. - var ErrDumpAlreadyRunning = status.Error(codes.FailedPrecondition, "pmm-dump already running.") - - const ( - pmmDumpBin = "pmm-dump" - dumpsDir = "/srv/dump" - ) -- -+// Service represents the dump service. - type Service struct { - l *logrus.Entry - -@@ -54,14 +54,14 @@ type Service struct { - rw sync.RWMutex - cancel context.CancelFunc - } -- -+// New creates a new instance of the dump service.. - func New(db *reform.DB) *Service { - return &Service{ - l: logrus.WithField("component", "management/backup/backup"), - db: db, - } - } -- -+// Params represents the parameters for configuring the dump service. - type Params struct { - APIKey string - Cookie string -@@ -73,7 +73,7 @@ type Params struct { - ExportQAN bool - IgnoreLoad bool - } -- -+// StartDump initiates the process of creating and managing dumps in the dump service. - func (s *Service) StartDump(params *Params) (string, error) { - // Check if some pmm-dump already running. - if !s.running.CompareAndSwap(false, true) { -@@ -174,7 +174,7 @@ func (s *Service) StartDump(params *Params) (string, error) { - - return dump.ID, nil - } -- -+// DeleteDump removes a specific dump associated with the dump service. - func (s *Service) DeleteDump(dumpID string) error { - dump, err := models.FindDumpByID(s.db.Querier, dumpID) - if err != nil { -@@ -198,7 +198,7 @@ func (s *Service) DeleteDump(dumpID string) error { - - return nil - } -- -+// GetFilePathsForDumps retrieves the file paths associated with the dumps managed by the dump service. - func (s *Service) GetFilePathsForDumps(dumpIDs []string) (map[string]string, error) { - dumps, err := models.FindDumpsByIDs(s.db.Querier, dumpIDs) - if err != nil { -@@ -271,7 +271,7 @@ func (s *Service) saveLogChunk(dumpID string, chunkN uint32, text string, last b - - return nil - } -- -+// StopDump stops the ongoing dump process in the dump service. - func (s *Service) StopDump() { - s.rw.RLock() - defer s.rw.RUnlock() -diff --git a/managed/services/ha/highavailability.go b/managed/services/ha/highavailability.go -index cec144b4..fb0cab97 100644 ---- a/managed/services/ha/highavailability.go -+++ b/managed/services/ha/highavailability.go -@@ -31,7 +31,7 @@ import ( - - "github.com/percona/pmm/managed/models" - ) -- -+// Service represents the high-availability service. - type Service struct { - params *models.HAParams - bootstrapCluster bool -@@ -49,21 +49,21 @@ type Service struct { - raftNode *raft.Raft - memberlist *memberlist.Memberlist - } -- -+// Apply applies a log entry to the high-availability service. - func (s *Service) Apply(logEntry *raft.Log) interface{} { - s.l.Printf("raft: got a message: %s", string(logEntry.Data)) - s.receivedMessages <- logEntry.Data - return nil - } -- -+// Snapshot returns a snapshot of the high-availability service. - func (s *Service) Snapshot() (raft.FSMSnapshot, error) { //nolint:ireturn - return nil, nil - } -- -+// Restore restores the high availability service to a previous state. - func (s *Service) Restore(_ io.ReadCloser) error { - return nil - } -- -+//Service provides new instance of the high availability service. - func New(params *models.HAParams) *Service { - return &Service{ - params: params, -@@ -76,7 +76,7 @@ func New(params *models.HAParams) *Service { - wg: &sync.WaitGroup{}, - } - } -- -+// Run runs the high availability service. - func (s *Service) Run(ctx context.Context) error { - s.wg.Add(1) - go func() { -@@ -289,14 +289,14 @@ func (s *Service) runLeaderObserver(ctx context.Context) { - } - } - } -- -+// AddLeaderService adds a leader service to the high availability service. - func (s *Service) AddLeaderService(leaderService LeaderService) { - err := s.services.Add(leaderService) - if err != nil { - s.l.Errorf("couldn't add HA service: +%v", err) - } - } -- -+// BroadcastMessage broadcasts a message from the high availability service. - func (s *Service) BroadcastMessage(message []byte) { - if s.params.Enabled { - s.rw.RLock() -@@ -306,13 +306,13 @@ func (s *Service) BroadcastMessage(message []byte) { - s.receivedMessages <- message - } - } -- -+// IsLeader checks if the current instance of the high availability service is the leader. - func (s *Service) IsLeader() bool { - s.rw.RLock() - defer s.rw.RUnlock() - return (s.raftNode != nil && s.raftNode.State() == raft.Leader) || !s.params.Enabled - } -- -+// Bootstrap performs the necessary steps to initialize the high availability service. - func (s *Service) Bootstrap() bool { - return s.params.Bootstrap || !s.params.Enabled - } -diff --git a/managed/services/ha/leaderservice.go b/managed/services/ha/leaderservice.go -index 9ec51856..fc776bf4 100644 ---- a/managed/services/ha/leaderservice.go -+++ b/managed/services/ha/leaderservice.go -@@ -19,20 +19,20 @@ import ( - "context" - "sync" - ) -- -+// LeaderService represents a leader service in the high-availability setup. - type LeaderService interface { - Start(ctx context.Context) error - Stop() - ID() string - } -- -+// StandardService represents a standard service in the high-availability setup. - type StandardService struct { - id string - - startFunc func(context.Context) error - stopFunc func() - } -- -+// NewStandardService creates a new standard service. - func NewStandardService(id string, startFunc func(context.Context) error, stopFunc func()) *StandardService { - return &StandardService{ - id: id, -@@ -40,19 +40,19 @@ func NewStandardService(id string, startFunc func(context.Context) error, stopFu - stopFunc: stopFunc, - } - } -- -+// ID returns the ID of the standard service. - func (s *StandardService) ID() string { - return s.id - } -- -+// Start starts the standard service. - func (s *StandardService) Start(ctx context.Context) error { - return s.startFunc(ctx) - } -- -+// Stop stops the standard service. - func (s *StandardService) Stop() { - s.stopFunc() - } -- -+// ContextService represents a context service. - type ContextService struct { - id string - -@@ -61,25 +61,25 @@ type ContextService struct { - m sync.Mutex - cancel context.CancelFunc - } -- -+// NewContextService creates a new context service. - func NewContextService(id string, startFunc func(context.Context) error) *ContextService { - return &ContextService{ - id: id, - startFunc: startFunc, - } - } -- -+// ID returns the ID of the context service. - func (s *ContextService) ID() string { - return s.id - } -- -+// Start starts the context service. - func (s *ContextService) Start(ctx context.Context) error { - s.m.Lock() - ctx, s.cancel = context.WithCancel(ctx) - s.m.Unlock() - return s.startFunc(ctx) - } -- -+// Stop stops the context service. - func (s *ContextService) Stop() { - s.m.Lock() - defer s.m.Unlock() -diff --git a/managed/utils/envvars/parser.go b/managed/utils/envvars/parser.go -index 780aca14..790d0ac3 100644 ---- a/managed/utils/envvars/parser.go -+++ b/managed/utils/envvars/parser.go -@@ -42,6 +42,7 @@ const ( - envEnableAccessControl = "ENABLE_RBAC" - envPlatformAPITimeout = "PERCONA_PLATFORM_API_TIMEOUT" - defaultPlatformAPITimeout = 30 * time.Second -+ // ENVvmAgentPrefix is the prefix for environment variables related to the VM agent. - ENVvmAgentPrefix = "VMAGENT_" - ) - -@@ -315,7 +316,7 @@ func GetPlatformPublicKeys() []string { - - return nil - } -- -+// GetInterfaceToBind retrieves the network interface to bind based on environment variables. - func GetInterfaceToBind() string { - return GetEnv(evnInterfaceToBind, "127.0.0.1") - } -diff --git a/utils/sqlmetrics/sqlmetrics.go b/utils/sqlmetrics/sqlmetrics.go -index 00a582ef..af284598 100644 ---- a/utils/sqlmetrics/sqlmetrics.go -+++ b/utils/sqlmetrics/sqlmetrics.go -@@ -84,7 +84,7 @@ func NewCollector(driver, dbName string, db *sql.DB) *Collector { - nil, constLabels), - } - } -- -+//nolint:revive - func (c *Collector) Describe(ch chan<- *prom.Desc) { - ch <- c.maxOpenConnections - -@@ -97,7 +97,7 @@ func (c *Collector) Describe(ch chan<- *prom.Desc) { - ch <- c.maxIdleClosed - ch <- c.maxLifetimeClosed - } -- -+//nolint:revive - func (c *Collector) Collect(ch chan<- prom.Metric) { - stats := c.db.Stats() - --- -2.34.1 - - -From c3143dcb942b9e03b89a4e0be39c9ed0de006b1a Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Tue, 16 Jan 2024 23:38:58 +0530 -Subject: [PATCH 13/15] added comments and nolint were needed - ---- - 2 | 201 ++++++++++++++++++ - admin/cli/cli.go | 4 +- - admin/cmd/pmm-admin/main.go | 2 +- - admin/cmd/pmm/main.go | 2 +- - admin/commands/base.go | 8 +- - .../inventory/add_agent_external_exporter.go | 2 +- - .../inventory/add_agent_mongodb_exporter.go | 2 +- - .../inventory/add_agent_mysqld_exporter.go | 2 +- - .../inventory/add_agent_node_exporter.go | 2 +- - .../commands/inventory/add_agent_pmm_agent.go | 2 +- - .../inventory/add_agent_postgres_exporter.go | 2 +- - .../inventory/add_agent_proxysql_exporter.go | 2 +- - .../add_agent_qan_mongodb_profiler_agent.go | 2 +- - .../add_agent_qan_mysql_perfschema_agent.go | 2 +- - .../add_agent_qan_mysql_slowlog_agent.go | 2 +- - ...d_agent_qan_postgres_pgstatements_agent.go | 2 +- - ..._agent_qan_postgres_pgstatmonitor_agent.go | 2 +- - .../inventory/add_agent_rds_exporter.go | 2 +- - .../commands/inventory/add_node_container.go | 2 +- - admin/commands/inventory/add_node_generic.go | 2 +- - admin/commands/inventory/add_node_remote.go | 2 +- - .../commands/inventory/add_node_remote_rds.go | 2 +- - .../inventory/add_service_external.go | 2 +- - .../commands/inventory/add_service_haproxy.go | 2 +- - .../commands/inventory/add_service_mongodb.go | 2 +- - admin/commands/inventory/add_service_mysql.go | 2 +- - .../inventory/add_service_postgresql.go | 2 +- - .../inventory/add_service_proxysql.go | 2 +- - admin/commands/inventory/inventory.go | 2 +- - admin/commands/inventory/list_agents.go | 2 +- - admin/commands/inventory/list_nodes.go | 2 +- - admin/commands/inventory/list_services.go | 2 +- - admin/commands/inventory/remove_agent.go | 2 +- - admin/commands/inventory/remove_node.go | 2 +- - admin/commands/inventory/remove_service.go | 2 +- - admin/commands/list.go | 2 +- - admin/commands/management/add_external.go | 4 +- - .../management/add_external_serverless.go | 4 +- - admin/commands/management/add_haproxy.go | 4 +- - admin/commands/management/add_mongodb.go | 12 +- - admin/commands/management/add_mysql.go | 10 +- - admin/commands/management/add_postgresql.go | 12 +- - admin/commands/management/add_proxysql.go | 12 +- - admin/commands/management/register.go | 2 +- - admin/commands/management/remove.go | 2 +- - admin/commands/management/unregister.go | 2 +- - admin/commands/pmm/client/upgrade.go | 2 +- - admin/commands/pmm/server/docker/base.go | 2 +- - admin/commands/pmm/server/docker/upgrade.go | 2 +- - admin/commands/status.go | 2 +- - agent/agentlocal/agent_local.go | 2 +- - agent/agents/agents_test.go | 2 +- - agent/runner/jobs/mysql_restore_job.go | 2 +- - agent/runner/jobs/pbm_helpers.go | 4 +- - api-tests/management/helpers.go | 4 +- - api/agentpb/agent.go | 72 +++---- - api/inventorypb/agents.go | 2 +- - managed/cmd/pmm-managed-init/main.go | 2 +- - managed/models/agentversion.go | 4 +- - managed/models/artifact_helpers.go | 2 +- - managed/models/database.go | 2 +- - managed/models/dump.go | 6 +- - managed/models/dump_helpers.go | 6 +- - managed/models/models.go | 3 +- - managed/models/role_helpers.go | 2 +- - managed/models/service_helpers.go | 2 +- - managed/models/settings_helpers.go | 2 +- - managed/models/template_helpers.go | 4 +- - managed/models/victoriametrics_params.go | 6 +- - managed/services/agents/agents.go | 2 +- - managed/services/agents/registry.go | 2 +- - managed/services/agents/versioner.go | 15 +- - managed/services/checks/checks.go | 4 +- - managed/services/grafana/client.go | 2 - - managed/services/management/checks.go | 2 +- - managed/services/management/dump/dump.go | 14 +- - managed/services/management/external.go | 2 +- - managed/services/management/haproxy.go | 2 +- - managed/services/platform/platform.go | 4 +- - managed/services/server/server.go | 11 +- - managed/services/supervisord/supervisord.go | 4 +- - managed/services/telemetry/config.go | 3 +- - .../telemetry/datasource_pmmdb_select.go | 4 +- - .../telemetry/datasource_victoria_metrics.go | 4 +- - managed/services/telemetry/telemetry.go | 2 +- - .../services/telemetry/uievents/uievents.go | 7 +- - managed/services/types.go | 2 +- - managed/utils/interceptors/grpc_extension.go | 6 +- - managed/utils/interceptors/interceptors.go | 2 +- - managed/utils/platform/client.go | 16 +- - qan-api2/db.go | 2 +- - 91 files changed, 400 insertions(+), 192 deletions(-) - create mode 100644 2 - -diff --git a/2 b/2 -new file mode 100644 -index 00000000..9ef37dce ---- /dev/null -+++ b/2 -@@ -0,0 +1,201 @@ -+// Copyright (C) 2023 Percona LLC -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ -+package client -+ -+import ( -+ "context" -+ "fmt" -+ "os" -+ "os/exec" -+ "strings" -+ -+ "github.com/sirupsen/logrus" -+ -+ "github.com/percona/pmm/admin/cli/flags" -+ "github.com/percona/pmm/admin/commands" -+ "github.com/percona/pmm/admin/pkg/client" -+ "github.com/percona/pmm/admin/pkg/client/tarball" -+ "github.com/percona/pmm/admin/pkg/common" -+) -+ -+// UpgradeCommand is used by Kong for CLI flags and commands. -+type UpgradeCommand struct { -+ Distribution string `enum:"autodetect,package-manager,tarball,docker" default:"autodetect" help:"Type of PMM Client distribution. One of: autodetect,package-manager,tarball,docker"` //nolint:lll -+ Version string `name:"use-version" help:"PMM Client version to upgrade to (default: latest)"` -+ -+ InstallPath string `group:"Tarball flags" default:"/usr/local/percona/pmm2" help:"Path where PMM Client is installed"` -+ User string `group:"Tarball flags" help:"Set file ownership instead of the current user"` -+ Group string `group:"Tarball flags" help:"Set group ownership instead of the current group"` -+ SkipChecksum bool `group:"Tarball flags" help:"Skip checksum validation of the downloaded files"` -+} -+ -+type distributionType string -+ -+const ( -+ distributionAutodetect distributionType = "autodetect" -+ distributionPackageManager distributionType = "package-manager" -+ distributionTar distributionType = "tarball" -+ distributionDocker distributionType = "docker" -+) -+ -+const versionLatest = "latest" -+ -+type packageManager int -+ -+const ( -+ dnf packageManager = iota -+ yum -+ apt -+) -+ -+type upgradeResult struct{} -+ -+// Result is a command run result. -+func (res *upgradeResult) Result() {} -+ -+// String stringifies command result. -+func (res *upgradeResult) String() string { -+ return "ok" -+} -+ -+// RunCmdWithContext runs install command. -+func (c *UpgradeCommand) RunCmdWithContext(ctx context.Context, _ *flags.GlobalFlags) (commands.Result, error) { -+ distributionType, err := c.distributionType(ctx) -+ if err != nil { -+ return nil, err -+ } -+ -+ switch distributionType { -+ case client.PackageManager: -+ err = c.upgradeViaPackageManager(ctx) -+ case client.Tarball: -+ err = c.upgradeViaTarball(ctx) -+ default: -+ logrus.Panicf("Unsupported distribution type %q", distributionType) -+ } -+ -+ if err != nil { -+ return nil, err -+ } -+ -+ return &upgradeResult{}, nil -+} -+ -+func (c *UpgradeCommand) distributionType(ctx context.Context) (client.DistributionType, error) { -+ var distType client.DistributionType -+ var err error -+ switch distributionType(c.Distribution) { -+ case distributionAutodetect: -+ distType, err = client.DetectDistributionType(ctx, c.InstallPath) -+ if err != nil { -+ return client.Unknown, err -+ } -+ case distributionPackageManager: -+ distType = client.PackageManager -+ case distributionTar: -+ distType = client.Tarball -+ case distributionDocker: -+ distType = client.Docker -+ } -+ -+ return distType, nil -+} -+ -+func (c *UpgradeCommand) upgradeViaTarball(ctx context.Context) error { -+ t := tarball.Base{ -+ InstallPath: c.InstallPath, -+ User: c.User, -+ Group: c.Group, -+ Version: c.Version, -+ SkipChecksum: c.SkipChecksum, -+ IsUpgrade: true, -+ } -+ if err := t.Install(ctx); err != nil {//nolint:revive -+ return err -+ } -+ -+ return nil -+} -+ -+func (c *UpgradeCommand) upgradeViaPackageManager(ctx context.Context) error { -+ cmds, err := c.getUpgradeCommands() -+ if err != nil { -+ return err -+ } -+ -+ for _, cmd := range cmds { -+ logrus.Infof("Running command %q", strings.Join(cmd, " ")) -+ -+ cmd := exec.CommandContext(ctx, cmd[0], cmd[1:]...) //nolint:gosec -+ cmd.Stdin = os.Stdin -+ cmd.Stdout = os.Stdout -+ cmd.Stderr = os.Stderr -+ -+ if err := cmd.Run(); err != nil { -+ return err -+ } -+ } -+ -+ return nil -+} -+ -+// ErrNoUpgradeCommandFound is returned when yum/dnf/apt/... Package manager cannot be detected. -+var ErrNoUpgradeCommandFound = fmt.Errorf("NoUpgradeCommandFound") -+ -+func (c *UpgradeCommand) getUpgradeCommands() ([][]string, error) { -+ cmd, err := common.DetectPackageManager() -+ if err != nil { -+ return nil, err -+ } -+ -+ switch cmd { -+ case common.Dnf: -+ return [][]string{ -+ {"dnf", "upgrade", "-y", fmt.Sprintf("pmm2-client%s", c.getVersionSuffix(dnf))}, -+ }, nil -+ case common.Yum: -+ return [][]string{ -+ {"yum", "upgrade", "-y", fmt.Sprintf("pmm2-client%s", c.getVersionSuffix(yum))}, -+ }, nil -+ case common.Apt: -+ return [][]string{ -+ {"percona-release", "enable", "pmm2-client", "release"}, -+ {"apt", "update"}, -+ {"apt", "install", "--only-upgrade", "-y", fmt.Sprintf("pmm2-client%s", c.getVersionSuffix(apt))}, -+ }, nil -+ case common.UnknownPackageManager: -+ return nil, fmt.Errorf("%w: cannot detect package manager (yum/dnf/apt)", ErrNoUpgradeCommandFound) -+ } -+ -+ return nil, fmt.Errorf("%w: cannot detect package manager (yum/dnf/apt)", ErrNoUpgradeCommandFound) -+} -+ -+func (c *UpgradeCommand) getVersionSuffix(pm packageManager) string { -+ if c.Version == "" || c.Version == versionLatest { -+ return "" -+ } -+ -+ switch pm { -+ case dnf: -+ return fmt.Sprintf("-%s", c.Version) -+ case yum: -+ return fmt.Sprintf("-%s", c.Version) -+ case apt: -+ return fmt.Sprintf("=%s*", c.Version) -+ } -+ -+ logrus.Panic("Invalid package manager provided") -+ return "" -+} -diff --git a/admin/cli/cli.go b/admin/cli/cli.go -index 9db76727..65dbc65b 100644 ---- a/admin/cli/cli.go -+++ b/admin/cli/cli.go -@@ -67,7 +67,7 @@ type PMMAdminCommands struct { - func (c *PMMAdminCommands) Run(ctx *kong.Context, globals *flags.GlobalFlags) error { - return run(ctx, globals) - } -- -+// GetGlobalFlags returns the global flags for PMMAdminCommands. - func (c *PMMAdminCommands) GetGlobalFlags() *flags.GlobalFlags { - return &c.GlobalFlags - } -@@ -80,7 +80,7 @@ type PMMCommands struct { - Client client.BaseCommand `cmd:"" help:"PMM client related commands"` - Completion commands.CompletionCommand `cmd:"" help:"Outputs shell code for initialising tab completions"` - } -- -+// GetGlobalFlags returns the global flags for PMMAdminCommands. - func (c *PMMCommands) GetGlobalFlags() *flags.GlobalFlags { - return &c.GlobalFlags - } -diff --git a/admin/cmd/pmm-admin/main.go b/admin/cmd/pmm-admin/main.go -index c376184e..199c4796 100644 ---- a/admin/cmd/pmm-admin/main.go -+++ b/admin/cmd/pmm-admin/main.go -@@ -11,7 +11,7 @@ - // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - // See the License for the specific language governing permissions and - // limitations under the License. -- -+// Package main - package main - - import ( -diff --git a/admin/cmd/pmm/main.go b/admin/cmd/pmm/main.go -index 6800636f..d796d43b 100644 ---- a/admin/cmd/pmm/main.go -+++ b/admin/cmd/pmm/main.go -@@ -11,7 +11,7 @@ - // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - // See the License for the specific language governing permissions and - // limitations under the License. -- -+// Package main - package main - - import ( -diff --git a/admin/commands/base.go b/admin/commands/base.go -index 92897899..d20c4649 100644 ---- a/admin/commands/base.go -+++ b/admin/commands/base.go -@@ -110,17 +110,17 @@ func ReadFromSource(src string) (*Credentials, error) { - - return &creds, nil - } -- -+// ErrorResponse defines the interface for error responses. - type ErrorResponse interface { - error - Code() int - } -- -+// Error represents an error with additional information. - type Error struct { - Code int `json:"code"` - Error string `json:"error"` - } -- -+// GetError converts an ErrorResponse to an Error. - func GetError(err ErrorResponse) Error { - v := reflect.ValueOf(err) - p := v.Elem().FieldByName("Payload") -@@ -130,7 +130,7 @@ func GetError(err ErrorResponse) Error { - Error: e.String(), - } - } -- -+// ParseTemplate parses the input text into a template.Template. - func ParseTemplate(text string) *template.Template { - t := template.New("").Option("missingkey=error") - return template.Must(t.Parse(strings.TrimSpace(text))) -diff --git a/admin/commands/inventory/add_agent_external_exporter.go b/admin/commands/inventory/add_agent_external_exporter.go -index 8d83d924..88cb404d 100644 ---- a/admin/commands/inventory/add_agent_external_exporter.go -+++ b/admin/commands/inventory/add_agent_external_exporter.go -@@ -59,7 +59,7 @@ type AddAgentExternalExporterCommand struct { - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - PushMetrics bool `help:"Enables push metrics model flow, it will be sent to the server by an agent"` - } -- -+// RunCmd executes the AddAgentExternalExporterCommand and returns the result. - func (cmd *AddAgentExternalExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_mongodb_exporter.go b/admin/commands/inventory/add_agent_mongodb_exporter.go -index fb258a39..e40f68b6 100644 ---- a/admin/commands/inventory/add_agent_mongodb_exporter.go -+++ b/admin/commands/inventory/add_agent_mongodb_exporter.go -@@ -68,7 +68,7 @@ type AddAgentMongodbExporterCommand struct { - CollectionsLimit int32 `name:"max-collections-limit" placeholder:"number" help:"Disable collstats & indexstats if there are more than collections"` //nolint:lll - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentMongodbExporterCommand and returns the result. - func (cmd *AddAgentMongodbExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_mysqld_exporter.go b/admin/commands/inventory/add_agent_mysqld_exporter.go -index 0753670a..b18271a3 100644 ---- a/admin/commands/inventory/add_agent_mysqld_exporter.go -+++ b/admin/commands/inventory/add_agent_mysqld_exporter.go -@@ -100,7 +100,7 @@ type AddAgentMysqldExporterCommand struct { - DisableCollectors []string `help:"Comma-separated list of collector names to exclude from exporter"` - LogLevel string `enum:"debug,info,warn,error" default:"warn" help:"Service logging level. One of: [debug, info, warn, error]"` - } -- -+// RunCmd executes the AddAgentMysqldExporterCommand and returns the result. - func (cmd *AddAgentMysqldExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_node_exporter.go b/admin/commands/inventory/add_agent_node_exporter.go -index 0e8f4f3e..9f5e0d26 100644 ---- a/admin/commands/inventory/add_agent_node_exporter.go -+++ b/admin/commands/inventory/add_agent_node_exporter.go -@@ -50,7 +50,7 @@ type AddAgentNodeExporterCommand struct { - DisableCollectors []string `help:"Comma-separated list of collector names to exclude from exporter"` - LogLevel string `enum:"debug,info,warn,error" default:"warn" help:"Service logging level. One of: [debug, info, warn, error]"` - } -- -+// RunCmd runs the command for AddAgentNodeExporterCommand. - func (cmd *AddAgentNodeExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &agents.AddNodeExporterParams{ -diff --git a/admin/commands/inventory/add_agent_pmm_agent.go b/admin/commands/inventory/add_agent_pmm_agent.go -index df8057e7..f27bf553 100644 ---- a/admin/commands/inventory/add_agent_pmm_agent.go -+++ b/admin/commands/inventory/add_agent_pmm_agent.go -@@ -43,7 +43,7 @@ type AddPMMAgentCommand struct { - RunsOnNodeID string `arg:"" help:"Node identifier where this instance runs"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddPMMAgentCommand and returns the result. - func (cmd *AddPMMAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &agents.AddPMMAgentParams{ -diff --git a/admin/commands/inventory/add_agent_postgres_exporter.go b/admin/commands/inventory/add_agent_postgres_exporter.go -index 0ee39234..134a9d84 100644 ---- a/admin/commands/inventory/add_agent_postgres_exporter.go -+++ b/admin/commands/inventory/add_agent_postgres_exporter.go -@@ -67,7 +67,7 @@ type AddAgentPostgresExporterCommand struct { - LogLevel string `enum:"debug,info,warn,error" default:"warn" help:"Service logging level. One of: [debug, info, warn, error]"` - AutoDiscoveryLimit int32 `default:"0" placeholder:"NUMBER" help:"Auto-discovery will be disabled if there are more than that number of databases (default: server-defined, -1: always disabled)"` - } -- -+// RunCmd executes the AddAgentPostgresExporterCommand and returns the result. - func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_proxysql_exporter.go b/admin/commands/inventory/add_agent_proxysql_exporter.go -index d0e53aa7..5a356b74 100644 ---- a/admin/commands/inventory/add_agent_proxysql_exporter.go -+++ b/admin/commands/inventory/add_agent_proxysql_exporter.go -@@ -61,7 +61,7 @@ type AddAgentProxysqlExporterCommand struct { - DisableCollectors []string `help:"Comma-separated list of collector names to exclude from exporter"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentProxysqlExporterCommand and returns the result. - func (cmd *AddAgentProxysqlExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &agents.AddProxySQLExporterParams{ -diff --git a/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go b/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go -index 22fbd3da..47626ecb 100644 ---- a/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go -+++ b/admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go -@@ -64,7 +64,7 @@ type AddAgentQANMongoDBProfilerAgentCommand struct { - AuthenticationMechanism string `help:"Authentication mechanism. Default is empty. Use MONGODB-X509 for ssl certificates"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentQANMongoDBProfilerAgentCommand and returns the result. - func (cmd *AddAgentQANMongoDBProfilerAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go b/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go -index 82492ad3..d1924fbf 100644 ---- a/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go -+++ b/admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go -@@ -70,7 +70,7 @@ type AddAgentQANMySQLPerfSchemaAgentCommand struct { - TLSKeyFile string `name:"tls-key" help:"Path to client key file"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd runs the command for AddAgentQANMySQLPerfSchemaAgentCommand. - func (cmd *AddAgentQANMySQLPerfSchemaAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go b/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go -index 1ca83e9b..2e645093 100644 ---- a/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go -+++ b/admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go -@@ -83,7 +83,7 @@ type AddAgentQANMySQLSlowlogAgentCommand struct { - TLSKeyFile string `name:"tls-key" help:"Path to client key file"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentQANMySQLSlowlogAgentCommand and returns the result. - func (cmd *AddAgentQANMySQLSlowlogAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go b/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go -index 8800accb..4827f9df 100644 ---- a/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go -+++ b/admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go -@@ -61,7 +61,7 @@ type AddAgentQANPostgreSQLPgStatementsAgentCommand struct { - TLSKeyFile string `help:"TLS certificate key file"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentQANPostgreSQLPgStatementsAgentCommand and returns the result. - func (cmd *AddAgentQANPostgreSQLPgStatementsAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go b/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go -index 53df775c..1713f647 100644 ---- a/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go -+++ b/admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go -@@ -63,7 +63,7 @@ type AddAgentQANPostgreSQLPgStatMonitorAgentCommand struct { - TLSKeyFile string `help:"TLS certificate key file"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd runs the command for AddAgentQANPostgreSQLPgStatMonitorAgentCommand. - func (cmd *AddAgentQANPostgreSQLPgStatMonitorAgentCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_agent_rds_exporter.go b/admin/commands/inventory/add_agent_rds_exporter.go -index 5d694ec7..b53329c9 100644 ---- a/admin/commands/inventory/add_agent_rds_exporter.go -+++ b/admin/commands/inventory/add_agent_rds_exporter.go -@@ -57,7 +57,7 @@ type AddAgentRDSExporterCommand struct { - PushMetrics bool `help:"Enables push metrics model flow, it will be sent to the server by an agent"` - LogLevel string `enum:"debug,info,warn,error,fatal" default:"warn" help:"Service logging level. One of: [debug, info, warn, error, fatal]"` - } -- -+// RunCmd executes the AddAgentRDSExporterCommand and returns the result. - func (cmd *AddAgentRDSExporterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &agents.AddRDSExporterParams{ -diff --git a/admin/commands/inventory/add_node_container.go b/admin/commands/inventory/add_node_container.go -index 18fabfe1..fd27c8ac 100644 ---- a/admin/commands/inventory/add_node_container.go -+++ b/admin/commands/inventory/add_node_container.go -@@ -57,7 +57,7 @@ type AddNodeContainerCommand struct { - Az string `help:"Node availability zone"` - NodeModel string `help:"Node model"` - } -- -+// RunCmd executes the AddNodeContainerCommand and returns the result. - func (cmd *AddNodeContainerCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &nodes.AddContainerNodeParams{ -diff --git a/admin/commands/inventory/add_node_generic.go b/admin/commands/inventory/add_node_generic.go -index 6bd51dc1..2faaf2d1 100644 ---- a/admin/commands/inventory/add_node_generic.go -+++ b/admin/commands/inventory/add_node_generic.go -@@ -56,7 +56,7 @@ type AddNodeGenericCommand struct { - Az string `help:"Node availability zone"` - NodeModel string `help:"Node mddel"` - } -- -+// RunCmd executes the AddNodeGenericCommand and returns the result. - func (cmd *AddNodeGenericCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &nodes.AddGenericNodeParams{ -diff --git a/admin/commands/inventory/add_node_remote.go b/admin/commands/inventory/add_node_remote.go -index 38fef755..22991f45 100644 ---- a/admin/commands/inventory/add_node_remote.go -+++ b/admin/commands/inventory/add_node_remote.go -@@ -50,7 +50,7 @@ type AddNodeRemoteCommand struct { - Region string `help:"Node region"` - Az string `help:"Node availability zone"` - } -- -+// RunCmd executes the AddNodeRemoteCommand and returns the result. - func (cmd *AddNodeRemoteCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &nodes.AddRemoteNodeParams{ -diff --git a/admin/commands/inventory/add_node_remote_rds.go b/admin/commands/inventory/add_node_remote_rds.go -index fb045bfb..b656ba35 100644 ---- a/admin/commands/inventory/add_node_remote_rds.go -+++ b/admin/commands/inventory/add_node_remote_rds.go -@@ -52,7 +52,7 @@ type AddNodeRemoteRDSCommand struct { - Az string `help:"Node availability zone"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddNodeRemoteRDSCommand and returns the result. - func (cmd *AddNodeRemoteRDSCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &nodes.AddRemoteRDSNodeParams{ -diff --git a/admin/commands/inventory/add_service_external.go b/admin/commands/inventory/add_service_external.go -index 4b957148..2477fe3b 100644 ---- a/admin/commands/inventory/add_service_external.go -+++ b/admin/commands/inventory/add_service_external.go -@@ -52,7 +52,7 @@ type AddServiceExternalCommand struct { - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - Group string `help:"Group name of external service"` - } -- -+// RunCmd executes the AddServiceExternalCommand and returns the result. - func (cmd *AddServiceExternalCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_service_haproxy.go b/admin/commands/inventory/add_service_haproxy.go -index a7fd48b9..b0729caf 100644 ---- a/admin/commands/inventory/add_service_haproxy.go -+++ b/admin/commands/inventory/add_service_haproxy.go -@@ -51,7 +51,7 @@ type AddServiceHAProxyCommand struct { - ReplicationSet string `placeholder:"rs1" help:"Replication set name"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddServiceHAProxyCommand and returns the result. - func (cmd *AddServiceHAProxyCommand) RunCmd() (commands.Result, error) { - isSupported, err := helpers.IsHAProxySupported() - if !isSupported { -diff --git a/admin/commands/inventory/add_service_mongodb.go b/admin/commands/inventory/add_service_mongodb.go -index 33143249..27608a5c 100644 ---- a/admin/commands/inventory/add_service_mongodb.go -+++ b/admin/commands/inventory/add_service_mongodb.go -@@ -59,7 +59,7 @@ type AddServiceMongoDBCommand struct { - ReplicationSet string `help:"Replication set name"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddServiceMongoDBCommand and returns the result. - func (cmd *AddServiceMongoDBCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &services.AddMongoDBServiceParams{ -diff --git a/admin/commands/inventory/add_service_mysql.go b/admin/commands/inventory/add_service_mysql.go -index ad05f1f0..6ce60032 100644 ---- a/admin/commands/inventory/add_service_mysql.go -+++ b/admin/commands/inventory/add_service_mysql.go -@@ -59,7 +59,7 @@ type AddServiceMySQLCommand struct { - ReplicationSet string `help:"Replication set name"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd runs the command for AddServiceMySQLCommand. - func (cmd *AddServiceMySQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &services.AddMySQLServiceParams{ -diff --git a/admin/commands/inventory/add_service_postgresql.go b/admin/commands/inventory/add_service_postgresql.go -index 992c3883..d08826c8 100644 ---- a/admin/commands/inventory/add_service_postgresql.go -+++ b/admin/commands/inventory/add_service_postgresql.go -@@ -59,7 +59,7 @@ type AddServicePostgreSQLCommand struct { - ReplicationSet string `help:"Replication set name"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddServicePostgreSQLCommand and returns the result. - func (cmd *AddServicePostgreSQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/inventory/add_service_proxysql.go b/admin/commands/inventory/add_service_proxysql.go -index 60f50ea6..086806a8 100644 ---- a/admin/commands/inventory/add_service_proxysql.go -+++ b/admin/commands/inventory/add_service_proxysql.go -@@ -59,7 +59,7 @@ type AddServiceProxySQLCommand struct { - ReplicationSet string `help:"Replication set name"` - CustomLabels map[string]string `mapsep:"," help:"Custom user-assigned labels"` - } -- -+// RunCmd executes the AddServiceProxySQLCommand and returns the result. - func (cmd *AddServiceProxySQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - params := &services.AddProxySQLServiceParams{ -diff --git a/admin/commands/inventory/inventory.go b/admin/commands/inventory/inventory.go -index 8de367d9..c492b2b5 100644 ---- a/admin/commands/inventory/inventory.go -+++ b/admin/commands/inventory/inventory.go -@@ -22,7 +22,7 @@ import ( - ) - - // InventoryCommand is used by Kong for CLI flags and commands. --type InventoryCommand struct { -+type InventoryCommand struct {//nolint:revive - List ListCommand `cmd:"" help:"List inventory commands"` - Add AddCommand `cmd:"" help:"Add to inventory commands"` - Remove RemoveCommand `cmd:"" help:"Remove from inventory commands"` -diff --git a/admin/commands/inventory/list_agents.go b/admin/commands/inventory/list_agents.go -index 22ffc6da..77708638 100644 ---- a/admin/commands/inventory/list_agents.go -+++ b/admin/commands/inventory/list_agents.go -@@ -100,7 +100,7 @@ type ListAgentsCommand struct { - NodeID string `help:"Filter by Node identifier"` - AgentType string `help:"Filter by Agent type"` - } -- -+// RunCmd executes the ListAgentsCommand and returns the result. - func (cmd *ListAgentsCommand) RunCmd() (commands.Result, error) { - agentType, err := formatTypeValue(acceptableAgentTypes, cmd.AgentType) - if err != nil { -diff --git a/admin/commands/inventory/list_nodes.go b/admin/commands/inventory/list_nodes.go -index e9febcd0..be451cea 100644 ---- a/admin/commands/inventory/list_nodes.go -+++ b/admin/commands/inventory/list_nodes.go -@@ -62,7 +62,7 @@ func (res *listNodesResult) String() string { - type ListNodesCommand struct { - NodeType string `help:"Filter by Node type"` - } -- -+// RunCmd executes the ListNodesCommand and returns the result. - func (cmd *ListNodesCommand) RunCmd() (commands.Result, error) { - nodeType, err := formatTypeValue(acceptableNodeTypes, cmd.NodeType) - if err != nil { -diff --git a/admin/commands/inventory/list_services.go b/admin/commands/inventory/list_services.go -index d3808fb8..13551aec 100644 ---- a/admin/commands/inventory/list_services.go -+++ b/admin/commands/inventory/list_services.go -@@ -77,7 +77,7 @@ type ListServicesCommand struct { - ServiceType string `help:"Filter by Service type"` - ExternalGroup string `help:"Filter by external group"` - } -- -+// RunCmd executes the ListServicesCommand and returns the result. - func (cmd *ListServicesCommand) RunCmd() (commands.Result, error) { - serviceType, err := formatTypeValue(acceptableServiceTypes, cmd.ServiceType) - if err != nil { -diff --git a/admin/commands/inventory/remove_agent.go b/admin/commands/inventory/remove_agent.go -index ff04ba8c..3b8b4912 100644 ---- a/admin/commands/inventory/remove_agent.go -+++ b/admin/commands/inventory/remove_agent.go -@@ -37,7 +37,7 @@ type RemoveAgentCommand struct { - AgentID string `arg:"" optional:"" help:"Agent ID"` - Force bool `help:"Remove agent with all dependencies"` - } -- -+// RunCmd executes the RemoveAgentCommand and returns the result. - func (cmd *RemoveAgentCommand) RunCmd() (commands.Result, error) { - params := &agents.RemoveAgentParams{ - Body: agents.RemoveAgentBody{ -diff --git a/admin/commands/inventory/remove_node.go b/admin/commands/inventory/remove_node.go -index 6184a597..58223734 100644 ---- a/admin/commands/inventory/remove_node.go -+++ b/admin/commands/inventory/remove_node.go -@@ -37,7 +37,7 @@ type RemoveNodeCommand struct { - NodeID string `arg:"" optional:"" help:"Node ID"` - Force bool `help:"Remove node with all dependencies"` - } -- -+// RunCmd runs the command for RemoveNodeCommand. - func (cmd *RemoveNodeCommand) RunCmd() (commands.Result, error) { - params := &nodes.RemoveNodeParams{ - Body: nodes.RemoveNodeBody{ -diff --git a/admin/commands/inventory/remove_service.go b/admin/commands/inventory/remove_service.go -index 551a28ca..52bca44c 100644 ---- a/admin/commands/inventory/remove_service.go -+++ b/admin/commands/inventory/remove_service.go -@@ -37,7 +37,7 @@ type RemoveServiceCommand struct { - ServiceID string `arg:"" optional:"" help:"Service ID"` - Force bool `help:"Remove service with all dependencies"` - } -- -+// RunCmd executes the RemoveServiceCommand and returns the result. - func (cmd *RemoveServiceCommand) RunCmd() (commands.Result, error) { - params := &services.RemoveServiceParams{ - Body: services.RemoveServiceBody{ -diff --git a/admin/commands/list.go b/admin/commands/list.go -index 10e145c0..616ede1c 100644 ---- a/admin/commands/list.go -+++ b/admin/commands/list.go -@@ -122,7 +122,7 @@ func convertTabs(template string) (string, error) { - type ListCommand struct { - NodeID string `help:"Node ID (default is autodetected)"` - } -- -+// RunCmd executes the List command and returns the result. - func (cmd *ListCommand) RunCmd() (Result, error) { - if cmd.NodeID == "" { - status, err := agentlocal.GetStatus(agentlocal.DoNotRequestNetworkInfo) -diff --git a/admin/commands/management/add_external.go b/admin/commands/management/add_external.go -index 0b9ee64f..dd7c2979 100644 ---- a/admin/commands/management/add_external.go -+++ b/admin/commands/management/add_external.go -@@ -72,7 +72,7 @@ type AddExternalCommand struct { - Group string `default:"${externalDefaultGroupExporter}" help:"Group name of external service (default: ${externalDefaultGroupExporter})"` - SkipConnectionCheck bool `help:"Skip exporter connection checks"` - } -- -+// GetCredentials returns the credentials for AddExternalCommand. - func (cmd *AddExternalCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -84,7 +84,7 @@ func (cmd *AddExternalCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddExternalCommand. - func (cmd *AddExternalCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/add_external_serverless.go b/admin/commands/management/add_external_serverless.go -index f7a7d08c..2d4f54dd 100644 ---- a/admin/commands/management/add_external_serverless.go -+++ b/admin/commands/management/add_external_serverless.go -@@ -87,7 +87,7 @@ if you specify --host you must provide all other parameters needed to build the - or even you can specify --address instead of host and port as individual parameters. - ` - } -- -+// GetCredentials returns the credentials for AddExternalServerlessCommand. - func (cmd *AddExternalServerlessCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -99,7 +99,7 @@ func (cmd *AddExternalServerlessCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddExternalServerlessCommand. - func (cmd *AddExternalServerlessCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/add_haproxy.go b/admin/commands/management/add_haproxy.go -index b6e7c556..6b829a89 100644 ---- a/admin/commands/management/add_haproxy.go -+++ b/admin/commands/management/add_haproxy.go -@@ -62,7 +62,7 @@ type AddHAProxyCommand struct { - MetricsMode string `enum:"${metricsModesEnum}" default:"auto" help:"Metrics flow mode, can be push - agent will push metrics, pull - server scrape metrics from agent or auto - chosen by server"` - SkipConnectionCheck bool `help:"Skip connection check"` - } -- -+// GetCredentials returns the credentials for AddHAProxyCommand. - func (cmd *AddHAProxyCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -74,7 +74,7 @@ func (cmd *AddHAProxyCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddHAProxyCommand. - func (cmd *AddHAProxyCommand) RunCmd() (commands.Result, error) { - isSupported, err := helpers.IsHAProxySupported() - if !isSupported { -diff --git a/admin/commands/management/add_mongodb.go b/admin/commands/management/add_mongodb.go -index 1d9fa14b..5369eb51 100644 ---- a/admin/commands/management/add_mongodb.go -+++ b/admin/commands/management/add_mongodb.go -@@ -87,23 +87,23 @@ type AddMongoDBCommand struct { - AddCommonFlags - AddLogLevelFatalFlags - } -- -+// GetServiceName returns the service name for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) GetServiceName() string { - return cmd.ServiceName - } -- -+// GetAddress returns the address for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) GetAddress() string { - return cmd.Address - } -- -+// GetDefaultAddress returns the default address for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) GetDefaultAddress() string { - return "127.0.0.1:27017" - } -- -+// GetSocket returns the socket for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) GetSocket() string { - return cmd.Socket - } -- -+// GetCredentials returns the credentials for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -116,7 +116,7 @@ func (cmd *AddMongoDBCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddMongoDBCommand. - func (cmd *AddMongoDBCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/add_mysql.go b/admin/commands/management/add_mysql.go -index 79a5820d..91f074b9 100644 ---- a/admin/commands/management/add_mysql.go -+++ b/admin/commands/management/add_mysql.go -@@ -125,23 +125,23 @@ type AddMySQLCommand struct { - AddCommonFlags - AddLogLevelNoFatalFlags - } -- -+// GetServiceName returns the service name for AddMySQLCommand. - func (cmd *AddMySQLCommand) GetServiceName() string { - return cmd.ServiceName - } -- -+// GetAddress returns the address for AddMySQLCommand. - func (cmd *AddMySQLCommand) GetAddress() string { - return cmd.Address - } -- -+// GetDefaultAddress returns the default address for AddMySQLCommand. - func (cmd *AddMySQLCommand) GetDefaultAddress() string { - return "127.0.0.1:3306" - } -- -+// GetSocket returns the socket for AddMySQLCommand. - func (cmd *AddMySQLCommand) GetSocket() string { - return cmd.Socket - } -- -+// RunCmd runs the command for AddMySQLCommand - func (cmd *AddMySQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/add_postgresql.go b/admin/commands/management/add_postgresql.go -index e2fc461e..ecab8d7b 100644 ---- a/admin/commands/management/add_postgresql.go -+++ b/admin/commands/management/add_postgresql.go -@@ -79,23 +79,23 @@ type AddPostgreSQLCommand struct { - AddCommonFlags - AddLogLevelNoFatalFlags - } -- -+// GetServiceName returns the service name for AddPostgreSQLCommand. - func (cmd *AddPostgreSQLCommand) GetServiceName() string { - return cmd.ServiceName - } -- -+// GetAddress returns the address for AddPostgreSQLCommand. - func (cmd *AddPostgreSQLCommand) GetAddress() string { - return cmd.Address - } -- -+// GetDefaultAddress returns the default address for AddPostgreSQLCommand. - func (cmd *AddPostgreSQLCommand) GetDefaultAddress() string { - return "127.0.0.1:5432" - } -- -+// GetSocket returns the socket for AddPostgreSQLCommand - func (cmd *AddPostgreSQLCommand) GetSocket() string { - return cmd.Socket - } -- -+// GetCredentials returns the credentials for AddPostgreSQLCommand. - func (cmd *AddPostgreSQLCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -108,7 +108,7 @@ func (cmd *AddPostgreSQLCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddPostgreSQLCommand. - func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/add_proxysql.go b/admin/commands/management/add_proxysql.go -index 5f3da141..c508df95 100644 ---- a/admin/commands/management/add_proxysql.go -+++ b/admin/commands/management/add_proxysql.go -@@ -69,23 +69,23 @@ type AddProxySQLCommand struct { - AddCommonFlags - AddLogLevelFatalFlags - } -- -+// GetServiceName returns the service name for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) GetServiceName() string { - return cmd.ServiceName - } -- -+// GetAddress returns the address for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) GetAddress() string { - return cmd.Address - } -- -+// GetDefaultAddress returns the default address for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) GetDefaultAddress() string { - return "127.0.0.1:6032" - } -- -+// GetSocket returns the socket for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) GetSocket() string { - return cmd.Socket - } -- -+// GetCredentials returns the credentials for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) GetCredentials() error { - creds, err := commands.ReadFromSource(cmd.CredentialsSource) - if err != nil { -@@ -98,7 +98,7 @@ func (cmd *AddProxySQLCommand) GetCredentials() error { - - return nil - } -- -+// RunCmd runs the command for AddProxySQLCommand. - func (cmd *AddProxySQLCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/register.go b/admin/commands/management/register.go -index b075eb53..d1df03e1 100644 ---- a/admin/commands/management/register.go -+++ b/admin/commands/management/register.go -@@ -66,7 +66,7 @@ type RegisterCommand struct { - MetricsMode string `enum:"${metricsModesEnum}" default:"auto" help:"Metrics flow mode, can be push - agent will push metrics, pull - server scrape metrics from agent or auto - chosen by server"` - DisableCollectors []string `help:"Comma-separated list of collector names to exclude from exporter"` - } -- -+// RunCmd runs the command for RegisterCommand. - func (cmd *RegisterCommand) RunCmd() (commands.Result, error) { - customLabels := commands.ParseCustomLabels(cmd.CustomLabels) - -diff --git a/admin/commands/management/remove.go b/admin/commands/management/remove.go -index 94b1107e..98871df1 100644 ---- a/admin/commands/management/remove.go -+++ b/admin/commands/management/remove.go -@@ -43,7 +43,7 @@ type RemoveCommand struct { - ServiceName string `arg:"" default:"" help:"Service name"` - ServiceID string `help:"Service ID"` - } -- -+// RunCmd runs the command for RemoveCommand. - func (cmd *RemoveCommand) RunCmd() (commands.Result, error) { - if cmd.ServiceID == "" && cmd.ServiceName == "" { - // Automatic service lookup during removal -diff --git a/admin/commands/management/unregister.go b/admin/commands/management/unregister.go -index 7632b344..09990193 100644 ---- a/admin/commands/management/unregister.go -+++ b/admin/commands/management/unregister.go -@@ -44,7 +44,7 @@ type UnregisterCommand struct { - Force bool `help:"Remove this node with all dependencies"` - NodeName string `help:"Node name (autodetected default: ${hostname})"` - } -- -+// RunCmd runs the command for UnregisterCommand. - func (cmd *UnregisterCommand) RunCmd() (commands.Result, error) { - var nodeName string - var nodeID string -diff --git a/admin/commands/pmm/client/upgrade.go b/admin/commands/pmm/client/upgrade.go -index b61c39c5..9ef37dce 100644 ---- a/admin/commands/pmm/client/upgrade.go -+++ b/admin/commands/pmm/client/upgrade.go -@@ -122,7 +122,7 @@ func (c *UpgradeCommand) upgradeViaTarball(ctx context.Context) error { - SkipChecksum: c.SkipChecksum, - IsUpgrade: true, - } -- if err := t.Install(ctx); err != nil { -+ if err := t.Install(ctx); err != nil {//nolint:revive - return err - } - -diff --git a/admin/commands/pmm/server/docker/base.go b/admin/commands/pmm/server/docker/base.go -index 32a16a82..30223353 100644 ---- a/admin/commands/pmm/server/docker/base.go -+++ b/admin/commands/pmm/server/docker/base.go -@@ -69,7 +69,7 @@ func installDocker(ctx context.Context, dockerFn Functions) error { - } - - logrus.Infoln("Installing Docker") -- if err = dockerFn.InstallDocker(ctx); err != nil { -+ if err = dockerFn.InstallDocker(ctx); err != nil {//nolint:revive - return err - } - -diff --git a/admin/commands/pmm/server/docker/upgrade.go b/admin/commands/pmm/server/docker/upgrade.go -index c8ce3a41..b7e54ecf 100644 ---- a/admin/commands/pmm/server/docker/upgrade.go -+++ b/admin/commands/pmm/server/docker/upgrade.go -@@ -74,7 +74,7 @@ func (u *upgradeResult) String() string { - } - - // RunCmdWithContext runs upgrade command. --func (c *UpgradeCommand) RunCmdWithContext(ctx context.Context, globals *flags.GlobalFlags) (commands.Result, error) { //nolint:unparam -+func (c *UpgradeCommand) RunCmdWithContext(ctx context.Context, globals *flags.GlobalFlags) (commands.Result, error) { //nolint:unparam,revive - logrus.Info("Starting PMM Server upgrade via Docker") - - d, err := prepareDocker(ctx, c.dockerFn, prepareOpts{install: false}) -diff --git a/admin/commands/status.go b/admin/commands/status.go -index b46281f0..9395cb12 100644 ---- a/admin/commands/status.go -+++ b/admin/commands/status.go -@@ -127,7 +127,7 @@ func (cmd *StatusCommand) RunCmd() (Result, error) { - return newStatusResult(status), nil - } - -- return nil, errors.Errorf("Failed to get PMM Agent status from local pmm-agent: %s.", err) //nolint:golint -+ return nil, errors.Errorf("Failed to get PMM Agent status from local pmm-agent: %s.", err) //nolint:golint,revive - default: - time.Sleep(1 * time.Second) - } -diff --git a/agent/agentlocal/agent_local.go b/agent/agentlocal/agent_local.go -index d23f2a82..b4adb321 100644 ---- a/agent/agentlocal/agent_local.go -+++ b/agent/agentlocal/agent_local.go -@@ -365,7 +365,7 @@ func addData(zipW *zip.Writer, name string, data []byte) error { - } - - // ZipLogs Handle function for generate zip file with logs. --func (s *Server) ZipLogs(w http.ResponseWriter, r *http.Request) { -+func (s *Server) ZipLogs(w http.ResponseWriter, r *http.Request) {//nolint:revive - zipBuffer := &bytes.Buffer{} - zipWriter := zip.NewWriter(zipBuffer) - -diff --git a/agent/agents/agents_test.go b/agent/agents/agents_test.go -index 49a11eca..60eb612b 100644 ---- a/agent/agents/agents_test.go -+++ b/agent/agents/agents_test.go -@@ -15,7 +15,7 @@ - package agents - - import "testing" -- -+// TestAgents is a test function for the Agents module. - func TestAgents(t *testing.T) { - // we need at least one test per package to correctly calculate coverage - } -diff --git a/agent/runner/jobs/mysql_restore_job.go b/agent/runner/jobs/mysql_restore_job.go -index 0c8fb7ab..dbe2414b 100644 ---- a/agent/runner/jobs/mysql_restore_job.go -+++ b/agent/runner/jobs/mysql_restore_job.go -@@ -228,7 +228,7 @@ func (j *MySQLRestoreJob) restoreMySQLFromS3(ctx context.Context, targetDirector - } - - wrapError := func(err error) error { -- return errors.Wrapf(err, "stderr: %s\n stdout: %s\n", stderr.String(), stdout.String()) -+ return errors.Wrapf(err, "stderr: %s\n stdout: %s\n", stderr.String(), stdout.String())//nolint:revive - } - - if err := xbcloudCmd.Start(); err != nil { -diff --git a/agent/runner/jobs/pbm_helpers.go b/agent/runner/jobs/pbm_helpers.go -index 0ede9508..b3683791 100644 ---- a/agent/runner/jobs/pbm_helpers.go -+++ b/agent/runner/jobs/pbm_helpers.go -@@ -335,7 +335,7 @@ func findPITRRestoreName(ctx context.Context, dbURL *string, restoreInfo *pbmRes - return "", errors.Errorf("failed to start restore") - } - continue -- } else { -+ } else {//nolint:revive - return entry.Name, nil - } - case <-ctx.Done(): -@@ -379,7 +379,7 @@ func waitForPBMRestore(ctx context.Context, l logrus.FieldLogger, dbURL *string, - maxRetryCount-- - l.Warnf("PMM failed to get backup restore status and will retry: %s", err) - continue -- } else { -+ } else {//nolint:revive - return errors.Wrap(err, "failed to get restore status") - } - } -diff --git a/api-tests/management/helpers.go b/api-tests/management/helpers.go -index 9a69dd3e..f68deede 100644 ---- a/api-tests/management/helpers.go -+++ b/api-tests/management/helpers.go -@@ -33,7 +33,7 @@ import ( - - // AgentStatusUnknown means agent is not connected and we don't know anything about its status. - var AgentStatusUnknown = inventorypb.AgentStatus_name[int32(inventorypb.AgentStatus_UNKNOWN)] -- -+// RegisterGenericNode registers a generic node using the provided parameters. - func RegisterGenericNode(t pmmapitests.TestingT, body node.RegisterNodeBody) (string, string) { - t.Helper() - params := node.RegisterNodeParams{ -@@ -118,7 +118,7 @@ func assertNodeCreated(t pmmapitests.TestingT, nodeID string, expectedResult nod - assert.NoError(t, err) - assert.Equal(t, expectedResult, *nodeOK.Payload) - } -- -+// RemovePMMAgentWithSubAgents removes a PMM Agent along with its sub-agents. - func RemovePMMAgentWithSubAgents(t pmmapitests.TestingT, pmmAgentID string) { - t.Helper() - -diff --git a/api/agentpb/agent.go b/api/agentpb/agent.go -index 1b59732a..aae3bb38 100644 ---- a/api/agentpb/agent.go -+++ b/api/agentpb/agent.go -@@ -54,154 +54,154 @@ type ServerRequestPayload interface { - sealed() - } - --// A list of AgentMessage request payloads. - -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *Ping) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_Ping{Ping: m} - } -- -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *StateChangedRequest) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_StateChanged{StateChanged: m} - } -- -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *QANCollectRequest) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_QanCollect{QanCollect: m} - } -- -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *ActionResultRequest) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_ActionResult{ActionResult: m} - } -- -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *JobProgress) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_JobProgress{JobProgress: m} - } -- -+// AgentMessageRequestPayload returns the payload for the AgentMessageRequest. - func (m *JobResult) AgentMessageRequestPayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_JobResult{JobResult: m} - } - --// A list of AgentMessage response payloads. - -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *Pong) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_Pong{Pong: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *SetStateResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_SetState{SetState: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *StartActionResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_StartAction{StartAction: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *StopActionResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_StopAction{StopAction: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *CheckConnectionResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_CheckConnection{CheckConnection: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *ServiceInfoResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_ServiceInfo{ServiceInfo: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *JobStatusResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_JobStatus{JobStatus: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *StartJobResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_StartJob{StartJob: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *StopJobResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_StopJob{StopJob: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *JobProgress) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_JobProgress{JobProgress: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *JobResult) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_JobResult{JobResult: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *GetVersionsResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_GetVersions{GetVersions: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *PBMSwitchPITRResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_PbmSwitchPitr{PbmSwitchPitr: m} - } -- -+// AgentMessageResponsePayload returns the payload for the AgentMessageResponse. - func (m *AgentLogsResponse) AgentMessageResponsePayload() isAgentMessage_Payload { //nolint:ireturn - return &AgentMessage_AgentLogs{AgentLogs: m} - } - --// A list of ServerMessage response payloads. - -+// ServerMessageResponsePayload returns the payload for the ServerMessageResponse. - func (m *Pong) ServerMessageResponsePayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_Pong{Pong: m} - } -- -+// ServerMessageResponsePayload returns the payload for the ServerMessageResponse. - func (m *StateChangedResponse) ServerMessageResponsePayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_StateChanged{StateChanged: m} - } -- -+// ServerMessageResponsePayload returns the payload for the ServerMessageResponse. - func (m *QANCollectResponse) ServerMessageResponsePayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_QanCollect{QanCollect: m} - } -- -+// ServerMessageResponsePayload returns the payload for the ServerMessageResponse. - func (m *ActionResultResponse) ServerMessageResponsePayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_ActionResult{ActionResult: m} - } - --// A list of ServerMessage request payloads. - -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *Ping) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_Ping{Ping: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *SetStateRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_SetState{SetState: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *StartActionRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_StartAction{StartAction: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *StopActionRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_StopAction{StopAction: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *CheckConnectionRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_CheckConnection{CheckConnection: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *StartJobRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_StartJob{StartJob: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *StopJobRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_StopJob{StopJob: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *JobStatusRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_JobStatus{JobStatus: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *GetVersionsRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_GetVersions{GetVersions: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *PBMSwitchPITRRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_PbmSwitchPitr{PbmSwitchPitr: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *AgentLogsRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_AgentLogs{AgentLogs: m} - } -- -+// ServerMessageRequestPayload returns the payload for the ServerMessageRequestPayload. - func (m *ServiceInfoRequest) ServerMessageRequestPayload() isServerMessage_Payload { //nolint:ireturn - return &ServerMessage_ServiceInfo{ServiceInfo: m} - } -diff --git a/api/inventorypb/agents.go b/api/inventorypb/agents.go -index 578b3f38..8af5e1e5 100644 ---- a/api/inventorypb/agents.go -+++ b/api/inventorypb/agents.go -@@ -1,3 +1,4 @@ -+// Package inventorypb provides protobuf definitions for agent inventory. - // Copyright (C) 2023 Percona LLC - // - // This program is free software: you can redistribute it and/or modify -@@ -12,7 +13,6 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- - package inventorypb - - //go-sumtype:decl Agent -diff --git a/managed/cmd/pmm-managed-init/main.go b/managed/cmd/pmm-managed-init/main.go -index 8aa0046e..4b686f15 100644 ---- a/managed/cmd/pmm-managed-init/main.go -+++ b/managed/cmd/pmm-managed-init/main.go -@@ -12,7 +12,7 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- -+// Package main provides the entry point for the pmm-managed-init command. - package main - - import ( -diff --git a/managed/models/agentversion.go b/managed/models/agentversion.go -index 272b19e4..719379c3 100644 ---- a/managed/models/agentversion.go -+++ b/managed/models/agentversion.go -@@ -22,7 +22,7 @@ import ( - "github.com/pkg/errors" - "gopkg.in/reform.v1" - ) -- -+// PMMAgentMinVersionForPostgreSQLSSLSni is the minimum required version of PMM Agent - var PMMAgentMinVersionForPostgreSQLSSLSni = version.Must(version.NewVersion("2.41.0-0")) - - // AgentNotSupportedError is used when the target PMM agent doesn't support the requested functionality. -@@ -70,7 +70,7 @@ func IsAgentSupported(agentModel *Agent, functionalityPrefix string, pmmMinVersi - } - return nil - } -- -+// IsPostgreSQLSSLSniSupported checks if PostgreSQL SSL SNI is supported by the PMM Agent. - func IsPostgreSQLSSLSniSupported(q *reform.Querier, pmmAgentID string) (bool, error) { - err := PMMAgentSupported(q, pmmAgentID, "postgresql SSL sni check", PMMAgentMinVersionForPostgreSQLSSLSni) - switch { -diff --git a/managed/models/artifact_helpers.go b/managed/models/artifact_helpers.go -index ed8a95a0..348ffaa8 100644 ---- a/managed/models/artifact_helpers.go -+++ b/managed/models/artifact_helpers.go -@@ -148,7 +148,7 @@ func FindArtifactByName(q *reform.Querier, name string) (*Artifact, error) { - err := q.FindOneTo(artifact, "name", name) - if err != nil { - if errors.Is(err, reform.ErrNoRows) { -- return nil, errors.Wrapf(ErrNotFound, "backup artifact with name %q not found.", name) -+ return nil, errors.Wrapf(ErrNotFound, "backup artifact with name %q not found.", name)//nolint:revive - } - return nil, errors.WithStack(err) - } -diff --git a/managed/models/database.go b/managed/models/database.go -index a512ea61..ee453e18 100644 ---- a/managed/models/database.go -+++ b/managed/models/database.go -@@ -1,3 +1,4 @@ -+// Package models provides functionality for handling database models and related tasks. - // Copyright (C) 2023 Percona LLC - // - // This program is free software: you can redistribute it and/or modify -@@ -12,7 +13,6 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . --// Package models provides functionality for handling database models and related tasks. - //nolint:lll - package models - -diff --git a/managed/models/dump.go b/managed/models/dump.go -index dfcbedeb..df5700e5 100644 ---- a/managed/models/dump.go -+++ b/managed/models/dump.go -@@ -27,9 +27,9 @@ import ( - type DumpStatus string - - const ( -- DumpStatusInProgress = DumpStatus("in_progress") -- DumpStatusSuccess = DumpStatus("success") -- DumpStatusError = DumpStatus("error") -+ DumpStatusInProgress = DumpStatus("in_progress")//nolint:revive -+ DumpStatusSuccess = DumpStatus("success")//nolint:revive -+ DumpStatusError = DumpStatus("error")//nolint:revive - ) - - // Validate validates Dumps status. -diff --git a/managed/models/dump_helpers.go b/managed/models/dump_helpers.go -index 65c307a8..d86f51bf 100644 ---- a/managed/models/dump_helpers.go -+++ b/managed/models/dump_helpers.go -@@ -57,7 +57,7 @@ type CreateDumpParams struct { - ExportQAN bool - IgnoreLoad bool - } -- -+// Validate checks the validity of CreateDumpParams. - func (p *CreateDumpParams) Validate() error { - if p.StartTime != nil && p.EndTime != nil && p.StartTime.After(*p.EndTime) { - return errors.Errorf("dump start time can't be greater than end time") -@@ -65,7 +65,7 @@ func (p *CreateDumpParams) Validate() error { - - return nil - } -- -+// CreateDump creates a dump using the specified parameters. - func CreateDump(q *reform.Querier, params CreateDumpParams) (*Dump, error) { - if err := params.Validate(); err != nil { - return nil, errors.Wrap(err, "invalid dump creation params") -@@ -164,7 +164,7 @@ func FindDumpByID(q *reform.Querier, id string) (*Dump, error) { - - return dump, nil - } -- -+// UpdateDumpStatus updates the status of a dump with the given ID. - func UpdateDumpStatus(q *reform.Querier, id string, status DumpStatus) error { - dump, err := FindDumpByID(q, id) - if err != nil { -diff --git a/managed/models/models.go b/managed/models/models.go -index c1024ea4..ff5dbd57 100644 ---- a/managed/models/models.go -+++ b/managed/models/models.go -@@ -234,6 +234,7 @@ const ( - type ParamUnit string - - const ( -- Percent = ParamUnit("%") -+ Percent = ParamUnit("%")//noiint:revive -+ // Seconds ... - Seconds = ParamUnit("s") - ) -diff --git a/managed/models/role_helpers.go b/managed/models/role_helpers.go -index da1c2505..9a104776 100644 ---- a/managed/models/role_helpers.go -+++ b/managed/models/role_helpers.go -@@ -33,7 +33,7 @@ var ( - - // CreateRole creates a new role. - func CreateRole(q *reform.Querier, role *Role) error { -- if err := q.Insert(role); err != nil { -+ if err := q.Insert(role); err != nil {//nolint:revive - return err - } - -diff --git a/managed/models/service_helpers.go b/managed/models/service_helpers.go -index 257fae1f..272742f5 100644 ---- a/managed/models/service_helpers.go -+++ b/managed/models/service_helpers.go -@@ -440,7 +440,7 @@ func ChangeStandardLabels(q *reform.Querier, serviceID string, labels ServiceSta - s.ExternalGroup = *labels.ExternalGroup - } - -- if err = q.UpdateColumns(s, columns...); err != nil { -+ if err = q.UpdateColumns(s, columns...); err != nil {//nolint:revive - return err - } - -diff --git a/managed/models/settings_helpers.go b/managed/models/settings_helpers.go -index b439121c..21f8e696 100644 ---- a/managed/models/settings_helpers.go -+++ b/managed/models/settings_helpers.go -@@ -322,7 +322,7 @@ func UpdateSettings(q reform.DBTX, params *ChangeSettingsParams) (*Settings, err - - func lockRoleForChange(tx *reform.TX, roleID int) error { - var r Role -- if err := FindAndLockRole(tx, roleID, &r); err != nil { -+ if err := FindAndLockRole(tx, roleID, &r); err != nil {//nolint:revive - return err - } - -diff --git a/managed/models/template_helpers.go b/managed/models/template_helpers.go -index 7c0ca1ee..d13ffc32 100644 ---- a/managed/models/template_helpers.go -+++ b/managed/models/template_helpers.go -@@ -173,11 +173,11 @@ func RemoveTemplate(q *reform.Querier, name string) error { - } - return nil - } -- -+// ConvertTemplate converts an alert template to the internal representation. - func ConvertTemplate(template *alert.Template, source Source) (*Template, error) { - p, err := ConvertParamsDefinitions(template.Params) - if err != nil { -- return nil, errors.Errorf("invalid rule template parameters: %v.", err) -+ return nil, errors.Errorf("invalid rule template parameters: %v.", err)//nolint:revive - } - - yaml, err := alert.ToYAML([]alert.Template{*template}) -diff --git a/managed/models/victoriametrics_params.go b/managed/models/victoriametrics_params.go -index 112467ce..4b1c2a9f 100644 ---- a/managed/models/victoriametrics_params.go -+++ b/managed/models/victoriametrics_params.go -@@ -100,15 +100,15 @@ func (vmp *VictoriaMetricsParams) loadVMAlertParams() error { - - return nil - } -- -+// ExternalVM returns true if VictoriaMetrics is configured to run externally. - func (vmp *VictoriaMetricsParams) ExternalVM() bool { - return vmp.url.Hostname() != "127.0.0.1" - } -- -+// URL returns the base URL for VictoriaMetrics. - func (vmp *VictoriaMetricsParams) URL() string { - return vmp.url.String() - } -- -+// URLFor returns the URL for a specific path in VictoriaMetrics. - func (vmp *VictoriaMetricsParams) URLFor(path string) (*url.URL, error) { - if path == "" { - return vmp.url, nil -diff --git a/managed/services/agents/agents.go b/managed/services/agents/agents.go -index 7d71672f..85ff58a4 100644 ---- a/managed/services/agents/agents.go -+++ b/managed/services/agents/agents.go -@@ -143,7 +143,7 @@ func ensureAuthParams(exporter *models.Agent, params *agentpb.SetStateRequest_Ag - } - - // getExporterListenAddress returns the appropriate listen address to use for a given exporter. --func getExporterListenAddress(node *models.Node, exporter *models.Agent) string { -+func getExporterListenAddress(node *models.Node, exporter *models.Agent) string {//nolint:revive - switch { - case exporter.ExposeExporter: - return "0.0.0.0" -diff --git a/managed/services/agents/registry.go b/managed/services/agents/registry.go -index 6db03924..e9cdf1e1 100644 ---- a/managed/services/agents/registry.go -+++ b/managed/services/agents/registry.go -@@ -416,7 +416,7 @@ func (r *Registry) Collect(ch chan<- prom.Metric) { - r.mRoundTrip.Collect(ch) - r.mClockDrift.Collect(ch) - } -- -+// KickAll sends a signal to all registered agents in the registry to perform a kick action. - func (r *Registry) KickAll(ctx context.Context) { - for _, agentInfo := range r.agents { - r.Kick(ctx, agentInfo.id) -diff --git a/managed/services/agents/versioner.go b/managed/services/agents/versioner.go -index e278fb87..174d377d 100644 ---- a/managed/services/agents/versioner.go -+++ b/managed/services/agents/versioner.go -@@ -56,8 +56,10 @@ type Software interface { - // Mysqld represents mysqld software. - type Mysqld struct{} - --func (*Mysqld) isSoftware() {} -+func (*Mysqld) isSoftware() -+// Name returns the software name for Mysqld.{} - func (*Mysqld) Name() models.SoftwareName { return models.MysqldSoftwareName } -+// GetVersionRequest returns the GetVersionsRequest_Software for Mysqld. - func (*Mysqld) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - return &agentpb.GetVersionsRequest_Software{ - Software: &agentpb.GetVersionsRequest_Software_Mysqld{}, -@@ -68,7 +70,9 @@ func (*Mysqld) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - type Xtrabackup struct{} - - func (*Xtrabackup) isSoftware() {} -+// Name returns the software name for Xtrabackup. - func (*Xtrabackup) Name() models.SoftwareName { return models.XtrabackupSoftwareName } -+// GetVersionRequest returns the GetVersionsRequest_Software for Xtrabackup. - func (*Xtrabackup) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - return &agentpb.GetVersionsRequest_Software{ - Software: &agentpb.GetVersionsRequest_Software_Xtrabackup{}, -@@ -77,9 +81,10 @@ func (*Xtrabackup) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - - // Xbcloud represents xbcloud software. - type Xbcloud struct{} -- - func (*Xbcloud) isSoftware() {} -+// Name returns the software name for Xbcloud. - func (*Xbcloud) Name() models.SoftwareName { return models.XbcloudSoftwareName } -+// GetVersionRequest returns the GetVersionsRequest_Software for Xbcloud. - func (*Xbcloud) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - return &agentpb.GetVersionsRequest_Software{ - Software: &agentpb.GetVersionsRequest_Software_Xbcloud{}, -@@ -90,7 +95,9 @@ func (*Xbcloud) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - type Qpress struct{} - - func (*Qpress) isSoftware() {} -+// Name returns the software name for Qpress. - func (*Qpress) Name() models.SoftwareName { return models.QpressSoftwareName } -+// GetVersionRequest returns the GetVersionsRequest_Software for Qpress. - func (*Qpress) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - return &agentpb.GetVersionsRequest_Software{ - Software: &agentpb.GetVersionsRequest_Software_Qpress{}, -@@ -100,8 +107,10 @@ func (*Qpress) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - // MongoDB represents mongod software. - type MongoDB struct{} - --func (*MongoDB) isSoftware() {} -+func (*MongoDB) isSoftware() -+// Name returns the software name for MongoDB.{} - func (*MongoDB) Name() models.SoftwareName { return models.MongoDBSoftwareName } -+// GetVersionRequest returns the GetVersionsRequest_Software for Qpress. - func (*MongoDB) GetVersionRequest() *agentpb.GetVersionsRequest_Software { - return &agentpb.GetVersionsRequest_Software{ - Software: &agentpb.GetVersionsRequest_Software_Mongod{}, -diff --git a/managed/services/checks/checks.go b/managed/services/checks/checks.go -index e8499ac6..df7a89e3 100644 ---- a/managed/services/checks/checks.go -+++ b/managed/services/checks/checks.go -@@ -369,7 +369,7 @@ func (s *Service) GetAdvisors() ([]check.Advisor, error) { - } - return res, nil - } -- -+// GetChecks retrieves a map of checks from the service. - func (s *Service) GetChecks() (map[string]check.Check, error) { - cs, err := models.FindCheckSettings(s.db.Querier) - if err != nil { -@@ -1438,7 +1438,7 @@ func (s *Service) loadLocalChecks(file string) ([]check.Check, error) { - - for _, c := range checks { - if c.Advisor != "dev" { -- return nil, errors.Errorf("Local checks are supposed to be linked to the 'dev' advisor.") -+ return nil, errors.Errorf("Local checks are supposed to be linked to the 'dev' advisor.")//nolint:revive - } - } - -diff --git a/managed/services/grafana/client.go b/managed/services/grafana/client.go -index 8dda69cb..1514c6c7 100644 ---- a/managed/services/grafana/client.go -+++ b/managed/services/grafana/client.go -@@ -14,8 +14,6 @@ - // along with this program. If not, see . - - // Package grafana provides facilities for working with Grafana. --// -- - package grafana - - import ( -diff --git a/managed/services/management/checks.go b/managed/services/management/checks.go -index d1d8049c..6a704d24 100644 ---- a/managed/services/management/checks.go -+++ b/managed/services/management/checks.go -@@ -249,7 +249,7 @@ func (s *ChecksAPIService) ListSecurityChecks(_ context.Context, _ *managementpb - - return &managementpb.ListSecurityChecksResponse{Checks: res}, nil - } -- -+// ListAdvisors retrieves a list of advisors based on the provided request. - func (s *ChecksAPIService) ListAdvisors(_ context.Context, _ *managementpb.ListAdvisorsRequest) (*managementpb.ListAdvisorsResponse, error) { - disChecks, err := s.checksService.GetDisabledChecks() - if err != nil { -diff --git a/managed/services/management/dump/dump.go b/managed/services/management/dump/dump.go -index 6ea6026c..fd8c7b8a 100644 ---- a/managed/services/management/dump/dump.go -+++ b/managed/services/management/dump/dump.go -@@ -41,7 +41,7 @@ import ( - "github.com/percona/pmm/managed/services/dump" - "github.com/percona/pmm/managed/services/grafana" - ) -- -+// Service represents a structure for managing dump-related operations. - type Service struct { - db *reform.DB - l *logrus.Entry -@@ -51,7 +51,7 @@ type Service struct { - - dumpv1beta1.UnimplementedDumpsServer - } -- -+// New creates a new instance of the Service with the provided dependencies. - func New(db *reform.DB, grafanaClient *grafana.Client, dumpService dumpService) *Service { - return &Service{ - db: db, -@@ -60,7 +60,7 @@ func New(db *reform.DB, grafanaClient *grafana.Client, dumpService dumpService) - l: logrus.WithField("component", "management/dump"), - } - } -- -+// StartDump starts a dump based on the provided context and request. - func (s *Service) StartDump(ctx context.Context, req *dumpv1beta1.StartDumpRequest) (*dumpv1beta1.StartDumpResponse, error) { - md, ok := metadata.FromIncomingContext(ctx) - if !ok { -@@ -136,7 +136,7 @@ func (s *Service) StartDump(ctx context.Context, req *dumpv1beta1.StartDumpReque - - return &dumpv1beta1.StartDumpResponse{DumpId: dumpID}, nil - } -- -+// ListDumps lists dumps based on the provided context and request. - func (s *Service) ListDumps(_ context.Context, _ *dumpv1beta1.ListDumpsRequest) (*dumpv1beta1.ListDumpsResponse, error) { - dumps, err := models.FindDumps(s.db.Querier, models.DumpFilters{}) - if err != nil { -@@ -157,7 +157,7 @@ func (s *Service) ListDumps(_ context.Context, _ *dumpv1beta1.ListDumpsRequest) - Dumps: dumpsResponse, - }, nil - } -- -+// DeleteDump deletes a dump based on the provided context and request. - func (s *Service) DeleteDump(_ context.Context, req *dumpv1beta1.DeleteDumpRequest) (*dumpv1beta1.DeleteDumpResponse, error) { - for _, id := range req.DumpIds { - if err := s.dumpService.DeleteDump(id); err != nil { -@@ -167,7 +167,7 @@ func (s *Service) DeleteDump(_ context.Context, req *dumpv1beta1.DeleteDumpReque - - return &dumpv1beta1.DeleteDumpResponse{}, nil - } -- -+// GetDumpLogs retrieves dump logs based on the provided context and request. - func (s *Service) GetDumpLogs(_ context.Context, req *dumpv1beta1.GetLogsRequest) (*dumpv1beta1.GetLogsResponse, error) { - filter := models.DumpLogsFilter{ - DumpID: req.DumpId, -@@ -198,7 +198,7 @@ func (s *Service) GetDumpLogs(_ context.Context, req *dumpv1beta1.GetLogsRequest - - return res, nil - } -- -+// UploadDump uploads a dump based on the provided context and request. - func (s *Service) UploadDump(_ context.Context, req *dumpv1beta1.UploadDumpRequest) (*dumpv1beta1.UploadDumpResponse, error) { - filePaths, err := s.dumpService.GetFilePathsForDumps(req.DumpIds) - if err != nil { -diff --git a/managed/services/management/external.go b/managed/services/management/external.go -index 7bb3253f..b12aa8fe 100644 ---- a/managed/services/management/external.go -+++ b/managed/services/management/external.go -@@ -47,7 +47,7 @@ func NewExternalService(db *reform.DB, vmdb prometheusService, state agentsState - cc: cc, - } - } -- -+// AddExternal adds an external service based on the provided request - func (e *ExternalService) AddExternal(ctx context.Context, req *managementpb.AddExternalRequest) (*managementpb.AddExternalResponse, error) { - res := &managementpb.AddExternalResponse{} - var pmmAgentID *string -diff --git a/managed/services/management/haproxy.go b/managed/services/management/haproxy.go -index 320b7bd1..6b563a71 100644 ---- a/managed/services/management/haproxy.go -+++ b/managed/services/management/haproxy.go -@@ -47,7 +47,7 @@ func NewHAProxyService(db *reform.DB, vmdb prometheusService, state agentsStateU - cc: cc, - } - } -- -+// AddHAProxy adds an HAProxy service based on the provided request. - func (e HAProxyService) AddHAProxy(ctx context.Context, req *managementpb.AddHAProxyRequest) (*managementpb.AddHAProxyResponse, error) { - res := &managementpb.AddHAProxyResponse{} - var pmmAgentID *string -diff --git a/managed/services/platform/platform.go b/managed/services/platform/platform.go -index 4b75510e..ff45f5c4 100644 ---- a/managed/services/platform/platform.go -+++ b/managed/services/platform/platform.go -@@ -202,7 +202,7 @@ func (s *Service) forceDisconnect(ctx context.Context) error { - } - return nil - } -- -+// UpdateSupervisordConfigurations updates supervisord configurations for the service. - func (s *Service) UpdateSupervisordConfigurations(ctx context.Context) error { - settings, err := models.GetSettings(s.db) - if err != nil { -@@ -377,7 +377,7 @@ func (s *Service) GetContactInformation(ctx context.Context, _ *platformpb.GetCo - - return response, nil - } -- -+// ServerInfo retrieves server information based on the provided context and request. - func (s *Service) ServerInfo(ctx context.Context, _ *platformpb.ServerInfoRequest) (*platformpb.ServerInfoResponse, error) { - settings, err := models.GetSettings(s.db) - if err != nil { -diff --git a/managed/services/server/server.go b/managed/services/server/server.go -index 6db57e23..456fe161 100644 ---- a/managed/services/server/server.go -+++ b/managed/services/server/server.go -@@ -221,8 +221,7 @@ func (s *Server) Version(ctx context.Context, req *serverpb.VersionRequest) (*se - } - - // Readiness returns an error when some PMM Server component is not ready yet or is being restarted. --// It can be used as for Docker health check or Kubernetes readiness probe. --func (s *Server) Readiness(ctx context.Context, req *serverpb.ReadinessRequest) (*serverpb.ReadinessResponse, error) { -+func (s *Server) Readiness(ctx context.Context, req *serverpb.ReadinessRequest) (*serverpb.ReadinessResponse, error) {//nolint:revive - var notReady bool - for n, svc := range map[string]healthChecker{ - "alertmanager": s.alertmanager, -@@ -246,7 +245,7 @@ func (s *Server) Readiness(ctx context.Context, req *serverpb.ReadinessRequest) - // LeaderHealthCheck checks if the instance is the leader in a cluster. - // Returns an error if the instance isn't the leader. - // It's used for HA purpose. --func (s *Server) LeaderHealthCheck(ctx context.Context, req *serverpb.LeaderHealthCheckRequest) (*serverpb.LeaderHealthCheckResponse, error) { -+func (s *Server) LeaderHealthCheck(ctx context.Context, req *serverpb.LeaderHealthCheckRequest) (*serverpb.LeaderHealthCheckResponse, error) {//nolint:revive - if s.haService.IsLeader() { - return &serverpb.LeaderHealthCheckResponse{}, nil - } -@@ -326,7 +325,7 @@ func (s *Server) CheckUpdates(ctx context.Context, req *serverpb.CheckUpdatesReq - } - - // StartUpdate starts PMM Server update. --func (s *Server) StartUpdate(ctx context.Context, req *serverpb.StartUpdateRequest) (*serverpb.StartUpdateResponse, error) { -+func (s *Server) StartUpdate(ctx context.Context, req *serverpb.StartUpdateRequest) (*serverpb.StartUpdateResponse, error) {//nolint:revive - s.envRW.RLock() - updatesDisabled := s.envSettings.DisableUpdates - s.envRW.RUnlock() -@@ -501,7 +500,7 @@ func (s *Server) convertSettings(settings *models.Settings, connectedToPlatform - } - - // GetSettings returns current PMM Server settings. --func (s *Server) GetSettings(ctx context.Context, req *serverpb.GetSettingsRequest) (*serverpb.GetSettingsResponse, error) { -+func (s *Server) GetSettings(ctx context.Context, req *serverpb.GetSettingsRequest) (*serverpb.GetSettingsResponse, error) {//nolint:revive - s.envRW.RLock() - defer s.envRW.RUnlock() - -@@ -877,7 +876,7 @@ func (s *Server) writeSSHKey(sshKey string) error { - } - - // AWSInstanceCheck checks AWS EC2 instance ID. --func (s *Server) AWSInstanceCheck(ctx context.Context, req *serverpb.AWSInstanceCheckRequest) (*serverpb.AWSInstanceCheckResponse, error) { -+func (s *Server) AWSInstanceCheck(ctx context.Context, req *serverpb.AWSInstanceCheckRequest) (*serverpb.AWSInstanceCheckResponse, error) {//nolint:revive - if err := s.awsInstanceChecker.check(req.InstanceId); err != nil { - return nil, err - } -diff --git a/managed/services/supervisord/supervisord.go b/managed/services/supervisord/supervisord.go -index 33826cd2..125956d5 100644 ---- a/managed/services/supervisord/supervisord.go -+++ b/managed/services/supervisord/supervisord.go -@@ -445,11 +445,11 @@ func (s *Service) marshalConfig(tmpl *template.Template, settings *models.Settin - if settings.PMMPublicAddress != "" { - publicURL, err := url.Parse(settings.PMMPublicAddress) - if err != nil { -- return nil, errors.Wrap(err, "failed to parse PMM public address.") -+ return nil, errors.Wrap(err, "failed to parse PMM public address.")//nolint:revive - } - if publicURL.Host == "" { - if publicURL, err = url.Parse(fmt.Sprintf("https://%s", settings.PMMPublicAddress)); err != nil { -- return nil, errors.Wrap(err, "failed to parse PMM public address.") -+ return nil, errors.Wrap(err, "failed to parse PMM public address.")//nolint:revive - } - } - templateParams["PMMServerHost"] = publicURL.Host -diff --git a/managed/services/telemetry/config.go b/managed/services/telemetry/config.go -index 361aa4a5..4783f61a 100644 ---- a/managed/services/telemetry/config.go -+++ b/managed/services/telemetry/config.go -@@ -168,10 +168,11 @@ type ReportingConfig struct { - - //go:embed config.default.yml - var defaultConfig string -- -+// ExtensionType represents the type of telemetry extension. - type ExtensionType string - - const ( -+ // UIEventsExtension is a constant for the UI events telemetry extension. - UIEventsExtension = ExtensionType("UIEventsExtension") - ) - -diff --git a/managed/services/telemetry/datasource_pmmdb_select.go b/managed/services/telemetry/datasource_pmmdb_select.go -index 09c9249b..c502e44f 100644 ---- a/managed/services/telemetry/datasource_pmmdb_select.go -+++ b/managed/services/telemetry/datasource_pmmdb_select.go -@@ -98,10 +98,10 @@ func (d *dsPmmDBSelect) FetchMetrics(ctx context.Context, config Config) ([]*pmm - return fetchMetricsFromDB(ctx, d.l, d.config.Timeout, d.db, config) - } - --func (d *dsPmmDBSelect) Init(ctx context.Context) error { -+func (d *dsPmmDBSelect) Init(ctx context.Context) error {//nolint:revive - return nil - } - --func (d *dsPmmDBSelect) Dispose(ctx context.Context) error { -+func (d *dsPmmDBSelect) Dispose(ctx context.Context) error {//nolint:revive - return nil - } -diff --git a/managed/services/telemetry/datasource_victoria_metrics.go b/managed/services/telemetry/datasource_victoria_metrics.go -index 1757a774..507c361f 100644 ---- a/managed/services/telemetry/datasource_victoria_metrics.go -+++ b/managed/services/telemetry/datasource_victoria_metrics.go -@@ -99,10 +99,10 @@ func (d *dataSourceVictoriaMetrics) FetchMetrics(ctx context.Context, config Con - return metrics, nil - } - --func (d *dataSourceVictoriaMetrics) Init(ctx context.Context) error { -+func (d *dataSourceVictoriaMetrics) Init(ctx context.Context) error {//nolint:revive - return nil - } - --func (d *dataSourceVictoriaMetrics) Dispose(ctx context.Context) error { -+func (d *dataSourceVictoriaMetrics) Dispose(ctx context.Context) error {//nolint:revive - return nil - } -diff --git a/managed/services/telemetry/telemetry.go b/managed/services/telemetry/telemetry.go -index d6951ae4..0f4a05bb 100644 ---- a/managed/services/telemetry/telemetry.go -+++ b/managed/services/telemetry/telemetry.go -@@ -411,7 +411,7 @@ func (s *Service) send(ctx context.Context, report *reporter.ReportRequest) erro - } - } - } -- -+// Format returns the formatted representation of the provided server metric. - func (s *Service) Format(report *pmmv1.ServerMetric) string { - var builder strings.Builder - for _, m := range report.Metrics { -diff --git a/managed/services/telemetry/uievents/uievents.go b/managed/services/telemetry/uievents/uievents.go -index e66be330..bb266200 100644 ---- a/managed/services/telemetry/uievents/uievents.go -+++ b/managed/services/telemetry/uievents/uievents.go -@@ -1,4 +1,3 @@ --// Copyright (C) 2023 Percona LLC - // - // This program is free software: you can redistribute it and/or modify - // it under the terms of the GNU Affero General Public License as published by -@@ -49,14 +48,14 @@ type Service struct { - - uievents.UnimplementedUIEventsServer - } -- -+// DashboardUsageStat represents a structure for dashboard usage statistics. - type DashboardUsageStat struct { - title string - uid string - useCount int32 - loadTime *hdrhistogram.Histogram - } -- -+// ComponentsUsageStat represents a structure for component usage statistics. - type ComponentsUsageStat struct { - uid string - useCount int32 -@@ -92,7 +91,7 @@ func (s *Service) ScheduleCleanup(ctx context.Context) { - } - }() - } -- -+// FetchMetrics fetches metrics for the service based on the provided context and telemetry configuration. - func (s *Service) FetchMetrics(_ context.Context, _ telemetry.Config) ([]*pmmv1.ServerMetric_Metric, error) { //nolint:unparam - s.stateM.RLock() - defer s.stateM.RUnlock() -diff --git a/managed/services/types.go b/managed/services/types.go -index 9573660b..f1c5d570 100644 ---- a/managed/services/types.go -+++ b/managed/services/types.go -@@ -34,7 +34,7 @@ type Target struct { - TDP *models.DelimiterPair - TLSSkipVerify bool - } -- -+// Copy creates a copy of the Target instance. - func (t *Target) Copy() Target { - labels := make(map[string]string, len(t.Labels)) - for k, v := range t.Labels { -diff --git a/managed/utils/interceptors/grpc_extension.go b/managed/utils/interceptors/grpc_extension.go -index 19046ade..3a59efbb 100644 ---- a/managed/utils/interceptors/grpc_extension.go -+++ b/managed/utils/interceptors/grpc_extension.go -@@ -36,15 +36,15 @@ const ( - type GRPCMetricsExtension struct { - grpc_prometheus.DefaultExtension - } -- -+// MetricsNameAdjust adjusts the given metric name and returns the adjusted name. - func (e GRPCMetricsExtension) MetricsNameAdjust(name string) string { - return "pmm_" + name - } -- -+// ServerStreamMsgReceivedCounterCustomLabels returns custom labels for the server stream message received counter. - func (e *GRPCMetricsExtension) ServerStreamMsgReceivedCounterCustomLabels() []string { - return []string{"caller_origin"} - } -- -+// ServerStreamMsgReceivedCounterValues returns custom values for the server stream message received counter. - func (e *GRPCMetricsExtension) ServerStreamMsgReceivedCounterValues(ctx context.Context) []string { - return []string{getCallerOriginStr(ctx)} - } -diff --git a/managed/utils/interceptors/interceptors.go b/managed/utils/interceptors/interceptors.go -index 039de491..e9b33754 100644 ---- a/managed/utils/interceptors/interceptors.go -+++ b/managed/utils/interceptors/interceptors.go -@@ -78,7 +78,7 @@ func logRequest(l *logrus.Entry, prefix string, f func() error) (err error) { - err = f() - return //nolint:nakedret - } -- -+// UnaryInterceptorType represents the type of a unary gRPC interceptor. - type UnaryInterceptorType = func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) - - // Unary adds context logger and Prometheus metrics to unary server RPC. -diff --git a/managed/utils/platform/client.go b/managed/utils/platform/client.go -index 0956f789..685b2d0e 100644 ---- a/managed/utils/platform/client.go -+++ b/managed/utils/platform/client.go -@@ -281,7 +281,7 @@ func (c *Client) makeRequest(ctx context.Context, accessToken, method, path stri - - return bodyBytes, nil - } -- -+// SsoDetails represents the Single Sign-On details containing information - type SsoDetails struct { - GrafanaClientID string `json:"grafana_client_id"` //nolint:tagliatelle - PMMManagedClientID string `json:"pmm_managed_client_id"` //nolint:tagliatelle -@@ -289,16 +289,16 @@ type SsoDetails struct { - Scope string `json:"scope"` - IssuerURL string `json:"issuer_url"` //nolint:tagliatelle - } -- -+// ConnectPMMResponse represents the response structure for the ConnectPMM API. - type ConnectPMMResponse struct { - SSODetails *SsoDetails `json:"sso_details"` - OrganizationID string `json:"org_id"` - } -- -+// SearchOrganizationEntitlementsResponse represents the response structure - type SearchOrganizationEntitlementsResponse struct { - Entitlement []*EntitlementResponse `json:"entitlements"` - } -- -+// EntitlementResponse represents the response structure for entitlement-related APIs. - type EntitlementResponse struct { - Number string `json:"number"` - Name string `json:"name"` -@@ -312,16 +312,16 @@ type EntitlementResponse struct { - EndDate string `json:"end_date"` //nolint:tagliatelle - Platform Response `json:"platform"` - } -- -+// Response represents a generic API response structure. - type Response struct { - SecurityAdvisor string `json:"security_advisor"` //nolint:tagliatelle - ConfigAdvisor string `json:"config_advisor"` //nolint:tagliatelle - } -- -+// SearchOrganizationTicketsResponse represents the response structure - type SearchOrganizationTicketsResponse struct { - Tickets []*TicketResponse `json:"tickets"` - } -- -+// TicketResponse represents the response structure for ticket-related APIs. - type TicketResponse struct { - Number string `json:"number"` - ShortDescription string `json:"short_description"` //nolint:tagliatelle -@@ -333,7 +333,7 @@ type TicketResponse struct { - TaskType string `json:"task_type"` //nolint:tagliatelle - URL string `json:"url"` - } -- -+// ContactInformation represents information about a contact. - type ContactInformation struct { - Contacts struct { - CustomerSuccess struct { -diff --git a/qan-api2/db.go b/qan-api2/db.go -index 4e0f9d16..f265879c 100644 ---- a/qan-api2/db.go -+++ b/qan-api2/db.go -@@ -12,7 +12,7 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- -+// Package main ... - package main - - import ( --- -2.34.1 - - -From c04a4144b288f2cb44cf154b6f31b45ac2118657 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Wed, 17 Jan 2024 03:19:10 +0530 -Subject: [PATCH 14/15] added comments and used nolint were required - ---- - agent/agentlocal/agent_local.go | 2 +- - agent/agents/agents_test.go | 2 +- - agent/agents/mongodb/mongodb.go | 2 +- - agent/agents/mysql/slowlog/slowlog.go | 2 +- - agent/agents/mysql/slowlog/slowlog_test.go | 6 +++--- - agent/agents/noop/noop.go | 4 ++-- - agent/agents/noop/noop_test.go | 2 +- - agent/agents/postgres/pgstatmonitor/pgstatmonitor.go | 6 +++--- - .../agents/postgres/pgstatstatements/pgstatstatements.go | 4 ++-- - agent/agents/supervisor/supervisor.go | 8 ++++---- - agent/commands/setup.go | 2 +- - agent/connectionchecker/connection_checker.go | 2 +- - agent/main.go | 2 +- - agent/runner/actions/mysql_explain_action.go | 2 +- - agent/runner/runner_test.go | 2 +- - managed/cmd/pmm-managed-starlark/main.go | 2 +- - managed/services/agents/channel/channel.go | 2 +- - managed/services/management/checks.go | 2 +- - managed/services/telemetry/datasource_grafanadb_select.go | 4 ++-- - managed/services/telemetry/datasource_qandb_select.go | 2 +- - 20 files changed, 30 insertions(+), 30 deletions(-) - -diff --git a/agent/agentlocal/agent_local.go b/agent/agentlocal/agent_local.go -index b4adb321..da651077 100644 ---- a/agent/agentlocal/agent_local.go -+++ b/agent/agentlocal/agent_local.go -@@ -136,7 +136,7 @@ func (s *Server) Run(ctx context.Context, reloadCh chan bool) { - } - - // Status returns current pmm-agent status. --func (s *Server) Status(ctx context.Context, req *agentlocalpb.StatusRequest) (*agentlocalpb.StatusResponse, error) { -+func (s *Server) Status(ctx context.Context, req *agentlocalpb.StatusRequest) (*agentlocalpb.StatusResponse, error) {//nolint:revive - connected := true - md := s.client.GetServerConnectMetadata() - if md == nil { -diff --git a/agent/agents/agents_test.go b/agent/agents/agents_test.go -index 60eb612b..98b83d68 100644 ---- a/agent/agents/agents_test.go -+++ b/agent/agents/agents_test.go -@@ -16,6 +16,6 @@ package agents - - import "testing" - // TestAgents is a test function for the Agents module. --func TestAgents(t *testing.T) { -+func TestAgents(t *testing.T) {//nolint:revive - // we need at least one test per package to correctly calculate coverage - } -diff --git a/agent/agents/mongodb/mongodb.go b/agent/agents/mongodb/mongodb.go -index f3a0dc8d..728bc3c0 100644 ---- a/agent/agents/mongodb/mongodb.go -+++ b/agent/agents/mongodb/mongodb.go -@@ -104,7 +104,7 @@ func (m *MongoDB) Write(r *report.Report) error { - return nil - } - --type Profiler interface { -+type Profiler interface {//nolint:revive - Start() error - Stop() error - } -diff --git a/agent/agents/mysql/slowlog/slowlog.go b/agent/agents/mysql/slowlog/slowlog.go -index 398c117d..b2c52741 100644 ---- a/agent/agents/mysql/slowlog/slowlog.go -+++ b/agent/agents/mysql/slowlog/slowlog.go -@@ -715,7 +715,7 @@ func errListsToMap(k, v []uint64) map[uint64]uint64 { - } - - // Describe implements prometheus.Collector. --func (s *SlowLog) Describe(ch chan<- *prometheus.Desc) { -+func (s *SlowLog) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/mysql/slowlog/slowlog_test.go b/agent/agents/mysql/slowlog/slowlog_test.go -index f049ef1a..8ba0da38 100644 ---- a/agent/agents/mysql/slowlog/slowlog_test.go -+++ b/agent/agents/mysql/slowlog/slowlog_test.go -@@ -171,7 +171,7 @@ func TestSlowLog(t *testing.T) { - assert.Equal(t, expected, actual) - - cancel() -- for range s.Changes() { -+ for range s.Changes() {//nolint:revive - } - }) - -@@ -222,7 +222,7 @@ func TestSlowLog(t *testing.T) { - assert.Equal(t, expected, actual) - - cancel() -- for range s.Changes() { -+ for range s.Changes() {//nolint:revive - } - }) - -@@ -271,7 +271,7 @@ func TestSlowLog(t *testing.T) { - assert.Equal(t, expected, actual) - - cancel() -- for range s.Changes() { -+ for range s.Changes() {//nolint:revive - } - }) - } -diff --git a/agent/agents/noop/noop.go b/agent/agents/noop/noop.go -index d1081717..8c034d22 100644 ---- a/agent/agents/noop/noop.go -+++ b/agent/agents/noop/noop.go -@@ -57,12 +57,12 @@ func (n *NoOp) Changes() <-chan agents.Change { - } - - // Describe implements prometheus.Collector. --func (n *NoOp) Describe(ch chan<- *prometheus.Desc) { -+func (n *NoOp) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - - // Collect implement prometheus.Collector. --func (n *NoOp) Collect(ch chan<- prometheus.Metric) { -+func (n *NoOp) Collect(ch chan<- prometheus.Metric) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/noop/noop_test.go b/agent/agents/noop/noop_test.go -index ccce0193..ab1e3d93 100644 ---- a/agent/agents/noop/noop_test.go -+++ b/agent/agents/noop/noop_test.go -@@ -16,6 +16,6 @@ package noop - - import "testing" - --func TestNoOp(t *testing.T) { -+func TestNoOp(t *testing.T) {//nolint:revive - // we need at least one test per package to correctly calculate coverage - } -diff --git a/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go b/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go -index f489af40..79d5c54c 100644 ---- a/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go -+++ b/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go -@@ -43,7 +43,7 @@ import ( - const defaultWaitTime = 60 * time.Second - - // PGStatMonitorQAN QAN services connects to PostgreSQL and extracts stats. --type PGStatMonitorQAN struct { -+type PGStatMonitorQAN struct {//nolint:revive - q *reform.Querier - dbCloser io.Closer - agentID string -@@ -715,12 +715,12 @@ func (m *PGStatMonitorQAN) Changes() <-chan agents.Change { - } - - // Describe implements prometheus.Collector. --func (m *PGStatMonitorQAN) Describe(ch chan<- *prometheus.Desc) { -+func (m *PGStatMonitorQAN) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - - // Collect implement prometheus.Collector. --func (m *PGStatMonitorQAN) Collect(ch chan<- prometheus.Metric) { -+func (m *PGStatMonitorQAN) Collect(ch chan<- prometheus.Metric) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/postgres/pgstatstatements/pgstatstatements.go b/agent/agents/postgres/pgstatstatements/pgstatstatements.go -index 2f9a2702..4758dd6f 100644 ---- a/agent/agents/postgres/pgstatstatements/pgstatstatements.go -+++ b/agent/agents/postgres/pgstatstatements/pgstatstatements.go -@@ -53,7 +53,7 @@ var pgStatVer18 = semver.MustParse("1.8.0") - type statementsMap map[int64]*pgStatStatementsExtended - - // PGStatStatementsQAN QAN services connects to PostgreSQL and extracts stats. --type PGStatStatementsQAN struct { -+type PGStatStatementsQAN struct {//nolint:revive - q *reform.Querier - dbCloser io.Closer - agentID string -@@ -409,7 +409,7 @@ func (m *PGStatStatementsQAN) Changes() <-chan agents.Change { - } - - // Describe implements prometheus.Collector. --func (m *PGStatStatementsQAN) Describe(ch chan<- *prometheus.Desc) { -+func (m *PGStatStatementsQAN) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/supervisor/supervisor.go b/agent/agents/supervisor/supervisor.go -index d4269809..f2d0cf52 100644 ---- a/agent/agents/supervisor/supervisor.go -+++ b/agent/agents/supervisor/supervisor.go -@@ -425,9 +425,9 @@ func filter(existing, ap map[string]agentpb.AgentParams) ([]string, []string, [] - return toStart, toRestart, toStop - } - --//nolint:golint,stylecheck -+//nolint:golint,stylecheck,revive - const ( -- type_TEST_SLEEP inventorypb.AgentType = 998 // process -+ type_TEST_SLEEP inventorypb.AgentType = 998 // processe - type_TEST_NOOP inventorypb.AgentType = 999 // built-in - ) - -@@ -671,11 +671,11 @@ func (s *Supervisor) processParams(agentID string, agentProcess *agentpb.SetStat - templateParams["tmp_dir"] = cfg.Paths.TempDir - processParams.Path = cfg.Paths.VMAgent - default: -- return nil, errors.Errorf("unhandled agent type %[1]s (%[1]d).", agentProcess.Type) -+ return nil, errors.Errorf("unhandled agent type %[1]s (%[1]d).", agentProcess.Type)//nolint:revive - } - - if processParams.Path == "" { -- return nil, errors.Errorf("no path for agent type %[1]s (%[1]d).", agentProcess.Type) -+ return nil, errors.Errorf("no path for agent type %[1]s (%[1]d).", agentProcess.Type)//nolint:revive - } - - tr := &templates.TemplateRenderer{ -diff --git a/agent/commands/setup.go b/agent/commands/setup.go -index 16db5e6f..0cd218f9 100644 ---- a/agent/commands/setup.go -+++ b/agent/commands/setup.go -@@ -12,7 +12,7 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - --//nolint:forbidigo -+//nolint:forbidigo,revive - package commands - - import ( -diff --git a/agent/connectionchecker/connection_checker.go b/agent/connectionchecker/connection_checker.go -index 98378422..549c5af1 100644 ---- a/agent/connectionchecker/connection_checker.go -+++ b/agent/connectionchecker/connection_checker.go -@@ -94,7 +94,7 @@ func (cc *ConnectionChecker) sqlPing(ctx context.Context, db *sql.DB) error { - return err - } - --func (cc *ConnectionChecker) checkMySQLConnection(ctx context.Context, dsn string, files *agentpb.TextFiles, tlsSkipVerify bool, id uint32) *agentpb.CheckConnectionResponse { //nolint:lll,unparam -+func (cc *ConnectionChecker) checkMySQLConnection(ctx context.Context, dsn string, files *agentpb.TextFiles, tlsSkipVerify bool, id uint32) *agentpb.CheckConnectionResponse { //nolint:lll,unparam,revive - var res agentpb.CheckConnectionResponse - var err error - -diff --git a/agent/main.go b/agent/main.go -index 7bf443c5..46ddb1b2 100644 ---- a/agent/main.go -+++ b/agent/main.go -@@ -11,7 +11,7 @@ - // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - // See the License for the specific language governing permissions and - // limitations under the License. -- -+// Package main - package main - - import ( -diff --git a/agent/runner/actions/mysql_explain_action.go b/agent/runner/actions/mysql_explain_action.go -index 2ac3ff4c..4a01dd02 100644 ---- a/agent/runner/actions/mysql_explain_action.go -+++ b/agent/runner/actions/mysql_explain_action.go -@@ -85,7 +85,7 @@ func (a *mysqlExplainAction) Run(ctx context.Context) ([]byte, error) { - - // You cant run Explain on trimmed queries. - if strings.HasSuffix(a.params.Query, "...") { -- return nil, errors.New("EXPLAIN failed because the query was too long and trimmed. Set max-query-length to a larger value.") -+ return nil, errors.New("EXPLAIN failed because the query was too long and trimmed. Set max-query-length to a larger value.")//nolint:revive - } - - // Explain is supported only for DML queries. -diff --git a/agent/runner/runner_test.go b/agent/runner/runner_test.go -index b5ed9ddb..aa44992e 100644 ---- a/agent/runner/runner_test.go -+++ b/agent/runner/runner_test.go -@@ -251,7 +251,7 @@ func (t testJob) Timeout() time.Duration { - return t.timeout - } - --func (t testJob) Run(ctx context.Context, send jobs.Send) error { -+func (t testJob) Run(ctx context.Context, send jobs.Send) error {//nolint:revive - <-ctx.Done() - return nil - } -diff --git a/managed/cmd/pmm-managed-starlark/main.go b/managed/cmd/pmm-managed-starlark/main.go -index f976d67a..7fef7c47 100644 ---- a/managed/cmd/pmm-managed-starlark/main.go -+++ b/managed/cmd/pmm-managed-starlark/main.go -@@ -12,7 +12,7 @@ - // - // You should have received a copy of the GNU Affero General Public License - // along with this program. If not, see . -- -+// Package main - package main - - import ( -diff --git a/managed/services/agents/channel/channel.go b/managed/services/agents/channel/channel.go -index 5e361423..d8d93daa 100644 ---- a/managed/services/agents/channel/channel.go -+++ b/managed/services/agents/channel/channel.go -@@ -67,7 +67,7 @@ type Response struct { - Error error - } - --type Stream interface { -+type Stream interface {//nolint:revive - Send(*agentpb.ServerMessage) error - Recv() (*agentpb.AgentMessage, error) - } -diff --git a/managed/services/management/checks.go b/managed/services/management/checks.go -index 6a704d24..ea5252f5 100644 ---- a/managed/services/management/checks.go -+++ b/managed/services/management/checks.go -@@ -172,7 +172,7 @@ func (s *ChecksAPIService) GetFailedChecks(ctx context.Context, req *managementp - } - - // ToggleCheckAlert toggles the silence state of the check with the provided alertID. --func (s *ChecksAPIService) ToggleCheckAlert(ctx context.Context, req *managementpb.ToggleCheckAlertRequest) (*managementpb.ToggleCheckAlertResponse, error) { -+func (s *ChecksAPIService) ToggleCheckAlert(ctx context.Context, req *managementpb.ToggleCheckAlertRequest) (*managementpb.ToggleCheckAlertResponse, error) {//nolint:revive - return nil, status.Error(codes.NotFound, "Advisor alerts silencing is not supported anymore.") - } - -diff --git a/managed/services/telemetry/datasource_grafanadb_select.go b/managed/services/telemetry/datasource_grafanadb_select.go -index 9361ff93..887b504d 100644 ---- a/managed/services/telemetry/datasource_grafanadb_select.go -+++ b/managed/services/telemetry/datasource_grafanadb_select.go -@@ -52,7 +52,7 @@ func NewDsGrafanaDBSelect(config DSConfigGrafanaDB, l *logrus.Entry) DataSource - } - } - --func (d *dsGrafanaDBSelect) Init(ctx context.Context) error { -+func (d *dsGrafanaDBSelect) Init(ctx context.Context) error {//nolint:revive - db, err := openGrafanaDBConnection(d.config, d.l) - if err != nil { - return err -@@ -99,6 +99,6 @@ func (d *dsGrafanaDBSelect) FetchMetrics(ctx context.Context, config Config) ([] - return fetchMetricsFromDB(ctx, d.l, d.config.Timeout, d.db, config) - } - --func (d *dsGrafanaDBSelect) Dispose(ctx context.Context) error { -+func (d *dsGrafanaDBSelect) Dispose(ctx context.Context) error {//nolint:revive - return d.db.Close() - } -diff --git a/managed/services/telemetry/datasource_qandb_select.go b/managed/services/telemetry/datasource_qandb_select.go -index b458a087..60379deb 100644 ---- a/managed/services/telemetry/datasource_qandb_select.go -+++ b/managed/services/telemetry/datasource_qandb_select.go -@@ -73,7 +73,7 @@ func (d *dsQanDBSelect) FetchMetrics(ctx context.Context, config Config) ([]*pmm - return fetchMetricsFromDB(ctx, d.l, d.config.Timeout, d.db, config) - } - --func (d *dsQanDBSelect) Init(ctx context.Context) error { -+func (d *dsQanDBSelect) Init(ctx context.Context) error {//nolint:revive - return nil - } - --- -2.34.1 - - -From 4033718466865599ff780a5382dfca61a14621a9 Mon Sep 17 00:00:00 2001 -From: vishwas-sharma2480 -Date: Wed, 17 Jan 2024 04:03:16 +0530 -Subject: [PATCH 15/15] added comments and used nolint were required - ---- - agent/agentlocal/agent_local.go | 2 +- - agent/agents/mongodb/mongodb.go | 4 ++-- - agent/agents/mysql/perfschema/perfschema.go | 2 +- - agent/agents/mysql/slowlog/slowlog.go | 2 +- - agent/client/basic_auth.go | 2 +- - managed/services/management/ia/channels_service.go | 8 ++++---- - managed/services/management/ia/rules_service.go | 10 +++++----- - managed/services/telemetry/datasource_qandb_select.go | 2 +- - 8 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/agent/agentlocal/agent_local.go b/agent/agentlocal/agent_local.go -index da651077..2f0987a9 100644 ---- a/agent/agentlocal/agent_local.go -+++ b/agent/agentlocal/agent_local.go -@@ -184,7 +184,7 @@ func roundFloat(upTime float32, numAfterDot int) float32 { - } - - // Reload reloads pmm-agent and its configuration. --func (s *Server) Reload(ctx context.Context, req *agentlocalpb.ReloadRequest) (*agentlocalpb.ReloadResponse, error) { -+func (s *Server) Reload(ctx context.Context, req *agentlocalpb.ReloadRequest) (*agentlocalpb.ReloadResponse, error) {//nolint:revive - // sync errors with setup command - - if _, err := s.cfg.Reload(s.l); err != nil { -diff --git a/agent/agents/mongodb/mongodb.go b/agent/agents/mongodb/mongodb.go -index 728bc3c0..7c244490 100644 ---- a/agent/agents/mongodb/mongodb.go -+++ b/agent/agents/mongodb/mongodb.go -@@ -110,12 +110,12 @@ type Profiler interface {//nolint:revive - } - - // Describe implements prometheus.Collector. --func (m *MongoDB) Describe(ch chan<- *prometheus.Desc) { -+func (m *MongoDB) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - - // Collect implement prometheus.Collector. --func (m *MongoDB) Collect(ch chan<- prometheus.Metric) { -+func (m *MongoDB) Collect(ch chan<- prometheus.Metric) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/mysql/perfschema/perfschema.go b/agent/agents/mysql/perfschema/perfschema.go -index ae4af57d..72c4b5a8 100644 ---- a/agent/agents/mysql/perfschema/perfschema.go -+++ b/agent/agents/mysql/perfschema/perfschema.go -@@ -462,7 +462,7 @@ func (m *PerfSchema) Changes() <-chan agents.Change { - } - - // Describe implements prometheus.Collector. --func (m *PerfSchema) Describe(ch chan<- *prometheus.Desc) { -+func (m *PerfSchema) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/agents/mysql/slowlog/slowlog.go b/agent/agents/mysql/slowlog/slowlog.go -index b2c52741..44ffc718 100644 ---- a/agent/agents/mysql/slowlog/slowlog.go -+++ b/agent/agents/mysql/slowlog/slowlog.go -@@ -720,7 +720,7 @@ func (s *SlowLog) Describe(ch chan<- *prometheus.Desc) {//nolint:revive - } - - // Collect implement prometheus.Collector. --func (s *SlowLog) Collect(ch chan<- prometheus.Metric) { -+func (s *SlowLog) Collect(ch chan<- prometheus.Metric) {//nolint:revive - // This method is needed to satisfy interface. - } - -diff --git a/agent/client/basic_auth.go b/agent/client/basic_auth.go -index 5055250f..a48b19cf 100644 ---- a/agent/client/basic_auth.go -+++ b/agent/client/basic_auth.go -@@ -27,7 +27,7 @@ type basicAuth struct { - } - - // GetRequestMetadata implements credentials.PerRPCCredentials interface. --func (b *basicAuth) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) { -+func (b *basicAuth) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {//nolint:revive - auth := b.username + ":" + b.password - enc := base64.StdEncoding.EncodeToString([]byte(auth)) - return map[string]string{ -diff --git a/managed/services/management/ia/channels_service.go b/managed/services/management/ia/channels_service.go -index 72cf0de5..5c0f0643 100644 ---- a/managed/services/management/ia/channels_service.go -+++ b/managed/services/management/ia/channels_service.go -@@ -60,7 +60,7 @@ func (s *ChannelsService) Enabled() bool { - - // ListChannels returns list of available channels. - // Deprecated. Do not use. --func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { //nolint:staticcheck -+func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { //nolint:staticcheck,revive - var pageIndex int - var pageSize int - if req.PageParams != nil { -@@ -161,7 +161,7 @@ func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ( - - // AddChannel adds new notification channel. - // Deprecated. Do not use. --func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { //nolint:staticcheck -+func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { //nolint:staticcheck,revive - params := &models.CreateChannelParams{ - Summary: req.Summary, - Disabled: req.Disabled, -@@ -212,7 +212,7 @@ func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChan - - // ChangeChannel changes existing notification channel. - // Deprecated. Do not use. --func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { //nolint:staticcheck -+func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { //nolint:staticcheck,revive - params := &models.ChangeChannelParams{ - Summary: req.Summary, - Disabled: req.Disabled, -@@ -261,7 +261,7 @@ func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.Chan - - // RemoveChannel removes notification channel. - // Deprecated. Do not use. --func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { //nolint:staticcheck -+func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { //nolint:staticcheck,revive - e := s.db.InTransaction(func(tx *reform.TX) error { - return models.RemoveChannel(tx.Querier, req.ChannelId) - }) -diff --git a/managed/services/management/ia/rules_service.go b/managed/services/management/ia/rules_service.go -index 1e217d91..f80920f0 100644 ---- a/managed/services/management/ia/rules_service.go -+++ b/managed/services/management/ia/rules_service.go -@@ -272,7 +272,7 @@ func (s *RulesService) writeRuleFile(rule *ruleFile) error { - - // ListAlertRules returns a list of all Integrated Alerting rules. - // Deprecated. Do not use. --func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { //nolint:staticcheck -+func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { //nolint:staticcheck,revive - var pageIndex int - pageSize := math.MaxInt32 - if req.PageParams != nil { -@@ -346,7 +346,7 @@ func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*model - - // CreateAlertRule creates Integrated Alerting rule. - // Deprecated. Do not use. --func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { //nolint:staticcheck -+func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { //nolint:staticcheck,revive - if req.TemplateName != "" && req.SourceRuleId != "" { - return nil, status.Errorf(codes.InvalidArgument, "Both template name and source rule id are specified.") - } -@@ -447,7 +447,7 @@ func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.Creat - - // UpdateAlertRule updates Integrated Alerting rule. - // Deprecated. Do not use. --func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { //nolint:staticcheck -+func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { //nolint:staticcheck,revive - params := &models.ChangeRuleParams{ - Name: req.Name, - Disabled: req.Disabled, -@@ -496,7 +496,7 @@ func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.Updat - - // ToggleAlertRule allows switching between disabled and enabled states of an Alert Rule. - // Deprecated. Do not use. --func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.ToggleAlertRuleRequest) (*iav1beta1.ToggleAlertRuleResponse, error) { //nolint:staticcheck -+func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.ToggleAlertRuleRequest) (*iav1beta1.ToggleAlertRuleResponse, error) { //nolint:staticcheck,revive - params := &models.ToggleRuleParams{Disabled: parseBooleanFlag(req.Disabled)} - e := s.db.InTransaction(func(tx *reform.TX) error { - _, err := models.ToggleRule(tx.Querier, req.RuleId, params) -@@ -513,7 +513,7 @@ func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.Toggl - - // DeleteAlertRule deletes Integrated Alerting rule. - // Deprecated. Do not use. --func (s *RulesService) DeleteAlertRule(ctx context.Context, req *iav1beta1.DeleteAlertRuleRequest) (*iav1beta1.DeleteAlertRuleResponse, error) { //nolint:staticcheck -+func (s *RulesService) DeleteAlertRule(ctx context.Context, req *iav1beta1.DeleteAlertRuleRequest) (*iav1beta1.DeleteAlertRuleResponse, error) { //nolint:staticcheck,revive - e := s.db.InTransaction(func(tx *reform.TX) error { - return models.RemoveRule(tx.Querier, req.RuleId) - }) -diff --git a/managed/services/telemetry/datasource_qandb_select.go b/managed/services/telemetry/datasource_qandb_select.go -index 60379deb..ddac88d6 100644 ---- a/managed/services/telemetry/datasource_qandb_select.go -+++ b/managed/services/telemetry/datasource_qandb_select.go -@@ -77,6 +77,6 @@ func (d *dsQanDBSelect) Init(ctx context.Context) error {//nolint:revive - return nil - } - --func (d *dsQanDBSelect) Dispose(ctx context.Context) error { -+func (d *dsQanDBSelect) Dispose(ctx context.Context) error {//nolint:revive - return nil - } --- -2.34.1 -