Refactoring (#45)

ohkinozomu · Nov 15, 2023 · 030d9ea · 030d9ea
1 parent 54be56d
commit 030d9ea
Show file tree

Hide file tree

Showing 12 changed files with 269 additions and 188 deletions.
diff --git a/cmd/agent.go b/cmd/agent.go
@@ -81,11 +81,12 @@ var agentCmd = &cobra.Command{
 			logger.Info("profiling enabled")
 			go func() {
 				var registry ncp.Registry
-				if config.Profiling.Registry == "cloudprofiler" {
+				switch config.Profiling.Registry {
+				case "cloudprofiler":
 					registry = ncp.CLOUD_PROFILER
-				} else if config.Profiling.Registry == "pyroscope" {
+				case "pyroscope":
 					registry = ncp.PYROSCOPE
-				} else {
+				default:
 					logger.Fatal("Unknown profiling registry")
 				}
 				c := ncp.Config{
@@ -109,11 +110,10 @@ var agentCmd = &cobra.Command{
 		labelMap := make(map[string]string)
 		for _, label := range labels {
 			parts := strings.SplitN(label, "=", 2)
-			if len(parts) == 2 {
-				labelMap[parts[0]] = parts[1]
-			} else {
+			if len(parts) != 2 {
 				logger.Fatal("Invalid label format")
 			}
+			labelMap[parts[0]] = parts[1]
 		}
 
 		c := agent.AgentConfig{

diff --git a/cmd/hub.go b/cmd/hub.go
@@ -73,11 +73,12 @@ var hubCmd = &cobra.Command{
 			logger.Info("profiling enabled")
 			go func() {
 				var registry ncp.Registry
-				if config.Profiling.Registry == "cloudprofiler" {
+				switch config.Profiling.Registry {
+				case "cloudprofiler":
 					registry = ncp.CLOUD_PROFILER
-				} else if config.Profiling.Registry == "pyroscope" {
+				case "pyroscope":
 					registry = ncp.PYROSCOPE
-				} else {
+				default:
 					logger.Fatal("Unknown profiling registry")
 				}
 				c := ncp.Config{

diff --git a/e2e/basic/test.go b/e2e/basic/test.go
@@ -35,7 +35,7 @@ func main() {
 		go func(i int) {
 			defer wg.Done()
 
-			jsonData := map[string]interface{}{
+			jsonData := map[string]any{
 				"message": fmt.Sprintf("This is request %d", i),
 			}
 			jsonBytes, err := json.Marshal(jsonData)
@@ -47,7 +47,7 @@ func main() {
 			response, err := exec.Command("kubectl", "exec", "-n", namespace, podName, "--",
 				"curl", "-X", "POST", "-H", "FuyuuRouter-IDs: agent01", "-H", contentType, "-d", string(jsonBytes), routerURL, "-s").Output()
 
-			var responseJSON map[string]interface{}
+			var responseJSON map[string]any
 			if err := json.Unmarshal(response, &responseJSON); err != nil {
 				errors <- fmt.Sprintf("Failed to unmarshal JSON response: %s\nResponse: %s", err, response)
 				return
@@ -70,10 +70,9 @@ func main() {
 		errorCount++
 	}
 
-	if errorCount == 0 {
-		fmt.Println("All requests returned the correct response.")
-	} else {
+	if errorCount != 0 {
 		fmt.Printf("Some requests did not return the correct response. Errors: %d\n", errorCount)
 		os.Exit(1)
 	}
+	fmt.Println("All requests returned the correct response.")
 }
diff --git a/e2e/protobuf/test.go b/e2e/protobuf/test.go
@@ -35,7 +35,7 @@ func main() {
 		go func(i int) {
 			defer wg.Done()
 
-			jsonData := map[string]interface{}{
+			jsonData := map[string]any{
 				"message": fmt.Sprintf("This is request %d", i),
 			}
 			jsonBytes, err := json.Marshal(jsonData)
@@ -47,7 +47,7 @@ func main() {
 			response, err := exec.Command("kubectl", "exec", "-n", namespace, podName, "--",
 				"curl", "-X", "POST", "-H", "FuyuuRouter-IDs: agent01", "-H", contentType, "-d", string(jsonBytes), routerURL, "-s").Output()
 
-			var responseJSON map[string]interface{}
+			var responseJSON map[string]any
 			if err := json.Unmarshal(response, &responseJSON); err != nil {
 				errors <- fmt.Sprintf("Failed to unmarshal JSON response: %s\nResponse: %s", err, response)
 				return
@@ -70,10 +70,9 @@ func main() {
 		errorCount++
 	}
 
-	if errorCount == 0 {
-		fmt.Println("All requests returned the correct response.")
-	} else {
+	if errorCount != 0 {
 		fmt.Printf("Some requests did not return the correct response. Errors: %d\n", errorCount)
 		os.Exit(1)
 	}
+	fmt.Println("All requests returned the correct response.")
 }
diff --git a/e2e/zstd/test.go b/e2e/zstd/test.go
@@ -35,7 +35,7 @@ func main() {
 		go func(i int) {
 			defer wg.Done()
 
-			jsonData := map[string]interface{}{
+			jsonData := map[string]any{
 				"message": fmt.Sprintf("This is request %d", i),
 			}
 			jsonBytes, err := json.Marshal(jsonData)
@@ -47,7 +47,7 @@ func main() {
 			response, err := exec.Command("kubectl", "exec", "-n", namespace, podName, "--",
 				"curl", "-X", "POST", "-H", "FuyuuRouter-IDs: agent01", "-H", contentType, "-d", string(jsonBytes), routerURL, "-s").Output()
 
-			var responseJSON map[string]interface{}
+			var responseJSON map[string]any
 			if err := json.Unmarshal(response, &responseJSON); err != nil {
 				errors <- fmt.Sprintf("Failed to unmarshal JSON response: %s\nResponse: %s", err, response)
 				return
@@ -70,10 +70,9 @@ func main() {
 		errorCount++
 	}
 
-	if errorCount == 0 {
-		fmt.Println("All requests returned the correct response.")
-	} else {
+	if errorCount != 0 {
 		fmt.Printf("Some requests did not return the correct response. Errors: %d\n", errorCount)
 		os.Exit(1)
 	}
+	fmt.Println("All requests returned the correct response.")
 }
diff --git a/example/agent.yaml b/example/agent.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: fuyuu-router-agent
-        image: ohkinozomu/fuyuu-router:6932d5a4388f2080d7d1e20b6ffb9fe24e1c4303
+        image: ohkinozomu/fuyuu-router:0.0.2
         volumeMounts:
         - name: fuyuu-router-agent-config
           mountPath: /app/config
@@ -43,4 +43,6 @@ metadata:
   namespace: fuyuu-router
 data:
   config.toml: |
-    # TODO
+    [profiling]
+    registry = "pyroscope"
+    server_address = "http://pyroscope.pyroscope:4040"
diff --git a/example/hub.yaml b/example/hub.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: fuyuu-router-hub
-        image: ohkinozomu/fuyuu-router:6932d5a4388f2080d7d1e20b6ffb9fe24e1c4303
+        image: ohkinozomu/fuyuu-router:0.0.2
         volumeMounts:
         - name: fuyuu-router-hub-config
           mountPath: /app/config
@@ -37,4 +37,4 @@ data:
   config.toml: |
     [profiling]
     registry = "pyroscope"
-    server_address = "pyroscope.pyroscope:4040"
+    server_address = "http://pyroscope.pyroscope:4040"