Merge branch 'main' into edw-remove-pg-byod-warning

Author: edw-defang

.github/workflows/build-samples-json.yml

@@ -14,5 +14,5 @@ jobs:
           uses: peter-evans/repository-dispatch@v1
           with:
             token: ${{ secrets.DOCS_ACTION_TRIGGER_TOKEN }}
-            repository: defang-io/defang-docs
+            repository: DefangLabs/defang-docs
             event-type: sample-update

.github/workflows/go.yml

@@ -149,14 +149,6 @@ jobs:
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
           MACOS_NOTARIZATION_APP_PW: ${{ secrets.MACOS_NOTARIZATION_APP_PW }}
 
-      - name: Trigger CLI Autodoc
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.DOCS_ACTION_TRIGGER_TOKEN }}
-          repository: defang-io/defang-docs
-          event-type: cli-autodoc
-          client-payload: '{"version": "${{ github.ref_name }}"}'
-
   publish-npm-binaries:
     runs-on: ubuntu-latest
     needs: go-release
@@ -171,6 +163,14 @@ jobs:
         working-directory: ./pkgs/npm
 
     steps:
+      - name: Trigger CLI Autodoc
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.DOCS_ACTION_TRIGGER_TOKEN }}
+          repository: DefangLabs/defang-docs
+          event-type: cli-autodoc
+          client-payload: '{"version": "${{ github.ref_name }}"}'
+
       - name: Checkout tag
         uses: actions/checkout@v4
 

.gitignore

@@ -5,5 +5,7 @@ node_modules/
 /result
 
 
-.log
+*.log
+*.txt
 .gitignore
+*-lock.json

README.md

