chore: update env vars

ubiquity-os-marketplace · Oct 28, 2024 · 638537f · 638537f
1 parent d4a1bef
commit 638537f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/compute.yml b/.github/workflows/compute.yml
@@ -25,8 +25,8 @@ jobs:
     permissions: write-all
     env:
       TELEGRAM_BOT_ENV: ${{ secrets.TELEGRAM_BOT_ENV }}
-      STORAGE_APP_ID: ${{ secrets.STORAGE_APP_ID }}
-      STORAGE_APP_PRIVATE_KEY: ${{ secrets.STORAGE_APP_PRIVATE_KEY }}
+      APP_ID: ${{ secrets.APP_ID }}
+      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 
     steps:
       - uses: actions/checkout@v4
@@ -47,5 +47,5 @@ jobs:
         id: Kernel-Telegram
         env:
           TELEGRAM_BOT_ENV: ${{ secrets.TELEGRAM_BOT_ENV }}
-          STORAGE_APP_ID: ${{ secrets.STORAGE_APP_ID }}
-          STORAGE_APP_PRIVATE_KEY: ${{ secrets.STORAGE_APP_PRIVATE_KEY }}
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff --git a/.github/workflows/worker-deploy.yml b/.github/workflows/worker-deploy.yml
@@ -40,12 +40,12 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           secrets: |
             TELEGRAM_BOT_ENV
-            STORAGE_APP_ID
-            STORAGE_APP_PRIVATE_KEY
+            APP_ID
+            APP_PRIVATE_KEY
         env:
           TELEGRAM_BOT_ENV: ${{ secrets.TELEGRAM_BOT_ENV }}
-          STORAGE_APP_ID: ${{ secrets.STORAGE_APP_ID }}
-          STORAGE_APP_PRIVATE_KEY: ${{ secrets.STORAGE_APP_PRIVATE_KEY }}
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Write Deployment URL to Summary
         run: |

