Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit 82fc42f

Browse files
authored
add some logging for LROs (#633)
fixed some logging statements missing new-lines
1 parent c289830 commit 82fc42f

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

autorest/adal/token.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -800,13 +800,13 @@ func newServicePrincipalTokenFromMSI(msiEndpoint, resource, userAssignedID, iden
800800
}
801801
msiType, endpoint, err := getMSIType()
802802
if err != nil {
803-
logger.Instance.Writef(logger.LogError, "Error determining managed identity environment: %v", err)
803+
logger.Instance.Writef(logger.LogError, "Error determining managed identity environment: %v\n", err)
804804
return nil, err
805805
}
806-
logger.Instance.Writef(logger.LogInfo, "Managed identity environment is %s, endpoint is %s", msiType, endpoint)
806+
logger.Instance.Writef(logger.LogInfo, "Managed identity environment is %s, endpoint is %s\n", msiType, endpoint)
807807
if msiEndpoint != "" {
808808
endpoint = msiEndpoint
809-
logger.Instance.Writef(logger.LogInfo, "Managed identity custom endpoint is %s", endpoint)
809+
logger.Instance.Writef(logger.LogInfo, "Managed identity custom endpoint is %s\n", endpoint)
810810
}
811811
msiEndpointURL, err := url.Parse(endpoint)
812812
if err != nil {

autorest/azure/async.go

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"time"
2727

2828
"github.com/Azure/go-autorest/autorest"
29+
"github.com/Azure/go-autorest/logger"
2930
"github.com/Azure/go-autorest/tracing"
3031
)
3132

@@ -215,6 +216,7 @@ func (f *Future) WaitForCompletionRef(ctx context.Context, client autorest.Clien
215216
}
216217
// if the initial response has a Retry-After, sleep for the specified amount of time before starting to poll
217218
if delay, ok := f.GetPollingDelay(); ok {
219+
logger.Instance.Writeln(logger.LogInfo, "WaitForCompletionRef: initial polling delay")
218220
if delayElapsed := autorest.DelayForBackoff(delay, 0, cancelCtx.Done()); !delayElapsed {
219221
err = cancelCtx.Err()
220222
return
@@ -234,12 +236,14 @@ func (f *Future) WaitForCompletionRef(ctx context.Context, client autorest.Clien
234236
var ok bool
235237
delay, ok = f.GetPollingDelay()
236238
if !ok {
239+
logger.Instance.Writeln(logger.LogInfo, "WaitForCompletionRef: Using client polling delay")
237240
delay = client.PollingDelay
238241
}
239242
} else {
240243
// there was an error polling for status so perform exponential
241244
// back-off based on the number of attempts using the client's retry
242245
// duration. update attempts after delayAttempt to avoid off-by-one.
246+
logger.Instance.Writef(logger.LogError, "WaitForCompletionRef: %s\n", err)
243247
delayAttempt = attempts
244248
delay = client.RetryDuration
245249
attempts++

autorest/azure/azure.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (r Resource) String() string {
211211
}
212212

213213
// ParseResourceID parses a resource ID into a ResourceDetails struct.
214-
// See https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-template-functions-resource#return-value-4.
214+
// See https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-functions-resource?tabs=json#resourceid.
215215
func ParseResourceID(resourceID string) (Resource, error) {
216216

217217
const resourceIDPatternText = `(?i)subscriptions/(.+)/resourceGroups/(.+)/providers/(.+?)/(.+?)/(.+)`

autorest/sender.go

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"sync"
2727
"time"
2828

29+
"github.com/Azure/go-autorest/logger"
2930
"github.com/Azure/go-autorest/tracing"
3031
)
3132

@@ -438,6 +439,7 @@ func DelayForBackoffWithCap(backoff, cap time.Duration, attempt int, cancel <-ch
438439
if cap > 0 && d > cap {
439440
d = cap
440441
}
442+
logger.Instance.Writef(logger.LogInfo, "DelayForBackoffWithCap: sleeping for %s\n", d)
441443
select {
442444
case <-time.After(d):
443445
return true

0 commit comments

Comments
 (0)