Merge branch 'scaleway:master' into master

Author: scaleway-bot

.github/CODEOWNERS

@@ -11,7 +11,6 @@
 /internal/namespaces/cockpit/ @scaleway/devtools-dms
 /internal/namespaces/config/ @scaleway/devtools
 /internal/namespaces/container/ @scaleway/devtools-compute
-/internal/namespaces/documentdb/ @scaleway/devtools-dms
 /internal/namespaces/domain/ @scaleway/devtools-dms
 /internal/namespaces/feedback/ @scaleway/devtools
 /internal/namespaces/flexibleip/ @scaleway/devtools-network

.github/workflows/nightly.yml

@@ -19,7 +19,6 @@ jobs:
           - cockpit
           - container
           - dedibox
-          - documentdb
           - domain
           - edge_services
           - flexibleip

README.md

@@ -116,7 +116,6 @@ To enable beta features, you can set `SCW_ENABLE_BETA=1` in your environment.
 | `cockpit`      | Cockpit API                             | [CLI](./docs/commands/cockpit.md) / [API](https://www.scaleway.com/en/developers/api/cockpit/)                    |
 | `config`       | Config file management                  | [CLI](./docs/commands/config.md)                                                                                  |
 | `container`    | Serverless Container API                | [CLI](./docs/commands/container.md) / [API](https://www.scaleway.com/en/developers/api/serverless-containers/)    |
-| `documentdb`   | DocumentDB API                          | [CLI](./docs/commands/document-db.md)                                                                             |
 | `dns`          | DNS API                                 | [CLI](./docs/commands/dns.md) / [API](https://www.scaleway.com/en/developers/api/domains-and-dns/)                |
 | `feedback`     | Send feedback to the Scaleway CLI Team! | [CLI](./docs/commands/feedback.md)                                                                                |
 | `flexibleip`   | Flexible IP API                         | [CLI](./docs/commands/fip.md) / [API](https://www.scaleway.com/en/developers/api/elastic-metal-flexible-ip/)      |

internal/namespaces/instance/v1/helpers_types.go

@@ -121,10 +121,9 @@ func getEndOfServiceDate(
 	}
 
 	for _, product := range products.Products {
-		if strings.HasPrefix(product.Product, commercialType) {
-			if product.Locality.Zone != nil && *product.Locality.Zone == zone {
-				return product.EndOfLifeAt.Format(time.DateOnly), nil
-			}
+		if product.Properties != nil && product.Properties.Instance != nil &&
+			product.Properties.Instance.OfferID == commercialType {
+			return product.EndOfLifeAt.Format(time.DateOnly), nil
 		}
 	}