@@ -7,17 +7,18 @@ import (
77 "strconv"
88
99 "github.com/hashicorp/logutils"
10- "github.com/webdevwilson/terraform-ui /persist"
11- "github.com/webdevwilson/terraform-ui /task"
10+ "github.com/webdevwilson/terraform-ci /persist"
11+ "github.com/webdevwilson/terraform-ci /task"
1212)
1313
1414// Settings contains all the configuration values for the service
1515type Settings struct {
16- LogLevel string
17- SiteRoot string
18- Port int
19- Store persist.Store
20- Executor * task.Executor
16+ LogLevel string
17+ SiteRoot string
18+ CheckoutDirectory string
19+ Port int
20+ Store persist.Store
21+ Executor * task.Executor
2122}
2223
2324var settings * Settings
@@ -33,10 +34,17 @@ func init() {
3334
3435 executor := task .NewExecutor (store )
3536
37+ workingDir , err := os .Getwd ()
38+
39+ if err != nil {
40+ log .Fatalf ("[FATAL] Failed to get current working directory: %s" , workingDir )
41+ }
42+
3643 // initialize settings
3744 settings = & Settings {
3845 envOr ("LOG_LEVEL" , "INFO" ),
39- envOrFunc ("SITE_ROOT" , defaultSiteRoot ),
46+ envOr ("SITE_ROOT" , path .Join (workingDir , "site" , "dist" )),
47+ envOr ("CHECKOUT_DIR" , path .Join (workingDir , ".state" , "projects" )),
4048 envOrInt ("PORT" , 3000 ),
4149 store ,
4250 executor ,
@@ -66,15 +74,6 @@ func defaultStatePath() (statePath string) {
6674 return
6775}
6876
69- func defaultSiteRoot () (siteRoot string ) {
70- wd , err := os .Getwd ()
71- if err != nil {
72- log .Fatalf ("[FATAL] Failed to get current working directory: %s" , wd )
73- }
74- siteRoot = path .Join (wd , "site" , "dist" )
75- return
76- }
77-
7877// env returns environment variables. fatal error if it does not exist
7978func env (name string ) (v string ) {
8079 if v = os .Getenv (name ); len (v ) == 0 {
0 commit comments