fixed test conflicts

Signed-off-by: Bill Hamilton <[email protected]>

.gitignore

@@ -30,4 +30,4 @@
 test_config.json
 
 .DS_Store
-bh_test.go
+bh_example.go

server/http.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 )
 
@@ -14,7 +14,7 @@ func handleResponse(res *http.Response, err error) ([]byte, *http.Response, erro
 		return nil, res, err
 	}
 
-	data, err := io.ReadAll(res.Body)
+	data, err := ioutil.ReadAll(res.Body)
 
 	if err != nil {
 		return nil, res, err

server/secret_test.go

@@ -38,7 +38,7 @@ func GetSecret(t *testing.T, tss *Server) {
 	s, err := tss.Secret(id)
 
 	if err != nil {
-		t.Error("calling server.Secret:", err)
+		t.Errorf("calling server.Secret: err = %+v, config = %+v, secretID = %d", err, tss, id)
 		return
 	}
 
@@ -231,13 +231,8 @@ func SecretCRUD(t *testing.T, tss *Server) {
 
 	// Test read of the deleted secret fails
 	s, err := tss.Secret(sc.ID)
-<<<<<<< HEAD
-	if s.Active || err != nil {
-		t.Errorf("deleted secret with id '%d' returned from read. S = %+v", sc.ID, s)
-=======
-	if s != nil && s.Active {
-		t.Errorf("deleted secret with id '%d' returned from read", sc.ID)
->>>>>>> main
+	if s != nil && s.Active || err != nil {
+		t.Errorf("deleted secret with id '%d' returned from read, err = %+v", sc.ID, err)
 	}
 }
 
@@ -618,13 +613,8 @@ func SecretCRUDForSSHTemplate(t *testing.T, tss *Server) {
 
 	// Test read of the deleted secret fails
 	s, err := tss.Secret(sc.ID)
-<<<<<<< HEAD
-	if s.Active || err != nil {
-		t.Errorf("deleted secret with id '%d' returned from read. error = %+v", sc.ID, err)
-=======
-	if s != nil && s.Active {
-		t.Errorf("deleted secret with id '%d' returned from read", sc.ID)
->>>>>>> main
+	if s != nil && s.Active || err != nil {
+		t.Errorf("deleted secret with id '%d' returned from read. err = %+v", sc.ID, err)
 	}
 }
 
@@ -729,10 +719,13 @@ func initServer() (*Server, error) {
 func initPlatformServer() (*Server, error) {
 	var config *Configuration
 
-	if cj, err := ioutil.ReadFile("../test_config.json"); err == nil {
+	if cj, err := os.ReadFile("../test_config.json"); err == nil {
 		config = new(Configuration)
 
-		json.Unmarshal(cj, &config)
+		err := json.Unmarshal(cj, &config)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		config = &Configuration{
 			Credentials: UserCredential{

server/server.go

@@ -137,23 +137,14 @@ func (s Server) accessResource(method, resource, path, version string, input int
 		}
 	}
 
-	s.apiVersion = version
-	req, err := http.NewRequest(method, s.urlFor(resource, path), body)
-
-	if err != nil {
-		log.Printf("[ERROR] creating req: %s /%s/%s: %s", method, resource, path, err)
-		return nil, err
-	}
-
 	accessToken, err := s.getAccessToken()
-
 	if err != nil {
 		log.Print("[ERROR] error getting accessToken:", err)
 		return nil, err
 	}
 
-	req, err = http.NewRequest(method, s.urlFor(resource, path), body)
-
+	s.apiVersion = version
+	req, err := http.NewRequest(method, s.urlFor(resource, path), body)
 	if err != nil {
 		log.Printf("[ERROR] creating req: %s /%s/%s: %s", method, resource, path, err)
 		return nil, err
@@ -186,25 +177,17 @@ func (s Server) searchResources(resource, searchText, field, apiVersion string)
 		return nil, fmt.Errorf(message)
 	}
 
-	method := "GET"
-	body := bytes.NewBuffer([]byte{})
-
-	s.apiVersion = apiVersion
-	req, err := http.NewRequest(method, s.urlForSearch(resource, searchText, field), body)
-
-	if err != nil {
-		log.Printf("[ERROR] creating req: %s /%s/%s/%s: %s", method, resource, searchText, field, err)
-		return nil, err
-	}
-
 	accessToken, err := s.getAccessToken()
 
 	if err != nil {
 		log.Print("[ERROR] error getting accessToken:", err)
 		return nil, err
 	}
 
-	req, err = http.NewRequest(method, s.urlForSearch(resource, searchText, field), body)
+	method := "GET"
+	body := bytes.NewBuffer([]byte{})
+	s.apiVersion = apiVersion
+	req, err := http.NewRequest(method, s.urlForSearch(resource, searchText, field), body)
 
 	if err != nil {
 		log.Printf("[ERROR] creating req: %s /%s/%s/%s: %s", method, resource, searchText, field, err)
@@ -277,18 +260,7 @@ func (s *Server) getAccessToken() (string, error) {
 	if s.Credentials.Token != "" {
 		return s.Credentials.Token, nil
 	}
-	if s.Credentials.Domain != "" {
-		values["domain"] = []string{s.Credentials.Domain}
-	}
-
-	s.apiVersion = "v2/"
-
-	body := strings.NewReader(values.Encode())
-	requestUrl := s.urlFor("token", "")
-	_, _, err := handleResponse(http.Post(requestUrl, "application/x-www-form-urlencoded", body))
-
 	response, err := s.checkPlatformDetails()
-
 	if err != nil {
 		log.Print("Error while checking server details:", err)
 		return "", err