address comments (#4340)

porter-dev · Feb 28, 2024 · 452783d · 452783d
1 parent e99eb1a
commit 452783d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/dashboard/src/lib/porter-apps/services.ts b/dashboard/src/lib/porter-apps/services.ts
@@ -240,18 +240,23 @@ export function defaultSerialized({
     memoryThresholdPercent: 50,
   };
 
-  const defaultHealthCheck: SerializedHealthcheck = {
+  const defaultWebHealthCheck: SerializedHealthcheck = {
     enabled: false,
     httpPath: "/healthz",
   };
 
+  const defaultWorkerHealthCheck: SerializedHealthcheck = {
+    enabled: false,
+    command: "./healthz.sh",
+  };
+
   return match(type)
     .with("web", () => ({
       ...baseService,
       config: {
         type: "web" as const,
         autoscaling: defaultAutoscaling,
-        healthCheck: defaultHealthCheck,
+        healthCheck: defaultWebHealthCheck,
         domains: [],
         private: false,
         ingressAnnotations: {},
@@ -263,7 +268,7 @@ export function defaultSerialized({
       config: {
         type: "worker" as const,
         autoscaling: defaultAutoscaling,
-        healthCheck: defaultHealthCheck,
+        healthCheck: defaultWorkerHealthCheck,
       },
     }))
     .with("job", () => ({

diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Health.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Health.tsx
@@ -10,16 +10,17 @@ import { type PorterAppFormData } from "lib/porter-apps";
 
 type HealthProps = {
   index: number;
-  command?: boolean;
 };
 
-const Health: React.FC<HealthProps> = ({ index, command = false }) => {
+const Health: React.FC<HealthProps> = ({ index }) => {
   const { register, control, watch } = useFormContext<PorterAppFormData>();
 
   const healthCheckEnabled = watch(
     `app.services.${index}.config.healthCheck.enabled`
   );
 
+  const serviceType = watch(`app.services.${index}.config.type`);
+
   return (
     <>
       <Spacer y={1} />
@@ -60,29 +61,29 @@ const Health: React.FC<HealthProps> = ({ index, command = false }) => {
         )}
       />
       {healthCheckEnabled.value &&
-        (command ? (
+        (serviceType === "web" ? (
           <>
             <Spacer y={0.5} />
-            <Text>Health check command</Text>
+            <Text>Health check endpoint</Text>
             <Spacer y={0.5} />
             <ControlledInput
               type="text"
-              placeholder="ex: ./healthz.sh"
+              placeholder="ex: /healthz"
               {...register(
-                `app.services.${index}.config.healthCheck.command.value`
+                `app.services.${index}.config.healthCheck.httpPath.value`
               )}
             />
           </>
         ) : (
           <>
             <Spacer y={0.5} />
-            <Text>Health check endpoint</Text>
+            <Text>Health check command</Text>
             <Spacer y={0.5} />
             <ControlledInput
               type="text"
-              placeholder="ex: /healthz"
+              placeholder="ex: ./healthz.sh"
               {...register(
-                `app.services.${index}.config.healthCheck.httpPath.value`
+                `app.services.${index}.config.healthCheck.command.value`
               )}
             />
           </>

diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WorkerTabs.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WorkerTabs.tsx
@@ -60,7 +60,7 @@ const WorkerTabs: React.FC<Props> = ({
         ))
         .with("advanced", () => (
           <>
-            <Health index={index} command={true} />
+            <Health index={index} />
             <Spacer y={1} />
             <Advanced index={index} />
           </>

diff --git a/internal/porter_app/v2/yaml.go b/internal/porter_app/v2/yaml.go
@@ -211,7 +211,7 @@ type Domains struct {
 	Name string `yaml:"name"`
 }
 
-// HealthCheck is the health check settings for a web service
+// HealthCheck contains the health check settings
 type HealthCheck struct {
 	Enabled  bool   `yaml:"enabled"`
 	HttpPath string `yaml:"httpPath"`