Skip to content

Handle pricing api change in aws-sdk-go 1.44.46 #140

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2022
Merged

Handle pricing api change in aws-sdk-go 1.44.46 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/aws/amazon-ec2-instance-selector/v2
go 1.18

require (
github.com/aws/aws-sdk-go v1.43.31
github.com/aws/aws-sdk-go v1.44.51
github.com/blang/semver/v4 v4.0.0
github.com/imdario/mergo v0.3.11
github.com/mitchellh/go-homedir v1.1.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/aws/aws-sdk-go v1.43.31 h1:yJZIr8nMV1hXjAvvOLUFqZRJcHV7udPQBfhJqawDzI0=
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.51 h1:jO9hoLynZOrMM4dj0KjeKIK+c6PA+HQbKoHOkAEye2Y=
github.com/aws/aws-sdk-go v1.44.51/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
Expand Down
2 changes: 1 addition & 1 deletion pkg/ec2pricing/ec2pricing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func setupMock(t *testing.T, api string, file string) mockedPricing {
err = json.Unmarshal(mockFile, &productsMap)
h.Assert(t, err == nil, "Error parsing mock json file contents "+mockFilename)
productsOutput := pricing.GetProductsOutput{
PriceList: []aws.JSONValue{productsMap},
PriceList: []*string{aws.String(string(mockFile))},
}
return mockedPricing{
GetProductsPagesResp: productsOutput,
Expand Down
6 changes: 5 additions & 1 deletion pkg/ec2pricing/odpricing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,14 @@ func (c *OnDemandPricing) getRegionForPricingAPI() string {
}

// parseOndemandUnitPrice takes a priceList from the pricing API and parses its weirdness
func (c *OnDemandPricing) parseOndemandUnitPrice(priceList aws.JSONValue) (string, float64, error) {
func (c *OnDemandPricing) parseOndemandUnitPrice(priceDoc *string) (string, float64, error) {
// TODO: this could probably be cleaned up a bit by adding a couple structs with json tags
// We still need to some weird for-loops to get at elements under json keys that are IDs...
// But it would probably be cleaner than this.
var priceList map[string]interface{}
if err := json.Unmarshal([]byte(*priceDoc), &priceList); err != nil {
return "", float64(-1.0), fmt.Errorf("unable to deserialize pricing doc")
}
attributes, ok := priceList["product"].(map[string]interface{})["attributes"]
if !ok {
return "", float64(-1.0), fmt.Errorf("unable to find product attributes")
Expand Down