From ccce957d7e4bc1357559b361d4b219872ba57739 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Jun 2023 14:31:18 -0700
Subject: Azure CLI: Compatibility with Debian `bookworm` (#578)

* add flag

* try to install via apt version of pipx (will only work on bookworm)

* _REMOTE_USER aware

* dont change more than you need to,josh

* increment azure-cli minor version (v1.1.0)

* install globally

* make sure env variables are in scope
---
 test/azure-cli/install_bicep.sh               |  2 ++
 test/azure-cli/install_extensions.sh          |  2 ++
 test/azure-cli/install_extensions_bookworm.sh |  8 ++++++++
 test/azure-cli/scenarios.json                 | 10 ++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 test/azure-cli/install_extensions_bookworm.sh

(limited to 'test/azure-cli')

diff --git a/test/azure-cli/install_bicep.sh b/test/azure-cli/install_bicep.sh
index 955507f..0430c64 100644
--- a/test/azure-cli/install_bicep.sh
+++ b/test/azure-cli/install_bicep.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Check to make sure the user is vscode
 check "user is vscode" whoami | grep vscode
 
+check "version" az  --version
+
 # Bicep-specific tests
 check "bicep" bicep --version
 check "az bicep" az bicep version
diff --git a/test/azure-cli/install_extensions.sh b/test/azure-cli/install_extensions.sh
index 1e66e26..58d1cff 100644
--- a/test/azure-cli/install_extensions.sh
+++ b/test/azure-cli/install_extensions.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Check to make sure the user is vscode
 check "user is vscode" whoami | grep vscode
 
+check "version" az  --version
+
 # Extension-specific tests
 check "aks-preview" az extension show --name aks-preview
 check "amg" az extension show --name amg
diff --git a/test/azure-cli/install_extensions_bookworm.sh b/test/azure-cli/install_extensions_bookworm.sh
new file mode 100644
index 0000000..3c281e6
--- /dev/null
+++ b/test/azure-cli/install_extensions_bookworm.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+./install_extensions.sh
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index cc1fd75..2313452 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -9,6 +9,16 @@
       }
     }
   },
+  "install_extensions_bookworm": {
+    "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "extensions": "aks-preview,amg,containerapp"
+      }
+    }
+  },
   "install_bicep": {
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "user": "vscode",
-- 
cgit v1.2.3