Merge pull request puppetlabs#2846 from donoghuc/PE-31711

(PE-31711) Make projects-dir a required bolt-server configuration value
beechtom · May 27, 2021 · 339083b · 339083b
2 parents fd000c6 + b5f33d9
commit 339083b
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 53 deletions.
diff --git a/lib/bolt_server/config.rb b/lib/bolt_server/config.rb
@@ -30,7 +30,7 @@ def defaults
     end
 
     def required_keys
-      super + %w[file-server-uri]
+      super + %w[file-server-uri projects-dir]
     end
 
     def service_name

diff --git a/spec/fixtures/api_server_configs/empty-plan-executor.conf b/spec/fixtures/api_server_configs/empty-plan-executor.conf
diff --git a/spec/fixtures/api_server_configs/global-bolt-server.conf b/spec/fixtures/api_server_configs/global-bolt-server.conf
@@ -12,4 +12,5 @@ bolt-server: {
     logfile: /var/log/global
     allowlist: [a]
     concurrency: 12
+    projects-dir: "/tmp/foo"
 }
diff --git a/spec/fixtures/api_server_configs/global-plan-executor.conf b/spec/fixtures/api_server_configs/global-plan-executor.conf
diff --git a/spec/fixtures/api_server_configs/local-bolt-server.conf b/spec/fixtures/api_server_configs/local-bolt-server.conf
diff --git a/spec/fixtures/api_server_configs/local-plan-executor.conf b/spec/fixtures/api_server_configs/local-plan-executor.conf
diff --git a/spec/fixtures/api_server_configs/required-bolt-server.conf b/spec/fixtures/api_server_configs/required-bolt-server.conf
@@ -3,4 +3,5 @@ bolt-server: {
     ssl-key: "spec/fixtures/ssl/key.pem"
     ssl-ca-cert: "spec/fixtures/ssl/ca.pem"
     file-server-uri: "https://localhost:8140"
+    projects-dir: "/tmp/foo"
 }
diff --git a/spec/fixtures/api_server_configs/required-plan-executor.conf b/spec/fixtures/api_server_configs/required-plan-executor.conf