Switch to scl, an extension of hcl

3 files changed, 42 insertions, 48 deletions

diff --git a/server/config/testdata/config.go b/server/config/testdata/config.go
deleted file mode 100644
index 27cffcc..0000000
--- a/server/config/testdata/config.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package testdata
-
-var Config = []byte(`
-	server {
-		use_tls = true
-		tls_key = "server.key"
-		tls_cert = "server.crt"
-		address = "127.0.0.1"
-		port = 443
-		user = "nobody"
-		cookie_secret = "supersecret"
-		csrf_secret = "supersecret"
-		http_logfile = "cashierd.log"
-		datastore = "mysql:user:passwd:localhost:3306"
-		database {
-			type = "mysql"
-			username = "user"
-			password = "passwd"
-			address = "localhost:3306"
-		}
-		datastore = "mysql:user:passwd:localhost:3306"
-	}
-	auth {
-		provider = "google"
-		oauth_client_id = "client_id"
-		oauth_client_secret = "secret"
-		oauth_callback_url = "https://sshca.example.com/auth/callback"
-		provider_opts {
-			domain = "example.com"
-		}
-		users_whitelist = ["a_user"]
-	}
-	ssh {
-		signing_key = "signing_key"
-		additional_principals = ["ec2-user", "ubuntu"]
-		max_age = "720h"
-		permissions = ["permit-pty", "permit-X11-forwarding", "permit-port-forwarding", "permit-user-rc"]
-	}
-	aws {
-		region = "us-east-1"
-		access_key = "abcdef"
-		secret_key = "omg123"
-	}
-	vault {
-		address = "https://vault:8200"
-		token = "abc-def-456-789"
-	}
-`)
diff --git a/server/config/testdata/empty.config b/server/config/testdata/empty.config
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/config/testdata/empty.config
diff --git a/server/config/testdata/test.config b/server/config/testdata/test.config
new file mode 100644
index 0000000..96899e7
--- /dev/null
+++ b/server/config/testdata/test.config
@@ -0,0 +1,42 @@
+server {
+  use_tls = true
+  tls_key = "server.key"
+  tls_cert = "server.crt"
+  address = "127.0.0.1"
+  port = 443
+  user = "nobody"
+  cookie_secret = "supersecret"
+  csrf_secret = "supersecret"
+  http_logfile = "cashierd.log"
+  database {
+    type = "mysql"
+    username = "user"
+    password = "passwd"
+    address = "localhost:3306"
+  }
+}
+auth {
+  provider = "google"
+  oauth_client_id = "client_id"
+  oauth_client_secret = "secret"
+  oauth_callback_url = "https://sshca.example.com/auth/callback"
+  provider_opts {
+    domain = "example.com"
+  }
+  users_whitelist = ["a_user"]
+}
+ssh {
+  signing_key = "signing_key"
+  additional_principals = ["ec2-user", "ubuntu"]
+  max_age = "720h"
+  permissions = ["permit-pty", "permit-X11-forwarding", "permit-port-forwarding", "permit-user-rc"]
+}
+aws {
+  region = "us-east-1"
+  access_key = "abcdef"
+  secret_key = "omg123"
+}
+vault {
+  address = "https://vault:8200"
+  token = "abc-def-456-789"
+}