Skip to content
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

Fix the Unrecognized Client exception for China/ITAR tests #475

Merged
merged 5 commits into from
Mar 7, 2025
Merged

Fix the Unrecognized Client exception for China/ITAR tests #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
755e463
Unhardcode region for creating aws clients
varunch77 Mar 6, 2025
43006cc
Only run resource metric entity test if in us-west-2
varunch77 Mar 7, 2025
ab82fd2
Fix formatting
varunch77 Mar 7, 2025
33c0ab3
Add debugging
varunch77 Mar 7, 2025
645fa70
Remove debugging
varunch77 Mar 7, 2025
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
6 changes: 5 additions & 1 deletion test/metric_value_benchmark/metrics_value_benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ func getEc2TestRunners(env *environment.MetaData) []*test_runner.TestRunner {
{TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}},
{TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}},
{TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}},
{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}},
}

// Only add EntityMetricsTestRunner if in us-west-2 (we don't have access to ListEntitiesForMetric in CN/ITAR)
if env.Region == "us-west-2" {
ec2TestRunners = append(ec2TestRunners, &test_runner.TestRunner{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}})
}
}
return ec2TestRunners
Expand Down
9 changes: 8 additions & 1 deletion util/awsservice/constant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package awsservice
import (
"context"
"fmt"
"os"
"sync"
"time"

Expand Down Expand Up @@ -59,7 +60,13 @@ var (
func init() {
ctx = context.Background()

err := ConfigureAWSClients("us-west-2")
region := os.Getenv("AWS_REGION")
if region == "" {
// default to us-west-2
region = "us-west-2"
}

err := ConfigureAWSClients(region)
if err != nil {
fmt.Println("There was an error trying to configure the AWS clients: ", err)
}
Expand Down