- Removed Environment from ServerConfiguration struct to the (#167)

Configuration struct.
- Added CONVOY_DISABLE_ENDPOINT env var.

Author: subomi

cmd/main.go

@@ -75,7 +75,7 @@ func main() {
 			err = sentry.Init(sentry.ClientOptions{
 				Debug:       true,
 				Dsn:         cfg.Sentry.Dsn,
-				Environment: cfg.Server.Environment,
+				Environment: cfg.Environment,
 			})
 			if err != nil {
 				return err

config/config.go

@@ -24,8 +24,7 @@ type SentryConfiguration struct {
 }
 
 type ServerConfiguration struct {
-	Environment string `json:"environment"`
-	HTTP        struct {
+	HTTP struct {
 		Port uint32 `json:"port"`
 	} `json:"http"`
 }
@@ -88,6 +87,7 @@ type Configuration struct {
 	Strategy          StrategyConfiguration  `json:"strategy"`
 	Signature         SignatureConfiguration `json:"signature"`
 	SMTP              SMTPConfiguration      `json:"smtp"`
+	Environment       string                 `json:"env"`
 	DisableEndpoint   bool                   `json:"disable_endpoint"`
 }
 
@@ -96,6 +96,10 @@ type QueueProvider string
 type StrategyProvider string
 type SignatureHeaderProvider string
 
+const (
+	DevelopmentEnvironment string = "development"
+)
+
 const (
 	NoAuthProvider          AuthProvider            = "none"
 	BasicAuthProvider       AuthProvider            = "basic"
@@ -145,13 +149,13 @@ func LoadConfig(p string) error {
 		}
 	}
 
-	if serverEnv := os.Getenv("CONVOY_SERVER_ENV"); serverEnv != "" {
-		c.Server.Environment = serverEnv
+	if env := os.Getenv("CONVOY_ENV"); env != "" {
+		c.Environment = env
 	}
 
 	// if it's still empty, set it to development
-	if c.Server.Environment == "" {
-		c.Server.Environment = "development"
+	if c.Environment == "" {
+		c.Environment = DevelopmentEnvironment
 	}
 
 	if sentryDsn := os.Getenv("CONVOY_SENTRY_DSN"); sentryDsn != "" {
@@ -240,6 +244,12 @@ func LoadConfig(p string) error {
 
 	}
 
+	if e := os.Getenv("CONVOY_DISABLE_ENDPOINT"); e != "" {
+		if d, err := strconv.ParseBool(e); err != nil {
+			c.DisableEndpoint = d
+		}
+	}
+
 	c.UIAuthorizedUsers = parseAuthorizedUsers(c.UIAuth)
 
 	cfgSingleton.Store(c)

convoy-docker.json

@@ -1,7 +1,7 @@
 {
-    "environment": "dev",
+	"environment": "development",
     "database": {
-		"dsn": "mongodb://root:rootpassword@mongodb:27017/newConvoy?authSource=admin"
+		"dsn": "mongodb://root:rootpassword@mongodb:27017/convoy?authSource=admin"
 	},
 	"queue": {
 		"type": "redis",