Merge e5141bf into f93c9ab

AnalogJ · Apr 20, 2018 · a22d66c · a22d66c
2 parents f93c9ab + e5141bf
commit a22d66c
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -285,11 +285,39 @@ func (c *configuration) ValidateConfigFile(configFilePath string) error {
 			},
 			"config_templates":{
 				"type": "object",
-				"additionalProperties":false
+				"patternProperties": {
+					"^[a-z0-9]*$":{
+						"type":"object",
+						"additionalProperties":false,
+						"required": ["filepath", "content"],
+						"properties": {
+							"filepath": {
+								"type": "string"
+							},
+							"content": {
+								"type": "string"
+							}
+						}
+					}
+				}
 			},
 			"extra_templates":{
 				"type": "object",
-				"additionalProperties":false
+				"patternProperties": {
+					"^[a-z0-9]*$":{
+						"type":"object",
+						"additionalProperties":false,
+						"required": ["filepath","content"],
+						"properties": {
+							"filepath": {
+								"type": "string"
+							},
+							"content": {
+								"type": "string"
+							}
+						}
+					}
+				}
 			}
 		}
 	}

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -143,3 +143,21 @@ func TestConfiguration_ReadConfig_DuplicateActiveTemplates(t *testing.T) {
 	//assert
 	require.Error(t, err, "should return an error if there is an duplicate active template")
 }
+
+func TestConfiguration_ReadConfig_OverrideDefaultConfigTemplate(t *testing.T) {
+	t.Parallel()
+
+	//setup
+	testConfig, _ := config.Create()
+
+	//test
+	err := testConfig.ReadConfig(path.Join("testdata", "valid_config_template.yaml"))
+	require.NoError(t, err, "should allow overriding default config template.")
+
+	configTmpl, err := testConfig.GetActiveConfigTemplate()
+
+	//assert
+	require.NoError(t, err, "should allow overriding default config template.")
+	require.Equal(t,"{{.environment}}-{{.username}}", configTmpl.FilePath)
+
+}
diff --git a/pkg/config/testdata/valid_config_template.yaml b/pkg/config/testdata/valid_config_template.yaml
@@ -0,0 +1,19 @@
+options:
+  pem_dir: '~/.ssh/drawbridge/pem'
+config_templates:
+  default:
+    filepath: '{{.environment}}-{{.username}}'
+    content: |
+      ForwardAgent yes
+      ForwardX11 no
+      HashKnownHosts yes
+      IdentitiesOnly yes
+      StrictHostKeyChecking no
+
+      Host bastion
+          Hostname bastion.example.com
+          User {{.username}}
+          IdentityFile {{.pem_dir}}/{{.pem_filename}}
+          LocalForward localhost:{{uniquePort .}} localhost:8080
+          UserKnownHostsFile=/dev/null
+          StrictHostKeyChecking=no
diff --git a/pkg/config/testdata/valid_templates.yaml b/pkg/config/testdata/valid_templates.yaml