Merge branch 'master' into azure-spring-apps

pulumi · Oct 25, 2022 · 9e1e1c2 · 9e1e1c2
2 parents aafc6be + d398079
commit 9e1e1c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
     - azure-native:appplatform:ConfigServer
     - azure-native:appplatform:MonitoringSetting
 
+## 1.83.1 (2022-10-25)
+
+- Fix panic when validating `az` CLI version [#2049](https://github.com/pulumi/pulumi-azure-native/pull/2049)
+
 ## 1.83.0 (2022-10-24)
 
 - Upgrade to latest version of Azure Rest API Specs.

diff --git a/provider/pkg/provider/provider.go b/provider/pkg/provider/provider.go
@@ -1741,7 +1741,7 @@ func getAzVersion() (*goversion.Version, error) {
 	var azVersion struct {
 		Cli string `json:"azure-cli"`
 	}
-	err = runAzCmd(&azVersion, "version")
+	err = runAzCmd(&azVersion, "version", "--output", "json")
 	if err != nil {
 		return nil, fmt.Errorf("could not determine az version: %w", err)
 	}