Merge branch 'main' into edw-byoc-account-in-domain

Author: edw-defang

.github/workflows/install.yml

@@ -5,7 +5,7 @@ on:
     types: [published]
   push:
     branches:
-      - main
+      - "**"
     paths:
       - '.github/workflows/install.yml'
       - 'src/bin/install'
@@ -15,8 +15,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Install defang
+      - name: Install defang (latest)
         run: . <(curl -Ls https://s.defang.io/install)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # avoid rate limiting
+
+      - name: Sanity check
+        run: defang --version
+
+      - name: Install defang (specific version)
+        run: . <(curl -Ls https://s.defang.io/install)
+        env:
+          DEFANG_INSTALL_VERSION: v0.5.36
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # alt name
 
       - name: Sanity check
         run: defang --version

pkgs/defang/cli.nix

@@ -6,7 +6,7 @@ buildGoModule {
   pname = "defang-cli";
   version = "git";
   src = ../../src;
-  vendorHash = "sha256-ZV9m9uRrJyP7LjrrpsZz9LK+IJZ+1YQSLmtiin3FYl4=";
+  vendorHash = "sha256-9T71kpXPQGxtlWiow5x4d7uoHdOFAhtKpOOP2+p/H8Q=";
 
   subPackages = [ "cmd/cli" ];
 

pkgs/defang/default.nix

@@ -10,22 +10,22 @@ system ? builtins.currentSystem
 }:
 let
   shaMap = {
-    x86_64-linux = "0rdid5havv8yrvvgi70ic4ml88d2ml9l3glvs85d2i0zna0k3yaj";
-    aarch64-linux = "1qakg5gdray9x8inrs3rf3iz04yw8y8wygzgh00qdn8bxlhi2x2g";
-    x86_64-darwin = "1fs60w7lvmb1jc5m1nbih93mkygh1s1zv074razc5bjf4v6mz8il";
-    aarch64-darwin = "1fs60w7lvmb1jc5m1nbih93mkygh1s1zv074razc5bjf4v6mz8il";
+    x86_64-linux = "1wzrjlwx1iv1zydj77k2qya7z40s6cpf6jkj80vg0sv27vxl3ayq";
+    aarch64-linux = "00sy50ivnfnp1lh1lip6f13vvz3c453i7849pq33570rjdkh9z6i";
+    x86_64-darwin = "0dchv18cv07nafkdaxqc1xrjqm8knijvlz202vjkahyxng7v70pp";
+    aarch64-darwin = "0dchv18cv07nafkdaxqc1xrjqm8knijvlz202vjkahyxng7v70pp";
   };
 
   urlMap = {
-    x86_64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.40/defang_0.5.40_linux_amd64.tar.gz";
-    aarch64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.40/defang_0.5.40_linux_arm64.tar.gz";
-    x86_64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.40/defang_0.5.40_macOS.zip";
-    aarch64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.40/defang_0.5.40_macOS.zip";
+    x86_64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.44/defang_0.5.44_linux_amd64.tar.gz";
+    aarch64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.44/defang_0.5.44_linux_arm64.tar.gz";
+    x86_64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.44/defang_0.5.44_macOS.zip";
+    aarch64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.44/defang_0.5.44_macOS.zip";
   };
 in
 stdenvNoCC.mkDerivation {
   pname = "defang";
-  version = "0.5.40";
+  version = "0.5.44";
   src = fetchurl {
     url = urlMap.${system};
     sha256 = shaMap.${system};

pkgs/npm/package-lock.json

@@ -28,12 +28,10 @@ async function getLatestVersion(): Promise<string> {
 }
 
 async function downloadAppArchive(
-  version: string,
   archiveFilename: string,
   outputPath: string
 ): Promise<string | null> {
-  const repo = "DefangLabs/defang";
-  const downloadUrl = `https://github.com/${repo}/releases/download/v${version}/${archiveFilename}`;
+  const downloadUrl = `https://s.defang.io/${archiveFilename}?x-defang-source=npm`;
   const downloadTargetFile = path.join(outputPath, archiveFilename);
 
   return await downloadFile(downloadUrl, downloadTargetFile);
@@ -291,7 +289,6 @@ export async function install(
     const filename = getAppArchiveFilename(version, os.platform, os.arch);
 
     const archiveFile = await downloadAppArchive(
-      version,
       filename,
       saveDirectory
     );

pkgs/npm/src/clilib.ts

@@ -109,7 +109,9 @@ winget:
   - publisher: DefangLabs
     name: Defang
     short_description: The Defang command-line interface (CLI)
-    description: Defang is the easiest way for developers to create and deploy their containerized applications to the cloud.
+    description: Defang is the easiest way to develop, deploy, and debug cloud applications.
+    copyright: Defang Software Labs Inc.
+    url_template: https://s.defang.io/defang_{{ .Version }}_{{ .Os }}_{{ .Arch }}.zip?x-defang-source=winget
     license: MIT
     publisher_url: https://defang.io/
     homepage: https://github.com/DefangLabs/defang/

pkgs/winget/DefangLabs.defang.installer.yaml

@@ -28,12 +28,24 @@ fi
 if [[ -z "$DEFANG_INSTALL_VERSION" ]]; then
     RELEASE_PATH="latest"
 else
-    RELEASE_PATH="tags/$DEFANG_INSTALL_VERSION"
+    RELEASE_PATH="tags/v${DEFANG_INSTALL_VERSION#v}"
 fi
 
-# Echo fetching the release path either latest or strip the tags/ from the version
-echo "Fetching the ${DEFANG_INSTALL_VERSION:-latest} release of defang..."
-RELEASE_JSON=$(curl -s -f -L https://api.github.com/repos/DefangLabs/defang/releases/$RELEASE_PATH)
+# Anonymous API request to GitHub are rate limited to 60 requests per hour.
+# Check whether the user has set a GitHub token to increase the rate limit.
+AUTH_HEADER=""
+if [[ -n "$GITHUB_TOKEN" ]]; then
+    AUTH_HEADER="Authorization: Bearer $GITHUB_TOKEN"
+elif [[ -n "$GH_TOKEN" ]]; then
+    AUTH_HEADER="Authorization: Bearer $GH_TOKEN"
+fi
+
+# Echo fetching the release path either latest or the version
+echo "Fetching the ${RELEASE_PATH#tags/} release of defang..."
+# Download the release information from GitHub, using the token if available, but falling back to anonymous access
+RELEASE_JSON=$([[ -n "$AUTH_HEADER" ]] &&
+    curl -sfL -H "$AUTH_HEADER" https://api.github.com/repos/DefangLabs/defang/releases/$RELEASE_PATH ||
+    curl -sfL https://api.github.com/repos/DefangLabs/defang/releases/$RELEASE_PATH)
 
 # Check for curl failure
 if [ -z "$RELEASE_JSON" ]; then
@@ -80,7 +92,7 @@ elif [ "$OS" = "Linux" ]; then
 fi
 
 # Download the file
-if ! curl -s -f -L "$DOWNLOAD_URL" -o "$FILENAME"; then
+if ! curl -sfL "$DOWNLOAD_URL" -o "$FILENAME"; then
     echo "Download failed. Please check your internet connection and try again."
     return 4
 fi
@@ -239,5 +251,5 @@ rm "$FILENAME"
 echo "Installation completed. You can now use defang by typing '$BINARY_NAME' in the terminal."
 
 # Unset the variables and functions to avoid polluting the user's environment
-unset EXTRACT_DIR DOWNLOAD_URL RELEASE_JSON RELEASE_PATH ARCH_SUFFIX ARCH OS FILENAME INSTALL_DIR BINARY_NAME REPLY EXPORT_PATH CURRENT_SHELL FOUND_PROFILE_FILE
+unset EXTRACT_DIR DOWNLOAD_URL RELEASE_JSON RELEASE_PATH ARCH_SUFFIX ARCH OS FILENAME INSTALL_DIR BINARY_NAME REPLY EXPORT_PATH CURRENT_SHELL FOUND_PROFILE_FILE AUTH_HEADER
 unset -f _prompt_and_append_to_file _generate_completion_script _install_completion_script