diff --git a/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden b/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden index 1d18763e1..898e57dec 100644 --- a/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden @@ -16,8 +16,8 @@ ARGS: [resource-name] Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned. [resource-id] Resource ID to filter for. Only IPs attached to this resource will be returned [resource-ids.{index}] Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned - [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) - [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) + [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) + [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) [mac-address] MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned [tags.{index}] Tags to filter for, only IPs with one or more matching tags will be returned [is-ipv6] Defines whether to filter only for IPv4s or IPv6s diff --git a/docs/commands/ipam.md b/docs/commands/ipam.md index 404d27f2e..439fe0add 100644 --- a/docs/commands/ipam.md +++ b/docs/commands/ipam.md @@ -110,8 +110,8 @@ scw ipam ip list [arg=value ...] | resource-name | | Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned. | | resource-id | | Resource ID to filter for. Only IPs attached to this resource will be returned | | resource-ids.{index} | | Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned | -| 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 | -| 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` | Resource types to filter for. Only IPs attached to these types of resources will be returned | +| 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` | Resource type to filter for. Only IPs attached to this type of resource will be returned | +| 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` | Resource types to filter for. Only IPs attached to these types of resources will be returned | | mac-address | | MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned | | tags.{index} | | Tags to filter for, only IPs with one or more matching tags will be returned | | is-ipv6 | | Defines whether to filter only for IPv4s or IPv6s | diff --git a/go.mod b/go.mod index c2d0d3a6e..e4bcec15e 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/mattn/go-isatty v0.0.20 github.com/moby/buildkit v0.13.2 github.com/opencontainers/go-digest v1.0.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250205135620-3eb9faddf455 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206084743-1234a876129f github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.6 diff --git a/go.sum b/go.sum index d9ac8589a..f0b72b891 100644 --- a/go.sum +++ b/go.sum @@ -464,8 +464,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250205135620-3eb9faddf455 h1:g3F+SVHuaSuU5mfzLLkaGMQiza81gFxiul+DXjTfI+w= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250205135620-3eb9faddf455/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206084743-1234a876129f h1:xHnQ7GB9FaK4uB6XZHwQslYIG55uI9WJXbgHblIC5o0= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250206084743-1234a876129f/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA= diff --git a/internal/namespaces/ipam/v1/ipam_cli.go b/internal/namespaces/ipam/v1/ipam_cli.go index e93e18b8c..0e54b604d 100644 --- a/internal/namespaces/ipam/v1/ipam_cli.go +++ b/internal/namespaces/ipam/v1/ipam_cli.go @@ -375,7 +375,7 @@ func ipamIPList() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"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"}, + EnumValues: []string{"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"}, }, { Name: "resource-types.{index}", @@ -383,7 +383,7 @@ func ipamIPList() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"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"}, + EnumValues: []string{"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"}, }, { Name: "mac-address",