From f8ce57c89a84d219b6953505f6a6d00d2e81cc9e Mon Sep 17 00:00:00 2001
From: Olgun Cengiz <olgun.cengiz@vereign.com>
Date: Thu, 29 Nov 2018 14:36:12 +0300
Subject: [PATCH] added viam variables
---
config.yaml.sample | 4 ++++
server/configs.go | 3 +++
server/server.go | 4 ++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/config.yaml.sample b/config.yaml.sample
index 1ee2d92..28d760a 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -7,6 +7,10 @@ dataStorageUrl: localhost:7777
grpcListenAddress: localhost:7877
restListenAddress: localhost:7878
+# VIAM Variables
+viamUUID: viam-system
+viamSession: viam-session
+
# Choose a certificate method for providing PEM strings
# 1 = Read from file (*.crt and *.key files)
# 2 = Read from Vault server (this will require additional config information for Vault)
diff --git a/server/configs.go b/server/configs.go
index d66e379..e40bafc 100644
--- a/server/configs.go
+++ b/server/configs.go
@@ -21,6 +21,9 @@ func SetConfigValues() {
viper.SetDefault("vereignCertFile", "vereign_ca.cer")
viper.SetDefault("vereignCertKey", "vereign_ca.key")
+ viper.SetDefault("viamUUID", "viam-system")
+ viper.SetDefault("viamSession", "viam-session")
+
viper.SetDefault("maxMessageSize", "32")
// Read Config File
diff --git a/server/server.go b/server/server.go
index 16a947d..5dcbe0e 100644
--- a/server/server.go
+++ b/server/server.go
@@ -67,8 +67,8 @@ func authenticateClient(ctx context.Context, s *handler.KeyStorageServerImpl, in
}
viamAuth := &authentication.Authentication{
- Uuid: "viam-system",
- Session: "viam-session",
+ Uuid: viper.GetString("viamUUID"),
+ Session: viper.GetString("viamSession"),
}
sessionClient := &client.DataStorageClientImpl{}
--
GitLab