Skip to content

Commit 95c6d74

Browse files
authored
Merge branch 'master' into v1.7326.0
2 parents 8ae4fef + 1679a91 commit 95c6d74

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/spf13/cobra v1.10.1
2929
github.com/spf13/pflag v1.0.10
3030
github.com/stretchr/testify v1.11.1
31-
golang.org/x/crypto v0.44.0
31+
golang.org/x/crypto v0.45.0
3232
golang.org/x/sync v0.18.0
3333
golang.org/x/term v0.37.0
3434
golang.org/x/text v0.31.0
@@ -201,7 +201,7 @@ require (
201201
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
202202
go.yaml.in/yaml/v2 v2.4.2 // indirect
203203
golang.org/x/mod v0.29.0 // indirect
204-
golang.org/x/net v0.46.0 // indirect
204+
golang.org/x/net v0.47.0 // indirect
205205
golang.org/x/sys v0.38.0 // indirect
206206
golang.org/x/time v0.14.0 // indirect
207207
golang.org/x/tools v0.38.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
577577
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
578578
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
579579
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
580-
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
581-
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
580+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
581+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
582582
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
583583
golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
584584
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -599,8 +599,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
599599
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
600600
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
601601
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
602-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
603-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
602+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
603+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
604604
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
605605
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
606606
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

internal/namespaces/cockpit/v1/cockpit_cli.go

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,14 @@ func cockpitGrafanaSyncDataSources() *core.Command {
225225

226226
func cockpitGrafanaUserCreate() *core.Command {
227227
return &core.Command{
228-
Short: `Create a Grafana user`,
229-
Long: `Create a Grafana user to connect to your Cockpit's Grafana. Upon creation, your user password displays only once, so make sure that you save it.
228+
Short: `(Deprecated) EOL 2026-01-20`,
229+
Long: `Create a Grafana user
230+
Create a Grafana user to connect to your Cockpit's Grafana. Upon creation, your user password displays only once, so make sure that you save it.
230231
Each Grafana user is associated with a role: viewer or editor. A viewer can only view dashboards, whereas an editor can create and edit dashboards. Note that the ` + "`" + `admin` + "`" + ` username is not available for creation.`,
231232
Namespace: "cockpit",
232233
Resource: "grafana-user",
233234
Verb: "create",
234-
// Deprecated: false,
235+
// Deprecated: true,
235236
ArgsType: reflect.TypeOf(cockpit.GlobalAPICreateGrafanaUserRequest{}),
236237
ArgSpecs: core.ArgSpecs{
237238
core.ProjectIDArgSpec(),
@@ -268,12 +269,13 @@ Each Grafana user is associated with a role: viewer or editor. A viewer can only
268269

269270
func cockpitGrafanaUserList() *core.Command {
270271
return &core.Command{
271-
Short: `List Grafana users`,
272-
Long: `List all Grafana users created in your Cockpit's Grafana. By default, the Grafana users returned in the list are ordered in ascending order.`,
272+
Short: `(Deprecated) EOL 2026-01-20`,
273+
Long: `List Grafana users
274+
List all Grafana users created in your Cockpit's Grafana. By default, the Grafana users returned in the list are ordered in ascending order.`,
273275
Namespace: "cockpit",
274276
Resource: "grafana-user",
275277
Verb: "list",
276-
// Deprecated: false,
278+
// Deprecated: true,
277279
ArgsType: reflect.TypeOf(cockpit.GlobalAPIListGrafanaUsersRequest{}),
278280
ArgSpecs: core.ArgSpecs{
279281
{
@@ -307,12 +309,13 @@ func cockpitGrafanaUserList() *core.Command {
307309

308310
func cockpitGrafanaUserDelete() *core.Command {
309311
return &core.Command{
310-
Short: `Delete a Grafana user`,
311-
Long: `Delete a Grafana user from your Cockpit's Grafana, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.`,
312+
Short: `(Deprecated) EOL 2026-01-20`,
313+
Long: `Delete a Grafana user
314+
Delete a Grafana user from your Cockpit's Grafana, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.`,
312315
Namespace: "cockpit",
313316
Resource: "grafana-user",
314317
Verb: "delete",
315-
// Deprecated: false,
318+
// Deprecated: true,
316319
ArgsType: reflect.TypeOf(cockpit.GlobalAPIDeleteGrafanaUserRequest{}),
317320
ArgSpecs: core.ArgSpecs{
318321
core.ProjectIDArgSpec(),
@@ -344,13 +347,14 @@ func cockpitGrafanaUserDelete() *core.Command {
344347

345348
func cockpitGrafanaUserResetPassword() *core.Command {
346349
return &core.Command{
347-
Short: `Reset a Grafana user password`,
348-
Long: `Reset the password of a Grafana user, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
350+
Short: `(Deprecated) EOL 2026-01-20`,
351+
Long: `Reset a Grafana user password
352+
Reset the password of a Grafana user, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
349353
A new password regenerates and only displays once. Make sure that you save it.`,
350354
Namespace: "cockpit",
351355
Resource: "grafana-user",
352356
Verb: "reset-password",
353-
// Deprecated: false,
357+
// Deprecated: true,
354358
ArgsType: reflect.TypeOf(cockpit.GlobalAPIResetGrafanaUserPasswordRequest{}),
355359
ArgSpecs: core.ArgSpecs{
356360
core.ProjectIDArgSpec(),
@@ -442,7 +446,7 @@ func cockpitPlanList() *core.Command {
442446
return &core.Command{
443447
Short: `List plan types`,
444448
Long: `Retrieve a list of available pricing plan types.
445-
Deprecated: retention is now managed at the data source level.`,
449+
Deprecated due to retention now being managed at the data source level.`,
446450
Namespace: "cockpit",
447451
Resource: "plan",
448452
Verb: "list",
@@ -480,7 +484,7 @@ func cockpitPlanSelect() *core.Command {
480484
return &core.Command{
481485
Short: `Apply a pricing plan`,
482486
Long: `Apply a pricing plan on a given Project. You must specify the ID of the pricing plan type. Note that you will be billed for the plan you apply.
483-
Deprecated: retention is now managed at the data source level.`,
487+
Deprecated due to retention now being managed at the data source level.`,
484488
Namespace: "cockpit",
485489
Resource: "plan",
486490
Verb: "select",
@@ -517,7 +521,7 @@ func cockpitPlanGet() *core.Command {
517521
return &core.Command{
518522
Short: `Get current plan`,
519523
Long: `Retrieve a pricing plan for the given Project, specified by the ID of the Project.
520-
Deprecated: retention is now managed at the data source level.`,
524+
Deprecated due to retention now being managed at the data source level.`,
521525
Namespace: "cockpit",
522526
Resource: "plan",
523527
Verb: "get",

0 commit comments

Comments
 (0)