Skip to content

[v15] Fix logging output for teleport configure commands. (#38257) #38508

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
AntonAM merged 1 commit into from
Feb 21, 2024
Merged

[v15] Fix logging output for teleport configure commands. (#38257) #38508

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
10 changes: 5 additions & 5 deletions lib/integrations/awsoidc/deployservice_iam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ package awsoidc

import (
"context"
"log"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/gravitational/trace"
"github.com/sirupsen/logrus"

awsapiutils "github.com/gravitational/teleport/api/utils/aws"
awslib "github.com/gravitational/teleport/lib/cloud/aws"
Expand Down Expand Up @@ -245,7 +245,7 @@ func createBoundaryPolicyForTaskRole(ctx context.Context, clt DeployServiceIAMCo
return trace.Wrap(convertedErr)
}

log.Printf("TaskRole: Boundary Policy %q created.\n", req.TaskRoleBoundaryPolicyName)
logrus.Infof("TaskRole: Boundary Policy %q created.\n", req.TaskRoleBoundaryPolicyName)
return nil
}

Expand Down Expand Up @@ -275,7 +275,7 @@ func createTaskRole(ctx context.Context, clt DeployServiceIAMConfigureClient, re
return trace.Wrap(convertedErr)
}

log.Printf("TaskRole: Role %q created with Boundary %q.\n", req.TaskRole, policyARNForRoleBoundary)
logrus.Infof("TaskRole: Role %q created with Boundary %q.\n", req.TaskRole, policyARNForRoleBoundary)
return nil
}

Expand All @@ -302,7 +302,7 @@ func addPolicyToTaskRole(ctx context.Context, clt DeployServiceIAMConfigureClien
return trace.Wrap(err)
}

log.Printf("TaskRole: IAM Policy %q added to Role %q.\n", req.TaskRole, req.TaskRole)
logrus.Infof("TaskRole: IAM Policy %q added to Role %q.\n", req.TaskRole, req.TaskRole)
return nil
}

Expand Down Expand Up @@ -331,6 +331,6 @@ func addPolicyToIntegrationRole(ctx context.Context, clt DeployServiceIAMConfigu
return trace.Wrap(err)
}

