From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Wed, 24 Jun 2020 13:48:39 +0000 (+0000)
Subject: Merge "Added condition for http and https"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=54b1432860d4a0843b75378f68bcb3eba56ba9a8;hp=2ad840b5fc270d416e6d74118f0537646a78adeb;p=ealt-edge.git

Merge "Added condition for http and https"
---

diff --git a/mecm/mepm/applcm/broker/pkg/handlers/handlers.go b/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
index 5e303e4..022f73c 100644
--- a/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
+++ b/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
@@ -33,6 +33,8 @@ const (
 	DeleteAppInstanceIdentifier = "/ealtedge/mepm/app_lcm/v1/app_instances/{appInstanceId}"
 	OnboardPackage              = "/ealtedge/mepm/app_pkgm/v1/app_packages"
 	QueryOnboardPackage         = "/ealtedge/mepm/app_pkgm/v1/app_packages/{appPkgId}"
+	// Https flag value true
+	HTTPSFlagValue = "true"
 )
 
 var (
@@ -58,8 +60,13 @@ func (hdlr *Handlers) Initialize(logger *logrus.Logger) {
 // Run on it's router
 func (hdlr *Handlers) Run(host string) {
 	hdlr.logger.Infof("Server is running on port %s", host)
-	err := http.ListenAndServeTLS(host, os.Getenv("CERTIFICATE_PATH"), os.Getenv("KEY_PATH"), hdlr.router)
-	//err := http.ListenAndServe(host, hdlr.router)
+	var err error
+	var httpflag = os.Getenv("HTTPS_FLAG")
+	if httpflag == HTTPSFlagValue {
+		err = http.ListenAndServeTLS(host, os.Getenv("CERTIFICATE_PATH"), os.Getenv("KEY_PATH"), hdlr.router)
+	} else {
+		err = http.ListenAndServe(host, hdlr.router)
+	}
 	if err != nil {
 		hdlr.logger.Fatalf("Server couldn't run on port %s", host)
 	}