Skip to content

Commit 73faa3a

Browse files
remyleoneremyleone
authored
Merge branch 'master' into v1.6630.0
2 parents 4c815ce + 34fc155 commit 73faa3a

File tree

5 files changed

+121
-3
lines changed

5 files changed

+121
-3
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.36.3
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1
88
github.com/buildpacks/pack v0.34.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.5

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2
9090
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
9191
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
9292
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
93-
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0 h1:fV4XIU5sn/x8gjRouoJpDVHj+ExJaUk4prYF+eb6qTs=
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE=
93+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1 h1:xYEAf/6QHiTZDccKnPMbsMwlau13GsDsTgdue3wmHGw=
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE=
9595
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc=
9696
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0=
9797
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE=

‎internal/namespaces/container/v1beta1/container_cli.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ func containerNamespaceCreate() *core.Command {
279279
},
280280
{
281281
Name: "activate-vpc-integration",
282+
Short: `Activate VPC integration for the namespace.`,
282283
Required: false,
283284
Deprecated: false,
284285
Positional: false,
@@ -723,6 +724,7 @@ func containerContainerCreate() *core.Command {
723724
},
724725
{
725726
Name: "private-network-id",
727+
Short: `ID of the Private Network the container is connected to.`,
726728
Required: false,
727729
Deprecated: false,
728730
Positional: false,
@@ -859,6 +861,7 @@ func containerContainerUpdate() *core.Command {
859861
},
860862
{
861863
Name: "protocol",
864+
Short: `Protocol the container uses`,
862865
Required: false,
863866
Deprecated: false,
864867
Positional: false,
@@ -870,6 +873,7 @@ func containerContainerUpdate() *core.Command {
870873
},
871874
{
872875
Name: "port",
876+
Short: `Port the container listens on`,
873877
Required: false,
874878
Deprecated: false,
875879
Positional: false,
@@ -965,6 +969,7 @@ func containerContainerUpdate() *core.Command {
965969
},
966970
{
967971
Name: "private-network-id",
972+
Short: `ID of the Private Network the container is connected to.`,
968973
Required: false,
969974
Deprecated: false,
970975
Positional: false,

‎internal/namespaces/function/v1beta1/function_cli.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ func functionNamespaceCreate() *core.Command {
324324
Deprecated: false,
325325
Positional: false,
326326
},
327+
{
328+
Name: "activate-vpc-integration",
329+
Short: `Activate VPC integration for the namespace.`,
330+
Required: false,
331+
Deprecated: false,
332+
Positional: false,
333+
},
327334
core.RegionArgSpec(
328335
scw.RegionFrPar,
329336
scw.RegionNlAms,
@@ -728,6 +735,13 @@ func functionFunctionCreate() *core.Command {
728735
Deprecated: false,
729736
Positional: false,
730737
},
738+
{
739+
Name: "private-network-id",
740+
Short: `ID of the Private Network the function is connected to.`,
741+
Required: false,
742+
Deprecated: false,
743+
Positional: false,
744+
},
731745
core.RegionArgSpec(
732746
scw.RegionFrPar,
733747
scw.RegionNlAms,
@@ -917,6 +931,13 @@ func functionFunctionUpdate() *core.Command {
917931
Deprecated: false,
918932
Positional: false,
919933
},
934+
{
935+
Name: "private-network-id",
936+
Short: `ID of the Private Network the function is connected to.`,
937+
Required: false,
938+
Deprecated: false,
939+
Positional: false,
940+
},
920941
core.RegionArgSpec(
921942
scw.RegionFrPar,
922943
scw.RegionNlAms,

‎internal/namespaces/instance/v1/instance_cli.go

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ func GetGeneratedCommands() *core.Commands {
4343
instanceUserDataSet(),
4444
instanceUserDataGet(),
4545
instanceServerGetCompatibleTypes(),
46+
instanceServerAttachFilesystem(),
47+
instanceServerDetachFilesystem(),
4648
instanceImageList(),
4749
instanceImageGet(),
4850
instanceImageCreate(),
@@ -1142,6 +1144,96 @@ If the specified Instance offer is flagged as end of service, the best compatibl
11421144
}
11431145
}
11441146

1147+
func instanceServerAttachFilesystem() *core.Command {
1148+
return &core.Command{
1149+
Short: `Attach a filesystem volume to an Instance`,
1150+
Long: `Attach a filesystem volume to an Instance.`,
1151+
Namespace: "instance",
1152+
Resource: "server",
1153+
Verb: "attach-filesystem",
1154+
// Deprecated: false,
1155+
ArgsType: reflect.TypeOf(instance.AttachServerFileSystemRequest{}),
1156+
ArgSpecs: core.ArgSpecs{
1157+
{
1158+
Name: "server-id",
1159+
Required: true,
1160+
Deprecated: false,
1161+
Positional: false,
1162+
},
1163+
{
1164+
Name: "filesystem-id",
1165+
Required: false,
1166+
Deprecated: false,
1167+
Positional: false,
1168+
},
1169+
core.ZoneArgSpec(
1170+
scw.ZoneFrPar1,
1171+
scw.ZoneFrPar2,
1172+
scw.ZoneFrPar3,
1173+
scw.ZoneNlAms1,
1174+
scw.ZoneNlAms2,
1175+
scw.ZoneNlAms3,
1176+
scw.ZonePlWaw1,
1177+
scw.ZonePlWaw2,
1178+
scw.ZonePlWaw3,
1179+
),
1180+
},
1181+
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
1182+
request := args.(*instance.AttachServerFileSystemRequest)
1183+
1184+
client := core.ExtractClient(ctx)
1185+
api := instance.NewAPI(client)
1186+
1187+
return api.AttachServerFileSystem(request)
1188+
},
1189+
}
1190+
}
1191+
1192+
func instanceServerDetachFilesystem() *core.Command {
1193+
return &core.Command{
1194+
Short: `Detach a filesystem volume to an Instance`,
1195+
Long: `Detach a filesystem volume to an Instance.`,
1196+
Namespace: "instance",
1197+
Resource: "server",
1198+
Verb: "detach-filesystem",
1199+
// Deprecated: false,
1200+
ArgsType: reflect.TypeOf(instance.DetachServerFileSystemRequest{}),
1201+
ArgSpecs: core.ArgSpecs{
1202+
{
1203+
Name: "server-id",
1204+
Required: true,
1205+
Deprecated: false,
1206+
Positional: false,
1207+
},
1208+
{
1209+
Name: "filesystem-id",
1210+
Required: false,
1211+
Deprecated: false,
1212+
Positional: false,
1213+
},
1214+
core.ZoneArgSpec(
1215+
scw.ZoneFrPar1,
1216+
scw.ZoneFrPar2,
1217+
scw.ZoneFrPar3,
1218+
scw.ZoneNlAms1,
1219+
scw.ZoneNlAms2,
1220+
scw.ZoneNlAms3,
1221+
scw.ZonePlWaw1,
1222+
scw.ZonePlWaw2,
1223+
scw.ZonePlWaw3,
1224+
),
1225+
},
1226+
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
1227+
request := args.(*instance.DetachServerFileSystemRequest)
1228+
1229+
client := core.ExtractClient(ctx)
1230+
api := instance.NewAPI(client)
1231+
1232+
return api.DetachServerFileSystem(request)
1233+
},
1234+
}
1235+
}
1236+
11451237
func instanceImageList() *core.Command {
11461238
return &core.Command{
11471239
Short: `List Instance images`,

0 commit comments

Comments
 (0)