From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Fri, 8 Jan 2021 21:37:14 +0000 (-0300)
Subject: 16981: Removes config loader code to fix import cycle.
X-Git-Tag: 2.2.0~163^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7ab4905be555e3e5f65c3020ccafe3cc88f9e839

16981: Removes config loader code to fix import cycle.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 7e719e72ed..d93ffd64dc 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -19,8 +19,10 @@ import (
 	"strconv"
 	"strings"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
 )
 
@@ -121,10 +123,15 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 `
 		}
 
-		tc, err := arvadostest.NewTestCluster(
-			filepath.Join(cwd, "..", ".."),
-			id, yaml, "127.0.0."+id[3:], c.Log)
+		loader := config.NewLoader(bytes.NewBufferString(yaml), ctxlog.TestLogger(c))
+		loader.Path = "-"
+		loader.SkipLegacy = true
+		loader.SkipAPICalls = true
+		cfg, err := loader.Load()
 		c.Assert(err, check.IsNil)
+		tc := arvadostest.NewTestCluster(
+			filepath.Join(cwd, "..", ".."),
+			id, cfg, "127.0.0."+id[3:], c.Log)
 		s.testClusters[id] = tc
 		s.testClusters[id].Start()
 	}
diff --git a/sdk/go/arvadostest/test_cluster.go b/sdk/go/arvadostest/test_cluster.go
index da2a9d78c7..57dca3d835 100644
--- a/sdk/go/arvadostest/test_cluster.go
+++ b/sdk/go/arvadostest/test_cluster.go
@@ -5,12 +5,10 @@
 package arvadostest
 
 import (
-	"bytes"
 	"context"
 	"net/url"
 
 	"git.arvados.org/arvados.git/lib/boot"
-	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/controller/rpc"
 	"git.arvados.org/arvados.git/lib/service"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
@@ -39,15 +37,7 @@ func (l logger) Log(args ...interface{}) {
 
 // NewTestCluster loads the provided configuration, and sets up a test cluster
 // ready for being started.
-func NewTestCluster(srcPath string, clusterID, yamlConf, listenHost string, logWriter func(...interface{})) (*TestCluster, error) {
-	loader := config.NewLoader(bytes.NewBufferString(yamlConf), ctxlog.TestLogger(logger{logWriter}))
-	loader.Path = "-"
-	loader.SkipLegacy = true
-	loader.SkipAPICalls = true
-	cfg, err := loader.Load()
-	if err != nil {
-		return nil, err
-	}
+func NewTestCluster(srcPath, clusterID string, cfg *arvados.Config, listenHost string, logWriter func(...interface{})) *TestCluster {
 	return &TestCluster{
 		Super: boot.Supervisor{
 			SourcePath:           srcPath,
@@ -61,7 +51,7 @@ func NewTestCluster(srcPath string, clusterID, yamlConf, listenHost string, logW
 		},
 		Config:    *cfg,
 		ClusterID: clusterID,
-	}, nil
+	}
 }
 
 // Start the test cluster.
diff --git a/tools/sync-groups/federation_test.go b/tools/sync-groups/federation_test.go
index 2462383f3e..baa2ec02a3 100644
--- a/tools/sync-groups/federation_test.go
+++ b/tools/sync-groups/federation_test.go
@@ -5,12 +5,15 @@
 package main
 
 import (
+	"bytes"
 	"net"
 	"os"
 	"path/filepath"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
 )
 
@@ -101,10 +104,15 @@ func (s *FederationSuite) SetUpSuite(c *check.C) {
 `
 		}
 
-		tc, err := arvadostest.NewTestCluster(
-			filepath.Join(cwd, "..", ".."),
-			id, yaml, "127.0.0."+id[3:], c.Log)
+		loader := config.NewLoader(bytes.NewBufferString(yaml), ctxlog.TestLogger(c))
+		loader.Path = "-"
+		loader.SkipLegacy = true
+		loader.SkipAPICalls = true
+		cfg, err := loader.Load()
 		c.Assert(err, check.IsNil)
+		tc := arvadostest.NewTestCluster(
+			filepath.Join(cwd, "..", ".."),
+			id, cfg, "127.0.0."+id[3:], c.Log)
 		s.testClusters[id] = tc
 		s.testClusters[id].Start()
 	}