ソースを参照

remove loader requirement for provisioner

Alexander Belanger 4 年 前
コミット
99c5ff63af

+ 2 - 4
api/server/shared/config/loader/loader.go

@@ -204,12 +204,10 @@ func (e *EnvConfigLoader) LoadConfig() (res *config.Config, err error) {
 
 	provClient, err := getProvisionerServiceClient(sc)
 
-	if err != nil {
-		return nil, err
+	if err == nil && provClient != nil {
+		res.ProvisionerClient = provClient
 	}
 
-	res.ProvisionerClient = provClient
-
 	res.AnalyticsClient = analytics.InitializeAnalyticsSegmentClient(sc.SegmentClientKey, res.Logger)
 
 	if sc.PowerDNSAPIKey != "" && sc.PowerDNSAPIServerURL != "" {

+ 1 - 1
api/server/shared/config/metadata.go

@@ -18,7 +18,7 @@ type Metadata struct {
 
 func MetadataFromConf(sc *env.ServerConf, version string) *Metadata {
 	return &Metadata{
-		Provisioning:       sc.ProvisionerServerURL != "",
+		Provisioning:       sc.ProvisionerServerURL != "" && sc.ProvisionerToken != "",
 		Github:             hasGithubAppVars(sc),
 		GithubLogin:        sc.GithubClientID != "" && sc.GithubClientSecret != "" && sc.GithubLoginEnabled,
 		BasicLogin:         sc.BasicLoginEnabled,