diff --git a/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden b/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden index fd8c861694..6d3f17719f 100644 --- a/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden @@ -16,7 +16,7 @@ ARGS: [additional-snapshots.{index}.id] UUID of the snapshot to add [additional-snapshots.{index}.name] Name of the additional snapshot [additional-snapshots.{index}.size] Size of the additional snapshot - [additional-snapshots.{index}.volume-type] Underlying volume type of the additional snapshot (l_ssd | b_ssd | unified) + [additional-snapshots.{index}.volume-type] Underlying volume type of the additional snapshot (l_ssd | b_ssd | unified | scratch) [additional-snapshots.{index}.project-id] Project ID that own the additional snapshot [project-id] Project ID to use. If none is passed the default project ID will be used [tags.{index}] Tags of the image diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden b/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden index fe3610b59c..8b47710585 100644 --- a/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden @@ -19,7 +19,7 @@ ARGS: [name=] Volume name [project-id] Project ID to use. If none is passed the default project ID will be used [tags.{index}] Volume tags - [volume-type] Volume type (l_ssd | b_ssd | unified) + [volume-type] Volume type (l_ssd | b_ssd | unified | scratch) [size] Volume disk size, must be a multiple of 512 [base-volume] ID of the volume on which this volume will be based [base-snapshot] ID of the snapshot on which this volume will be based diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden b/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden index 60b21b1c05..033fd2ce9e 100644 --- a/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden @@ -22,7 +22,7 @@ EXAMPLES: scw instance volume list volume-type=b_ssd name=foobar ARGS: - [volume-type] Filter by volume type (l_ssd | b_ssd | unified) + [volume-type] Filter by volume type (l_ssd | b_ssd | unified | scratch) [project-id] Filter volume by Project ID [tags.{index}] Filter volumes with these exact tags (to filter with several tags, use commas to separate them) [name] Filter volume by name (for eg. "vol" will return "myvolume" but not "data") diff --git a/docs/commands/instance.md b/docs/commands/instance.md index ed18959f30..d82a9d24b2 100644 --- a/docs/commands/instance.md +++ b/docs/commands/instance.md @@ -132,7 +132,7 @@ scw instance image create [arg=value ...] | additional-snapshots.{index}.id | | UUID of the snapshot to add | | additional-snapshots.{index}.name | | Name of the additional snapshot | | additional-snapshots.{index}.size | | Size of the additional snapshot | -| additional-snapshots.{index}.volume-type | One of: `l_ssd`, `b_ssd`, `unified` | Underlying volume type of the additional snapshot | +| additional-snapshots.{index}.volume-type | One of: `l_ssd`, `b_ssd`, `unified`, `scratch` | Underlying volume type of the additional snapshot | | additional-snapshots.{index}.project-id | | Project ID that own the additional snapshot | | ~~additional-snapshots.{index}.organization-id~~ | Deprecated | Organization ID that own the additional snapshot | | project-id | | Project ID to use. If none is passed the default project ID will be used | @@ -2928,7 +2928,7 @@ scw instance volume create [arg=value ...] | name | Default: `` | Volume name | | project-id | | Project ID to use. If none is passed the default project ID will be used | | tags.{index} | | Volume tags | -| volume-type | One of: `l_ssd`, `b_ssd`, `unified` | Volume type | +| volume-type | One of: `l_ssd`, `b_ssd`, `unified`, `scratch` | Volume type | | size | | Volume disk size, must be a multiple of 512 | | base-volume | | ID of the volume on which this volume will be based | | base-snapshot | | ID of the snapshot on which this volume will be based | @@ -3032,7 +3032,7 @@ scw instance volume list [arg=value ...] | Name | | Description | |------|---|-------------| -| volume-type | One of: `l_ssd`, `b_ssd`, `unified` | Filter by volume type | +| volume-type | One of: `l_ssd`, `b_ssd`, `unified`, `scratch` | Filter by volume type | | project-id | | Filter volume by Project ID | | tags.{index} | | Filter volumes with these exact tags (to filter with several tags, use commas to separate them) | | name | | Filter volume by name (for eg. "vol" will return "myvolume" but not "data") | diff --git a/go.mod b/go.mod index 86d7a9bd01..3709ae8c8c 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/moby/buildkit v0.11.6 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/errors v0.9.1 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230821160755-82a4aa87ba70 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230829075301-d16b548612e4 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index abc51ef111..cd0243b842 100644 --- a/go.sum +++ b/go.sum @@ -491,8 +491,8 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj 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.20.0.20230821160755-82a4aa87ba70 h1:k8EwAXHaONvKu7l55pnC4EoY/XpNyM0/5J/+Bruw2PU= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230821160755-82a4aa87ba70/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230829075301-d16b548612e4 h1:yaIT6F5d7vs4MRg+aCaWIO9FAN2kYRy61y0Did8RuSU= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230829075301-d16b548612e4/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go index 4394037162..a1b4726035 100644 --- a/internal/namespaces/instance/v1/instance_cli.go +++ b/internal/namespaces/instance/v1/instance_cli.go @@ -619,7 +619,7 @@ func instanceServerUpdate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"l_ssd", "b_ssd", "unified"}, + EnumValues: []string{"l_ssd", "b_ssd", "unified", "scratch"}, }, { Name: "volumes.{key}.base-snapshot", @@ -1219,7 +1219,7 @@ func instanceImageCreate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"l_ssd", "b_ssd", "unified"}, + EnumValues: []string{"l_ssd", "b_ssd", "unified", "scratch"}, }, { Name: "extra-volumes.{key}.project", @@ -1628,7 +1628,7 @@ func instanceVolumeList() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"l_ssd", "b_ssd", "unified"}, + EnumValues: []string{"l_ssd", "b_ssd", "unified", "scratch"}, }, { Name: "project", @@ -1772,7 +1772,7 @@ func instanceVolumeCreate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"l_ssd", "b_ssd", "unified"}, + EnumValues: []string{"l_ssd", "b_ssd", "unified", "scratch"}, }, { Name: "size",