Use case-insensitive comparison for success case (Azure#17773)

* Use case-insensitive comparison for success case * update test
azure-sdk · Apr 29, 2022 · a516802 · a516802
1 parent bf5fa70
commit a516802
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/sdk/azcore/internal/pollers/armloc/loc.go b/sdk/azcore/internal/pollers/armloc/loc.go
@@ -62,7 +62,7 @@ func (p *Poller) URL() string {
 
 // State returns the current state of the LRO.
 func (p *Poller) State() pollers.OperationState {
-	if p.CurState == pollers.StatusSucceeded {
+	if pollers.Succeeded(p.CurState) {
 		return pollers.OperationStateSucceeded
 	} else if pollers.IsTerminalState(p.CurState) {
 		return pollers.OperationStateFailed

diff --git a/sdk/azcore/internal/pollers/async/async.go b/sdk/azcore/internal/pollers/async/async.go
@@ -87,7 +87,7 @@ func New(resp *http.Response, finalState pollers.FinalStateVia, pollerID string)
 
 // State returns the current state of the LRO.
 func (p *Poller) State() pollers.OperationState {
-	if p.CurState == pollers.StatusSucceeded {
+	if pollers.Succeeded(p.CurState) {
 		return pollers.OperationStateSucceeded
 	} else if pollers.IsTerminalState(p.CurState) {
 		return pollers.OperationStateFailed

diff --git a/sdk/azcore/internal/pollers/body/body.go b/sdk/azcore/internal/pollers/body/body.go
@@ -75,7 +75,7 @@ func (p *Poller) URL() string {
 
 // State returns the current state of the LRO.
 func (p *Poller) State() pollers.OperationState {
-	if p.CurState == pollers.StatusSucceeded {
+	if pollers.Succeeded(p.CurState) {
 		return pollers.OperationStateSucceeded
 	} else if pollers.IsTerminalState(p.CurState) {
 		return pollers.OperationStateFailed

diff --git a/sdk/azcore/internal/pollers/op/op.go b/sdk/azcore/internal/pollers/op/op.go
@@ -83,7 +83,7 @@ func (p *Poller) URL() string {
 
 // State returns the current state of the LRO.
 func (p *Poller) State() pollers.OperationState {
-	if p.CurState == pollers.StatusSucceeded {
+	if pollers.Succeeded(p.CurState) {
 		return pollers.OperationStateSucceeded
 	} else if pollers.IsTerminalState(p.CurState) {
 		return pollers.OperationStateFailed

diff --git a/sdk/azcore/internal/pollers/op/op_test.go b/sdk/azcore/internal/pollers/op/op_test.go
@@ -167,7 +167,7 @@ func TestUpdateSucceeded(t *testing.T) {
 	if u := poller.URL(); u != fakePollingURL2 {
 		t.Fatalf("unexpected URL %s", u)
 	}
-	resp = createResponse(strings.NewReader(`{ "status": "Succeeded" }`))
+	resp = createResponse(strings.NewReader(`{ "status": "succeeded" }`))
 	if err := poller.Update(resp); err != nil {
 		t.Fatal(err)
 	}
@@ -184,7 +184,7 @@ func TestUpdateResourceLocation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	resp = createResponse(strings.NewReader(`{ "status": "Succeeded", "resourceLocation": "https://foo.bar.baz/resource2" }`))
+	resp = createResponse(strings.NewReader(`{ "status": "succeeded", "resourceLocation": "https://foo.bar.baz/resource2" }`))
 	if err := poller.Update(resp); err != nil {
 		t.Fatal(err)
 	}

diff --git a/sdk/azcore/internal/pollers/util.go b/sdk/azcore/internal/pollers/util.go
@@ -78,6 +78,11 @@ func Failed(s string) bool {
 	return strings.EqualFold(s, StatusFailed) || strings.EqualFold(s, StatusCanceled)
 }
 
+// Succeeded returns true if the LRO's state is terminal success.
+func Succeeded(s string) bool {
+	return strings.EqualFold(s, StatusSucceeded)
+}
+
 // returns true if the LRO response contains a valid HTTP status code
 func StatusCodeValid(resp *http.Response) bool {
 	return exported.HasStatusCode(resp, http.StatusOK, http.StatusAccepted, http.StatusCreated, http.StatusNoContent)