Skip to content

Commit c0f0d3c

Browse files
scaleway-botscaleway-bot
authored
chore: change deprecated order (#5367)
1 parent 2a6187a commit c0f0d3c

15 files changed

+109
-109
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/moby/buildkit v0.27.1
2525
github.com/moby/go-archive v0.2.0
2626
github.com/opencontainers/go-digest v1.0.0
27-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260225162449-25895fc5ce56
27+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260303132029-414fb71b4faf
2828
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2929
github.com/spf13/cobra v1.10.2
3030
github.com/spf13/pflag v1.0.10

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
468468
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
469469
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
470470
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
471-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260225162449-25895fc5ce56 h1:LrMPtquQCTVrHlb1uX+Sf0wYtZIQGOdnNUquq5RP5pc=
472-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260225162449-25895fc5ce56/go.mod h1:EG4RjSWH4YiEB6bPmLxzkDm7GsEqLcXNTCwigMNapxQ=
471+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260303132029-414fb71b4faf h1:bRmBaL9slf/ACeBew9LmivAzEiLcad5WLUinMDqdUrI=
472+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260303132029-414fb71b4faf/go.mod h1:EG4RjSWH4YiEB6bPmLxzkDm7GsEqLcXNTCwigMNapxQ=
473473
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
474474
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
475475
github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=

‎internal/namespaces/rdb/v1/testdata/test-add-acl-multiple-with-description.golden‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ 3 ACL rules successfully added.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 18112 tcp inbound allow Allow All
6-
1.2.3.4/32 18112 tcp inbound allow some-unique-description
7-
10.10.10.10/32 18112 tcp inbound allow some-unique-description
8-
192.168.1.0/30 18112 tcp inbound allow some-unique-description
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 18112
6+
1.2.3.4/32 tcp inbound allow some-unique-description 18112
7+
10.10.10.10/32 tcp inbound allow some-unique-description 18112
8+
192.168.1.0/30 tcp inbound allow some-unique-description 18112
99
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
1010
{
1111
"Rules": [
1212
{
1313
"ip": "0.0.0.0/0",
14-
"port": 18112,
1514
"protocol": "tcp",
1615
"direction": "inbound",
1716
"action": "allow",
18-
"description": "Allow All"
17+
"description": "Allow All",
18+
"port": 18112
1919
},
2020
{
2121
"ip": "1.2.3.4/32",
22-
"port": 18112,
2322
"protocol": "tcp",
2423
"direction": "inbound",
2524
"action": "allow",
26-
"description": "some-unique-description"
25+
"description": "some-unique-description",
26+
"port": 18112
2727
},
2828
{
2929
"ip": "10.10.10.10/32",
30-
"port": 18112,
3130
"protocol": "tcp",
3231
"direction": "inbound",
3332
"action": "allow",
34-
"description": "some-unique-description"
33+
"description": "some-unique-description",
34+
"port": 18112
3535
},
3636
{
3737
"ip": "192.168.1.0/30",
38-
"port": 18112,
3938
"protocol": "tcp",
4039
"direction": "inbound",
4140
"action": "allow",
42-
"description": "some-unique-description"
41+
"description": "some-unique-description",
42+
"port": 18112
4343
}
4444
],
4545
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-add-acl-multiple.golden‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ 3 ACL rules successfully added.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 29920 tcp inbound allow Allow All
6-
1.2.3.4/32 29920 tcp inbound allow Allow 1.2.3.4/32
7-
10.10.10.10/32 29920 tcp inbound allow Allow 10.10.10.10/32
8-
192.168.1.0/30 29920 tcp inbound allow Allow 192.168.1.0/30
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 29920
6+
1.2.3.4/32 tcp inbound allow Allow 1.2.3.4/32 29920
7+
10.10.10.10/32 tcp inbound allow Allow 10.10.10.10/32 29920
8+
192.168.1.0/30 tcp inbound allow Allow 192.168.1.0/30 29920
99
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
1010
{
1111
"Rules": [
1212
{
1313
"ip": "0.0.0.0/0",
14-
"port": 29920,
1514
"protocol": "tcp",
1615
"direction": "inbound",
1716
"action": "allow",
18-
"description": "Allow All"
17+
"description": "Allow All",
18+
"port": 29920
1919
},
2020
{
2121
"ip": "1.2.3.4/32",
22-
"port": 29920,
2322
"protocol": "tcp",
2423
"direction": "inbound",
2524
"action": "allow",
26-
"description": "Allow 1.2.3.4/32"
25+
"description": "Allow 1.2.3.4/32",
26+
"port": 29920
2727
},
2828
{
2929
"ip": "10.10.10.10/32",
30-
"port": 29920,
3130
"protocol": "tcp",
3231
"direction": "inbound",
3332
"action": "allow",
34-
"description": "Allow 10.10.10.10/32"
33+
"description": "Allow 10.10.10.10/32",
34+
"port": 29920
3535
},
3636
{
3737
"ip": "192.168.1.0/30",
38-
"port": 29920,
3938
"protocol": "tcp",
4039
"direction": "inbound",
4140
"action": "allow",
42-
"description": "Allow 192.168.1.0/30"
41+
"description": "Allow 192.168.1.0/30",
42+
"port": 29920
4343
}
4444
],
4545
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-add-acl-simple-with-description.golden‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ ACL rule 1.2.3.4/32 successfully added.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 11942 tcp inbound allow Allow All
6-
1.2.3.4/32 11942 tcp inbound allow some-unique-description
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 11942
6+
1.2.3.4/32 tcp inbound allow some-unique-description 11942
77
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
88
{
99
"Rules": [
1010
{
1111
"ip": "0.0.0.0/0",
12-
"port": 11942,
1312
"protocol": "tcp",
1413
"direction": "inbound",
1514
"action": "allow",
16-
"description": "Allow All"
15+
"description": "Allow All",
16+
"port": 11942
1717
},
1818
{
1919
"ip": "1.2.3.4/32",
20-
"port": 11942,
2120
"protocol": "tcp",
2221
"direction": "inbound",
2322
"action": "allow",
24-
"description": "some-unique-description"
23+
"description": "some-unique-description",
24+
"port": 11942
2525
}
2626
],
2727
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-add-acl-simple.golden‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ ACL rule 1.2.3.4/32 successfully added.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 27078 tcp inbound allow Allow All
6-
1.2.3.4/32 27078 tcp inbound allow Allow 1.2.3.4/32
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 27078
6+
1.2.3.4/32 tcp inbound allow Allow 1.2.3.4/32 27078
77
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
88
{
99
"Rules": [
1010
{
1111
"ip": "0.0.0.0/0",
12-
"port": 27078,
1312
"protocol": "tcp",
1413
"direction": "inbound",
1514
"action": "allow",
16-
"description": "Allow All"
15+
"description": "Allow All",
16+
"port": 27078
1717
},
1818
{
1919
"ip": "1.2.3.4/32",
20-
"port": 27078,
2120
"protocol": "tcp",
2221
"direction": "inbound",
2322
"action": "allow",
24-
"description": "Allow 1.2.3.4/32"
23+
"description": "Allow 1.2.3.4/32",
24+
"port": 27078
2525
}
2626
],
2727
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-delete-acl-multiple-when-not-set.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ 1 ACL rules successfully deleted (2 were not set).
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 5849 tcp inbound allow Allow All
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 5849
66
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
77
{
88
"Rules": [
99
{
1010
"ip": "0.0.0.0/0",
11-
"port": 5849,
1211
"protocol": "tcp",
1312
"direction": "inbound",
1413
"action": "allow",
15-
"description": "Allow All"
14+
"description": "Allow All",
15+
"port": 5849
1616
}
1717
],
1818
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-delete-acl-multiple-when-set.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ 3 ACL rules successfully deleted.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
5-
0.0.0.0/0 27884 tcp inbound allow Allow All
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
5+
0.0.0.0/0 tcp inbound allow Allow All 27884
66
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
77
{
88
"Rules": [
99
{
1010
"ip": "0.0.0.0/0",
11-
"port": 27884,
1211
"protocol": "tcp",
1312
"direction": "inbound",
1413
"action": "allow",
15-
"description": "Allow All"
14+
"description": "Allow All",
15+
"port": 27884
1616
}
1717
],
1818
"Success": {

‎internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ ACL rule 0.0.0.0/0 successfully deleted.
4-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
4+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
55
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
66
{
77
"Rules": null,

‎internal/namespaces/rdb/v1/testdata/test-get-instance-simple.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ max_parallel_workers_per_gather 0
4343
work_mem 4
4444

4545
ACLs:
46-
IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
47-
0.0.0.0/0 27851 tcp inbound allow Allow All
46+
IP PROTOCOL DIRECTION ACTION DESCRIPTION PORT
47+
0.0.0.0/0 tcp inbound allow Allow All 27851
4848
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
4949
{
5050
"created_at": "1970-01-01T00:00:00.0Z",
@@ -126,11 +126,11 @@ IP PORT PROTOCOL DIRECTION ACTION DESCRIPTION
126126
"acls": [
127127
{
128128
"ip": "0.0.0.0/0",
129-
"port": 27851,
130129
"protocol": "tcp",
131130
"direction": "inbound",
132131
"action": "allow",
133-
"description": "Allow All"
132+
"description": "Allow All",
133+
"port": 27851
134134
}
135135
]
136136
}

0 commit comments

Comments
 (0)