Skip to content

Commit bd93e35

Browse files
scaleway-botscaleway-bot
authored
Merge branch 'scaleway:master' into master
2 parents eecee5c + 8cf24ad commit bd93e35

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

‎cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ ARGS:
1616
[resource-name] Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned.
1717
[resource-id] Resource ID to filter for. Only IPs attached to this resource will be returned
1818
[resource-ids.{index}] Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned
19-
[resource-type] Resource type to filter for. Only IPs attached to this type of resource will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment | sedb_cluster)
20-
[resource-types.{index}] Resource types to filter for. Only IPs attached to these types of resources will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment | sedb_cluster)
19+
[resource-type] Resource type to filter for. Only IPs attached to this type of resource will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment | sedb_cluster | msgq_cluster)
20+
[resource-types.{index}] Resource types to filter for. Only IPs attached to these types of resources will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment | sedb_cluster | msgq_cluster)
2121
[mac-address] MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned
2222
[tags.{index}] Tags to filter for, only IPs with one or more matching tags will be returned
2323
[is-ipv6] Defines whether to filter only for IPv4s or IPv6s

‎docs/commands/ipam.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ scw ipam ip list [arg=value ...]
111111
| resource-name | | Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned. |
112112
| resource-id | | Resource ID to filter for. Only IPs attached to this resource will be returned |
113113
| resource-ids.{index} | | Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned |
114-
| resource-type | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment`, `sedb_cluster` | Resource type to filter for. Only IPs attached to this type of resource will be returned |
115-
| resource-types.{index} | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment`, `sedb_cluster` | Resource types to filter for. Only IPs attached to these types of resources will be returned |
114+
| resource-type | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment`, `sedb_cluster`, `msgq_cluster` | Resource type to filter for. Only IPs attached to this type of resource will be returned |
115+
| resource-types.{index} | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment`, `sedb_cluster`, `msgq_cluster` | Resource types to filter for. Only IPs attached to these types of resources will be returned |
116116
| mac-address | | MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned |
117117
| tags.{index} | | Tags to filter for, only IPs with one or more matching tags will be returned |
118118
| is-ipv6 | | Defines whether to filter only for IPv4s or IPv6s |

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.26.1
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251117143834-a8fa9f915f40
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251120105008-da92c1d23d16
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.10.1
2929
github.com/spf13/pflag v1.0.10

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
464464
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
465465
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
466466
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
467-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251117143834-a8fa9f915f40 h1:SbMYbOoCxZwWCcRVlPwp/wXAgD09MzEZSGgjDoTr7/Y=
468-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251117143834-a8fa9f915f40/go.mod h1:BBENv1W9QH4COViJkDJB/0D1T6CweMAkDP7XehRsHQ8=
467+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251120105008-da92c1d23d16 h1:NECKW6fpn7/hja8ZZpAjhVSvuqgL+b0Mn7EVEWG9LqE=
468+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251120105008-da92c1d23d16/go.mod h1:BBENv1W9QH4COViJkDJB/0D1T6CweMAkDP7XehRsHQ8=
469469
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
470470
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
471471
github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=

‎internal/namespaces/ipam/v1/ipam_cli.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ func ipamIPList() *core.Command {
444444
"scbl_sedb_cluster",
445445
"dtwh_deployment",
446446
"sedb_cluster",
447+
"msgq_cluster",
447448
},
448449
},
449450
{
@@ -481,6 +482,7 @@ func ipamIPList() *core.Command {
481482
"scbl_sedb_cluster",
482483
"dtwh_deployment",
483484
"sedb_cluster",
485+
"msgq_cluster",
484486
},
485487
},
486488
{

0 commit comments

Comments
 (0)