Skip to content

Commit 6d66848

Browse files
authored
Merge branch 'master' into v1.7156.0
2 parents d6fab0d + 1a90849 commit 6d66848

File tree

6 files changed

+36
-123
lines changed

6 files changed

+36
-123
lines changed

cmd/scw-sweeper/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
flexibleipSweeper "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1/sweepers"
1515
functionSweeper "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1/sweepers"
1616
iamSweeper "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1/sweepers"
17-
inferenceSweeper "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1/sweepers"
17+
inferenceSweeper "github.com/scaleway/scaleway-sdk-go/api/inference/v1/sweepers"
1818
instanceSweeper "github.com/scaleway/scaleway-sdk-go/api/instance/v1/sweepers"
1919
iotSweeper "github.com/scaleway/scaleway-sdk-go/api/iot/v1/sweepers"
2020
ipamSweeper "github.com/scaleway/scaleway-sdk-go/api/ipam/v1/sweepers"

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/scaleway/scaleway-cli/v2
33
go 1.25.0
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.39.2
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.4
6+
github.com/aws/aws-sdk-go-v2 v1.39.3
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.5
88
github.com/buildpacks/pack v0.38.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.10
@@ -54,24 +54,24 @@ require (
5454
github.com/ProtonMail/go-crypto v1.3.0 // indirect
5555
github.com/agext/levenshtein v1.2.3 // indirect
5656
github.com/apex/log v1.9.0 // indirect
57-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
57+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect
5858
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
5959
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
6060
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
61-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 // indirect
6363
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 // indirect
64+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 // indirect
6565
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
67-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.0 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 // indirect
7171
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
74-
github.com/aws/smithy-go v1.23.0 // indirect
74+
github.com/aws/smithy-go v1.23.1 // indirect
7575
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.10.1 // indirect
7676
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
7777
github.com/beorn7/perks v1.0.1 // indirect

go.sum

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,46 +61,46 @@ github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3st
6161
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6262
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
6363
github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
64-
github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I=
65-
github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
66-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E=
67-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00=
64+
github.com/aws/aws-sdk-go-v2 v1.39.3 h1:h7xSsanJ4EQJXG5iuW4UqgP7qBopLpj84mpkNx3wPjM=
65+
github.com/aws/aws-sdk-go-v2 v1.39.3/go.mod h1:yWSxrnioGUZ4WVv9TgMrNUeLV3PFESn/v+6T/Su8gnM=
66+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
67+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=
6868
github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo=
6969
github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ=
7070
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg=
7171
github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs=
7272
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14=
7373
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww=
74-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 h1:se2vOWGD3dWQUtfn4wEjRQJb1HK1XsNIt825gskZ970=
75-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9/go.mod h1:hijCGH2VfbZQxqCDN7bwz/4dzxV+hkyhjawAtdPWKZA=
76-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 h1:6RBnKZLkJM4hQ+kN6E7yWFveOTg8NLPHAkqrs4ZPlTU=
77-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9/go.mod h1:V9rQKRmK7AWuEsOMnHzKj8WyrIir1yUJbZxDuZLFvXI=
74+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 h1:mj/bdWleWEh81DtpdHKkw41IrS+r3uw1J/VQtbwYYp8=
75+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10/go.mod h1:7+oEMxAZWP8gZCyjcm9VicI0M61Sx4DJtcGfKYv2yKQ=
76+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 h1:wh+/mn57yhUrFtLIxyFPh2RgxgQz/u+Yrf7hiHGHqKY=
77+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10/go.mod h1:7zirD+ryp5gitJJ2m1BBux56ai8RIRDykXZrJSp540w=
7878
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
7979
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
80-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 h1:w9LnHqTq8MEdlnyhV4Bwfizd65lfNCNgdlNC6mM5paE=
81-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9/go.mod h1:LGEP6EK4nj+bwWNdrvX/FnDTFowdBNwcSPuZu/ouFys=
80+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 h1:FHw90xCTsofzk6vjU808TSuDtDfOOKPNdz5Weyc3tUI=
81+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10/go.mod h1:n8jdIE/8F3UYkg8O4IGkQpn2qUmapg/1K1yl29/uf/c=
8282
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE=
8383
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8=
8484
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274=
8585
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA=
86-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM=
87-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8=
88-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.0 h1:X0FveUndcZ3lKbSpIC6rMYGRiQTcUVRNH6X4yYtIrlU=
89-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.0/go.mod h1:IWjQYlqw4EX9jw2g3qnEPPWvCE6bS8fKzhMed1OK7c8=
90-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 h1:5r34CgVOD4WZudeEKZ9/iKpiT6cM1JyEROpXjOcdWv8=
91-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9/go.mod h1:dB12CEbNWPbzO2uC6QSWHteqOg4JfBVJOojbAoAUb5I=
92-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9 h1:wuZ5uW2uhJR63zwNlqWH2W4aL4ZjeJP3o92/W+odDY4=
93-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9/go.mod h1:/G58M2fGszCrOzvJUkDdY8O9kycodunH4VdT5oBAqls=
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.4 h1:mUI3b885qJgfqKDUSj6RgbRqLdX0wGmg8ruM03zNfQA=
95-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.4/go.mod h1:6v8ukAxc7z4x4oBjGUsLnH7KGLY9Uhcgij19UJNkiMg=
86+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
87+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
88+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 h1:ne+eepnDB2Wh5lHKzELgEncIqeVlQ1rSF9fEa4r5I+A=
89+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1/go.mod h1:u0Jkg0L+dcG1ozUq21uFElmpbmjBnhHR5DELHIme4wg=
90+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 h1:DRND0dkCKtJzCj4Xl4OpVbXZgfttY5q712H9Zj7qc/0=
91+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10/go.mod h1:tGGNmJKOTernmR2+VJ0fCzQRurcPZj9ut60Zu5Fi6us=
92+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 h1:DA+Hl5adieRyFvE7pCvBWm3VOZTRexGVkXw33SUqNoY=
93+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10/go.mod h1:L+A89dH3/gr8L4ecrdzuXUYd1znoko6myzndVGZx/DA=
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.5 h1:FlGScxzCGNzT+2AvHT1ZGMvxTwAMa6gsooFb1pO/AiM=
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.5/go.mod h1:N/iojY+8bW3MYol9NUMuKimpSbPEur75cuI1SmtonFM=
9696
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg=
9797
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE=
9898
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA=
9999
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ=
100100
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI=
101101
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c=
102-
github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE=
103-
github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
102+
github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
103+
github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
104104
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.10.1 h1:6lMw4/QGLFPvbKQ0eri/9Oh3YX5Nm6BPrUlZR8yuJHg=
105105
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.10.1/go.mod h1:EVJOSYOVeoD3VFFZ/dWCAzWJp5wZr9lTOCjW8ejAmO0=
106106
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=

internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -574,35 +574,6 @@ func appleSiliconServerReinstall() *core.Command {
574574
Deprecated: false,
575575
Positional: false,
576576
},
577-
{
578-
Name: "runner-configuration.name",
579-
Required: false,
580-
Deprecated: false,
581-
Positional: false,
582-
},
583-
{
584-
Name: "runner-configuration.url",
585-
Required: false,
586-
Deprecated: false,
587-
Positional: false,
588-
},
589-
{
590-
Name: "runner-configuration.token",
591-
Required: false,
592-
Deprecated: false,
593-
Positional: false,
594-
},
595-
{
596-
Name: "runner-configuration.provider",
597-
Required: false,
598-
Deprecated: false,
599-
Positional: false,
600-
EnumValues: []string{
601-
"unknown_provider",
602-
"github",
603-
"gitlab",
604-
},
605-
},
606577
core.ZoneArgSpec(scw.ZoneFrPar3),
607578
},
608579
Run: func(ctx context.Context, args any) (i any, e error) {

internal/namespaces/cockpit/v1/cockpit_cli.go

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ func GetGeneratedCommands() *core.Commands {
5858
cockpitContactPointCreate(),
5959
cockpitContactPointList(),
6060
cockpitContactPointDelete(),
61-
cockpitManagedAlertsEnable(),
62-
cockpitManagedAlertsDisable(),
6361
cockpitTestAlertTrigger(),
6462
)
6563
}
@@ -1239,62 +1237,6 @@ func cockpitContactPointDelete() *core.Command {
12391237
}
12401238
}
12411239

