Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactor: load files from ./etc folder (#392)

Guilherme Oenning7e23dca1e02d
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index 1a71e1c19..ce4df45f6 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -7,8 +7,6 @@ import (
"strings"
"path"
-
- "github.com/getfider/fider/app/pkg/errors"
)
// GetEnvOrDefault retrieves the value of the environment variable named by the key.
@@ -77,7 +75,7 @@ func GetPublicIP() (string, error) {
if err == nil {
publicIP[domain] = addr[0].String()
} else {
- return "", errors.Wrap(err, "failed to lookup IP of %s", domain)
+ return "", err
}
}
return publicIP[domain], nil
@@ -110,12 +108,20 @@ func Path(p ...string) string {
root := "./"
if IsTest() {
root = os.Getenv("GOPATH") + "/src/github.com/getfider/fider/"
+ } else {
+ panic(Current())
}
elems := append([]string{root}, p...)
return path.Join(elems...)
}
+// Etc returns a path to a folder or file inside the /etc/ folder
+func Etc(p ...string) string {
+ paths := append([]string{"etc"}, p...)
+ return Path(paths...)
+}
+
// IsDevelopment returns true on Fider production environment
func IsDevelopment() bool {
return Current() == "development"
diff --git a/app/pkg/env/env_test.go b/app/pkg/env/env_test.go
index e9c7d67b0..a4fe4f4e3 100644
--- a/app/pkg/env/env_test.go
+++ b/app/pkg/env/env_test.go
@@ -32,15 +32,41 @@ func TestGetEnvOrDefault(t *testing.T) {
func TestCurrent(t *testing.T) {
RegisterT(t)
+ current := env.Current()
+ defer func() {
+ os.Setenv("GO_ENV", current)
+ }()
+
for _, testCase := range envs {
os.Setenv("GO_ENV", testCase.go_env)
Expect(env.Current()).Equals(testCase.env)
}
}
+func TestPath(t *testing.T) {
+ RegisterT(t)
+
+ Expect(env.Path("etc/deep/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/deep/file.txt")
+ Expect(env.Path("etc/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/file.txt")
+ Expect(env.Path("///etc/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/file.txt")
+ Expect(env.Path("/etc/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/file.txt")
+ Expect(env.Path("./etc/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/file.txt")
+ Expect(env.Path("file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/file.txt")
+ Expect(env.Path("/file.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/file.txt")
+ Expect(env.Path("")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider")
+
+ Expect(env.Etc("a.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/a.txt")
+ Expect(env.Etc("b.txt")).Equals(os.Getenv("GOPATH") + "/src/github.com/getfider/fider/etc/b.txt")
+}
+
func TestIsEnvironment(t *testing.T) {
RegisterT(t)
+ current := env.Current()
+ defer func() {
+ os.Setenv("GO_ENV", current)
+ }()
+
for _, testCase := range envs {
os.Setenv("GO_ENV", testCase.go_env)
actual := testCase.isEnv()
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index 9ce064938..75f1aa8eb 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -84,6 +84,9 @@ func (e *Engine) Start(address string) {
keyFile := env.GetEnvOrDefault("SSL_CERT_KEY", "")
autoSSL := env.GetEnvOrDefault("SSL_AUTO", "")
+ certFilePath := env.Etc(certFile)
+ keyFilePath := env.Etc(keyFile)
+
e.server = &http.Server{
ReadTimeout: 5 * time.Second,
WriteTimeout: 10 * time.Second,
@@ -102,7 +105,7 @@ func (e *Engine) Start(address string) {
certManager *CertificateManager
)
if autoSSL == "true" {
- certManager, err = NewCertificateManager(certFile, keyFile, "certs")
+ certManager, err = NewCertificateManager(certFilePath, keyFilePath, env.Etc("certs"))
if err != nil {
panic(errors.Wrap(err, "failed to initialize CertificateManager"))
}
@@ -119,7 +122,7 @@ func (e *Engine) Start(address string) {
err = e.server.ListenAndServe()
} else {
e.logger.Infof("https server started on %s", address)
- err = e.server.ListenAndServeTLS(certFile, keyFile)
+ err = e.server.ListenAndServeTLS(certFilePath, keyFilePath)
}
if err != nil && err != http.ErrServerClosed {