Use autopaho in agent (#54)

ohkinozomu · Nov 18, 2023 · 26589be · 26589be
1 parent 2818410
commit 26589be
Show file tree

Hide file tree

Showing 14 changed files with 165 additions and 133 deletions.
diff --git a/e2e/basic/manifests/agent.yaml b/e2e/basic/manifests/agent.yaml
@@ -53,7 +53,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         volumeMounts:

diff --git a/e2e/loadbalancing/manifests/agent1.yaml b/e2e/loadbalancing/manifests/agent1.yaml
@@ -22,7 +22,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         command: ["/bin/sh", "-c"]

diff --git a/e2e/loadbalancing/manifests/agent2.yaml b/e2e/loadbalancing/manifests/agent2.yaml
@@ -22,7 +22,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent02 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent02 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         command: ["/bin/sh", "-c"]

diff --git a/e2e/password/manifests/agent.yaml b/e2e/password/manifests/agent.yaml
@@ -22,7 +22,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug --username admin --password adminpassword
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug --username admin --password adminpassword
       - name: appserver
         image: golang:1.21.3
         command: ["/bin/sh", "-c"]

diff --git a/e2e/protobuf/manifests/agent.yaml b/e2e/protobuf/manifests/agent.yaml
@@ -53,7 +53,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         volumeMounts:

diff --git a/e2e/split/manifests/agent.yaml b/e2e/split/manifests/agent.yaml
@@ -24,7 +24,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         command: ["/bin/sh", "-c"]

diff --git a/e2e/storage_relay/manifests/agent.yaml b/e2e/storage_relay/manifests/agent.yaml
@@ -24,7 +24,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         command: ["/bin/sh", "-c"]

diff --git a/e2e/tls/manifests/agent.yaml b/e2e/tls/manifests/agent.yaml
@@ -19,7 +19,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:8883 --proxy-host 127.0.0.1:8000 --loglevel debug --cafile /etc/certs/cacert.pem --cert /etc/certs/cert.pem --key /etc/certs/key.pem
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtts://mosquitto.mosquitto:8883 --proxy-host 127.0.0.1:8000 --loglevel debug --cafile /etc/certs/cacert.pem --cert /etc/certs/cert.pem --key /etc/certs/key.pem
         volumeMounts:
         - name: certs-volume
           mountPath: /etc/certs

diff --git a/e2e/zstd/manifests/agent.yaml b/e2e/zstd/manifests/agent.yaml
@@ -53,7 +53,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
         - |
-          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
+          /app/fuyuu-router agent -c /app/config/config.toml --id agent01 -b mqtt://mosquitto.mosquitto:1883 --proxy-host 127.0.0.1:8000 --loglevel debug
       - name: appserver
         image: golang:1.21.3
         volumeMounts:

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21.1
 
 require (
 	github.com/dgraph-io/badger/v4 v4.2.0
-	github.com/eclipse/paho.golang v0.12.0
+	github.com/eclipse/paho.golang v0.12.1-0.20231115041409-5f4de1dba813
 	github.com/go-playground/validator/v10 v10.16.0
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/mux v1.8.1
@@ -70,6 +70,7 @@ require (
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grafana/pyroscope-go v1.0.4 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -130,6 +130,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eclipse/paho.golang v0.12.0 h1:EXQFJbJklDnUqW6lyAknMWRhM2NgpHxwrrL8riUmp3Q=
 github.com/eclipse/paho.golang v0.12.0/go.mod h1:TSDCUivu9JnoR9Hl+H7sQMcHkejWH2/xKK1NJGtLbIE=
+github.com/eclipse/paho.golang v0.12.1-0.20231115041409-5f4de1dba813 h1:yu//BXrsaMc14YJpePcWBEZhwsJ24K9qApseBJzKQcA=
+github.com/eclipse/paho.golang v0.12.1-0.20231115041409-5f4de1dba813/go.mod h1:TSDCUivu9JnoR9Hl+H7sQMcHkejWH2/xKK1NJGtLbIE=
 github.com/efficientgo/core v1.0.0-rc.0.0.20221201130417-ba593f67d2a4 h1:rydBwnBoywKQMjWF0z8SriYtQ+uUcaFsxuijMjJr5PI=
 github.com/efficientgo/core v1.0.0-rc.0.0.20221201130417-ba593f67d2a4/go.mod h1:kQa0V74HNYMfuJH6jiPiwNdpWXl4xd/K4tzlrcvYDQI=
 github.com/efficientgo/e2e v0.13.1-0.20220922081603-45de9fc588a8 h1:UFLc39BcUXahSNCLUrKjNGZABMUZaS4M74EZvTRnq3k=
@@ -269,6 +271,8 @@ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qK
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/pyroscope-go v1.0.4 h1:oyQX0BOkL+iARXzHuCdIF5TQ7/sRSel1YFViMHC7Bm0=
 github.com/grafana/pyroscope-go v1.0.4/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.4 h1:mDsJ3ngul7UfrHibGQpV66PbZ3q1T8glz/tK3bQKKEk=