misc: 0.7.0 (#407)

* misc: drop patches * infra: pin postgres to version 14 * refactor: fix thruster example app name * infra: db_fqdn fix * tests: warp hello world
shuttle-hq · Oct 19, 2022 · ac43016 · ac43016
1 parent cf1b30c
commit ac43016
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -37,22 +37,22 @@ ifeq ($(PROD),true)
 DOCKER_COMPOSE_FILES=-f docker-compose.yml
 STACK=shuttle-prod
 APPS_FQDN=shuttleapp.rs
-DB_FQDN=pg.shuttle.rs
+DB_FQDN=db.shuttle.rs
 CONTAINER_REGISTRY=public.ecr.aws/shuttle
 else
 DOCKER_COMPOSE_FILES=-f docker-compose.yml -f docker-compose.dev.yml
 STACK=shuttle-dev
 APPS_FQDN=unstable.shuttleapp.rs
-DB_FQDN=pg.unstable.shuttle.rs
+DB_FQDN=db.unstable.shuttle.rs
 CONTAINER_REGISTRY=public.ecr.aws/shuttle-dev
 endif
 
 POSTGRES_EXTRA_PATH?=./extras/postgres
-POSTGRES_TAG?=latest
+POSTGRES_TAG?=14
 
 RUST_LOG?=debug
 
-DOCKER_COMPOSE_ENV=STACK=$(STACK) BACKEND_TAG=$(TAG) PROVISIONER_TAG=$(TAG) POSTGRES_TAG=latest APPS_FQDN=$(APPS_FQDN) DB_FQDN=$(DB_FQDN) POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) RUST_LOG=$(RUST_LOG) CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) MONGO_INITDB_ROOT_USERNAME=$(MONGO_INITDB_ROOT_USERNAME) MONGO_INITDB_ROOT_PASSWORD=$(MONGO_INITDB_ROOT_PASSWORD)
+DOCKER_COMPOSE_ENV=STACK=$(STACK) BACKEND_TAG=$(TAG) PROVISIONER_TAG=$(TAG) POSTGRES_TAG=${POSTGRES_TAG} APPS_FQDN=$(APPS_FQDN) DB_FQDN=$(DB_FQDN) POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) RUST_LOG=$(RUST_LOG) CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) MONGO_INITDB_ROOT_USERNAME=$(MONGO_INITDB_ROOT_USERNAME) MONGO_INITDB_ROOT_PASSWORD=$(MONGO_INITDB_ROOT_PASSWORD)
 
 .PHONY: images clean src up down deploy shuttle-% postgres docker-compose.rendered.yml test
 

diff --git a/cargo-shuttle/tests/integration/run.rs b/cargo-shuttle/tests/integration/run.rs
@@ -229,7 +229,7 @@ async fn warp_hello_world() {
         .await
         .unwrap();
 
-    assert_eq!(request_text, "Hello, World!");
+    assert_eq!(request_text, "Hello, World");
 }
 
 #[tokio::test(flavor = "multi_thread")]

diff --git a/examples/thruster/postgres/Shuttle.toml b/examples/thruster/postgres/Shuttle.toml
@@ -1 +1 @@
-name = "postgres-tide-app"
+name = "postgres-thruster-app"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		name = "postgres-tide-app"
		name = "postgres-thruster-app"