config: add node advertised address

vinceanalytics · Mar 1, 2024 · d5c5896 · d5c5896
1 parent 313fdb6
commit d5c5896
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 59 deletions.
diff --git a/gen/go/vince/v1/config.pb.go b/gen/go/vince/v1/config.pb.go
diff --git a/internal/cmd/main.go b/internal/cmd/main.go
@@ -115,6 +115,11 @@ func App() *cli.Command {
 				Usage:   "Raft id of the node",
 				Sources: cli.EnvVars("VINCE_NODE_ID"),
 			},
+			&cli.StringFlag{
+				Name:    "nodeAdv",
+				Usage:   "Advertised address for inter-node-communication",
+				Sources: cli.EnvVars("VINCE_NODE_ADVERTISE"),
+			},
 			&cli.StringFlag{
 				Name:    "nodeCa",
 				Usage:   "Path to ca certificate for this node",
@@ -171,6 +176,7 @@ func App() *cli.Command {
 				AutoTls:         c.Bool("autoTls"),
 				Node: &v1.RaftNode{
 					Id:               c.String("nodeId"),
+					Advertise:        c.String("nodeAdv"),
 					Ca:               c.String("nodeCa"),
 					Cert:             c.String("nodeCert"),
 					Key:              c.String("nodeKey"),

diff --git a/proto/buf.lock b/proto/buf.lock
@@ -4,13 +4,13 @@ deps:
   - remote: buf.build
     owner: bufbuild
     repository: protovalidate
-    commit: 1baebb0a15184714854fa1ddfd22a29b
-    digest: shake256:ecd24ac37ca4f1ea65d816ae98e2a977e5004076ac957de9aedc0d4b517c66eaf3b7c8d6c7669ffd6e2eca5e8a5705372bed339ba47a608b37183ef1ee4f8baf
+    commit: f05a6f4403ce4327bae4f50f281c3ed0
+    digest: shake256:668a0661b8df44d41839194896329330965fc215f3d2f88057fd60eeb759c2daf6cc6edfdd13b2a653d49fe2896ebedcb1a33c4c5b2dd10919f03ffb7fc52ae6
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 28151c0d0a1641bf938a7672c500e01d
-    digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de
+    commit: 7e6f6e774e29406da95bd61cdcdbc8bc
+    digest: shake256:fe43dd2265ea0c07d76bd925eeba612667cf4c948d2ce53d6e367e1b4b3cb5fa69a51e6acb1a6a50d32f894f054a35e6c0406f6808a483f2752e10c866ffbf73
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
@@ -19,5 +19,5 @@ deps:
   - remote: buf.build
     owner: opentelemetry
     repository: opentelemetry
-    commit: 3341592ed9fd48dfbeaa81f6aed9541d
-    digest: shake256:a6dce02bbb21653891959e9300fee89bc6956290210be6b3c5c81f996a1264b46480e11cb84b3c4771f4c24aac89dc97ab412a1b8bfa01c36c280925380049c4
+    commit: 3b1a4532819a4fa4a146cebc8f7c8f16
+    digest: shake256:487ca73312a2d34792549db13003259bd4549f8589c31f1c9c84aaaf84bd4635d1a735e833ffaf5bfb8382a4123fb90eb1499600c3957ff16ca78b32d9970925
diff --git a/proto/vince/v1/config.proto b/proto/vince/v1/config.proto
@@ -11,7 +11,10 @@ message Version { string version = 1; }
 
 message Config {
   string data = 1 [ (buf.validate.field).required = true ];
-  string listen = 2 [ (buf.validate.field).required = true ];
+  string listen = 2 [
+    (buf.validate.field).required = true,
+    (buf.validate.field).string.host_and_port = true
+  ];
   double rate_limit = 3 [ (buf.validate.field).required = true ];
   int64 granule_size = 5 [ (buf.validate.field).required = true ];
   // Path to the geoiip database used to set web analytics country attribute.
@@ -53,6 +56,10 @@ message RaftNode {
   bool verify = 5;
   bool verify_client = 6;
   bool verify_server_name = 7;
+  string advertise = 8 [
+    (buf.validate.field).required = true,
+    (buf.validate.field).string.host_and_port = true
+  ];
 }
 
 message Domain { string name = 1 [ (buf.validate.field).required = true ]; }