Skip to content

refactor(azure,gcp): use common.HoursPerYear instead of 8760 literals #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristim merged 3 commits into from
Oct 20, 2026
Merged

refactor(azure,gcp): use common.HoursPerYear instead of 8760 literals #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c6c61
feat(common): add shared HoursPerYear constant
cristim Oct 20, 2026
a1598c2
refactor(azure,gcp): use common.HoursPerYear instead of 8760 literals
cristim Oct 20, 2026
e9f38c8
Merge branch 'main' into refactor/hours-per-year-constant
cristim Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/common/hours.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package common //nolint:revive // pkg/common is the module's core domain package; see breakeven.go

// HoursPerYear is the 365-day year length (24 * 365) used to convert a
// reservation term in years into billable hours.
const HoursPerYear = 8760.0
2 changes: 1 addition & 1 deletion providers/azure/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/search/armsearch v1.4.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/sql/armsql v1.2.0
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017001455-7383c3a7db7e
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4
github.com/stretchr/testify v1.11.1
golang.org/x/sync v0.23.0
)
Expand Down
4 changes: 2 additions & 2 deletions providers/azure/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJ
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017001455-7383c3a7db7e h1:SeuL9mqUKVNiDa4yXU9IdaKKlwNo/iaaDmDXMHClw+o=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017001455-7383c3a7db7e/go.mod h1:SCDEgHG6evjPh0RsoXof+J3aMmGXNFMrwbJIle7rMpQ=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4 h1:8ZnV+uLXITP5oTimNlsUsB0KMW5sf4JgEMKEO0DOTCs=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4/go.mod h1:SCDEgHG6evjPh0RsoXof+J3aMmGXNFMrwbJIle7rMpQ=
github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/cache/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ func (c *Client) getRedisPricing(ctx context.Context, sku, region string, termYe
return nil, err
}
return &RedisPricing{
HourlyRate: selected.RetailPrice / (8760 * float64(termYears)),
HourlyRate: selected.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: selected.RetailPrice,
Currency: selected.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/compute/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ func (c *Client) getVMPricing(ctx context.Context, vmSize, region string, termYe
}

return &VMPricing{
HourlyRate: item.RetailPrice / (8760.0 * float64(termYears)),
HourlyRate: item.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: item.RetailPrice,
Currency: item.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/cosmosdb/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ func (c *Client) getCosmosPricing(ctx context.Context, sku, region string, termY
}

return &CosmosPricing{
HourlyRate: selected.RetailPrice / (8760.0 * float64(termYears)),
HourlyRate: selected.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: selected.RetailPrice,
Currency: selected.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/database/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ func (c *Client) getSQLPricing(ctx context.Context, sku, region string, termYear
}

return &SQLPricing{
HourlyRate: reservation.RetailPrice / (8760.0 * float64(termYears)),
HourlyRate: reservation.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: reservation.RetailPrice,
Currency: reservation.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/managedredis/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ func (c *Client) getRedisPricing(ctx context.Context, sku, region string, termYe
return nil, err
}
return &RedisPricing{
HourlyRate: selected.RetailPrice / (8760 * float64(termYears)),
HourlyRate: selected.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: selected.RetailPrice,
Currency: selected.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/search/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ func (c *Client) getSearchPricing(ctx context.Context, sku, region string, termY
return nil, fmt.Errorf("azure search SKU %s in region %s: %w", sku, region, err)
}

hoursInTerm := 8760.0 * float64(termYears)
hoursInTerm := common.HoursPerYear * float64(termYears)
return &Pricing{
HourlyRate: selected.RetailPrice / hoursInTerm,
ReservationPrice: selected.RetailPrice,
Expand Down
2 changes: 1 addition & 1 deletion providers/azure/services/synapse/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ func (c *Client) getSynapsePricing(ctx context.Context, sku, region string, term
}

return &Pricing{
HourlyRate: selected.RetailPrice / (8760.0 * float64(termYears)),
HourlyRate: selected.RetailPrice / (common.HoursPerYear * float64(termYears)),
ReservationPrice: selected.RetailPrice,
Currency: selected.CurrencyCode,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion providers/gcp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
cloud.google.com/go/redis v1.18.3
cloud.google.com/go/resourcemanager v1.10.7
cloud.google.com/go/storage v1.59.2
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017012250-2bf23fbd8c2a
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4
github.com/googleapis/gax-go/v2 v2.21.0
github.com/stretchr/testify v1.11.1
golang.org/x/oauth2 v0.36.0
Expand Down
4 changes: 2 additions & 2 deletions providers/gcp/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.54.0/go.mod h1:vB2GH9GAYYJTO3mEn8oYwzEdhlayZIdQz6zdzgUIRvA=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 h1:s0WlVbf9qpvkh1c/uDAPElam0WrL7fHRIidgZJ7UqZI=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017012250-2bf23fbd8c2a h1:TggoJtZRb3MHRRhJ8Q1uu5SGGmhL1YbHiG08Xv9hqDw=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261017012250-2bf23fbd8c2a/go.mod h1:SCDEgHG6evjPh0RsoXof+J3aMmGXNFMrwbJIle7rMpQ=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4 h1:8ZnV+uLXITP5oTimNlsUsB0KMW5sf4JgEMKEO0DOTCs=
github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261020054349-66c6c61918d4/go.mod h1:SCDEgHG6evjPh0RsoXof+J3aMmGXNFMrwbJIle7rMpQ=
github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
Expand Down
4 changes: 1 addition & 3 deletions providers/gcp/services/computeengine/pricing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ const (
// computeServiceID is the Cloud Billing catalog service for Compute Engine.
computeServiceID = "services/6F81-5844-456A"

hoursPerYear = 8760.0

usageUnitHour = "h"
usageUnitGiBHour = "GiBy.h"

Expand Down Expand Up @@ -298,7 +296,7 @@ func (c *Client) getComputePricing(ctx context.Context, machineType, region stri
return nil, err
}

hours := hoursPerYear * float64(termYears)
hours := common.HoursPerYear * float64(termYears)
commitHourly := float64(res.vcpus)*rates.commitment.cpu + res.memoryGiB*rates.commitment.ram
onDemandHourly := float64(res.vcpus)*rates.onDemand.cpu + res.memoryGiB*rates.onDemand.ram

Expand Down
Loading