Skip to content

Commit

Permalink
chore: bump quickstart (#229)
Browse files Browse the repository at this point in the history
  • Loading branch information
siddhart1o1 authored Jan 19, 2024
1 parent 4e9bfcb commit bd597eb
Show file tree
Hide file tree
Showing 185 changed files with 1,938 additions and 444 deletions.
2 changes: 1 addition & 1 deletion tests/e2e/gql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GALOY_ENDPOINT="http://localhost:4455/graphql"


gql_file() {
echo "${REPO_ROOT}/vendor/galoy-quickstart/galoy/test/bats/gql/$1.gql"
echo "${REPO_ROOT}/vendor/galoy-quickstart/graphql/gql/$1.gql"
}

gql_query() {
Expand Down
6 changes: 3 additions & 3 deletions vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- git:
commitTitle: 'refactor(core): cleanup old notification code (#3866)...'
sha: 87302ead3d5f75ce4f9dadda122bf119bd1f0b30
commitTitle: 'chore(release): [ci skip] bump quickstart image to sha256@db6cadaf07496da7a06e545c3d7b9c526c88a4d9eb9ba085cd7ce4b0d6fb1e02'
sha: 944635e78eec2c086a3e8f191e3239dfcfe7ffa4
tags:
- 0.20.9
- 0.20.17
path: galoy-quickstart
path: vendor
kind: LockConfig
7 changes: 2 additions & 5 deletions vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ directories:
- path: galoy-quickstart
git:
url: https://github.com/GaloyMoney/galoy.git
ref: 'main'
ref: main
includePaths:
- quickstart/.env.galoy
- quickstart/docker-compose.yml
- quickstart/dev/**/*
- quickstart/bin/**/*
- quickstart/graphql/**/*
- quickstart/galoy/test/**/*
- quickstart/bin/*
- quickstart/.gitignore
newRootPath: quickstart
67 changes: 0 additions & 67 deletions vendor/galoy-quickstart/.env.galoy

This file was deleted.

1 change: 0 additions & 1 deletion vendor/galoy-quickstart/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/galoy-quickstart/bin/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ bitcoin_signer_cli() {
}

gql_file() {
echo "$GALOY_DIR/galoy/test/bats/gql/$1.gql"
echo "$GALOY_DIR/graphql/gql/$1.gql"
}

gql_query() {
Expand Down
2 changes: 1 addition & 1 deletion vendor/galoy-quickstart/bin/init-onchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bitcoin_cli createwallet "outside" || true
bitcoin_cli -generate 200 > /dev/null 2>&1

bitcoin_signer_cli createwallet "dev" || true
bitcoin_signer_cli -rpcwallet=dev importdescriptors "$(cat $GALOY_DIR/galoy/test/bats/bitcoind_signer_descriptors.json)"
bitcoin_signer_cli -rpcwallet=dev importdescriptors "$(cat $GALOY_DIR/dev/config/bitcoind/bitcoind_signer_descriptors.json)"

echo "Checking that bria is running..."

Expand Down
11 changes: 2 additions & 9 deletions vendor/galoy-quickstart/bin/re-render.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,11 @@
set -e

REPO_ROOT=$(git rev-parse --show-toplevel)
GALOY_ROOT_DIR=${REPO_ROOT}/quickstart/galoy
DEV_ROOT_DIR=${REPO_ROOT}/quickstart/dev

pushd ${REPO_ROOT}/quickstart

ytt -f vendir > vendir.yml
vendir sync

ytt -f ./docker-compose.tmpl.yml -f ${GALOY_ROOT_DIR}/docker-compose.yml > docker-compose.yml

pushd ${GALOY_ROOT_DIR}
source .env
mkdir -p "${GALOY_ROOT_DIR}/../vendor/galoy-quickstart/env"

export OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-agent:4318
envsubst < .env.ci | grep -v '^LND2' > ${GALOY_ROOT_DIR}/../.env.galoy
ytt -f ./docker-compose.tmpl.yml -f ${DEV_ROOT_DIR}/docker-compose.deps.yml > docker-compose.yml
99 changes: 99 additions & 0 deletions vendor/galoy-quickstart/dev/BUCK
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
load("@toolchains//rover:macros.bzl", "supergraph", "diff_check", "dev_update_file")
load( ":tilt.bzl", "tilt",)

# Bring up the full set of services for development
tilt(
name = "up",
subcmd = "up",
)

# Bring down any remaining/running services
tilt(
name = "down",
subcmd = "down",
)

python_bootstrap_binary(
name = "healthcheck",
main = "healthcheck.py",
visibility = ["PUBLIC"],
)

supergraph(
name = "supergraph",
config = "config/apollo-federation/supergraph-config.yaml",
subgraphs = {
"API_KEYS_SCHEMA": "//core/api-keys:sdl",
"NOTIFICATIONS_SCHEMA": "//core/notifications:sdl",
"PUBLIC_SCHEMA": "//core/api:public-sdl",
},
)

diff_check(
name = "supergraph-diff",
original = "config/apollo-federation/supergraph.graphql",
new = ":supergraph"
)

test_suite(
name = "check-sdls",
tests = [
":supergraph-diff",
"//core/api:public-schema-diff",
"//core/api:admin-schema-diff",
"//core/api-keys:schema-diff",
"//core/notifications:schema-diff",
],
)

dev_update_file(
name = "update-supergraph",
generated = ":supergraph",
out = "config/apollo-federation/supergraph.graphql"
)

dev_update_file(
name = "update-core-supergraph",
generated = ":supergraph",
out = "../core/api/dev/apollo-federation/supergraph.graphql"
)

sh_binary(
name = "update-schemas",
main = "bin/update-schemas.sh",
)

sh_binary(
name = "init-onchain",
main = "bin/init-onchain.sh",
)

sh_binary(
name = "init-lightning",
main = "bin/init-lightning.sh",
)

sh_binary(
name = "init-user",
main = "bin/init-user.sh",
)

sh_binary(
name = "setup-hydra-client",
main = "bin/setup-hydra-client.sh",
)

sh_binary(
name = "stoppable-trigger",
main = "bin/run-stoppable-trigger.sh",
)

sh_binary(
name = "add-test-users-with-usernames",
main = "bin/add-test-users-with-usernames.sh",
)

sh_binary(
name = "fund-user",
main = "bin/fund-user.sh",
)
Loading

0 comments on commit bd597eb

Please sign in to comment.