updated hello-world app to include env var in route

xigxog · Oct 24, 2023 · d9f94d9 · d9f94d9
1 parent 44f051c
commit d9f94d9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/efs/hello-world/components/backend/main.go b/efs/hello-world/components/backend/main.go
@@ -9,7 +9,7 @@ func main() {
 }
 
 func sayWho(k kit.Kontext) error {
-	who := k.EnvDef("HELLO_WORLD_WHO", "World")
+	who := k.EnvDef("who", "World")
 	k.Log().Infof("The who is '%s'!", who)
 
 	return k.Resp().SendStr(who)

diff --git a/efs/hello-world/components/frontend/main.go b/efs/hello-world/components/frontend/main.go
@@ -9,7 +9,7 @@ import (
 
 func main() {
 	k := kit.New()
-	k.Route("Path(`/hello`)", sayHello)
+	k.Route("Path(`/{{.Env.subPath}}/hello`)", sayHello)
 	k.Start()
 }
 

diff --git a/efs/hello-world/hack/environments/universe.yaml b/efs/hello-world/hack/environments/universe.yaml
@@ -4,4 +4,5 @@ metadata:
   name: universe
 spec:
   vars:
-    HELLO_WORLD_WHO: Universe
+    subPath: big
+    who: Universe
diff --git a/efs/hello-world/hack/environments/world.yaml b/efs/hello-world/hack/environments/world.yaml
@@ -4,4 +4,5 @@ metadata:
   name: world
 spec:
   vars:
-    HELLO_WORLD_WHO: World
+    subPath: small
+    who: World
diff --git a/internal/kubernetes/client.go b/internal/kubernetes/client.go
@@ -405,7 +405,7 @@ func (c *Client) PortForward(ctx context.Context, req *PortForwardRequest) (*Por
 
 	go func() {
 		if err := pfer.ForwardPorts(); err != nil {
-			log.Fatal("Error starting port forward: %v", err)
+			log.Fatal("Error with port forward: %v", err)
 		}
 	}()