Require cost acknowledgement for Standard and Premium APIM SKUs, add SKU compatibility matrix (#153)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: simonkurtz-MSFT <84809797+simonkurtz-MSFT@users.noreply.github.com>
Co-authored-by: Simon Kurtz <simonkurtz@microsoft.com>

Author: Copilot

.vscode/extensions.json

@@ -9,7 +9,6 @@
         "ms-azuretools.vscode-bicep",
         "ms-vscode.azurecli",
         "charliermarsh.ruff",
-        "GitHub.copilot",
         "GitHub.copilot-chat",
         "donjayamanne.vscode-default-python-kernel"
     ]

README.md

@@ -73,12 +73,14 @@ It's quick and easy to get started!
 | [Secure Blob Access][sample-secure-blob-access]             | Secure blob access via the [valet key pattern][valet-key-pattern].                                                  | All infrastructures           |
 </details>
 
-### Compatibility Matrix
+### Compatibility Matrices
 
-Most samples work with all infrastructures, making this a truly _a la carte_ experience. The diagram below shows which samples are compatible with which infrastructures.
+Most samples work with all infrastructures, making this a truly _a la carte_ experience. The diagrams below show which samples are compatible with which infrastructures, and which APIM SKUs each infrastructure supports.
 
 <img src="./assets/diagrams/Infrastructure-Sample-Compatibility.svg" alt="Infrastructure and Sample Compatibility Matrix" title="Infrastructure and Sample Compatibility Matrix" />
 
+<img src="./assets/diagrams/Infrastructure-SKU-Compatibility.svg" alt="Infrastructure and SKU Compatibility Matrix" title="Infrastructure and SKU Compatibility Matrix" />
+
 
 ## 🧰 APIM Samples Developer CLI
 

assets/diagrams/Infrastructure-SKU-Compatibility.svg

@@ -27,7 +27,7 @@
     "\n",
     "rg_location = Region.EAST_US_2      # Azure region for deployment\n",
     "index       = 1                     # Infrastructure index (use different numbers for multiple environments)\n",
-    "apim_sku    = APIM_SKU.BASICV2      # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2      # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "\n",
     "\n",
     "\n",

infrastructure/apim-aca/create.ipynb

@@ -29,7 +29,7 @@
     "\n",
     "rg_location = Region.EAST_US_2      # Azure region for deployment\n",
     "index       = 1                     # Infrastructure index (use different numbers for multiple environments)\n",
-    "apim_sku    = APIM_SKU.DEVELOPER    # Options: 'DEVELOPER'\n",
+    "apim_sku    = APIM_SKU.DEVELOPER    # Options: 'DEVELOPER', 'PREMIUM' (VNet injection requires Developer or Premium)\n",
     "\n",
     "\n",
     "\n",

infrastructure/appgw-apim/create.ipynb

@@ -27,7 +27,7 @@
     "\n",
     "rg_location = Region.EAST_US_2      # Azure region for deployment\n",
     "index       = 1                     # Infrastructure index (use different numbers for multiple environments)\n",
-    "apim_sku    = APIM_SKU.BASICV2      # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2      # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "\n",
     "\n",
     "\n",

infrastructure/simple-apim/create.ipynb

@@ -28,7 +28,7 @@
     "\n",
     "rg_location = Region.EAST_US_2\n",
     "index       = 1\n",
-    "apim_sku    = APIM_SKU.BASICV2              # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2              # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "deployment  = INFRASTRUCTURE.AFD_APIM_PE    # Options: see supported_infras below\n",
     "api_prefix  = 'template-'                   # ENTER A PREFIX FOR THE APIS TO REDUCE COLLISION POTENTIAL WITH OTHER SAMPLES\n",
     "tags        = ['tag1', 'tag2']              # ENTER DESCRIPTIVE TAGS\n",

samples/_TEMPLATE/create.ipynb

@@ -28,7 +28,7 @@
     "\n",
     "rg_location = Region.EAST_US_2\n",
     "index       = 1\n",
-    "apim_sku    = APIM_SKU.BASICV2              # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2              # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "deployment  = INFRASTRUCTURE.SIMPLE_APIM    # Options: see supported_infras below\n",
     "api_prefix  = 'authX-pro-'                  # ENTER A PREFIX FOR THE APIS TO REDUCE COLLISION POTENTIAL WITH OTHER SAMPLES\n",
     "tags        = ['authX-pro', 'jwt', 'policy-fragment']  # ENTER DESCRIPTIVE TAG(S)\n",

samples/authX-pro/create.ipynb

@@ -28,7 +28,7 @@
     "\n",
     "rg_location = Region.EAST_US_2\n",
     "index       = 1\n",
-    "apim_sku    = APIM_SKU.BASICV2              # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2              # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "deployment  = INFRASTRUCTURE.SIMPLE_APIM    # Options: see supported_infras below\n",
     "api_prefix  = 'authX-'                      # ENTER A PREFIX FOR THE APIS TO REDUCE COLLISION POTENTIAL WITH OTHER SAMPLES\n",
     "tags        = ['authX', 'jwt', 'hr']        # ENTER DESCRIPTIVE TAG(S)\n",

samples/authX/create.ipynb

@@ -32,7 +32,7 @@
     "\n",
     "rg_location = Region.EAST_US_2\n",
     "index       = 1\n",
-    "apim_sku    = APIM_SKU.BASICV2              # Options: 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
+    "apim_sku    = APIM_SKU.BASICV2              # Options: 'DEVELOPER', 'BASIC', 'STANDARD', 'PREMIUM', 'BASICV2', 'STANDARDV2', 'PREMIUMV2'\n",
     "deployment  = INFRASTRUCTURE.SIMPLE_APIM    # Options: see supported_infras below\n",
     "api_prefix  = ''            # using a prefix results in some issues with at least the default API GET. It's fine to leave it off.\n",
     "tags        = ['azure-maps']\n",