chore: adding hydra to quickstart (#3297)

* chore: adding hydra to quickstart * chore: updating docker-compose * chore: more time needed --------- Co-authored-by: Nicolas Burtey <[email protected]>
GaloyMoney · Oct 3, 2023 · b8d62c2 · b8d62c2
1 parent 150b68b
commit b8d62c2
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 19 deletions.
diff --git a/.github/workflows/bats.yml b/.github/workflows/bats.yml
@@ -8,7 +8,7 @@ jobs:
   integration:
     name: Bats tests
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 18
     steps:
       - name: Setup BATS
         uses: mig4/setup-bats@v1

diff --git a/core/api/docker-compose.yml b/core/api/docker-compose.yml
@@ -424,32 +424,33 @@ services:
     image: postgres:14.1
     environment:
       POSTGRES_PASSWORD: postgres
+
   hydra:
     image: oryd/hydra:v2.1.2
+    ports: []
+    extra_hosts: []
     command: serve -c /home/ory/hydra.yml all --dev
     volumes:
-      - type: bind
-        source: dev/ory
-        target: /home/ory
+      - ${HOST_PROJECT_PATH:-.}/dev/ory:/home/ory
     environment:
       - DSN=postgres://hydra:secret@postgresdhydra:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
     restart: unless-stopped
     depends_on:
       - hydra-migrate
       - postgresdhydra
-    ports: []
+
   hydra-migrate:
     image: oryd/hydra:v2.1.2
     environment:
       - DSN=postgres://hydra:secret@postgresdhydra:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
     command: migrate -c /home/ory/hydra.yml sql -e --yes
     volumes:
-      - type: bind
-        source: dev/ory
-        target: /home/ory
+      - ${HOST_PROJECT_PATH:-.}/dev/ory:/home/ory
+
     restart: on-failure
     depends_on:
       - postgresdhydra
+
   postgresdhydra:
     image: postgres:14.1
     environment:

diff --git a/docs/hydra.tf b/docs/hydra.tf
@@ -18,21 +18,19 @@ resource "hydra_oauth2_client" "example" {
   token_endpoint_auth_method = "none"
 }
 
-output "example_client_id" {
-  description = "The client ID of the example OAuth2 client."
-  value       = hydra_oauth2_client.example.client_id
+output "blink_app_client_id" {
+  value = hydra_oauth2_client.example.client_id
 }
 
-output "example_client_secret" {
-  description = "The client secret of the example OAuth2 client."
-  value       = hydra_oauth2_client.example.client_secret
-  sensitive   = true
+output "blink_app_client_secret" {
+  value     = hydra_oauth2_client.example.client_secret
+  sensitive = true
 }
 
-resource "hydra_oauth2_client" "example2" {
-  client_name                = "example2"
+resource "hydra_oauth2_client" "blink_app" {
+  client_name                = "blink_app"
   grant_types                = ["client_credentials"]
-  redirect_uris              = ["http://localhost:8080/callback"]
   response_types             = ["token"]
   token_endpoint_auth_method = "client_secret_basic"
+  scopes                     = ["editor"]
 }
diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml
@@ -27,6 +27,7 @@ services:
       - stablesats
       - svix
       - svix-pg
+      - hydra
     restart: on-failure:10
 
   #! Proxies
@@ -37,6 +38,10 @@ services:
   kratos: #@ data.values.services["kratos"]
   kratos-pg: #@ data.values.services["kratos-pg"]
 
+  hydra: #@ data.values.services["hydra"]
+  hydra-migrate: #@ data.values.services["hydra-migrate"]
+  postgresdhydra: #@ data.values.services["postgresdhydra"]
+
   galoy:
 #@ if galoy_image_digest == "local":
     build:
@@ -140,7 +145,7 @@ services:
     #@overlay/match when=1
     volumes:
     #@overlay/match by=overlay.all, expects="0+"
-    #@overlay/replace via=lambda left, right: left.replace("HOST_PROJECT_PATH:-.}", "HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}")
+    #@overlay/replace via=lambda left, right: str(left).replace("HOST_PROJECT_PATH:-.}", "HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}")
     - REPLACED
 
 #@overlay/match by=overlay.all

diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
@@ -22,6 +22,7 @@ services:
     - stablesats
     - svix
     - svix-pg
+    - hydra
     restart: on-failure:10
   apollo-router:
     image: ghcr.io/apollographql/router:v1.25.0
@@ -63,6 +64,36 @@ services:
     - POSTGRES_USER=dbuser
     - POSTGRES_PASSWORD=secret
     - POSTGRES_DB=default
+  hydra:
+    image: oryd/hydra:v2.1.2
+    command: serve -c /home/ory/hydra.yml all --dev
+    volumes:
+    - yamlfragment(*yamlmeta.Map)
+    environment:
+    - DSN=postgres://hydra:secret@postgresdhydra:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
+    restart: unless-stopped
+    depends_on:
+    - hydra-migrate
+    - postgresdhydra
+    ports:
+    - 4444:4444
+    - 4445:4445
+  hydra-migrate:
+    image: oryd/hydra:v2.1.2
+    environment:
+    - DSN=postgres://hydra:secret@postgresdhydra:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
+    command: migrate -c /home/ory/hydra.yml sql -e --yes
+    volumes:
+    - yamlfragment(*yamlmeta.Map)
+    restart: on-failure
+    depends_on:
+    - postgresdhydra
+  postgresdhydra:
+    image: postgres:14.1
+    environment:
+    - POSTGRES_USER=hydra
+    - POSTGRES_PASSWORD=secret
+    - POSTGRES_DB=hydra
   galoy:
     image: us.gcr.io/galoy-org/galoy-app@sha256:e40668b0abae303d278182946bebfb9001caee6003867fedfb89b40fdd6b704d
     command: