fixing a broken reference

Azure · Sep 7, 2018 · a844567 · a844567
1 parent 391c25f
commit a844567
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/autorest/azure/async_test.go b/autorest/azure/async_test.go
@@ -793,10 +793,9 @@ func TestFuture_WaitForCompletion(t *testing.T) {
 	sender := mocks.NewSender()
 	sender.AppendAndRepeatResponse(r2, 2)
 	sender.AppendResponse(r3)
-	pollingDuration := autorest.DefaultPollingDuration
 	client := autorest.Client{
 		PollingDelay:    1 * time.Second,
-		PollingDuration: &pollingDuration,
+		PollingDuration: autorest.DefaultPollingDuration,
 		RetryAttempts:   autorest.DefaultRetryAttempts,
 		RetryDuration:   1 * time.Second,
 		Sender:          sender,
@@ -827,10 +826,9 @@ func TestFuture_WaitForCompletionRef(t *testing.T) {
 	sender := mocks.NewSender()
 	sender.AppendAndRepeatResponse(r2, 2)
 	sender.AppendResponse(r3)
-	pollingDuration := autorest.DefaultPollingDuration
 	client := autorest.Client{
 		PollingDelay:    1 * time.Second,
-		PollingDuration: &pollingDuration,
+		PollingDuration: autorest.DefaultPollingDuration,
 		RetryAttempts:   autorest.DefaultRetryAttempts,
 		RetryDuration:   1 * time.Second,
 		Sender:          sender,
@@ -865,10 +863,9 @@ func TestFuture_WaitForCompletionTimedOut(t *testing.T) {
 		t.Fatalf("failed to create future: %v", err)
 	}
 
-	pollingDuration := 2 * time.Second
 	client := autorest.Client{
 		PollingDelay:    autorest.DefaultPollingDelay,
-		PollingDuration: &pollingDuration,
+		PollingDuration: 2 * time.Second,
 		RetryAttempts:   autorest.DefaultRetryAttempts,
 		RetryDuration:   1 * time.Second,
 		Sender:          sender,
@@ -892,10 +889,9 @@ func TestFuture_WaitForCompletionRetriesExceeded(t *testing.T) {
 		t.Fatalf("failed to create future: %v", err)
 	}
 
-	pollingDuration := autorest.DefaultPollingDuration
 	client := autorest.Client{
 		PollingDelay:    autorest.DefaultPollingDelay,
-		PollingDuration: &pollingDuration,
+		PollingDuration: autorest.DefaultPollingDuration,
 		RetryAttempts:   autorest.DefaultRetryAttempts,
 		RetryDuration:   100 * time.Millisecond,
 		Sender:          sender,
@@ -918,10 +914,9 @@ func TestFuture_WaitForCompletionCancelled(t *testing.T) {
 		t.Fatalf("failed to create future: %v", err)
 	}
 
-	pollingDuration := autorest.DefaultPollingDuration
 	client := autorest.Client{
 		PollingDelay:    autorest.DefaultPollingDelay,
-		PollingDuration: &pollingDuration,
+		PollingDuration: autorest.DefaultPollingDuration,
 		RetryAttempts:   autorest.DefaultRetryAttempts,
 		RetryDuration:   autorest.DefaultRetryDuration,
 		Sender:          sender,

diff --git a/autorest/azure/rp.go b/autorest/azure/rp.go
@@ -141,7 +141,7 @@ func register(client autorest.Client, originalReq *http.Request, re RequestError
 
 	// poll for registered provisioning state
 	registrationStartTime := time.Now()
-	for err == nil && (client.PollingDuration == nil || (client.PollingDuration != nil && time.Since(registrationStartTime) < *client.PollingDuration)) {
+	for err == nil && (client.PollingDuration == 0 || (client.PollingDuration != 0 && time.Since(registrationStartTime) < client.PollingDuration)) {
 		// taken from the resources SDK
 		// https://github.com/Azure/azure-sdk-for-go/blob/9f366792afa3e0ddaecdc860e793ba9d75e76c27/arm/resources/resources/providers.go#L45
 		preparer := autorest.CreatePreparer(
@@ -183,7 +183,7 @@ func register(client autorest.Client, originalReq *http.Request, re RequestError
 			return originalReq.Context().Err()
 		}
 	}
-	if client.PollingDuration != nil && !(time.Since(registrationStartTime) < *client.PollingDuration) {
+	if client.PollingDuration != 0 && !(time.Since(registrationStartTime) < client.PollingDuration) {
 		return errors.New("polling for resource provider registration has exceeded the polling duration")
 	}
 	return err

diff --git a/autorest/azure/rp_test.go b/autorest/azure/rp_test.go
@@ -59,11 +59,10 @@ func TestDoRetryWithRegistration(t *testing.T) {
 
 	req := mocks.NewRequestForURL("https://lol/subscriptions/rofl")
 	req.Body = mocks.NewBody("lolol")
-	pollingDuration := time.Second * 10
 	r, err := autorest.SendWithSender(client, req,
 		DoRetryWithRegistration(autorest.Client{
 			PollingDelay:    time.Second,
-			PollingDuration: &pollingDuration,
+			PollingDuration: time.Second * 10,
 			RetryAttempts:   5,
 			RetryDuration:   time.Second,
 			Sender:          client,
@@ -104,11 +103,10 @@ func TestDoRetrySkipRegistration(t *testing.T) {
 
 	req := mocks.NewRequestForURL("https://lol/subscriptions/rofl")
 	req.Body = mocks.NewBody("lolol")
-	pollingDuration := time.Second * 10
 	r, err := autorest.SendWithSender(client, req,
 		DoRetryWithRegistration(autorest.Client{
 			PollingDelay:    time.Second,
-			PollingDuration: &pollingDuration,
+			PollingDuration: time.Second * 10,
 			RetryAttempts:   5,
 			RetryDuration:   time.Second,
 			Sender:          client,
@@ -149,7 +147,7 @@ func TestDoRetryWithRegistration_CanBeCancelled(t *testing.T) {
 		_, err = autorest.SendWithSender(client, req,
 			DoRetryWithRegistration(autorest.Client{
 				PollingDelay:    time.Second,
-				PollingDuration: &delay,
+				PollingDuration: delay,
 				RetryAttempts:   5,
 				RetryDuration:   time.Second,
 				Sender:          client,

diff --git a/autorest/client.go b/autorest/client.go
@@ -175,10 +175,9 @@ type Client struct {
 // NewClientWithUserAgent returns an instance of a Client with the UserAgent set to the passed
 // string.
 func NewClientWithUserAgent(ua string) Client {
-	pollingDuration := DefaultPollingDuration
 	c := Client{
 		PollingDelay:    DefaultPollingDelay,
-		PollingDuration: &pollingDuration,
+		PollingDuration: DefaultPollingDuration,
 		RetryAttempts:   DefaultRetryAttempts,
 		RetryDuration:   DefaultRetryDuration,
 		UserAgent:       defaultUserAgent,