Merge pull request #274 from DefangLabs/linda-hasura

Hasura changes

Author: raphaeltm

samples/hasura/README.md

@@ -2,37 +2,55 @@
 
 [![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-hasura-template%26template_owner%3DDefangSamples)
 
-This sample project demonstrates how to deploy Hasura with Defang and connect it to a Postgres database. We also demonstrate how to run a Postgres container during development and how to switch over to a managed postgres service like RDS, Neon, or others in production. If you want to get a compatible database ready to go really quickly for free, [Neon](https://neon.tech/) is a quick and easy way to go. The sample populates the database with some sample data so you can quickly start playing with the Hasura console. It sets wide open permissions on the tables as well so you can start querying or mutating the data right away.
+This sample project demonstrates how to deploy Hasura with Defang and connect it to a Postgres database. 
+
+The sample populates the database with some sample data so you can quickly start playing with the Hasura console. It sets wide open permissions on the tables as well so you can start querying or mutating the data right away.
 
 ## Prerequisites
 
 1. Download [Defang CLI](https://github.com/DefangLabs/defang)
 2. (Optional) If you are using [Defang BYOC](https://docs.defang.io/docs/concepts/defang-byoc) authenticate with your cloud provider account
 3. (Optional for local development) [Docker CLI](https://docs.docker.com/engine/install/)
-4. (Optional) [Install the Hasura CLI](https://hasura.io/docs/latest/hasura-cli/install-hasura-cli/) to create migrations and update metadata for your Hasura GraphQL api.
+Comment view5. (Optional) Install the [Hasura CLI](https://hasura.io/docs/latest/hasura-cli/install-hasura-cli/) to create migrations and update metadata for your Hasura GraphQL API
 
 ## Development
 
-To start the development environment, run `docker -f ./compose.dev.yaml up`. This will start the Postgres container and the Hasura container. The Hasura console will be available at `http://localhost:8080` with the password `password`.
-**Note:** _If you want to make changes to your database, permissions, etc. you should use the Hasura console and the Hasura CLI to make those changes. See the next section for more information._
+ To run the application locally, you can use the following command:
+
+```bash
+docker compose -f ./compose.yaml -f ./compose.dev.yaml up --build
+```
+This will start the Postgres container (from `compose.dev.yaml`) and the Hasura container (from `compose.yaml` with some overrides). The Hasura console will be available at `http://localhost:8080` with the password `password`.
 
-### Editing the database/permissions etc.
+> Note: If you want to make changes to your database, permissions, etc. see [Editing Hasura Settings](#editing-hasura-settings).
 
-If you want to edit the database, permissions, or any other Hasura settings such that you can deploy them to production, you should [install the Hasura CLI](https://hasura.io/docs/latest/hasura-cli/install-hasura-cli/). Then, after starting the development environment, you can run `hasura console` _inside the `./hasura` directory_. This will open the Hasura console in your browser. Any changes you make in the console will be saved to the `migrations` and `metadata` directories. When you run `defang compose up` these changes will be applied to the production environment.
+### Editing Hasura Settings
 
-**NOTE**: If you are using the [Dev Container](https://containers.dev/) defined in [.devcontainer/devcontainer.json](.devcontainer/devcontainer.json), the Hasura CLI will already be installed.
+To edit the database, permissions, or any other Hasura settings such that you can deploy them to production, you should install the [ Hasura CLI](https://hasura.io/docs/latest/hasura-cli/install-hasura-cli/). Then, after starting the development environment, you can run `hasura console` _inside the `./hasura` directory_. This will open the Hasura console in your browser. Any changes you make in the console will be saved to the `migrations` and `metadata` directories. When you run `defang compose up`, these changes will be applied to the production environment.
 
 ## Configuration
 
-For this sample, you will need to provide the following [configuration](https://docs.defang.io/docs/concepts/configuration). Note that if you are using the 1-click deploy option, you can set these values as secrets in your GitHub repository and the action will automatically deploy them for you.
+For this sample, you will need to provide the following [configuration](https://docs.defang.io/docs/concepts/configuration): 
 
-### `HASURA_GRAPHQL_ADMIN_SECRET`
-This password will be used to allow you to access the hasura console. 
+> Note that if you are using the 1-click deploy option, you can set these values as secrets in your GitHub repository and the action will automatically deploy them for you.
 
+### `POSTGRES_PASSWORD` 
+A password for your database.
+```bash
+defang config set POSTGRES_PASSWORD
+```
 
-### `POSTGRES_PASSWORD`
-This password will be used to initialize the PostgreSQL database and to connect to it. You could use a command like `openssl rand -base64 16` to generate a random password.
+### `SSL_MODE` 
+Either `disable` if you're using the Defang Playground or `require` if you're using BYOC. 
+```bash
+defang config set SSL_MODE
+```
 
+### `HASURA_GRAPHQL_ADMIN_SECRET`
+A password you would like to log into Hasura with. 
+```bash
+defang config set HASURA_GRAPHQL_ADMIN_SECRET
+```
 
 ## Deployment
 
@@ -41,17 +59,20 @@ This password will be used to initialize the PostgreSQL database and to connect
 
 ### Defang Playground
 
-Deploy your application to the defang playground by opening up your terminal and typing `defang up`.
-
-**Keep in mind that the playground does not support [managed Postgres](https://docs.defang.io/docs/concepts/managed-storage/managed-postgres).**
+Deploy your application to the Defang Playground by opening up your terminal and typing:
+```bash
+defang compose up
+```
 
 ### BYOC (AWS)
 
 If you want to deploy to your own cloud account, you can use Defang BYOC:
 
 1. [Authenticate your AWS account](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html), and check that you have properly set your environment variables like `AWS_PROFILE`, `AWS_REGION`, `AWS_ACCESS_KEY_ID`, and `AWS_SECRET_ACCESS_KEY`.
-2. Run `defang --provider=aws up` in a terminal that has access to your AWS environment variables.
-
+2. Run in a terminal that has access to your AWS environment variables:
+    ```bash
+    defang --provider=aws compose up
+    ```
 
 ---
 

samples/hasura/compose.yaml

@@ -9,15 +9,19 @@ services:
       - target: 8080
         published: 8080
         mode: ingress
+    depends_on:
+      database:
+        condition: service_started
     environment:
       - HASURA_GRAPHQL_ADMIN_SECRET
-      - HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
+      - HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres?sslmode=${SSL_MODE}
       - HASURA_GRAPHQL_ENABLE_CONSOLE=true
       - HASURA_GRAPHQL_UNAUTHORIZED_ROLE=public
       - HASURA_GRAPHQL_EXPERIMENTAL_FEATURES=naming_convention
       - HASURA_GRAPHQL_DEFAULT_NAMING_CONVENTION=graphql-default
       - HASURA_GRAPHQL_MIGRATIONS_DIR=/hasura/migrations
       - HASURA_GRAPHQL_METADATA_DIR=/hasura/metadata
+      - SSL_MODE
       - POSTGRES_PASSWORD
     deploy:
       resources:
@@ -31,8 +35,6 @@ services:
       - target: 5432
         mode: host
     environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_DB=postgres
       - POSTGRES_PASSWORD
     deploy:
       resources:

samples/hasura/hasura/.dockerignore

@@ -0,0 +1,27 @@
+# Default .dockerignore file for Defang
+**/__pycache__
+**/.direnv
+**/.DS_Store
+**/.envrc
+**/.git
+**/.github
+**/.idea
+**/.next
+**/.vscode
+**/compose.*.yaml
+**/compose.*.yml
+**/compose.yaml
+**/compose.yml
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
+**/docker-compose.yaml
+**/docker-compose.yml
+**/node_modules
+**/Thumbs.db
+Dockerfile
+*.Dockerfile
+# Ignore our own binary, but only in the root to avoid ignoring subfolders
+defang
+defang.exe
+# Ignore our project-level state
+.defang