Merge pull request #275 from fosrl/dev

add migration script

server/lib/consts.ts

@@ -2,7 +2,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 // This is a placeholder value replaced by the build process
-export const APP_VERSION = "1.0.0-beta.15";
+export const APP_VERSION = "1.0.0";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);

server/setup/migrations.ts

@@ -16,6 +16,7 @@ import m7 from "./scripts/1.0.0-beta10";
 import m8 from "./scripts/1.0.0-beta12";
 import m13 from "./scripts/1.0.0-beta13";
 import m15 from "./scripts/1.0.0-beta15";
+import m16 from "./scripts/1.0.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -31,7 +32,8 @@ const migrations = [
     { version: "1.0.0-beta.10", run: m7 },
     { version: "1.0.0-beta.12", run: m8 },
     { version: "1.0.0-beta.13", run: m13 },
-    { version: "1.0.0-beta.15", run: m15 }
+    { version: "1.0.0-beta.15", run: m15 },
+    { version: "1.0.0", run: m16 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scripts/1.0.0.ts

@@ -0,0 +1,57 @@
+import { APP_PATH } from "@server/lib/consts";
+import fs from "fs";
+import yaml from "js-yaml";
+import path from "path";
+import { z } from "zod";
+import { fromZodError } from "zod-validation-error";
+
+const version = "1.0.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    try {
+        const traefikPath = path.join(
+            APP_PATH,
+            "traefik",
+            "traefik_config.yml"
+        );
+
+        const schema = z.object({
+            experimental: z.object({
+                plugins: z.object({
+                    badger: z.object({
+                        moduleName: z.string(),
+                        version: z.string()
+                    })
+                })
+            })
+        });
+
+        const traefikFileContents = fs.readFileSync(traefikPath, "utf8");
+        const traefikConfig = yaml.load(traefikFileContents) as any;
+
+        const parsedConfig = schema.safeParse(traefikConfig);
+
+        if (!parsedConfig.success) {
+            throw new Error(fromZodError(parsedConfig.error).toString());
+        }
+
+        traefikConfig.experimental.plugins.badger.version = "v1.0.0";
+
+        const updatedTraefikYaml = yaml.dump(traefikConfig);
+
+        fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
+
+        console.log(
+            "Updated the version of Badger in your Traefik configuration to 1.0.0"
+        );
+    } catch (e) {
+        console.log(
+            "We were unable to update the version of Badger in your Traefik configuration. Please update it manually."
+        );
+        console.error(e);
+    }
+
+    console.log(`${version} migration complete`);
+}

src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx

@@ -408,7 +408,7 @@ export default function ResourceAuthenticationPage() {
                         <SwitchInput
                             id="sso-toggle"
                             label="Use Platform SSO"
-                            description="Existing users will only have to login once for all resources that have this enabled."
+                            description="Existing users will only have to log in once for all resources that have this enabled."
                             defaultChecked={resource.sso}
                             onCheckedChange={(val) => setSsoEnabled(val)}
                         />

src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx

@@ -455,7 +455,7 @@ export default function ReverseProxyTargets(props: {
                             SSL Configuration
                         </SettingsSectionTitle>
                         <SettingsSectionDescription>
-                            Setup SSL to secure your connections with certificates
+                            Set up SSL to secure your connections with certificates
                         </SettingsSectionDescription>
                     </SettingsSectionHeader>
                     <SettingsSectionBody>
@@ -477,7 +477,7 @@ export default function ReverseProxyTargets(props: {
                         Target Configuration
                     </SettingsSectionTitle>
                     <SettingsSectionDescription>
-                        Setup targets to route traffic to your services
+                        Set up targets to route traffic to your services
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
                 <SettingsSectionBody>

src/app/auth/login/page.tsx

@@ -41,7 +41,7 @@ export default async function Page(props: {
                             Looks like you've been invited!
                         </h2>
                         <p className="text-center">
-                            To accept the invite, you must login or create an
+                            To accept the invite, you must log in or create an
                             account.
                         </p>
                     </div>

src/app/auth/reset-password/ResetPasswordForm.tsx

@@ -182,7 +182,7 @@ export default function ResetPasswordForm({
                 return;
             }
 
-            setSuccessMessage("Password reset successfully! Back to login...");
+            setSuccessMessage("Password reset successfully! Back to log in...");
 
             setTimeout(() => {
                 if (redirect) {

src/app/auth/signup/page.tsx

@@ -57,7 +57,7 @@ export default async function Page(props: {
                             Looks like you've been invited!
                         </h2>
                         <p className="text-center">
-                            To accept the invite, you must login or create an
+                            To accept the invite, you must log in or create an
                             account.
                         </p>
                     </div>

src/app/setup/page.tsx

@@ -112,7 +112,7 @@ export default function StepperForm() {
         <>
             <Card>
                 <CardHeader>
-                    <CardTitle>Setup New Organization</CardTitle>
+                    <CardTitle>New Organization</CardTitle>
                     <CardDescription>
                         Create your organization, site, and resources
                     </CardDescription>