diff --git a/lib/integrations/awsoidc/deployservice_iam_config.go b/lib/integrations/awsoidc/deployservice_iam_config.go index a3e5c0964369a..3a59e6c9694b3 100644 --- a/lib/integrations/awsoidc/deployservice_iam_config.go +++ b/lib/integrations/awsoidc/deployservice_iam_config.go @@ -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" @@ -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 } @@ -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 } @@ -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 } @@ -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 } diff --git a/lib/integrations/awsoidc/eice_iam_config.go b/lib/integrations/awsoidc/eice_iam_config.go index 58703551888f7..70854b12f8f82 100644 --- a/lib/integrations/awsoidc/eice_iam_config.go +++ b/lib/integrations/awsoidc/eice_iam_config.go @@ -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" ) @@ -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 } diff --git a/lib/integrations/awsoidc/eks_iam_config.go b/lib/integrations/awsoidc/eks_iam_config.go index 413c4e5634154..ec5936769eb3f 100644 --- a/lib/integrations/awsoidc/eks_iam_config.go +++ b/lib/integrations/awsoidc/eks_iam_config.go @@ -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" ) @@ -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 } diff --git a/lib/integrations/awsoidc/idp_iam_config.go b/lib/integrations/awsoidc/idp_iam_config.go index ed54808bb93a5..27e1f3da91079 100644 --- a/lib/integrations/awsoidc/idp_iam_config.go +++ b/lib/integrations/awsoidc/idp_iam_config.go @@ -20,7 +20,6 @@ package awsoidc import ( "context" - "log" "net/url" "github.com/aws/aws-sdk-go-v2/aws" @@ -28,6 +27,7 @@ import ( "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" @@ -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}, @@ -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 } diff --git a/lib/integrations/awsoidc/listdatabases_iam_config.go b/lib/integrations/awsoidc/listdatabases_iam_config.go index bfe7cc2973503..2e10762624ac7 100644 --- a/lib/integrations/awsoidc/listdatabases_iam_config.go +++ b/lib/integrations/awsoidc/listdatabases_iam_config.go @@ -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" ) @@ -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") diff --git a/tool/teleport/common/teleport.go b/tool/teleport/common/teleport.go index 6e78629223eed..e1f1acf6dc79a 100644 --- a/tool/teleport/common/teleport.go +++ b/tool/teleport/common/teleport.go @@ -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" @@ -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) @@ -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) @@ -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) @@ -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) @@ -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")