ci: move init-related targets

GaloyMoney · May 2, 2024 · 2490685 · 2490685
1 parent 15ad02a
commit 2490685
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 51 deletions.
diff --git a/dev/tilt/init.tiltfile b/dev/tilt/init.tiltfile
@@ -1,3 +1,5 @@
+load('./config.tiltfile', 'run_apps')
+
 LOAD_SYMBOL="<dummy-import-symbol>"
 
 local_resource(
@@ -48,6 +50,45 @@ local_resource(
   ]
 )
 
+local_resource(
+  name='init-voucher-hydra-client',
+  labels = ['init'],
+  cmd=[
+    'buck2',
+    'run',
+    '//dev:setup-hydra-client',
+    '--',
+    'voucher',
+    'authorization_code,refresh_token',
+    'http://localhost:3006/api/auth/callback/blink',
+  ],
+  allow_parallel = True,
+  resource_deps = [
+    "hydra",
+    "api",
+  ]
+)
+
+local_resource(
+  name='init-consent-hydra-client',
+  labels = ['init'],
+  cmd=[
+    'buck2',
+    'run',
+    '//dev:setup-hydra-client',
+    '--',
+    'consent-test',
+    'authorization_code,refresh_token',
+    'http://localhost:3000',
+  ],
+  allow_parallel = True,
+  auto_init = run_apps,
+  resource_deps = [
+    "hydra",
+    "api",
+  ]
+)
+
 local_resource(
   name='init-user-funds',
   labels = ['init'],
@@ -64,3 +105,12 @@ local_resource(
     "price",
   ]
 )
+
+local_resource(
+    name="init-voucher-escrow",
+    labels = ['init'],
+    cmd="buck2 run //dev:setup-voucher-escrow",
+    allow_parallel=False,
+    auto_init=run_apps,
+    resource_deps=["voucher-pg", "api-keys"]
+)
diff --git a/dev/tilt/services.tiltfile b/dev/tilt/services.tiltfile
@@ -211,42 +211,14 @@ local_resource(
     resource_deps = [
         "api",
         "apollo-router",
-        "hydra-voucher",
-        "setup-voucher"
+        "init-voucher-hydra-client",
+        "init-voucher-escrow"
     ],
     links = [
         link("http://localhost:3006", "voucher"),
     ],
 )
 
-local_resource(
-  name='hydra-voucher',
-  labels = ['apps'],
-  cmd=[
-    'buck2',
-    'run',
-    '//dev:setup-hydra-client',
-    '--',
-    'voucher',
-    'authorization_code,refresh_token',
-    'http://localhost:3006/api/auth/callback/blink',
-  ],
-  allow_parallel = True,
-  resource_deps = [
-    "hydra",
-    "api",
-  ]
-)
-
-local_resource(
-    name="setup-voucher",
-    cmd="buck2 run //dev:setup-voucher-escrow",
-    allow_parallel=False,
-    auto_init=run_apps,
-    resource_deps=["voucher-pg", "api-keys"]
-)
-
-
 api_target = "//core/api:dev"
 if is_ci:
     api_target = "//core/api:api"

diff --git a/dev/tilt/tests.tiltfile b/dev/tilt/tests.tiltfile
@@ -147,33 +147,13 @@ local_resource(
         "apollo-router",
         "hydra",
         "api",
-        "hydra-consent-test-client",
+        "init-consent-hydra-client",
     ],
     links = [
         link("http://localhost:3000", "consent"),
     ],
 )
 
-local_resource(
-  name='hydra-consent-test-client',
-  labels = ['auth'],
-  cmd=[
-    'buck2',
-    'run',
-    '//dev:setup-hydra-client',
-    '--',
-    'consent-test',
-    'authorization_code,refresh_token',
-    'http://localhost:3000',
-  ],
-  allow_parallel = True,
-  auto_init = run_apps,
-  resource_deps = [
-    "hydra",
-    "api",
-  ]
-)
-
 
 map_test_target = "//apps/map:test-integration"
 local_resource(