Merge branch 'main' into feat/shuttle-ecs-common

.circleci/config.yml

@@ -356,6 +356,9 @@ jobs:
       gateway-admin-key:
         description: "Admin API key that authorizes gateway requests to auth service, for key to jwt conversion."
         type: string
+      permit-api-key:
+        description: "Permit.io API key for the Permit environment that matches the current ${SHUTTLE_ENV}."
+        type: string
     steps:
       - checkout
       - set-git-tag
@@ -383,6 +386,7 @@ jobs:
             AUTH_JWTSIGNING_PRIVATE_KEY=${<< parameters.jwt-signing-private-key >>} \
             CONTROL_DB_POSTGRES_URI=${<< parameters.control-db-postgres-uri >>} \
             GATEWAY_ADMIN_KEY=${<< parameters.gateway-admin-key >>} \
+            PERMIT_API_KEY=${<< parameters.permit-api-key >>} \
             make deploy
       - when:
           condition:
@@ -748,6 +752,7 @@ workflows:
           jwt-signing-private-key: DEV_AUTH_JWTSIGNING_PRIVATE_KEY
           control-db-postgres-uri: DEV_CONTROL_DB_POSTGRES_URI
           gateway-admin-key: DEV_GATEWAY_ADMIN_KEY
+          permit-api-key: STAGING_PERMIT_API_KEY
           requires:
             - build-and-push-unstable
             - approve-deploy-images-unstable
@@ -832,6 +837,7 @@ workflows:
           jwt-signing-private-key: PROD_AUTH_JWTSIGNING_PRIVATE_KEY
           control-db-postgres-uri: PROD_CONTROL_DB_POSTGRES_URI
           gateway-admin-key: PROD_GATEWAY_ADMIN_KEY
+          permit-api-key: PROD_PERMIT_API_KEY
           ssh-fingerprint: 6a:c5:33:fe:5b:c9:06:df:99:64:ca:17:0d:32:18:2e
           ssh-config-script: production-ssh-config.sh
           ssh-host: shuttle.prod.internal

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -20,7 +20,7 @@ body:
     attributes:
       label: Version
       description: What version of `cargo-shuttle` are you running (`cargo shuttle --version`)?
-      placeholder: "v0.42.0"
+      placeholder: "v0.43.0"
     validations:
       required: true
   - type: dropdown

.gitignore

@@ -43,3 +43,5 @@ yarn.lock
 *.wasm
 *.sqlite*
 .envrc
+
+/private

Cargo.toml

@@ -2,7 +2,8 @@
 resolver = "2"
 members = [
   "admin",
-  "auth", "backends",
+  "auth",
+  "backends",
   "cargo-shuttle",
   "codegen",
   "common",
@@ -23,19 +24,19 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.42.0"
+version = "0.43.0"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/shuttle-hq/shuttle"
 
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
 [workspace.dependencies]
-shuttle-backends = { path = "backends", version = "0.42.0" }
-shuttle-codegen = { path = "codegen", version = "0.42.0" }
-shuttle-common = { path = "common", version = "0.42.0" }
-shuttle-common-tests = { path = "common-tests", version = "0.42.0" }
-shuttle-proto = { path = "proto", version = "0.42.0" }
-shuttle-service = { path = "service", version = "0.42.0" }
+shuttle-backends = { path = "backends", version = "0.43.0" }
+shuttle-codegen = { path = "codegen", version = "0.43.0" }
+shuttle-common = { path = "common", version = "0.43.0" }
+shuttle-common-tests = { path = "common-tests", version = "0.43.0" }
+shuttle-proto = { path = "proto", version = "0.43.0" }
+shuttle-service = { path = "service", version = "0.43.0" }
 
 anyhow = "1.0.66"
 async-trait = "0.1.58"