clean up

ctrlplanedev · Aug 27, 2024 · 3caa1dc · 3caa1dc
1 parent 54f6f83
commit 3caa1dc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/apps/webservice/src/app/[workspaceSlug]/dashboard/TargetAnnotationPieChart.tsx b/apps/webservice/src/app/[workspaceSlug]/dashboard/TargetAnnotationPieChart.tsx
@@ -19,7 +19,7 @@ export const TargetAnnotationPieChart: React.FC<{
   const targets = api.target.byWorkspaceId.list.useQuery({ workspaceId });
   const [showUndefined] = useState(false);
   const [annotation] = useState<string | null>(
-    "kubernetes.io/autoscaling-enabled",
+    "kubernetes/autoscaling-enabled",
   );
 
   const chartData = _.chain(targets.data?.items ?? [])

diff --git a/apps/webservice/src/app/[workspaceSlug]/dashboards/widgets/TargetWidgets.tsx b/apps/webservice/src/app/[workspaceSlug]/dashboards/widgets/TargetWidgets.tsx
@@ -92,7 +92,7 @@ export const WidgetTargetLabelCount: Widget<{
   },
   Component: ({ config, updateConfig, isEditMode }) => {
     const countUndefined = config.countUndefined ?? false;
-    const label = config.label ?? "kubernetes.io/autoscaling-enabled";
+    const label = config.label ?? "kubernetes/autoscaling-enabled";
     const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
     const workspace = api.workspace.bySlug.useQuery(workspaceSlug);
     const targets = api.target.byWorkspaceId.list.useQuery(

diff --git a/packages/api/src/router/target.ts b/packages/api/src/router/target.ts
@@ -1,6 +1,5 @@
 import type { SQL, Tx } from "@ctrlplane/db";
 import ms from "ms";
-import { targetScanQueue } from "src/dispatch";
 import { isPresent } from "ts-is-present";
 import { z } from "zod";
 
@@ -28,6 +27,7 @@ import {
   workspace,
 } from "@ctrlplane/db/schema";
 
+import { targetScanQueue } from "../dispatch";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 const labelGroupRouter = createTRPCRouter({
@@ -158,10 +158,11 @@ const targetProviderRouter = createTRPCRouter({
             .returning()
             .then(takeFirst);
 
+          console.log("queueing target scan");
           await targetScanQueue.add(
             tg.id,
             { targetProviderId: tg.id },
-            { repeat: { every: ms("5m") } },
+            { repeat: { every: ms("5m"), immediately: true } },
           );
 
           return { ...tg, config: tgConfig };

diff --git a/packages/validators/src/config-file.ts b/packages/validators/src/config-file.ts
diff --git a/packages/validators/src/index.ts b/packages/validators/src/index.ts
@@ -1 +1,13 @@
-export * from "./config-file.js";
+import { z } from "zod";
+
+export const configFile = z.object({
+  deployments: z.array(
+    z.object({
+      name: z.string(),
+      slug: z.string(),
+      description: z.string().optional(),
+      system: z.string(),
+      workspace: z.string(),
+    }),
+  ),
+});