Merge pull request #62 from TheRipperoni/integrationTesting

Integration Testing

Author: rudyfraser

.github/workflows/rust.yml

@@ -10,14 +10,19 @@ env:
   PDS_EMAIL_FROM_NAME: "noreply"
   PDS_MODERATION_EMAIL_FROM_NAME: "noreply"
   PDS_MODERATION_EMAIL_FROM_ADDRESS: "noreply@blacksky.app"
-  PDS_HOSTNAME: "localho.st"
+  PDS_HOSTNAME: "rsky.com"
   PDS_SERVICE_DID: "did:web:localho.st"
-  PDS_ADMIN_PASS: ${{ secrets.PDS_ADMIN_PASS }}
-  PDS_JWT_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_JWT_KEY_K256_PRIVATE_KEY_HEX }}
+  PDS_SERVICE_HANDLE_DOMAINS: ".rsky.com"
+  PDS_ADMIN_PASS: 3ed1c7b568d3328c44430add531a099f
+  PDS_JWT_KEY_K256_PRIVATE_KEY_HEX: 9d5907143471e8f0e8df0f8b9512a8c5377878ee767f18fcf961055ecfc071cd
+  #  PDS_ADMIN_PASS: ${{ secrets.PDS_ADMIN_PASS }}
+  #  PDS_JWT_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_JWT_KEY_K256_PRIVATE_KEY_HEX }}
   PDS_MAILGUN_API_KEY: ${{ secrets.PDS_MAILGUN_API_KEY }}
   PDS_MAILGUN_DOMAIN: ${{ secrets.PDS_MAILGUN_DOMAIN }}
-  PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX }}
-  PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX }}
+  #PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX }}
+  #PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX: ${{ secrets.PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX }}
+  PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX: fb478b39dd2ddf84bef135dd60f90381903eefadbb9df4b18a2b9b174ae72582
+  PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX: 71cfcf4882a6cff494c3d0affadd3858eb3a5838e7b5e15170e696a590a4fa01
 
 jobs:
   check:

.gitignore

@@ -25,6 +25,7 @@ Rocket.toml
 rustc-*.txt
 /botenv/
 
+.idea/
 # Node.gitignore
 
 # Logs

.idea/dataSources.xml

@@ -11,44 +11,44 @@ repository = "https://github.com/blacksky-algorithms/rsky/tree/main/rsky-pds"
 documentation = "https://docs.rs/rsky-pds"
 
 [dependencies]
-tokio = {workspace = true}
-rocket = { version = "=0.5.1", features = ["json","tls"] }
+tokio = { workspace = true }
+rocket = { version = "=0.5.1", features = ["json", "tls"] }
 dotenvy = "0.15"
 rsky-lexicon = { workspace = true }
 rsky-identity = { workspace = true }
 rsky-crypto = { workspace = true }
-rsky-common = {workspace = true }
+rsky-common = { workspace = true }
 rsky-syntax = { workspace = true }
 rsky-repo = { workspace = true }
 diesel = { version = "=2.1.5", features = ["chrono", "postgres"] }
 chrono = "0.4.26"
 serde = { workspace = true }
 serde_repr = "0.1"
-serde_derive = {workspace = true}
-rand = {workspace = true}
+serde_derive = { workspace = true }
+rand = { workspace = true }
 email_address = "0.2.4"
 anyhow = "1.0.79"
 serde_cbor = { workspace = true }
 base64 = "0.22.0"
 data-encoding = "2.5.0"
-reqwest = { version = "0.12.3",features = ["json","blocking"] }
-serde_json = {workspace = true}
+reqwest = { version = "0.12.3", features = ["json", "blocking"] }
+serde_json = { workspace = true }
 serde_ipld_dagcbor = { workspace = true }
 serde_bytes = { workspace = true }
 base64-url = "2.0.2"
-secp256k1 = {workspace = true}
-rand_core = {workspace = true}
-sha2 = {workspace = true}
-indexmap = { version = "1.9.3",features = ["serde-1"] }
+secp256k1 = { workspace = true }
+rand_core = { workspace = true }
+sha2 = { workspace = true }
+indexmap = { version = "1.9.3", features = ["serde-1"] }
 hex = "0.4.3"
 libipld = { workspace = true }
 lazy_static = "1.4.0"
 regex = "1.10.3"
 thiserror = "1.0.40"
 aws-sdk-s3 = "1.29.0"
-aws-config = { version = "1.1.8",features = ["behavior-version-latest"] }
+aws-config = { version = "1.1.8", features = ["behavior-version-latest"] }
 futures = "0.3.28"
-jwt-simple = { version = "0.12.9",default-features = false, features = ["pure-rust"] }
+jwt-simple = { version = "0.12.9", default-features = false, features = ["pure-rust"] }
 argon2 = "0.5.3"
 base64ct = "1.6.0"
 mailgun-rs = "0.1.10"
@@ -59,17 +59,23 @@ toml = "0.8.12"
 ws = { package = "rocket_ws", version = "0.1.1" }
 atrium-api = "0.24.6"
 atrium-xrpc-client = "0.5.8"
-atrium-ipld = {package = "ipld-core", version = "0.4.1"}
+atrium-ipld = { package = "ipld-core", version = "0.4.1" }
 time = "^0.3.36"
 url = "2.5.2"
 async-event-emitter = "0.1.3"
 event-emitter-rs = "0.1.4"
-webpki-roots = { version = "0.26.0-alpha.1" }
 lexicon_cid = { workspace = true }
-once_cell = "1.19.0"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 
+[dev-dependencies]
+testcontainers = "0.23.2"
+testcontainers-modules = { version = "0.11.6", features = ["postgres", "blocking"] }
+diesel_migrations = {version = "2.1.0", features = ["postgres"]}
+http-auth-basic = { version = "0.3.5" }
+
 [dependencies.rocket_sync_db_pools]
 version = "=0.1.0"
 features = ["diesel_postgres_pool"]
+
+