1242-
func cockpitManagedAlertsEnable() *core.Command {
1243-
return &core.Command{
1244-
Short: `Enable managed alerts`,
1245-
Long: `Enable the sending of managed alerts for the specified Project. Managed alerts are predefined alerts that apply to Scaleway recources integrated with Cockpit by default.`,
1246-
Namespace: "cockpit",
1247-
Resource: "managed-alerts",
1248-
Verb: "enable",
1249-
// Deprecated: false,
1250-
ArgsType: reflect.TypeOf(cockpit.RegionalAPIEnableManagedAlertsRequest{}),
1251-
ArgSpecs: core.ArgSpecs{
1252-
core.ProjectIDArgSpec(),
1253-
core.RegionArgSpec(
1254-
scw.RegionFrPar,
1255-
scw.RegionNlAms,
1256-
scw.RegionPlWaw,
1257-
),
1258-
},
1259-
Run: func(ctx context.Context, args any) (i any, e error) {
1260-
request := args.(*cockpit.RegionalAPIEnableManagedAlertsRequest)
1261-
1262-
client := core.ExtractClient(ctx)
1263-
api := cockpit.NewRegionalAPI(client)
1264-
1265-
return api.EnableManagedAlerts(request)
1266-
},
1267-
}
1268-
}
1269-
1270-
func cockpitManagedAlertsDisable() *core.Command {
1271-
return &core.Command{
1272-
Short: `Disable managed alerts`,
1273-
Long: `Disable the sending of managed alerts for the specified Project.`,
1274-
Namespace: "cockpit",
1275-
Resource: "managed-alerts",
1276-
Verb: "disable",
1277-
// Deprecated: false,
1278-
ArgsType: reflect.TypeOf(cockpit.RegionalAPIDisableManagedAlertsRequest{}),
1279-
ArgSpecs: core.ArgSpecs{
1280-
core.ProjectIDArgSpec(),
1281-
core.RegionArgSpec(
1282-
scw.RegionFrPar,
1283-
scw.RegionNlAms,
1284-
scw.RegionPlWaw,
1285-
),
1286-
},
1287-
Run: func(ctx context.Context, args any) (i any, e error) {
1288-
request := args.(*cockpit.RegionalAPIDisableManagedAlertsRequest)
1289-
1290-
client := core.ExtractClient(ctx)
1291-
api := cockpit.NewRegionalAPI(client)
1292-
1293-
return api.DisableManagedAlerts(request)
1294-
},
1295-
}
1296-
}
1297-
12981240
func cockpitTestAlertTrigger() *core.Command {
12991241
return &core.Command{
13001242
Short: `Trigger a test alert`,

internal/namespaces/dedibox/v1/dedibox_cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,8 +2605,8 @@ func dediboxIPv6BlockCreate() *core.Command {
26052605

26062606
func dediboxIPv6BlockGet() *core.Command {
26072607
return &core.Command{
2608-
Short: `Get a specific IPv6 block`,
2609-
Long: `Get the IPv6 block associated with the given ID.`,
2608+
Short: `Get first IPv6 block`,
2609+
Long: `Get the first IPv6 block associated with the given project ID.`,
26102610
Namespace: "dedibox",
26112611
Resource: "ipv6-block",
26122612
Verb: "get",

0 commit comments

Comments
 (0)