Skip to content

Commit 8f1ab5c

Browse files
authored
fix(instance): EoS warning: filter product list by offer_id (#3203)
* fix(instance): EoS warning: filter product list by offer_id * record baremetal TestAccServer_WithIPAMPrivateNetwork test
1 parent fd6e880 commit 8f1ab5c

File tree

3 files changed

+1648
-1504
lines changed

3 files changed

+1648
-1504
lines changed

internal/services/baremetal/testdata/server-with-ipam-private-network.cassette.yaml

Lines changed: 1637 additions & 1488 deletions
Large diffs are not rendered by default.

internal/services/instance/server.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,10 +1407,6 @@ func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDif
14071407
// the image with another tool.
14081408
marketplaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m))
14091409

1410-
if err != nil {
1411-
return err
1412-
}
1413-
14141410
marketplaceImage, err := marketplaceAPI.GetLocalImage(&marketplace.GetLocalImageRequest{
14151411
LocalImageID: server.Server.Image.ID,
14161412
}, scw.WithContext(ctx))
@@ -1613,10 +1609,9 @@ func GetEndOfServiceDate(ctx context.Context, client *scw.Client, zone scw.Zone,
16131609
}
16141610

16151611
for _, product := range products.Products {
1616-
if strings.HasPrefix(product.Product, commercialType) {
1617-
if product.Locality.Zone != nil && *product.Locality.Zone == zone {
1618-
return product.EndOfLifeAt.Format(time.DateOnly), nil
1619-
}
1612+
if product.Properties != nil && product.Properties.Instance != nil &&
1613+
product.Properties.Instance.OfferID == commercialType {
1614+
return product.EndOfLifeAt.Format(time.DateOnly), nil
16201615
}
16211616
}
16221617

internal/services/instance/testdata/test-get-end-of-service-date.cassette.yaml

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)