chore(instance): add APIIDs filter to PCU requests to reduce cassette size (#5486)

Author: Mia-Cross

go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/moby/buildkit v0.29.0
 	github.com/moby/go-archive v0.2.0
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260410085437-583409c79721
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260416143224-746704f18a9f
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -476,8 +476,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 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.36.0.20260410085437-583409c79721 h1:cysx/Agxy/gRF3WLMPh/0hcSj8QBRDEyQI/nG3a2j8Y=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260410085437-583409c79721/go.mod h1:jG9ApeokegM68b/6vebk8fAhBJbqZKUoor/+f19+bH0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260416143224-746704f18a9f h1:uRw/kv3yB8Ivlca4RsZMo4pCXQm01g/X+K0pCd0Em+I=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260416143224-746704f18a9f/go.mod h1:jG9ApeokegM68b/6vebk8fAhBJbqZKUoor/+f19+bH0=
 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.10.0 h1:l+H5ErcW0PAehBNrBxoGv1jjNpGYdZ9RcheFkB2WI14=

internal/namespaces/instance/v1/custom_server_type.go

@@ -102,8 +102,13 @@ func serverTypeListBuilder(c *core.Command) *core.Command {
 				ProductTypes: []product_catalog.ListPublicCatalogProductsRequestProductType{
 					instanceProductType,
 				},
-				Zone:   &request.Zone,
-				Status: nil,
+				Zone: &request.Zone,
+				Status: []product_catalog.ListPublicCatalogProductsRequestStatus{
+					product_catalog.ListPublicCatalogProductsRequestStatusPublicBeta,
+					product_catalog.ListPublicCatalogProductsRequestStatusPreview,
+					product_catalog.ListPublicCatalogProductsRequestStatusGeneralAvailability,
+					product_catalog.ListPublicCatalogProductsRequestStatusEndOfNewFeatures,
+				},
 			},
 			scw.WithAllPages(),
 			scw.WithContext(ctx),
@@ -132,27 +137,6 @@ func serverTypeListBuilder(c *core.Command) *core.Command {
 		serverTypes := []*customServerType(nil)
 
 		for _, pcuServerType := range listServersTypesResponse.Products {
-			switch pcuServerType.Status {
-			case product_catalog.PublicCatalogProductStatusUnknownStatus:
-				continue
-			case product_catalog.PublicCatalogProductStatusPublicBeta:
-			case product_catalog.PublicCatalogProductStatusPreview:
-			case product_catalog.PublicCatalogProductStatusGeneralAvailability:
-			case product_catalog.PublicCatalogProductStatusEndOfNewFeatures:
-			case product_catalog.PublicCatalogProductStatusEndOfGrowth:
-				continue
-			case product_catalog.PublicCatalogProductStatusEndOfDeployment:
-				continue
-			case product_catalog.PublicCatalogProductStatusEndOfSupport:
-				continue
-			case product_catalog.PublicCatalogProductStatusEndOfSale:
-				continue
-			case product_catalog.PublicCatalogProductStatusEndOfLife:
-				continue
-			case product_catalog.PublicCatalogProductStatusRetired:
-				continue
-			}
-
 			name := pcuServerType.Properties.Instance.OfferID
 			serverType := &customServerType{
 				Name:        name,

internal/namespaces/instance/v1/helpers_types.go

@@ -121,6 +121,8 @@ func getEndOfServiceDate(
 			ProductTypes: []product_catalog.ListPublicCatalogProductsRequestProductType{
 				product_catalog.ListPublicCatalogProductsRequestProductTypeInstance,
 			},
+			Zone:   &zone,
+			APIIDs: []string{commercialType},
 		},
 		scw.WithAllPages(),
 		scw.WithContext(ctx),
@@ -129,12 +131,13 @@ func getEndOfServiceDate(
 		return "", fmt.Errorf("could not list product catalog entries: %w", err)
 	}
 
-	for _, product := range products.Products {
-		if product.Properties != nil && product.Properties.Instance != nil &&
-			product.Properties.Instance.OfferID == commercialType {
-			return product.EndOfLifeAt.Format(time.DateOnly), nil
-		}
+	if products.TotalCount != 1 {
+		return "", fmt.Errorf(
+			"expected exactly 1 PCU entry for %q, got %d",
+			commercialType,
+			products.TotalCount,
+		)
 	}
 
-	return "", fmt.Errorf("could not find product catalog entry for %q in %s", commercialType, zone)
+	return products.Products[0].EndOfLifeAt.Format(time.DateOnly), nil
 }