Almost successful round trip with local TUF, more WiX work required

Author: dantecatalfamo

orbit/pkg/packaging/windows.go

@@ -68,7 +68,11 @@ func BuildMSI(opt Options) (string, error) {
 	}
 
 	if opt.Desktop {
-		updateOpt.Targets[constant.DesktopTUFTargetName] = update.DesktopWindowsTarget
+		if opt.Architecture == ArchArm64 {
+			updateOpt.Targets[constant.DesktopTUFTargetName] = update.DesktopWindowsArm64Target
+		} else {
+			updateOpt.Targets[constant.DesktopTUFTargetName] = update.DesktopWindowsTarget
+		}
 		// Override default channel with the provided value.
 		updateOpt.Targets.SetTargetChannel(constant.DesktopTUFTargetName, opt.DesktopChannel)
 	}

tools/tuf/test/create_repository.sh

@@ -93,7 +93,7 @@ for system in $SYSTEMS; do
         goarch_value="arm64"
     fi
     orbit_target=orbit-$system
-    if [[ $system == "windows" ]]; then
+    if [[ $system == "windows" ]] || [[ $system == "windows-arm64" ]]; then
         orbit_target="${orbit_target}.exe"
     fi
 

tools/tuf/test/gen_pkgs.sh

@@ -179,6 +179,30 @@ if [ -n "$GENERATE_MSI" ]; then
         --update-url=$MSI_TUF_URL
 fi
 
+if [ -n "$GENERATE_MSI_ARM64" ]; then
+    echo "Generating msi (arm64)..."
+    ./build/fleetctl package \
+        --type=msi \
+        --arch=arm64 \
+        ${FLEET_DESKTOP:+--fleet-desktop} \
+        --fleet-url=$MSI_FLEET_URL \
+        --enroll-secret=$ENROLL_SECRET \
+        ${USE_FLEET_SERVER_CERTIFICATE:+--fleet-certificate=./tools/osquery/fleet.crt} \
+        ${USE_UPDATE_SERVER_CERTIFICATE:+--update-tls-certificate=./tools/osquery/fleet.crt} \
+        ${INSECURE:+--insecure} \
+        ${DEBUG:+--debug} \
+        --update-roots="$ROOT_KEYS" \
+        --update-interval=10s \
+        --disable-open-folder \
+        ${USE_FLEET_CLIENT_CERTIFICATE:+--fleet-tls-client-certificate=./tools/test-orbit-mtls/client.crt} \
+        ${USE_FLEET_CLIENT_CERTIFICATE:+--fleet-tls-client-key=./tools/test-orbit-mtls/client.key} \
+        ${USE_UPDATE_CLIENT_CERTIFICATE:+--update-tls-client-certificate=./tools/test-orbit-mtls/client.crt} \
+        ${USE_UPDATE_CLIENT_CERTIFICATE:+--update-tls-client-key=./tools/test-orbit-mtls/client.key} \
+        ${FLEET_DESKTOP_ALTERNATIVE_BROWSER_HOST:+--fleet-desktop-alternative-browser-host=$FLEET_DESKTOP_ALTERNATIVE_BROWSER_HOST} \
+        ${ENABLE_SCRIPTS:+--enable-scripts} \
+        --update-url=$MSI_TUF_URL
+fi
+
 echo "Packages generated."
 
 if [[ $OSTYPE == 'darwin'* && -n "$INSTALL_PKG" ]]; then

tools/tuf/test/main.sh

@@ -52,6 +52,6 @@ if [ -z "$SKIP_SERVER" ]; then
     ./tools/tuf/test/run_server.sh
 fi
 
-if [ -n "$GENERATE_PKG" ] || [ -n "$GENERATE_DEB" ] || [ -n "$GENERATE_RPM" ] || [ -n "$GENERATE_MSI" ] || [ -n "$GENERATE_DEB_ARM64" ] || [ -n "$GENERATE_RPM_ARM64" ]; then
+if [ -n "$GENERATE_PKG" ] || [ -n "$GENERATE_DEB" ] || [ -n "$GENERATE_RPM" ] || [ -n "$GENERATE_MSI" ] || [ -n "$GENERATE_DEB_ARM64" ] || [ -n "$GENERATE_RPM_ARM64" ] || [ -n "$GENERATE_MSI_ARM64" ]; then
     bash ./tools/tuf/test/gen_pkgs.sh
 fi