diff --git a/src/bot/mtproto-api/bot/scripts/sms-auth/setup-env.ts b/src/bot/mtproto-api/bot/scripts/sms-auth/setup-env.ts
@@ -108,13 +108,13 @@ class SetUpHandler {
       questions: [
         {
           type: "input",
-          name: "STORAGE_APP_ID",
+          name: "APP_ID",
           message:
             "Enter your storage app id. This can be obtained from `https://github.com/settings/apps`\n\n This should be saved as an organization secret but we'll save it to the repo too.",
         },
         {
           type: "input",
-          name: "STORAGE_APP_PRIVATE_KEY",
+          name: "APP_PRIVATE_KEY",
           message:
             "Enter your storage app private key. This can be obtained following the instructions in the README. \n\n This should be saved as an organization secret but we'll save it to the repo too.",
         },
@@ -164,8 +164,8 @@ class SetUpHandler {
     console.clear();
 
     this.env = {
-      STORAGE_APP_ID: answers["Storage settings"]["STORAGE_APP_ID"],
-      STORAGE_APP_PRIVATE_KEY: answers["Storage settings"]["STORAGE_APP_PRIVATE_KEY"],
+      APP_ID: answers["Storage settings"]["APP_ID"],
+      APP_PRIVATE_KEY: answers["Storage settings"]["APP_PRIVATE_KEY"],
       TELEGRAM_BOT_ENV: {
         botSettings: {
           TELEGRAM_BOT_ADMINS: JSON.parse(answers["Bot settings"]["TELEGRAM_BOT_ADMINS"]),
@@ -207,7 +207,7 @@ class SetUpHandler {
     console.log(step.title);
 
     const passwords = [
-      "STORAGE_APP_PRIVATE_KEY",
+      "APP_PRIVATE_KEY",
       "TELEGRAM_BOT_WEBHOOK_SECRET",
       "REPO_ADMIN_ACCESS_TOKEN",
       "TELEGRAM_API_HASH",
@@ -234,15 +234,15 @@ class SetUpHandler {
   }
 
   async validateEnv() {
-    const { TELEGRAM_BOT_ENV, STORAGE_APP_PRIVATE_KEY, STORAGE_APP_ID } = this.env;
+    const { TELEGRAM_BOT_ENV, APP_PRIVATE_KEY, APP_ID } = this.env;
     const { botSettings, mtProtoSettings, storageSettings } = TELEGRAM_BOT_ENV;
 
     const merged = {
       ...botSettings,
       ...mtProtoSettings,
       ...storageSettings,
-      STORAGE_APP_PRIVATE_KEY,
-      STORAGE_APP_ID,
+      APP_PRIVATE_KEY,
+      APP_ID,
     };
 
     const keys = Object.keys(merged);
@@ -272,8 +272,8 @@ class SetUpHandler {
 
     const telegramBotEnv = `TELEGRAM_BOT_ENV=${JSON.stringify(this.env.TELEGRAM_BOT_ENV)}`;
     const repositoryEnv = `TELEGRAM_BOT_REPOSITORY_FULL_NAME=${process.env.TELEGRAM_BOT_REPOSITORY_FULL_NAME}`;
-    const storageAppId = `STORAGE_APP_ID=${this.env.STORAGE_APP_ID}`;
-    const storageAppPrivateKey = `STORAGE_APP_PRIVATE_KEY=${this.env.STORAGE_APP_PRIVATE_KEY}`;
+    const storageAppId = `APP_ID=${this.env.APP_ID}`;
+    const storageAppPrivateKey = `APP_PRIVATE_KEY=${this.env.APP_PRIVATE_KEY}`;
 
     for (const path of paths) {
       const envVar = `${repositoryEnv}\n${telegramBotEnv}\n${storageAppId}\n${storageAppPrivateKey}`;
@@ -330,8 +330,8 @@ class SetUpHandler {
     const octokit = new Octokit({ auth: process.env.REPO_ADMIN_ACCESS_TOKEN });
     const secrets = {
       TELEGRAM_BOT_ENV: this.env.TELEGRAM_BOT_ENV,
-      STORAGE_APP_ID: this.env.STORAGE_APP_ID,
-      STORAGE_APP_PRIVATE_KEY: this.env.STORAGE_APP_PRIVATE_KEY,
+      APP_ID: this.env.APP_ID,
+      APP_PRIVATE_KEY: this.env.APP_PRIVATE_KEY,
     };
 
     try {

diff --git a/src/types/env.ts b/src/types/env.ts
@@ -90,8 +90,8 @@ export const env = T.Object({
       return str;
     })
     .Encode((obj) => JSON.stringify(obj)),
-  STORAGE_APP_ID: T.String(),
-  STORAGE_APP_PRIVATE_KEY: T.String(),
+  APP_ID: T.String(),
+  APP_PRIVATE_KEY: T.String(),
 });
 
 export type Env = StaticDecode<typeof env>;

diff --git a/src/types/plugin-context-single.ts b/src/types/plugin-context-single.ts
@@ -59,8 +59,8 @@ export class PluginContext {
 
   getApp() {
     try {
-      const appId = this.env.STORAGE_APP_ID;
-      const privateKey = this.env.STORAGE_APP_PRIVATE_KEY;
+      const appId = this.env.APP_ID;
+      const privateKey = this.env.APP_PRIVATE_KEY;
 
       if (!appId || !privateKey) {
         throw new Error("Storage app ID or private key not found");

diff --git a/src/workflow-entry.ts b/src/workflow-entry.ts
@@ -18,8 +18,8 @@ export async function run() {
 
   const payloadEnv = {
     TELEGRAM_BOT_ENV: process.env.TELEGRAM_BOT_ENV,
-    STORAGE_APP_ID: process.env.STORAGE_APP_ID,
-    STORAGE_APP_PRIVATE_KEY: process.env.STORAGE_APP_PRIVATE_KEY,
+    APP_ID: process.env.APP_ID,
+    APP_PRIVATE_KEY: process.env.APP_PRIVATE_KEY,
   };
 
   try {