From ff265afe9e45347fee5bef57bc55f32daba62cef Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Wed, 16 Oct 2024 23:24:05 +0000 Subject: [PATCH 1/3] Fixing regression for persistSettings() which is trying to read values after an error. --- cli/azd/pkg/containerapps/container_app.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/azd/pkg/containerapps/container_app.go b/cli/azd/pkg/containerapps/container_app.go index 8edd230b8cc..5fa75fff6fc 100644 --- a/cli/azd/pkg/containerapps/container_app.go +++ b/cli/azd/pkg/containerapps/container_app.go @@ -146,6 +146,7 @@ func (cas *containerAppService) persistSettings( aca, err := cas.getContainerApp(ctx, subscriptionId, resourceGroupName, appName, options) if err != nil { log.Printf("failed getting current aca settings: %v. No settings will be persisted.", err) + return obj, nil } objConfig := config.NewConfig(obj) From 3c7c71413231d08444fd583137802142c55e291c Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Thu, 17 Oct 2024 00:07:38 +0000 Subject: [PATCH 2/3] comment --- cli/azd/pkg/containerapps/container_app.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/azd/pkg/containerapps/container_app.go b/cli/azd/pkg/containerapps/container_app.go index 5fa75fff6fc..5303a408de6 100644 --- a/cli/azd/pkg/containerapps/container_app.go +++ b/cli/azd/pkg/containerapps/container_app.go @@ -146,6 +146,8 @@ func (cas *containerAppService) persistSettings( aca, err := cas.getContainerApp(ctx, subscriptionId, resourceGroupName, appName, options) if err != nil { log.Printf("failed getting current aca settings: %v. No settings will be persisted.", err) + // if the container app doesn't exist, there's nothing for us to update in the desired state, + // so we can just return the existing state as is. return obj, nil } From 00bd1cffda81711bfabdf289a3f1289ce6aca563 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Thu, 17 Oct 2024 00:19:08 +0000 Subject: [PATCH 3/3] cl --- cli/azd/CHANGELOG.md | 8 ++------ cli/version.txt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md index bcc6eb60143..e0f7c334361 100644 --- a/cli/azd/CHANGELOG.md +++ b/cli/azd/CHANGELOG.md @@ -1,14 +1,10 @@ # Release History -## 1.11.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes +## 1.10.3 (2024-10-16) ### Bugs Fixed -### Other Changes +- [[4450]](https://github.com/Azure/azure-dev/pull/4450) fix `persistSettings` alpha feature. ## 1.10.2 (2024-10-08) diff --git a/cli/version.txt b/cli/version.txt index 3d7793563cc..587c5f0c730 100644 --- a/cli/version.txt +++ b/cli/version.txt @@ -1 +1 @@ -1.11.0-beta.1 +1.10.3