From 01b90f49b408252cd3caae034e3db10ae080848f Mon Sep 17 00:00:00 2001
From: Jeff <1830237+domainname@users.noreply.github.com>
Date: Thu, 28 Nov 2024 15:06:10 +0800
Subject: [PATCH 1/3] fix: Detect Failed operation during polling

---
 src/spring/azext_spring/app.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/spring/azext_spring/app.py b/src/spring/azext_spring/app.py
index 74c25941f55..9f8c45fd763 100644
--- a/src/spring/azext_spring/app.py
+++ b/src/spring/azext_spring/app.py
@@ -309,6 +309,11 @@ def app_update(cmd, client, resource_group, service, name,
     if no_wait:
         return
     wait_till_end(cmd, *pollers)
+
+    for p in pollers:
+        if p.status() == 'Failed':
+            raise p.result()
+
     return app_get(cmd, client, resource_group, service, name)
 
 

From d06e1adbccfad35ca031cb67f63a3347ff107852 Mon Sep 17 00:00:00 2001
From: Jeff <1830237+domainname@users.noreply.github.com>
Date: Thu, 28 Nov 2024 15:14:01 +0800
Subject: [PATCH 2/3] updatez

---
 src/spring/azext_spring/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/spring/azext_spring/app.py b/src/spring/azext_spring/app.py
index 9f8c45fd763..4503e1c1e47 100644
--- a/src/spring/azext_spring/app.py
+++ b/src/spring/azext_spring/app.py
@@ -311,7 +311,7 @@ def app_update(cmd, client, resource_group, service, name,
     wait_till_end(cmd, *pollers)
 
     for p in pollers:
-        if p.status() == 'Failed':
+        if p.status() == 'Failed' and isinstance(p.result(), Exception):
             raise p.result()
 
     return app_get(cmd, client, resource_group, service, name)

From 4057e706dced03434ca0896925d46a54a527d8fa Mon Sep 17 00:00:00 2001
From: Jeff <1830237+domainname@users.noreply.github.com>
Date: Fri, 29 Nov 2024 16:34:38 +0800
Subject: [PATCH 3/3] update history & version

---
 src/spring/HISTORY.md | 6 +++++-
 src/spring/setup.py   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/spring/HISTORY.md b/src/spring/HISTORY.md
index f1f49315c53..7c588a7414d 100644
--- a/src/spring/HISTORY.md
+++ b/src/spring/HISTORY.md
@@ -1,5 +1,9 @@
 Release History
 ===============
+1.26.1
+---
+* Fix command `az spring app update`, so that it can detect update failure and return error message.
+
 1.26.0
 ---
 * Remove `Preview` tag for config server features in Enterprise tier.
@@ -30,7 +34,7 @@ Release History
 
 1.24.1
 ---
-* Add command group `az spring private-dns-zone` to configure constumer private DNS zone with Azure Spring Apps.
+* Add command group `az spring private-dns-zone` to configure customer private DNS zone with Azure Spring Apps.
 * Add new command `az spring private-dns-zone add`,  `az spring private-dns-zone update` and `az spring private-dns-zone clean`
 
 1.24.0
diff --git a/src/spring/setup.py b/src/spring/setup.py
index 97b25f118a2..bf76d1caacb 100644
--- a/src/spring/setup.py
+++ b/src/spring/setup.py
@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '1.26.0'
+VERSION = '1.26.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers