Skip to content

Commit

Permalink
db cleanup (#673)
Browse files Browse the repository at this point in the history
* feat: clean up columns and try pscale http proxy

* chore(ci.yaml): replace environment variable syntax with plain variable names in MySQL and Drizzle configurations

* fix(ci.yaml): change options flag for planetscale job to use double dashes instead of single dashes for consistency

* fix(ci.yaml): fix formatting of options for planetscale job

* chore(ci.yaml): remove unused planetscale service
feat(ci.yaml): add step to run Planetscale Proxy

* fix(ci.yaml): update Planetscale Proxy run command to use correct syntax and remove unnecessary flags

* fix(ci.yaml): run Planetscale Proxy container in detached mode

The `docker run` command for running the Planetscale Proxy container was modified to include the `-d` flag, which runs the container in detached mode. This allows the container to run in the background and not block the execution of subsequent steps in the CI workflow.

* fix(ci.yaml): update DRIZZLE_DATABASE_URL to use port 3306 for MySQL connection

* fix(ci.yaml): update DRIZZLE_DATABASE_URL to use DATABASE_USERNAME instead of DATABASE_HOST in the MySQL connection string

* ci.yaml: add support for creating and connecting to a docker network
env.ts: add default value for DATABASE_NAME as "unkey"

* fix(ci.yaml): update Planetscale Proxy setup to use go install instead of docker run

* chore(ci.yaml): update actions/checkout to v4
chore(ci.yaml): update actions/setup-go to v4 and set go-version to ^1.20
chore(ci.yaml): update actions/setup-node to v4 and set node-version to 20

* fix(ci.yaml): update DRIZZLE_DATABASE_URL to use port 8080 instead of 3306
fix(ci.yaml): update DATABASE_HOST to include port 8080 instead of using default port

* chore(ci.yaml): update DATABASE_HOST and DRIZZLE_DATABASE_URL values

The DATABASE_HOST value is updated to "localhost:8080" and commented that it is proxied by planetscale proxy.

The DRIZZLE_DATABASE_URL value is updated to use port 3306 instead of 8080.

* fix(ci.yaml): update DATABASE_HOST environment variable to only include hostname
feat(ci.yaml): add DATABASE_PORT environment variable
fix(db.ts): remove unnecessary whitespace
feat(env.ts): add DATABASE_URL environment variable
fix(global.ts): update metrics and rateLimiter initialization
fix(usagelimit/durable_object.ts): update logger initialization

* chore(ci.yaml): remove DATABASE_PORT environment variable
fix(ci.yaml): update ps-http-sim command to listen on all network interfaces

* fix(db.ts): set protocol to "http" if host includes "localhost" for CI testing

* fix(ci.yaml): remove port number from mysql-addr argument in ps-http-sim command

* fix(ci.yaml): remove unnecessary mysql-addr flag from ps-http-sim command

* chore(ci.yaml): remove unused environment variables
fix(ci.yaml): hardcode database credentials and database name in job steps

* chore(ci.yaml): add step to print pscale.logs at the end of the job

* ci: test worker before deployment

* chore(deploy-api.yaml): remove unnecessary empty line
chore(deploy-api.yaml): add condition to only deploy to production if it's not a prerelease
  • Loading branch information
chronark authored Dec 12, 2023
1 parent f8c4c34 commit 91e4489
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/deploy-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ jobs:
UNKEY_ROOT_KEY: ${{ secrets.CANARY_ROOT_KEY }}

production:
if: "!github.event.release.prerelease"
needs:
- canary
- canary-tests
Expand Down
1 change: 0 additions & 1 deletion apps/web/lib/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ export const db = drizzle(
);

export * from "@unkey/db";
export * from "drizzle-orm";

0 comments on commit 91e4489

Please sign in to comment.