From 3558e354f19e1739980853d23c8d70ad2f21370f Mon Sep 17 00:00:00 2001 From: Brian Terry Date: Mon, 25 Jul 2022 20:46:35 -0700 Subject: [PATCH 1/2] CW client creds refresh --- cfn/cfn.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cfn/cfn.go b/cfn/cfn.go index bb69385b..9659c60e 100644 --- a/cfn/cfn.go +++ b/cfn/cfn.go @@ -89,19 +89,19 @@ func makeEventFunc(h Handler) eventFunc { return func(ctx context.Context, event *event) (response, error) { ps := credentials.SessionFromCredentialsProvider(&event.RequestData.ProviderCredentials) m := metrics.New(cloudwatch.New(ps), event.ResourceType) - once.Do(func() { - l, err := logging.NewCloudWatchLogsProvider( - cloudwatchlogs.New(ps), - event.RequestData.ProviderLogGroupName, - ) - if err != nil { - log.Printf("Error: %v, Logging to Stdout", err) - m.PublishExceptionMetric(time.Now(), event.Action, err) - l = os.Stdout - } - // Set default logger to output to CWL in the provider account - logging.SetProviderLogOutput(l) - }) + + l, err := logging.NewCloudWatchLogsProvider( + cloudwatchlogs.New(ps), + event.RequestData.ProviderLogGroupName, + ) + if err != nil { + log.Printf("Error: %v, Logging to Stdout", err) + m.PublishExceptionMetric(time.Now(), event.Action, err) + l = os.Stdout + } + // Set default logger to output to CWL in the provider account + logging.SetProviderLogOutput(l) + re := newReportErr(m) if err := scrubFiles("/tmp"); err != nil { log.Printf("Error: %v", err) From 1c09841dab79e8ee6234d683169a19c4a7186a70 Mon Sep 17 00:00:00 2001 From: Brian Terry Date: Tue, 2 Aug 2022 07:52:25 -0700 Subject: [PATCH 2/2] fix var --- cfn/cfn.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cfn/cfn.go b/cfn/cfn.go index 9659c60e..a8fbec6b 100644 --- a/cfn/cfn.go +++ b/cfn/cfn.go @@ -3,6 +3,7 @@ package cfn import ( "context" "errors" + "io" "io/ioutil" "log" "os" @@ -87,6 +88,8 @@ type handlerFunc func(request handler.Request) handler.ProgressEvent // MakeEventFunc is the entry point to all invocations of a custom resource func makeEventFunc(h Handler) eventFunc { return func(ctx context.Context, event *event) (response, error) { + var l io.Writer + ps := credentials.SessionFromCredentialsProvider(&event.RequestData.ProviderCredentials) m := metrics.New(cloudwatch.New(ps), event.ResourceType)