fix winget install

colbylwilliams · Oct 18, 2022 · 69b9e8b · 69b9e8b
1 parent 45a2538
commit 69b9e8b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Microsoft Azure CLI Custom Image Helper 'az' Extension adds useful "utilities" f
 To install the Azure CLI Custom Image Helper extension, simply run the following command:
 
 ```sh
-az extension add --source https://github.com/colbylwilliams/az-bake/releases/latest/download/bake-0.0.22-py3-none-any.whl -y
+az extension add --source https://github.com/colbylwilliams/az-bake/releases/latest/download/bake-0.0.23-py3-none-any.whl -y
 ```
 
 ### Update
@@ -29,22 +29,22 @@ az bake upgrade --pre
 This extension adds the following commands.  Use `az bake -h` for more information.
 | Command | Description |
 | ------- | ----------- |
-| [az bake user check](#az-bake-user-check) | Check if a user has appropriate licenses to use dev box. |
+| [az bake repo](#az-bake-repo) | // TODO |
 
 ---
 
-### `az bake user check`
+### `az bake repo`
 
-Check if a user has appropriate licenses to use dev box.
+// TODO
 
 ```sh
-az bake user check --user
+az bake repo
 ```
 
 #### Examples
 
 ```sh
-az bake user check --user user@example.com
+az bake repo
 
 # output: user@example.com has valid licenses for dev box: ['SPE_E3']
 ```

diff --git a/bake/HISTORY.rst b/bake/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+0.0.23
+++++++
++ Fix winget install
+
 0.0.22
 ++++++
 + Add new schema files

diff --git a/bake/azext_bake/_packer.py b/bake/azext_bake/_packer.py
@@ -209,17 +209,13 @@ def inject_winget_provisioners(image_dir, winget_packages):
   # Injected by az bake
   provisioner "powershell" {{
     inline = [
-      "$file=Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle",
-      "$path=$env:TEMP/$file",
-      "Invoke-WebRequest -Uri https://github.com/microsoft/winget-cli/releases/latest/download/$file -OutFile $path",
-      "Add-AppxPackage -InstallAllResources -ForceTargetApplicationShutdown -ForceUpdateFromAnyVersion -Path $path",
-      "Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath $path",
-
-      "$file=source.msix",
-      "$path=$env:TEMP/$file",
-      "Invoke-WebRequest -Uri https://winget.azureedge.net/cache/$file -OutFile $path",
-      "Add-AppxPackage -ForceTargetApplicationShutdown -ForceUpdateFromAnyVersion -Path $path",
-      "Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath $path",
+      "(new-object net.webclient).DownloadFile('https://github.com/microsoft/winget-cli/releases/latest/download/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle', 'C:/Windows/Temp/appinstaller.msixbundle')",
+      "Add-AppxPackage -InstallAllResources -ForceTargetApplicationShutdown -ForceUpdateFromAnyVersion -Path 'C:/Windows/Temp/appinstaller.msixbundle'",
+      "Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath 'C:/Windows/Temp/appinstaller.msixbundle'",
+
+      "(new-object net.webclient).DownloadFile('https://winget.azureedge.net/cache/source.msix', 'C:/Windows/Temp/source.msix')",
+      "Add-AppxPackage -ForceTargetApplicationShutdown -ForceUpdateFromAnyVersion -Path 'C:/Windows/Temp/source.msix'",
+      "Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath 'C:/Windows/Temp/source.msix'",
 
       "winget source reset --force",
       "winget source list"

diff --git a/bake/azext_bake/custom.py b/bake/azext_bake/custom.py
@@ -83,8 +83,7 @@ def bake_builder_build(cmd, in_builder=False, repo=None, storage=None, sandbox=N
 
     save_packer_vars_file(sandbox, gallery, image)
 
-    success = packer_execute(image)
-    # success = True
+    success = packer_execute(image) if in_builder else True
 
     if not success:
         raise CLIError('Packer build failed')

diff --git a/bake/azext_bake/templates/packer/build.pkr.hcl b/bake/azext_bake/templates/packer/build.pkr.hcl
@@ -1,12 +1,12 @@
-packer {
-  required_plugins {
-    # https://github.com/rgl/packer-plugin-windows-update
-    windows-update = {
-      version = "0.14.1"
-      source  = "github.com/rgl/windows-update"
-    }
-  }
-}
+// packer {
+//   required_plugins {
+//     # https://github.com/rgl/packer-plugin-windows-update
+//     windows-update = {
+//       version = "0.14.1"
+//       source  = "github.com/rgl/windows-update"
+//     }
+//   }
+// }
 
 # https://www.packer.io/plugins/builders/azure/arm
 source "azure-arm" "vm" {
@@ -79,8 +79,8 @@ build {
   }
 
   # https://github.com/rgl/packer-plugin-windows-update
-  provisioner "windows-update" {
-  }
+  // provisioner "windows-update" {
+  // }
   ###BAKE###
 
   # Disable Auto-Logon that was enabled above

diff --git a/bake/setup.py b/bake/setup.py
@@ -17,7 +17,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
 # Must match a HISTORY.rst entry.
-VERSION = '0.0.22'
+VERSION = '0.0.23'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -38,7 +38,7 @@ LABEL maintainer="Microsoft" \
 RUN apk add --no-cache packer --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
 
 # install az-bake
-RUN az extension add --source https://github.com/colbylwilliams/az-bake/releases/latest/download/bake-0.0.22-py3-none-any.whl -y
+RUN az extension add --source https://github.com/colbylwilliams/az-bake/releases/latest/download/bake-0.0.23-py3-none-any.whl -y
 
 # Terminate container on stop
 STOPSIGNAL SIGTERM

diff --git a/schema/bake.schema.json b/schema/bake.schema.json
@@ -21,7 +21,6 @@
             "description": "Sandbox configuration",
             "additionalProperties": false,
             "required": [
-                "location",
                 "resourceGroup",
                 "subscription",
                 "virtualNetwork",

diff --git a/schema/image.schema.json b/schema/image.schema.json
@@ -5,9 +5,6 @@
     "type": "object",
     "additionalProperties": false,
     "required": [
-        "name",
-        "publisher",
-        "offer",
         "sku",
         "version",
         "os"