feat(product_catalog): add block storage properties to admin and public api (scaleway#2624)

Co-authored-by: protobuf-ci-cd <[email protected]>

Author: scaleway-bot

api/product_catalog/v2alpha1/product_catalog_sdk.go

@@ -402,6 +402,15 @@ type PublicCatalogProductPropertiesAppleSilicon struct {
 	Range string `json:"range"`
 }
 
+// PublicCatalogProductPropertiesBlockStorage: public catalog product properties block storage.
+type PublicCatalogProductPropertiesBlockStorage struct {
+	// MinVolumeSize: the minimum size of storage volume for this product in bytes.
+	MinVolumeSize scw.Size `json:"min_volume_size"`
+
+	// MaxVolumeSize: the maximum size of storage volume for this product in bytes.
+	MaxVolumeSize scw.Size `json:"max_volume_size"`
+}
+
 // PublicCatalogProductPropertiesDedibox: public catalog product properties dedibox.
 type PublicCatalogProductPropertiesDedibox struct {
 	// Range: the range of the Dedibox server.
@@ -482,20 +491,24 @@ type PublicCatalogProductProperties struct {
 	Hardware *PublicCatalogProductPropertiesHardware `json:"hardware"`
 
 	// Dedibox: the properties of Dedibox products.
-	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance must be set.
+	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance, BlockStorage must be set.
 	Dedibox *PublicCatalogProductPropertiesDedibox `json:"dedibox,omitempty"`
 
 	// ElasticMetal: the properties of Elastic Metal products.
-	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance must be set.
+	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance, BlockStorage must be set.
 	ElasticMetal *PublicCatalogProductPropertiesElasticMetal `json:"elastic_metal,omitempty"`
 
 	// AppleSilicon: the properties of Apple Silicon products.
-	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance must be set.
+	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance, BlockStorage must be set.
 	AppleSilicon *PublicCatalogProductPropertiesAppleSilicon `json:"apple_silicon,omitempty"`
 
 	// Instance: the properties of Instance products.
-	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance must be set.
+	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance, BlockStorage must be set.
 	Instance *PublicCatalogProductPropertiesInstance `json:"instance,omitempty"`
+
+	// BlockStorage: the properties of Block Storage products.
+	// Precisely one of Dedibox, ElasticMetal, AppleSilicon, Instance, BlockStorage must be set.
+	BlockStorage *PublicCatalogProductPropertiesBlockStorage `json:"block_storage,omitempty"`
 }
 
 // PublicCatalogProductUnitOfMeasure: public catalog product unit of measure.

scw/client.go

@@ -1,6 +1,7 @@
 package scw
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -201,17 +202,17 @@ func (c *Client) do(req *ScalewayRequest, res any) (sdkErr error) {
 	logger.Debugf("creating %s request on %s\n", req.Method, url.String())
 
 	// build request
-	httpRequest, err := http.NewRequest(req.Method, url.String(), req.Body)
+	ctx := req.ctx
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	httpRequest, err := http.NewRequestWithContext(ctx, req.Method, url.String(), req.Body)
 	if err != nil {
 		return errors.Wrap(err, "could not create request")
 	}
 
 	httpRequest.Header = req.getAllHeaders(req.auth, c.userAgent, false)
 
-	if req.ctx != nil {
-		httpRequest = httpRequest.WithContext(req.ctx)
-	}
-
 	// execute request
 	httpResponse, err := c.httpClient.Do(httpRequest)
 	if err != nil {