Address comments

gravitational · Nov 16, 2024 · 94c1158 · 94c1158
1 parent 929666d
commit 94c1158
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/cloud/aws/config/config.go b/lib/cloud/aws/config/config.go
@@ -201,14 +201,14 @@ func getAWSConfigForRegion(ctx context.Context, region string, options awsOption
 			return aws.Config{}, trace.BadParameter("missing aws integration credential provider")
 		}
 
-		slog.DebugContext(ctx, "Initializing AWS config with integration.", "region", region, "integration", options.integration)
+		slog.DebugContext(ctx, "Initializing AWS config with integration", "region", region, "integration", options.integration)
 		var err error
 		cred, err = options.awsIntegrationCredentialsProvider(ctx, region, options.integration)
 		if err != nil {
 			return aws.Config{}, trace.Wrap(err)
 		}
 	} else {
-		slog.DebugContext(ctx, "Initializing AWS config from environment.", "region", region)
+		slog.DebugContext(ctx, "Initializing AWS config from environment", "region", region)
 	}
 
 	cfg, err := awsAmbientConfigProvider(region, cred, options)

diff --git a/lib/srv/discovery/discovery.go b/lib/srv/discovery/discovery.go
@@ -226,13 +226,13 @@ kubernetes matchers are present.`)
 				if err != nil {
 					return nil, trace.Wrap(err)
 				}
+				if integration.GetAWSOIDCIntegrationSpec() == nil {
+					return nil, trace.BadParameter("integration does not have aws oidc spec fields %q", integrationName)
+				}
 				token, err := c.AccessPoint.GenerateAWSOIDCToken(ctx, integrationName)
 				if err != nil {
 					return nil, trace.Wrap(err)
 				}
-				if integration.GetAWSOIDCIntegrationSpec() == nil {
-					return nil, trace.BadParameter("integration does not have aws oidc spec fields %q", integrationName)
-				}
 				cred, err := awsoidc.NewAWSCredentialsProvider(ctx, &awsoidc.AWSClientRequest{
 					Token:   token,
 					RoleARN: integration.GetAWSOIDCIntegrationSpec().RoleARN,

diff --git a/lib/srv/server/ec2_watcher_test.go b/lib/srv/server/ec2_watcher_test.go
@@ -40,7 +40,7 @@ type mockEC2Client struct {
 }
 
 func (m *mockEC2Client) DescribeInstances(ctx context.Context, input *ec2.DescribeInstancesInput, opts ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error) {
-	output := ec2.DescribeInstancesOutput{}
+	var output ec2.DescribeInstancesOutput
 	for _, res := range m.output.Reservations {
 		var instances []ec2types.Instance
 		for _, inst := range res.Instances {