From 2835b826443bf7a5224503276cc6d5775bf96233 Mon Sep 17 00:00:00 2001 From: "i.rybachuk" Date: Thu, 5 May 2022 00:09:43 +0300 Subject: [PATCH 1/2] PMM-5692 show ports --- agentlocal/agentlocal.go | 2 ++ commands/inventory/list_agents.go | 12 ++++++++++-- commands/list.go | 12 ++++++++++-- commands/list_test.go | 14 +++++++------- commands/status.go | 2 +- commands/status_test.go | 8 +++++--- 6 files changed, 35 insertions(+), 15 deletions(-) diff --git a/agentlocal/agentlocal.go b/agentlocal/agentlocal.go index 2ee65fa1..e230a739 100644 --- a/agentlocal/agentlocal.go +++ b/agentlocal/agentlocal.go @@ -82,6 +82,7 @@ type AgentStatus struct { AgentID string `json:"agent_id"` AgentType string `json:"agent_type"` Status string `json:"status"` + Port int64 `json:"listen_port,omitempty"` } // GetRawStatus returns raw local pmm-agent status. No special cases. @@ -129,6 +130,7 @@ func GetStatus(requestNetworkInfo NetworkInfo) (*Status, error) { AgentID: a.AgentID, AgentType: pointer.GetString(a.AgentType), Status: pointer.GetString(a.Status), + Port: a.ListenPort, } } var clockDrift time.Duration diff --git a/commands/inventory/list_agents.go b/commands/inventory/list_agents.go index c72bc769..2c083824 100644 --- a/commands/inventory/list_agents.go +++ b/commands/inventory/list_agents.go @@ -29,9 +29,9 @@ import ( var listAgentsResultT = commands.ParseTemplate(` Agents list. -{{ printf "%-27s" "Agent type" }} {{ printf "%-15s" "Status" }} {{ printf "%-47s" "Agent ID" }} {{ printf "%-47s" "PMM-Agent ID" }} {{ printf "%-47s" "Service ID" }} +{{ printf "%-27s" "Agent type" }} {{ printf "%-15s" "Status" }} {{ printf "%-47s" "Agent ID" }} {{ printf "%-47s" "PMM-Agent ID" }} {{ printf "%-47s" "Service ID" }} {{ printf "%-47s" "Port" }} {{ range .Agents }} -{{- printf "%-27s" .HumanReadableAgentType }} {{ printf "%-15s" .NiceAgentStatus }} {{ .AgentID }} {{ .PMMAgentID }} {{ .ServiceID }} +{{- printf "%-27s" .HumanReadableAgentType }} {{ printf "%-15s" .NiceAgentStatus }} {{ .AgentID }} {{ .PMMAgentID }} {{ .ServiceID }} {{ .Port }} {{ end }} `) @@ -57,6 +57,7 @@ type listResultAgent struct { ServiceID string `json:"service_id"` Status string `json:"status"` Disabled bool `json:"disabled"` + Port int64 `json:"port,omitempty"` } func (a listResultAgent) HumanReadableAgentType() string { @@ -132,6 +133,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { PMMAgentID: a.PMMAgentID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.MysqldExporter { @@ -142,6 +144,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { ServiceID: a.ServiceID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.MongodbExporter { @@ -152,6 +155,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { ServiceID: a.ServiceID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.PostgresExporter { @@ -162,6 +166,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { ServiceID: a.ServiceID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.ProxysqlExporter { @@ -172,6 +177,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { ServiceID: a.ServiceID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.RDSExporter { @@ -181,6 +187,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { PMMAgentID: a.PMMAgentID, Status: getAgentStatus(a.Status), Disabled: a.Disabled, + Port: a.ListenPort, }) } for _, a := range agentsRes.Payload.QANMysqlPerfschemaAgent { @@ -240,6 +247,7 @@ func (cmd *listAgentsCommand) Run() (commands.Result, error) { ServiceID: a.ServiceID, Status: getAgentStatus(nil), Disabled: a.Disabled, + Port: a.ListenPort, }) } diff --git a/commands/list.go b/commands/list.go index 5a937118..f38a1e61 100644 --- a/commands/list.go +++ b/commands/list.go @@ -40,9 +40,9 @@ Service type{{"\t"}}Service name{{"\t"}}Address and port{{"\t"}}Service ID {{ range .Services }} {{- .HumanReadableServiceType }}{{"\t"}}{{ .ServiceName }}{{"\t"}}{{ .AddressPort }}{{"\t"}}{{ .ServiceID }} {{ end }} -Agent type{{"\t"}}Status{{"\t"}}Metrics Mode{{"\t"}}Agent ID{{"\t"}}Service ID +Agent type{{"\t"}}Status{{"\t"}}Metrics Mode{{"\t"}}Agent ID{{"\t"}}Service ID{{"\t"}}Port {{ range .Agents }} -{{- .HumanReadableAgentType }}{{"\t"}}{{ .NiceAgentStatus }}{{"\t"}}{{ .MetricsMode }}{{"\t"}}{{ .AgentID }}{{"\t"}}{{ .ServiceID }} +{{- .HumanReadableAgentType }}{{"\t"}}{{ .NiceAgentStatus }}{{"\t"}}{{ .MetricsMode }}{{"\t"}}{{ .AgentID }}{{"\t"}}{{ .ServiceID }}{{"\t"}}{{ .Port }} {{ end }} `) @@ -53,6 +53,7 @@ type listResultAgent struct { Status string `json:"status"` Disabled bool `json:"disabled"` MetricsMode string `json:"push_metrics_enabled"` + Port int64 `json:"port,omitempty"` } func (a listResultAgent) HumanReadableAgentType() string { @@ -242,6 +243,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -254,6 +256,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -266,6 +269,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -278,6 +282,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -290,6 +295,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -301,6 +307,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(a.Status), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } @@ -368,6 +375,7 @@ func (cmd *listCommand) Run() (Result, error) { Status: getStatus(nil), Disabled: a.Disabled, MetricsMode: getMetricsMode(a.PushMetricsEnabled), + Port: a.ListenPort, }) } } diff --git a/commands/list_test.go b/commands/list_test.go index c15cc97d..c03d17d2 100644 --- a/commands/list_test.go +++ b/commands/list_test.go @@ -36,15 +36,15 @@ func TestListResultString(t *testing.T) { {ServiceType: types.ServiceTypeMySQLService, ServiceID: "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", ServiceName: "mysql-service"}, }, Agents: []listResultAgent{ - {AgentType: types.AgentTypeMySQLdExporter, AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", ServiceID: "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", Status: "RUNNING", MetricsMode: "pull"}, + {AgentType: types.AgentTypeMySQLdExporter, AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", ServiceID: "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", Status: "RUNNING", MetricsMode: "pull", Port: 3306}, }, }, expected: strings.TrimSpace(` Service type Service name Address and port Service ID MySQL mysql-service /service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a -Agent type Status Metrics Mode Agent ID Service ID -mysqld_exporter Running pull /agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140 /service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a +Agent type Status Metrics Mode Agent ID Service ID Port +mysqld_exporter Running pull /agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140 /service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a 3306 `), }, { @@ -53,7 +53,7 @@ mysqld_exporter Running pull /agent_id/8b732ac3-825 expected: strings.TrimSpace(` Service type Service name Address and port Service ID -Agent type Status Metrics Mode Agent ID Service ID +Agent type Status Metrics Mode Agent ID Service ID Port `), }, { @@ -63,15 +63,15 @@ Agent type Status Metrics Mode Agent ID Service ID {ServiceType: types.ServiceTypeExternalService, ServiceID: "/service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a", ServiceName: "myhost-redis", Group: "redis"}, }, Agents: []listResultAgent{ - {AgentType: types.AgentTypeExternalExporter, AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1149", ServiceID: "/service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a", Status: "RUNNING"}, + {AgentType: types.AgentTypeExternalExporter, AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1149", ServiceID: "/service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a", Status: "RUNNING", Port: 8080}, }, }, expected: strings.TrimSpace(` Service type Service name Address and port Service ID External:redis myhost-redis /service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a -Agent type Status Metrics Mode Agent ID Service ID -external-exporter Running /agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1149 /service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a +Agent type Status Metrics Mode Agent ID Service ID Port +external-exporter Running /agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1149 /service_id/8ff49c41-80a1-4030-bc02-cd76e3b0b84a 8080 `), }, } diff --git a/commands/status.go b/commands/status.go index 7e88f329..3766049c 100644 --- a/commands/status.go +++ b/commands/status.go @@ -44,7 +44,7 @@ PMM Client: pmm-admin version: {{ .PMMVersion }} pmm-agent version: {{ .PMMAgentStatus.AgentVersion }} Agents: -{{ range .PMMAgentStatus.Agents }} {{ .AgentID }} {{ .AgentType | $.HumanReadableAgentType }} {{ .Status | $.NiceAgentStatus }} +{{ range .PMMAgentStatus.Agents }} {{ .AgentID }} {{ .AgentType | $.HumanReadableAgentType }} {{ .Status | $.NiceAgentStatus }} {{ .Port }} {{ end }} `) diff --git a/commands/status_test.go b/commands/status_test.go index c890af9b..93e5e8d1 100644 --- a/commands/status_test.go +++ b/commands/status_test.go @@ -37,6 +37,7 @@ func TestStatus(t *testing.T) { AgentID: "/agent_id/1afe233f-b319-4645-be6c-a1e05d4a545b", AgentType: "NODE_EXPORTER", Status: "RUNNING", + Port: 3310, }, { AgentID: "/agent_id/2c7c0e04-6eef-411d-bcce-51e138e771cc", AgentType: "QAN_POSTGRESQL_PGSTATEMENTS_AGENT", @@ -45,6 +46,7 @@ func TestStatus(t *testing.T) { AgentID: "/agent_id/4824ac2b-3f1f-4e9b-90d1-3f56b891bb8b", AgentType: "POSTGRES_EXPORTER", Status: "RUNNING", + Port: 5432, }}, }) @@ -61,9 +63,9 @@ PMM Client: pmm-admin version: unknown pmm-agent version: 2.5.1 Agents: - /agent_id/1afe233f-b319-4645-be6c-a1e05d4a545b node_exporter Running - /agent_id/2c7c0e04-6eef-411d-bcce-51e138e771cc postgresql_pgstatements_agent Running - /agent_id/4824ac2b-3f1f-4e9b-90d1-3f56b891bb8b postgres_exporter Running + /agent_id/1afe233f-b319-4645-be6c-a1e05d4a545b node_exporter Running 3310 + /agent_id/2c7c0e04-6eef-411d-bcce-51e138e771cc postgresql_pgstatements_agent Running 0 + /agent_id/4824ac2b-3f1f-4e9b-90d1-3f56b891bb8b postgres_exporter Running 5432 `) + "\n" assert.Equal(t, expected, res.String()) } From 4a67d2d58a0f2f6e0db35569f21d09ac691e23e4 Mon Sep 17 00:00:00 2001 From: "i.rybachuk" Date: Thu, 26 May 2022 23:49:43 +0300 Subject: [PATCH 2/2] PMM-5692 add ports output --- commands/list.go | 1 + go.mod | 14 +++++++------- go.sum | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/commands/list.go b/commands/list.go index f38a1e61..5db811c2 100644 --- a/commands/list.go +++ b/commands/list.go @@ -386,6 +386,7 @@ func (cmd *listCommand) Run() (Result, error) { AgentID: a.AgentID, Status: getStatus(a.Status), MetricsMode: getMetricsMode(true), + Port: a.ListenPort, }) } } diff --git a/go.mod b/go.mod index ed705566..05e8abda 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,13 @@ replace gopkg.in/alecthomas/kingpin.v2 => github.com/Percona-Lab/kingpin v2.2.6- require ( github.com/AlekSi/pointer v1.2.0 - github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d - github.com/go-openapi/runtime v0.24.0 - github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8 + github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 + github.com/go-openapi/runtime v0.24.1 + github.com/percona/pmm v0.0.0-20220526185452-bff6aff4da4f github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.1 - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a gopkg.in/alecthomas/kingpin.v2 v2.2.6 ) @@ -31,7 +31,7 @@ require ( github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/loads v0.21.1 // indirect - github.com/go-openapi/spec v0.20.5 // indirect + github.com/go-openapi/spec v0.20.6 // indirect github.com/go-openapi/strfmt v0.21.2 // indirect github.com/go-openapi/swag v0.21.1 // indirect github.com/go-openapi/validate v0.21.0 // indirect @@ -42,7 +42,7 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.mongodb.org/mongo-driver v1.9.0 // indirect + go.mongodb.org/mongo-driver v1.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect ) diff --git a/go.sum b/go.sum index d06ecef8..473828b6 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= @@ -34,9 +36,13 @@ github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlD github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.24.0 h1:vTgDijpGLCgJOJTdAp5kG+O+nRsVCbH417YQ3O0iZo0= github.com/go-openapi/runtime v0.24.0/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= +github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo= +github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= github.com/go-openapi/spec v0.20.5 h1:skHa8av4VnAtJU5zyAUXrrdK/NDiVX8lchbG+BfcdrE= github.com/go-openapi/spec v0.20.5/go.mod h1:QbfOSIVt3/sac+a1wzmKbbcLXm5NdZnyBZYtCijp43o= +github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= +github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2 h1:5NDNgadiX1Vhemth/TH4gCGopWSTdDjxl60H3B7f+os= @@ -115,6 +121,8 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8 h1:P5iuV4GRUIviRg/5/FM6ZOKdiBPdwUPbrHld/epM3hk= github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8/go.mod h1:gr+WLd8clEAe2xMFgsGhpw9ziZc2UCWcfy6d3M6Aq00= +github.com/percona/pmm v0.0.0-20220526185452-bff6aff4da4f h1:UaKAbCqnDzrOJF4TwIPkoQyXyHiK5lkqdu6ibbaVvsw= +github.com/percona/pmm v0.0.0-20220526185452-bff6aff4da4f/go.mod h1:gr+WLd8clEAe2xMFgsGhpw9ziZc2UCWcfy6d3M6Aq00= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -151,6 +159,8 @@ go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4x go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= go.mongodb.org/mongo-driver v1.9.0 h1:f3aLGJvQmBl8d9S40IL+jEyBC6hfLPbJjv9t5hEM9ck= go.mongodb.org/mongo-driver v1.9.0/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.9.1 h1:m078y9v7sBItkt1aaoe2YlvWEXcD263e1a4E1fBrJ1c= +go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -178,6 +188,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -205,3 +217,5 @@ gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=