Merge pull request #180 from kerberos-io/fix/merge-secondary-kerberos-vault-settings

Add support for secondary Kerberos Vault settings in configuration

deployments/docker/README.md

@@ -41,7 +41,7 @@ You attach a volume to your container by leveraging the `-v` option. To mount yo
 
 ### Override with environment variables
 
-Next to attaching the configuration file, it is also possible to override the configuration with environment variables. This makes deployments easier when leveraging `docker compose` or `kubernetes` deployments much easier and scalable. Using this approach we simplify automation through `ansible` and `terraform`. You'll find [the full list of environment variables on the main README.md file](https://github.com/kerberos-io/agent#override-with-environment-variables).
+Next to attaching the configuration file, it is also possible to override the configuration with environment variables. This makes deployments when leveraging `docker compose` or `kubernetes` much easier and more scalable. Using this approach we simplify automation through `ansible` and `terraform`. You'll find [the full list of environment variables on the main README.md file](https://github.com/kerberos-io/agent#override-with-environment-variables).
 
 ### 2. Running multiple containers with Docker compose
 

machinery/src/config/main.go

@@ -135,6 +135,12 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
 		conjungo.Merge(&kerberosvault, configuration.CustomConfig.KStorage, opts)
 		configuration.Config.KStorage = &kerberosvault
 
+		// Merge Secondary Kerberos Vault settings
+		var kerberosvaultSecondary models.KStorage
+		conjungo.Merge(&kerberosvaultSecondary, configuration.GlobalConfig.KStorageSecondary, opts)
+		conjungo.Merge(&kerberosvaultSecondary, configuration.CustomConfig.KStorageSecondary, opts)
+		configuration.Config.KStorageSecondary = &kerberosvaultSecondary
+
 		// Merge Kerberos S3 settings
 		var s3 models.S3
 		conjungo.Merge(&s3, configuration.GlobalConfig.S3, opts)

machinery/src/models/Config.go

@@ -153,12 +153,12 @@ type S3 struct {
 // KStorage contains the credentials of the Kerberos Storage/Kerberos Cloud instance.
 // By defining KStorage you can make your recordings available in the cloud, at a centrel place.
 type KStorage struct {
-	URI             string `json:"uri" bson:"uri"`
-	CloudKey        string `json:"cloud_key" bson:"cloud_key"` /* old way, remove this */
-	AccessKey       string `json:"access_key" bson:"access_key"`
-	SecretAccessKey string `json:"secret_access_key" bson:"secret_access_key"`
-	Provider        string `json:"provider" bson:"provider"`
-	Directory       string `json:"directory" bson:"directory"`
+	URI             string `json:"uri,omitempty" bson:"uri,omitempty"`
+	CloudKey        string `json:"cloud_key,omitempty" bson:"cloud_key,omitempty"` /* old way, remove this */
+	AccessKey       string `json:"access_key,omitempty" bson:"access_key,omitempty"`
+	SecretAccessKey string `json:"secret_access_key,omitempty" bson:"secret_access_key,omitempty"`
+	Provider        string `json:"provider,omitempty" bson:"provider,omitempty"`
+	Directory       string `json:"directory,omitempty" bson:"directory,omitempty"`
 }
 
 // Dropbox integration