[incubator-trafficcontrol] 03/19: fixup imports in auth/login.go and ldap.go

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 36226a1259f0d52288513192dc44bbe1cd501ca2
Author: Dylan Volz <Dy...@comcast.com>
AuthorDate: Wed Mar 14 14:46:25 2018 -0600

    fixup imports in auth/login.go and ldap.go
---
 traffic_ops/install/bin/_postinstall                 |  2 +-
 traffic_ops/traffic_ops_golang/auth/ldap.go          |  3 +--
 traffic_ops/traffic_ops_golang/auth/login.go         |  7 +++----
 traffic_ops/traffic_ops_golang/config/config.go      | 10 ++++++----
 traffic_ops/traffic_ops_golang/traffic_ops_golang.go |  3 +--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 25e17c7..f059b2a 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -262,7 +262,7 @@ sub generateLdapConf {
         }
     }
 
-    my @requiredKeys = qw{ host admin_dn admin_pass search_base };
+    my @requiredKeys = qw{ host admin_dn admin_pass search_base search_query insecure ldap_timeout_secs };
     for my $k (@requiredKeys) {
         if (! exists $ldapConf{$k} ) {
             errorOut("$k is a required key in $fileName");
diff --git a/traffic_ops/traffic_ops_golang/auth/ldap.go b/traffic_ops/traffic_ops_golang/auth/ldap.go
index 487d2ab..55d8a6f 100644
--- a/traffic_ops/traffic_ops_golang/auth/ldap.go
+++ b/traffic_ops/traffic_ops_golang/auth/ldap.go
@@ -4,13 +4,12 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/apache/incubator-trafficcontrol/lib/go-log"
 	"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/config"
 
-	"strings"
-
 	"gopkg.in/ldap.v2"
 )
 
diff --git a/traffic_ops/traffic_ops_golang/auth/login.go b/traffic_ops/traffic_ops_golang/auth/login.go
index e55a6d8..b104652 100644
--- a/traffic_ops/traffic_ops_golang/auth/login.go
+++ b/traffic_ops/traffic_ops_golang/auth/login.go
@@ -4,18 +4,17 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
-
-	"github.com/jmoiron/sqlx"
-
 	"time"
 
 	"github.com/apache/incubator-trafficcontrol/lib/go-log"
 	"github.com/apache/incubator-trafficcontrol/lib/go-tc"
 	"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/config"
 	"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tocookie"
-	"github.com/pkg/errors"
+
+	"github.com/jmoiron/sqlx"
 )
 
 type passwordForm struct {
diff --git a/traffic_ops/traffic_ops_golang/config/config.go b/traffic_ops/traffic_ops_golang/config/config.go
index ca1f053..59fdee4 100644
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@ -44,6 +44,7 @@ type Config struct {
 	RiakEnabled     bool
 	ConfigLDAP      *ConfigLDAP
 	LDAPEnabled     bool
+	LDAPConfPath    string `json:"ldap_conf_location"`
 	Version         string
 }
 
@@ -120,7 +121,8 @@ func (c Config) EventLog() log.LogLocation {
 }
 
 // LoadConfig - reads the config file into the Config struct
-func LoadConfig(cdnConfPath string, dbConfPath string, riakConfPath string, ldapConfPath string, appVersion string) (Config, error) {
+
+func LoadConfig(cdnConfPath string, dbConfPath string, riakConfPath string, appVersion string) (Config, error) {
 	// load json from cdn.conf
 	confBytes, err := ioutil.ReadFile(cdnConfPath)
 	if err != nil {
@@ -154,11 +156,11 @@ func LoadConfig(cdnConfPath string, dbConfPath string, riakConfPath string, ldap
 		}
 	}
 
-	if ldapConfPath != "" {
-		cfg.LDAPEnabled, cfg.ConfigLDAP, err = GetLDAPConfig(ldapConfPath)
+	if cfg.LDAPConfPath != "" {
+		cfg.LDAPEnabled, cfg.ConfigLDAP, err = GetLDAPConfig(cfg.LDAPConfPath)
 		if err != nil {
 			cfg.LDAPEnabled = false // probably unnecessary
-			return cfg, fmt.Errorf("parsing ldap config '%s': %v", ldapConfPath, err)
+			return cfg, fmt.Errorf("parsing ldap config '%s': %v", cfg.LDAPConfPath, err)
 		}
 	} else {
 		cfg.LDAPEnabled = false
diff --git a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
index 462a58a..9de1055 100644
--- a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
+++ b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
@@ -48,7 +48,6 @@ func main() {
 	configFileName := flag.String("cfg", "", "The config file path")
 	dbConfigFileName := flag.String("dbcfg", "", "The db config file path")
 	riakConfigFileName := flag.String("riakcfg", "", "The riak config file path")
-	ldapConfigFileName := flag.String("ldapcfg", "", "the ldap config file path")
 	flag.Parse()
 
 	if *showVersion {
@@ -64,7 +63,7 @@ func main() {
 	var err error
 	var errorToLog error
 
-	if cfg, err = config.LoadConfig(*configFileName, *dbConfigFileName, *riakConfigFileName, *ldapConfigFileName, version); err != nil {
+	if cfg, err = config.LoadConfig(*configFileName, *dbConfigFileName, *riakConfigFileName, version); err != nil {
 		if !strings.Contains(err.Error(), "riak conf") {
 			fmt.Println("Error loading config: " + err.Error())
 			return

-- 
To stop receiving notification emails like this one, please contact
rob@apache.org.