Skip to content

Commit 2538bad

Browse files
authored
Merge branch 'master' into v1.5832.0
2 parents e0c9111 + 74ffd8c commit 2538bad

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ARGS:
1414
[vpc-id] VPC ID to filter for.
1515
[attached] Defines whether to filter only for IPs which are attached to a resource
1616
[resource-id] Resource ID to filter for. Only IPs attached to this resource will be returned
17+
[resource-ids.{index}] Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned
1718
[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)
1819
[mac-address] MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned
1920
[tags.{index}] Tags to filter for, only IPs with one or more matching tags will be returned

docs/commands/ipam.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ scw ipam ip list [arg=value ...]
108108
| vpc-id | | VPC ID to filter for. |
109109
| attached | | Defines whether to filter only for IPs which are attached to a resource |
110110
| resource-id | | Resource ID to filter for. Only IPs attached to this resource will be returned |
111+
| resource-ids.{index} | | Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned |
111112
| 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` | Resource type to filter for. Only IPs attached to this type of resource will be returned |
112113
| mac-address | | MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned |
113114
| tags.{index} | | Tags to filter for, only IPs with one or more matching tags will be returned |

internal/namespaces/ipam/v1/ipam_cli.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,13 @@ func ipamIPList() *core.Command {
355355
Deprecated: false,
356356
Positional: false,
357357
},
358+
{
359+
Name: "resource-ids.{index}",
360+
Short: `Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned`,
361+
Required: false,
362+
Deprecated: false,
363+
Positional: false,
364+
},
358365
{
359366
Name: "resource-type",
360367
Short: `Resource type to filter for. Only IPs attached to this type of resource will be returned`,

0 commit comments

Comments
 (0)