Revert over eager livekit renames

crates/collab/.env.toml

@@ -5,9 +5,9 @@ HTTP_PORT = 8080
 API_TOKEN = "secret"
 INVITE_LINK_PREFIX = "http://localhost:3000/invites/"
 ZED_ENVIRONMENT = "development"
-livekit_SERVER = "http://localhost:7880"
-livekit_KEY = "devkey"
-livekit_SECRET = "secret"
+LIVEKIT_SERVER = "http://localhost:7880"
+LIVEKIT_KEY = "devkey"
+LIVEKIT_SECRET = "secret"
 BLOB_STORE_ACCESS_KEY = "the-blob-store-access-key"
 BLOB_STORE_SECRET_KEY = "the-blob-store-secret-key"
 BLOB_STORE_BUCKET = "the-extensions-bucket"

crates/collab/k8s/collab.template.yml

@@ -109,7 +109,7 @@ spec:
                 secretKeyRef:
                   name: zed-client
                   key: checksum-seed
-            - name: livekit_SERVER
+            - name: LIVEKIT_SERVER
               valueFrom:
                 secretKeyRef:
                   name: livekit

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -40,7 +40,7 @@ CREATE INDEX "index_contacts_user_id_b" ON "contacts" ("user_id_b");
 
 CREATE TABLE "rooms" (
     "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "livekit_room" VARCHAR NOT NULL,
+    "live_kit_room" VARCHAR NOT NULL,
     "environment" VARCHAR,
     "channel_id" INTEGER REFERENCES channels (id) ON DELETE CASCADE
 );

crates/collab/migrations/20221111092550_reconnection_support.sql

@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS "rooms" (
     "id" SERIAL PRIMARY KEY,
-    "livekit_room" VARCHAR NOT NULL
+    "live_kit_room" VARCHAR NOT NULL
 );
 
 ALTER TABLE "projects"

crates/collab/src/tests/test_server.rs

@@ -79,7 +79,7 @@ pub struct ContactsSummary {
 
 impl TestServer {
     pub async fn start(deterministic: BackgroundExecutor) -> Self {
-        static NEXT_livekit_SERVER_ID: AtomicUsize = AtomicUsize::new(0);
+        static NEXT_LIVEKIT_SERVER_ID: AtomicUsize = AtomicUsize::new(0);
 
         let use_postgres = env::var("USE_POSTGRES").ok();
         let use_postgres = use_postgres.as_deref();
@@ -88,7 +88,7 @@ impl TestServer {
         } else {
             TestDb::sqlite(deterministic.clone())
         };
-        let livekit_server_id = NEXT_livekit_SERVER_ID.fetch_add(1, SeqCst);
+        let livekit_server_id = NEXT_LIVEKIT_SERVER_ID.fetch_add(1, SeqCst);
         let livekit_server = livekit_client::test::TestServer::create(
             format!("http://livekit.{}.test", livekit_server_id),
             format!("devkey-{}", livekit_server_id),

crates/livekit_client/examples/test_app.rs

@@ -66,9 +66,9 @@ fn main() {
             }],
         }]);
 
-        let livekit_url = std::env::var("livekit_URL").unwrap_or("http://localhost:7880".into());
-        let livekit_key = std::env::var("livekit_KEY").unwrap_or("devkey".into());
-        let livekit_secret = std::env::var("livekit_SECRET").unwrap_or("secret".into());
+        let livekit_url = std::env::var("LIVEKIT_URL").unwrap_or("http://localhost:7880".into());
+        let livekit_key = std::env::var("LIVEKIT_KEY").unwrap_or("devkey".into());
+        let livekit_secret = std::env::var("LIVEKIT_SECRET").unwrap_or("secret".into());
         let height = px(800.);
         let width = px(800.);
 

crates/proto/proto/zed.proto

@@ -368,7 +368,7 @@ message CreateRoom {}
 
 message CreateRoomResponse {
     Room room = 1;
-    optional LiveKitConnectionInfo livekit_connection_info = 2;
+    optional LiveKitConnectionInfo live_kit_connection_info = 2;
 }
 
 message JoinRoom {
@@ -378,7 +378,7 @@ message JoinRoom {
 message JoinRoomResponse {
     Room room = 1;
     optional uint64 channel_id = 2;
-    optional LiveKitConnectionInfo livekit_connection_info = 3;
+    optional LiveKitConnectionInfo live_kit_connection_info = 3;
 }
 
 message RejoinRoom {
@@ -429,7 +429,7 @@ message Room {
     repeated Participant participants = 2;
     repeated PendingParticipant pending_participants = 3;
     repeated Follower followers = 4;
-    string livekit_room = 5;
+    string live_kit_room = 5;
 }
 
 message Participant {