From ab9833a2d881e18f15bf6c9d39126afbcd0a48c9 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 8 Oct 2020 18:01:09 -0300 Subject: [PATCH] 16981: Retrieves the local clusterID from exported config. Also, fixed tests by not starting a new api server and using what run-tests provides. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- tools/sync-groups/sync-groups.go | 8 +++++++- tools/sync-groups/sync-groups_test.go | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/sync-groups/sync-groups.go b/tools/sync-groups/sync-groups.go index 4d03ba89e3..5fdd82bfae 100644 --- a/tools/sync-groups/sync-groups.go +++ b/tools/sync-groups/sync-groups.go @@ -275,7 +275,13 @@ func GetConfig() (config ConfigParams, err error) { if !u.IsActive || !u.IsAdmin { return config, fmt.Errorf("current user (%s) is not an active admin user", u.UUID) } - config.SysUserUUID = u.UUID[:12] + "000000000000000" + + var ac struct{ ClusterID string } + err = config.Client.RequestAndDecode(&ac, "GET", "arvados/v1/config", nil, nil) + if err != nil { + return config, fmt.Errorf("error getting the exported config: %s", err) + } + config.SysUserUUID = ac.ClusterID + "-tpzed-000000000000000" // Set up remote groups' parent if err = SetParentGroup(&config); err != nil { diff --git a/tools/sync-groups/sync-groups_test.go b/tools/sync-groups/sync-groups_test.go index 2da8c1cdde..ec2f18a307 100644 --- a/tools/sync-groups/sync-groups_test.go +++ b/tools/sync-groups/sync-groups_test.go @@ -26,14 +26,6 @@ type TestSuite struct { users map[string]arvados.User } -func (s *TestSuite) SetUpSuite(c *C) { - arvadostest.StartAPI() -} - -func (s *TestSuite) TearDownSuite(c *C) { - arvadostest.StopAPI() -} - func (s *TestSuite) SetUpTest(c *C) { ac := arvados.NewClientFromEnv() u, err := ac.CurrentUser() -- 2.30.2