fix(all): do not os.Exit(1) in wire code.

go-orb · Feb 26, 2025 · 7c1d41e · 7c1d41e
1 parent ffb2057
commit 7c1d41e
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 60 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -21,3 +21,15 @@ tasks:
     cmds:
       - cmd: dagger call test --root=.
       - cmd: ./scripts/test.sh
+
+  generate:
+    desc: "Run go generate ./... in all packages."
+    cmds:
+    - |
+      for i in $(find . -type d); do 
+        [[ ! -f $i/go.mod ]] && continue
+        pushd $i 1>/dev/null
+        echo $i
+        go generate ./... || true
+        popd 1>/dev/null
+      done
diff --git a/benchmarks/event/cmd/handler/wire.go b/benchmarks/event/cmd/handler/wire.go
@@ -59,8 +59,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -77,7 +77,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/benchmarks/event/cmd/handler/wire_gen.go b/benchmarks/event/cmd/handler/wire_gen.go
diff --git a/benchmarks/event/cmd/request/wire.go b/benchmarks/event/cmd/request/wire.go
@@ -58,8 +58,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -76,7 +76,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/benchmarks/event/cmd/request/wire_gen.go b/benchmarks/event/cmd/request/wire_gen.go
diff --git a/benchmarks/rps/cmd/orb-rps-client/wire.go b/benchmarks/rps/cmd/orb-rps-client/wire.go
@@ -58,8 +58,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -76,7 +76,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/benchmarks/rps/cmd/orb-rps-client/wire_gen.go b/benchmarks/rps/cmd/orb-rps-client/wire_gen.go
diff --git a/benchmarks/rps/cmd/orb-rps-server/wire.go b/benchmarks/rps/cmd/orb-rps-server/wire.go
@@ -112,8 +112,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -130,7 +130,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/benchmarks/rps/cmd/orb-rps-server/wire_gen.go b/benchmarks/rps/cmd/orb-rps-server/wire_gen.go
diff --git a/event/simple/cmd/handler/wire.go b/event/simple/cmd/handler/wire.go
@@ -51,8 +51,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -69,7 +69,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/event/simple/cmd/handler/wire_gen.go b/event/simple/cmd/handler/wire_gen.go
diff --git a/event/simple/cmd/request/wire.go b/event/simple/cmd/request/wire.go
@@ -53,8 +53,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -71,7 +71,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/event/simple/cmd/request/wire_gen.go b/event/simple/cmd/request/wire_gen.go
diff --git a/rest/auth/cmd/client/wire.go b/rest/auth/cmd/client/wire.go
@@ -36,8 +36,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -54,7 +54,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/rest/auth/cmd/client/wire_gen.go b/rest/auth/cmd/client/wire_gen.go
diff --git a/rest/auth/cmd/server/wire.go b/rest/auth/cmd/server/wire.go
@@ -42,8 +42,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -60,7 +60,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/rest/auth/cmd/server/wire_gen.go b/rest/auth/cmd/server/wire_gen.go
diff --git a/rest/middleware/cmd/client/wire.go b/rest/middleware/cmd/client/wire.go
@@ -52,8 +52,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -70,7 +70,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 

diff --git a/rest/middleware/cmd/client/wire_gen.go b/rest/middleware/cmd/client/wire_gen.go
diff --git a/rest/middleware/cmd/server/wire.go b/rest/middleware/cmd/server/wire.go
@@ -61,8 +61,8 @@ func wireRun(
 	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
-			os.Exit(1)
+			logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			return "", err
 		}
 	}
 
@@ -79,7 +79,7 @@ func wireRun(
 	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
+			logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}