Skip to content

Commit

Permalink
drop timestamp from price-gen
Browse files Browse the repository at this point in the history
  • Loading branch information
jmdeal committed Oct 9, 2023
1 parent 651cfe9 commit 6905671
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 15 deletions.
2 changes: 0 additions & 2 deletions hack/code/prices_gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ func main() {
license := lo.Must(os.ReadFile("hack/boilerplate.go.txt"))
fmt.Fprintln(src, string(license))
fmt.Fprintln(src, "package pricing")
fmt.Fprintln(src, `import "time"`)
now := time.Now().UTC().Format(time.RFC3339)
fmt.Fprintf(src, "// generated at %s for %s\n\n\n", now, region)
fmt.Fprintf(src, "var InitialPriceUpdateTime%s, _ = time.Parse(time.RFC3339, \"%s\")\n", getPartitionSuffix(opts.partition), now)
fmt.Fprintf(src, "var InitialOnDemandPrices%s = map[string]map[string]float64{\n", getPartitionSuffix(opts.partition))
// record prices for each region we are interested in
for _, region := range getAWSRegions(opts.partition) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/providers/pricing/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var _ = AfterEach(func() {
var _ = Describe("Pricing", func() {
DescribeTable(
"should return correct static data for all partitions",
func(staticPricing map[string]map[string]float64, updateTime time.Time) {
func(staticPricing map[string]map[string]float64) {
for region, prices := range staticPricing {
provider := pricing.NewProvider(ctx, awsEnv.PricingAPI, awsEnv.EC2API, region)
for instance, price := range prices {
Expand All @@ -95,9 +95,9 @@ var _ = Describe("Pricing", func() {
}
}
},
Entry("aws", pricing.InitialOnDemandPricesAWS, pricing.InitialPriceUpdateTimeAWS),
Entry("aws-us-gov", pricing.InitialOnDemandPricesUSGov, pricing.InitialPriceUpdateTimeUSGov),
Entry("aws-cn", pricing.InitialOnDemandPricesCN, pricing.InitialPriceUpdateTimeCN),
Entry("aws", pricing.InitialOnDemandPricesAWS),
Entry("aws-us-gov", pricing.InitialOnDemandPricesUSGov),
Entry("aws-cn", pricing.InitialOnDemandPricesCN),
)
It("should return static on-demand data if pricing API fails", func() {
awsEnv.PricingAPI.NextError.Set(fmt.Errorf("failed"))
Expand Down
3 changes: 0 additions & 3 deletions pkg/providers/pricing/zz_generated.pricing_aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ limitations under the License.

package pricing

import "time"

// generated at 2023-09-18T13:06:44Z for us-east-1

var InitialPriceUpdateTimeAWS, _ = time.Parse(time.RFC3339, "2023-09-18T13:06:44Z")
var InitialOnDemandPricesAWS = map[string]map[string]float64{
"us-east-1": {
// a1 family
Expand Down
3 changes: 0 additions & 3 deletions pkg/providers/pricing/zz_generated.pricing_aws_cn.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ limitations under the License.

package pricing

import "time"

// generated at 2023-09-18T13:06:44Z for cn-north-1

var InitialPriceUpdateTimeCN, _ = time.Parse(time.RFC3339, "2023-09-18T13:06:44Z")
var InitialOnDemandPricesCN = map[string]map[string]float64{
"cn-north-1": {
// c3 family
Expand Down
3 changes: 0 additions & 3 deletions pkg/providers/pricing/zz_generated.pricing_aws_us_gov.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ limitations under the License.

package pricing

import "time"

// generated at 2023-09-18T13:06:44Z for us-east-1

var InitialPriceUpdateTimeUSGov, _ = time.Parse(time.RFC3339, "2023-09-18T13:06:44Z")
var InitialOnDemandPricesUSGov = map[string]map[string]float64{
"us-gov-west-1": {
// c1 family
Expand Down

0 comments on commit 6905671

Please sign in to comment.