Merge pull request #62 from Axway/APIGOV-18136

APIGOV-18136 - set config team name
Axway · Mar 24, 2021 · 707335c · 707335c
2 parents ee7b004 + e41149f
commit 707335c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -557,5 +557,9 @@ func applyResConfigToCentralConfig(cfg *config.CentralConfiguration, resCfgAddit
 		log.GlobalLoggerConfig.Level(logLevel).Apply()
 	}
 
-	cfg.TeamName = resCfgTeamName
+	// If config team is blank, check resource team name.  If resource team name is not blank, use resource team name
+	if cfg.TeamName == "" && resCfgTeamName != "" {
+		cfg.TeamName = resCfgTeamName
+	}
+
 }