log.Printf("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleDeployServicePolicy, req.IntegrationRole)
logrus.Infof("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleDeployServicePolicy, req.IntegrationRole)
return nil
}
4 changes: 2 additions & 2 deletions lib/integrations/awsoidc/eice_iam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package awsoidc

import (
"context"
"log"

"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/gravitational/trace"
"github.com/sirupsen/logrus"

awslib "github.com/gravitational/teleport/lib/cloud/aws"
)
Expand Down Expand Up @@ -142,6 +142,6 @@ func ConfigureEICEIAM(ctx context.Context, clt EICEIAMConfigureClient, req EICEI
return trace.Wrap(err)
}

log.Printf("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleEICEPolicy, req.IntegrationRole)
logrus.Infof("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleEICEPolicy, req.IntegrationRole)
return nil
}
4 changes: 2 additions & 2 deletions lib/integrations/awsoidc/eks_iam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package awsoidc

import (
"context"
"log"

"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/gravitational/trace"
"github.com/sirupsen/logrus"

awslib "github.com/gravitational/teleport/lib/cloud/aws"
)
Expand Down Expand Up @@ -129,6 +129,6 @@ func ConfigureEKSIAM(ctx context.Context, clt EKSIAMConfigureClient, req EKSIAMC
return trace.Wrap(err)
}

log.Printf("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleEKSPolicy, req.IntegrationRole)
logrus.Infof("IntegrationRole: IAM Policy %q added to Role %q\n", req.IntegrationRoleEKSPolicy, req.IntegrationRole)
return nil
}
8 changes: 4 additions & 4 deletions lib/integrations/awsoidc/idp_iam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ package awsoidc

import (
"context"
"log"
"net/url"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/gravitational/trace"
"github.com/sirupsen/logrus"

"github.com/gravitational/teleport/api/types"
awslib "github.com/gravitational/teleport/lib/cloud/aws"
Expand Down Expand Up @@ -158,7 +158,7 @@ func ConfigureIdPIAM(ctx context.Context, clt IdPIAMConfigureClient, req IdPIAMC
if err != nil {
return trace.Wrap(err)
}
log.Printf("Using the following thumbprint: %s", thumbprint)
logrus.Infof("Using the following thumbprint: %s", thumbprint)

createOIDCResp, err := clt.CreateOpenIDConnectProvider(ctx, &iam.CreateOpenIDConnectProviderInput{
ThumbprintList: []string{thumbprint},
Expand All @@ -172,13 +172,13 @@ func ConfigureIdPIAM(ctx context.Context, clt IdPIAMConfigureClient, req IdPIAMC
}
return trace.Wrap(err)
}
log.Printf("IAM OpenID Connect Provider created: url=%q arn=%q.", req.ProxyPublicAddress, aws.ToString(createOIDCResp.OpenIDConnectProviderArn))
logrus.Infof("IAM OpenID Connect Provider created: url=%q arn=%q.", req.ProxyPublicAddress, aws.ToString(createOIDCResp.OpenIDConnectProviderArn))

createdIdpIAMRoleArn, err := createIdPIAMRole(ctx, clt, req)
if err != nil {
return trace.Wrap(err)
}
log.Printf("IAM Role created: name=%q arn=%q", req.IntegrationRole, aws.ToString(createdIdpIAMRoleArn))
logrus.Infof("IAM Role created: name=%q arn=%q", req.IntegrationRole, aws.ToString(createdIdpIAMRoleArn))

return nil
}
Expand Down
4 changes: 2 additions & 2 deletions lib/integrations/awsoidc/listdatabases_iam_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/gravitational/trace"
log "github.com/sirupsen/logrus"
"github.com/sirupsen/logrus"

awslib "github.com/gravitational/teleport/lib/cloud/aws"
)
Expand Down Expand Up @@ -93,7 +93,7 @@ func ConfigureListDatabasesIAM(ctx context.Context, clt ListDatabasesIAMConfigur
return trace.Wrap(err)
}

log.WithFields(log.Fields{
logrus.WithFields(logrus.Fields{
"policy": defaultPolicyNameForListDatabases,
"role": req.IntegrationRole,
}).Info("Added Inline Policy to IAM Role")
Expand Down
15 changes: 13 additions & 2 deletions tool/teleport/common/teleport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/gravitational/trace"
log "github.com/sirupsen/logrus"
"golang.org/x/exp/maps"

"github.com/gravitational/teleport"
Expand Down Expand Up @@ -952,6 +951,9 @@ func onJoinOpenSSH(clf config.CommandLineFlags, conf *servicecfg.Config) error {
func onIntegrationConfDeployService(params config.IntegrationConfDeployServiceIAM) error {
ctx := context.Background()

// Ensure we print output to the user. LogLevel at this point was set to Error.
utils.InitLogger(utils.LoggingForDaemon, slog.LevelInfo)

iamClient, err := awsoidc.NewDeployServiceIAMConfigureClient(ctx, params.Region)
if err != nil {
return trace.Wrap(err)
Expand All @@ -974,6 +976,9 @@ func onIntegrationConfDeployService(params config.IntegrationConfDeployServiceIA
func onIntegrationConfEICEIAM(params config.IntegrationConfEICEIAM) error {
ctx := context.Background()

// Ensure we print output to the user. LogLevel at this point was set to Error.
utils.InitLogger(utils.LoggingForDaemon, slog.LevelInfo)

iamClient, err := awsoidc.NewEICEIAMConfigureClient(ctx, params.Region)
if err != nil {
return trace.Wrap(err)
Expand All @@ -993,6 +998,9 @@ func onIntegrationConfEICEIAM(params config.IntegrationConfEICEIAM) error {
func onIntegrationConfEKSIAM(params config.IntegrationConfEKSIAM) error {
ctx := context.Background()

// Ensure we print output to the user. LogLevel at this point was set to Error.
utils.InitLogger(utils.LoggingForDaemon, slog.LevelInfo)

iamClient, err := awsoidc.NewEKSIAMConfigureClient(ctx, params.Region)
if err != nil {
return trace.Wrap(err)
Expand All @@ -1012,6 +1020,9 @@ func onIntegrationConfEKSIAM(params config.IntegrationConfEKSIAM) error {
func onIntegrationConfAWSOIDCIdP(params config.IntegrationConfAWSOIDCIdP) error {
ctx := context.Background()

// Ensure we print output to the user. LogLevel at this point was set to Error.
utils.InitLogger(utils.LoggingForDaemon, slog.LevelInfo)

iamClient, err := awsoidc.NewIdPIAMConfigureClient(ctx)
if err != nil {
return trace.Wrap(err)
Expand All @@ -1035,7 +1046,7 @@ func onIntegrationConfListDatabasesIAM(params config.IntegrationConfListDatabase

// Ensure we show progress to the user.
// LogLevel at this point is set to Error.
log.SetLevel(log.InfoLevel)
utils.InitLogger(utils.LoggingForDaemon, slog.LevelInfo)

if params.Region == "" {
return trace.BadParameter("region is required")
Expand Down