@@ -1,87 +1,98 @@
-[![Go package](https://github.com/defang-io/defang/actions/workflows/go.yml/badge.svg?branch=main)](https://github.com/defang-io/defang/actions/workflows/go.yml)
+[![Go package](https://github.com/DefangLabs/defang/actions/workflows/go.yml/badge.svg?branch=main)](https://github.com/DefangLabs/defang/actions/workflows/go.yml)
 
 # Defang
+
 Defang is a radically simpler way for developers to create, deploy, and manage cloud applications.
 
 This repo includes:
-* Public releases of the Defang CLI; [click here](https://github.com/defang-io/defang/releases/latest/) for the latest version
+* Public releases of the Defang CLI; [click here](https://github.com/DefangLabs/defang/releases/latest/) for the latest version
 * Samples in Golang, Python, and Node.js that show how to accomplish various tasks and deploy them to the DOP using a Docker Compose file using the Defang CLI.
-* Samples that show how to deploy an app using the [Defang Pulumi Provider](https://github.com/defang-io/pulumi-defang).
+* Samples that show how to deploy an app using the [Defang Pulumi Provider](https://github.com/DefangLabs/pulumi-defang).
 
 ## Getting started
 * Read our [Getting Started](https://docs.defang.io/docs/getting-started) page
 * Follow the installation instructions from the [Installing](https://docs.defang.io/docs/getting-started/installing) page
-* Take a look at our [Samples folder](https://github.com/defang-io/defang/tree/main/samples) for example projects in various programming languages.
+* Take a look at our [Samples folder](https://github.com/DefangLabs/defang/tree/main/samples) for example projects in various programming languages.
 * Try the AI integration by running `defang generate`
 * Start your new service with `defang compose up`
 
 ## Installing
+
 Install the Defang CLI from one of the following sources:
-* Using the [Homebrew](https://brew.sh) package manager [defang-io/defang tap](https://github.com/defang-io/homebrew-defang):
+* Using the [Homebrew](https://brew.sh) package manager [DefangLabs/defang tap](https://github.com/DefangLabs/homebrew-defang):
   ```
-  brew install defang-io/defang/defang
+  brew install DefangLabs/defang/defang
   ```
-* Using a shell script:
+- Using a shell script:
   ```
   . <(curl -Ls https://s.defang.io/install)
   ```
-* Using [Go](https://go.dev):
+- Using [Go](https://go.dev):
   ```
-  go install github.com/defang-io/defang/src/cmd/cli@latest
+  go install github.com/DefangLabs/defang/src/cmd/cli@latest
   ```
-* Using the [Nix package manager](https://nixos.org):
-  * with Nix-Env:
+- Using the [Nix package manager](https://nixos.org):
+  - with Nix-Env:
     ```
-    nix-env -if https://github.com/defang-io/defang/archive/main.tar.gz
+    nix-env -if https://github.com/DefangLabs/defang/archive/main.tar.gz
     ```
-  * or with Flakes:
+  - or with Flakes:
     ```
-    nix profile install github:defang-io/defang#defang-bin --refresh
+    nix profile install github:DefangLabs/defang#defang-bin --refresh
     ```
-* Download the [latest binary](https://github.com/defang-io/defang/releases/latest/) of the Defang CLI. For this beta, MacOS users will have to explicitly allow running of downloaded programs in the OS security settings.
+* Download the [latest binary](https://github.com/DefangLabs/defang/releases/latest/) of the Defang CLI. For this beta, MacOS users will have to explicitly allow running of downloaded programs in the OS security settings.
 
 ## Support
-* File any issues [right here on GitHub](https://github.com/defang-io/defang/issues)
+* File any issues [right here on GitHub](https://github.com/DefangLabs/defang/issues)
 
 ## Command completion
+
 The Defang CLI supports command completion for Bash, Zsh, Fish, and Powershell. To get the shell script for command completion, run the following command:
+
 ```
 defang completion [bash|zsh|fish|powershell]
 ```
 
 If you're using Bash, you can add the following to your `~/.bashrc` file:
+
 ```
 source <(defang completion bash)
 ```
 
 If you're using Zsh, you can add the following to your `~/.zshrc` file:
+
 ```
 source <(defang completion zsh)
 ```
+
 or pipe the output to a file called `_defang` in the directory with the completions.
 
 If you're using Fish, you can add the following to your `~/.config/fish/config.fish` file:
+
 ```
 defang completion fish | source
 ```
 
 If you're using Powershell, you can add the following to your `$HOME\Documents\PowerShell\Microsoft.PowerShell_profile.ps1` file:
+
 ```
 Invoke-Expression -Command (defang completion powershell | Out-String)
 ```
 
 ## Environment Variables
+
 The Defang CLI recognizes the following environment variables:
-* `COMPOSE_PROJECT_NAME` - The name of the project to use; overrides the name in the `compose.yaml` file
-* `DEFANG_ACCESS_TOKEN` - The access token to use for authentication; if not specified, uses token from `defang login`
-* `DEFANG_CD_BUCKET` - The S3 bucket to use for the BYOC CD pipeline; defaults to `defang-cd-bucket-…`
-* `DEFANG_CD_IMAGE` - The image to use for the Continuous Deployment (CD) pipeline; defaults to `public.ecr.aws/defang-io/cd:public-beta`
-* `DEFANG_DEBUG` - set this to `1` or `true` to enable debug logging
-* `DEFANG_DISABLE_ANALYTICS` - If set to `true`, disables sending analytics to Defang; defaults to `false`
-* `DEFANG_FABRIC` - The address of the Defang Fabric to use; defaults to `fabric-prod1.defang.dev`
-* `DEFANG_HIDE_HINTS` - If set to `true`, hides hints in the CLI output; defaults to `false`
-* `DEFANG_HIDE_UPDATE` - If set to `true`, hides the update notification; defaults to `false`
-* `DEFANG_PROVIDER` - The name of the cloud provider to use, `auto` (default), `aws`, or `defang`
-* `NO_COLOR` - If set to any value, disables color output; by default, color output is enabled depending on the terminal
-* `TZ` - The timezone to use for log timestamps: an IANA TZ name like `UTC` or `Europe/Amsterdam`; defaults to `Local`
-* `XDG_STATE_HOME` - The directory to use for storing state; defaults to `~/.local/state`
+
+- `COMPOSE_PROJECT_NAME` - The name of the project to use; overrides the name in the `compose.yaml` file
+- `DEFANG_ACCESS_TOKEN` - The access token to use for authentication; if not specified, uses token from `defang login`
+- `DEFANG_CD_BUCKET` - The S3 bucket to use for the BYOC CD pipeline; defaults to `defang-cd-bucket-…`
+- `DEFANG_CD_IMAGE` - The image to use for the Continuous Deployment (CD) pipeline; defaults to `public.ecr.aws/defang-io/cd:public-beta`
+- `DEFANG_DEBUG` - set this to `1` or `true` to enable debug logging
+- `DEFANG_DISABLE_ANALYTICS` - If set to `true`, disables sending analytics to Defang; defaults to `false`
+- `DEFANG_FABRIC` - The address of the Defang Fabric to use; defaults to `fabric-prod1.defang.dev`
+- `DEFANG_HIDE_HINTS` - If set to `true`, hides hints in the CLI output; defaults to `false`
+- `DEFANG_HIDE_UPDATE` - If set to `true`, hides the update notification; defaults to `false`
+- `DEFANG_PROVIDER` - The name of the cloud provider to use, `auto` (default), `aws`, or `defang`
+- `NO_COLOR` - If set to any value, disables color output; by default, color output is enabled depending on the terminal
+- `TZ` - The timezone to use for log timestamps: an IANA TZ name like `UTC` or `Europe/Amsterdam`; defaults to `Local`
+- `XDG_STATE_HOME` - The directory to use for storing state; defaults to `~/.local/state`

pkgs/defang/default.nix

@@ -10,22 +10,22 @@ system ? builtins.currentSystem
 }:
 let
   shaMap = {
-    x86_64-linux = "1958pxh2jrjr9f9xdvg70a6plmzklxnrzf3fk2451wy4zrb3klkp";
-    aarch64-linux = "1krsjbfl3icrp4ppdjjmwhcvg66i7gaqpvhc65iyg4lnhvc23ln9";
-    x86_64-darwin = "1b4bmks0nq1g0ixih6k947dw11gg71y5xsihzryvam0af2z1nhnb";
-    aarch64-darwin = "1b4bmks0nq1g0ixih6k947dw11gg71y5xsihzryvam0af2z1nhnb";
+    x86_64-linux = "0q6zqnxni9vh73fjmsfk6ppbh4m9dwj1mvxin1gxwnbcj9hsywd6";
+    aarch64-linux = "04km33v76z3w5jyhrxrlkvgaya97yqbljm5g27rcwf7xxj3grlaf";
+    x86_64-darwin = "02dr4nbbq5k3kqw0jgj51r2bk78nkxaz35wqp34y471r427vc1ly";
+    aarch64-darwin = "02dr4nbbq5k3kqw0jgj51r2bk78nkxaz35wqp34y471r427vc1ly";
   };
 
   urlMap = {
-    x86_64-linux = "https://github.com/defang-io/defang/releases/download/v0.5.16/defang_0.5.16_linux_amd64.tar.gz";
-    aarch64-linux = "https://github.com/defang-io/defang/releases/download/v0.5.16/defang_0.5.16_linux_arm64.tar.gz";
-    x86_64-darwin = "https://github.com/defang-io/defang/releases/download/v0.5.16/defang_0.5.16_macOS.zip";
-    aarch64-darwin = "https://github.com/defang-io/defang/releases/download/v0.5.16/defang_0.5.16_macOS.zip";
+    x86_64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.19/defang_0.5.19_linux_amd64.tar.gz";
+    aarch64-linux = "https://github.com/DefangLabs/defang/releases/download/v0.5.19/defang_0.5.19_linux_arm64.tar.gz";
+    x86_64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.19/defang_0.5.19_macOS.zip";
+    aarch64-darwin = "https://github.com/DefangLabs/defang/releases/download/v0.5.19/defang_0.5.19_macOS.zip";
   };
 in
 stdenvNoCC.mkDerivation {
   pname = "defang";
-  version = "0.5.16";
+  version = "0.5.19";
   src = fetchurl {
     url = urlMap.${system};
     sha256 = shaMap.${system};
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation {
   system = system;
 
   meta = {
-    description = "Command-line interface for the Defang Opinionated Platform";
+    description = "Defang is easiest way for developers to create and deploy their containerized applications";
     homepage = "https://defang.io/";
     license = lib.licenses.mit;
 

pkgs/npm/package.json

@@ -8,13 +8,13 @@
     "defang": "./bin/cli.js"
   },
   "keywords": [],
-  "homepage": "https://github.com/defang-io/defang#readme",
+  "homepage": "https://github.com/DefangLabs/defang#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/defang-io/defang.git"
+    "url": "git+https://github.com/DefangLabs/defang.git"
   },
   "bugs": {
-    "url": "https://github.com/defang-io/defang/issues"
+    "url": "https://github.com/DefangLabs/defang/issues"
   },
   "scripts": {
     "build": "tsc",

pkgs/npm/src/installer.ts

@@ -10,7 +10,7 @@ async function downloadAppArchive(
   archiveFilename: string,
   outputPath: string
 ): Promise<string> {
-  const repo = "defang-io/defang";
+  const repo = "DefangLabs/defang";
   const downloadUrl = `https://github.com/${repo}/releases/download/v${version}/${archiveFilename}`;
   const downloadTargetFile = path.join(outputPath, archiveFilename);
 

pkgs/winget/DefangLabs.defang.installer.yaml

@@ -0,0 +1,26 @@
+# This file was generated by GoReleaser. DO NOT EDIT.
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.6.0.schema.json
+PackageIdentifier: DefangLabs.defang
+PackageVersion: 0.5.18
+InstallerLocale: en-US
+InstallerType: zip
+ReleaseDate: "2024-05-17"
+Installers:
+  - Architecture: arm64
+    NestedInstallerType: portable
+    NestedInstallerFiles:
+      - RelativeFilePath: defang.exe
+        PortableCommandAlias: defang
+    InstallerUrl: https://github.com/DefangLabs/defang/releases/download/v0.5.18/defang_0.5.18_windows_arm64.zip
+    InstallerSha256: a0ce31f84d5f474dd54ded225ad0f68d250062f4372a82caaf1dbbd458a1facb
+    UpgradeBehavior: uninstallPrevious
+  - Architecture: x64
+    NestedInstallerType: portable
+    NestedInstallerFiles:
+      - RelativeFilePath: defang.exe
+        PortableCommandAlias: defang
+    InstallerUrl: https://github.com/DefangLabs/defang/releases/download/v0.5.18/defang_0.5.18_windows_amd64.zip
+    InstallerSha256: 0f7cf85ddd8b51e2e110bb4a2c990eab4fd1fa08d47df319e314738abc00d0a4
+    UpgradeBehavior: uninstallPrevious
+ManifestType: installer
+ManifestVersion: 1.6.0

pkgs/winget/DefangLabs.defang.locale.en-US.yaml

@@ -0,0 +1,16 @@
+# This file was generated by GoReleaser. DO NOT EDIT.
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.6.0.schema.json
+PackageIdentifier: DefangLabs.defang
+PackageVersion: 0.5.18
+PackageLocale: en-US
+Publisher: DefangLabs
+PublisherUrl: https://defang.io/
+PublisherSupportUrl: https://github.com/DefangLabs/defang/issues/
+PackageName: defang
+PackageUrl: https://github.com/DefangLabs/defang/
+License: mit
+ShortDescription: The Defang command-line interface (CLI)
+Description: Defang is easiest way for developers to create and deploy their containerized applications to the cloud
+Moniker: defang
+ManifestType: defaultLocale
+ManifestVersion: 1.6.0

pkgs/winget/DefangLabs.defang.yaml

@@ -0,0 +1,7 @@
+# This file was generated by GoReleaser. DO NOT EDIT.
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.6.0.schema.json
+PackageIdentifier: DefangLabs.defang
+PackageVersion: 0.5.18
+DefaultLocale: en-US
+ManifestType: version
+ManifestVersion: 1.6.0