Allow configuring via bit config cloud_domain and symphony_url (teambit#6930)

Author: GiladShoham

e2e/bitsrc-tester.ts

@@ -1,13 +1,13 @@
 import fetch from 'node-fetch';
 
-import { BASE_CLOUD_DOMAIN } from '../src/constants';
+import { getCloudDomain } from '../src/constants';
 
-// const apiBaseUrl = process.env.NODE_ENV === 'production' ? `https://api.${BASE_CLOUD_DOMAIN}` : `https://api-stg.${BASE_CLOUD_DOMAIN}`;
+// const apiBaseUrl = process.env.NODE_ENV === 'production' ? `https://api.${getCloudDomain()}` : `https://api-stg.${getCloudDomain()}`;
 const skipBitDevTests = process.env.SKIP_BIT_DEV_TESTS === 'True' || process.env.SKIP_BIT_DEV_TESTS === 'true';
 const supportTestingOnBitsrc = !skipBitDevTests;
 // const supportTestingOnBitsrc = true;
 const apiBaseUrl =
-  process.env.BITSRC_ENV === 'stg' ? `https://api-stg.${BASE_CLOUD_DOMAIN}` : `https://api.${BASE_CLOUD_DOMAIN}`;
+  process.env.BITSRC_ENV === 'stg' ? `https://api-stg.${getCloudDomain()}` : `https://api.${getCloudDomain()}`;
 const username = process.env.testerBitsrcUsername || 'tester';
 const password = process.env.testerBitsrcPassword;
 

scopes/cloud/cloud/cloud.main.runtime.ts

@@ -1,8 +1,8 @@
 import { MainRuntime } from '@teambit/cli';
 import {
-  BASE_CLOUD_DOMAIN,
+  getCloudDomain,
   DEFAULT_HUB_DOMAIN,
-  SYMPHONY_URL,
+  getSymphonyUrl,
   SYMPHONY_GRAPHQL,
   DEFAULT_HUB_LOGIN,
   DEFAULT_ANALYTICS_DOMAIN,
@@ -67,9 +67,9 @@ export class CloudMain {
   static dependencies = [];
   static runtime = MainRuntime;
   static defaultConfig: CloudWorkspaceConfig = {
-    cloudDomain: BASE_CLOUD_DOMAIN,
+    cloudDomain: getCloudDomain(),
     cloudHubDomain: DEFAULT_HUB_DOMAIN,
-    cloudApi: SYMPHONY_URL,
+    cloudApi: getSymphonyUrl(),
     cloudGraphQL: SYMPHONY_GRAPHQL,
     loginDomain: DEFAULT_HUB_LOGIN,
     analyticsDomain: DEFAULT_ANALYTICS_DOMAIN,

scopes/component/snapping/tag-model-component.ts

@@ -12,7 +12,7 @@ import {
   CFG_USER_EMAIL_KEY,
   CFG_USER_NAME_KEY,
   CFG_USER_TOKEN_KEY,
-  BASE_CLOUD_DOMAIN,
+  getCloudDomain,
   Extensions,
 } from '@teambit/legacy/dist/constants';
 import { CURRENT_SCHEMA } from '@teambit/legacy/dist/consumer/component/component-schema';
@@ -448,7 +448,7 @@ async function getBitCloudUsername(): Promise<string | undefined> {
   const token = await globalConfig.get(CFG_USER_TOKEN_KEY);
   if (!token) return '';
   try {
-    const res = await fetch(`https://api.${BASE_CLOUD_DOMAIN}/user`, {
+    const res = await fetch(`https://api.${getCloudDomain()}/user`, {
       headers: {
         Authorization: `Bearer ${token}`,
         'Content-Type': 'application/json',

scopes/dependencies/dependency-resolver/dependency-resolver.main.runtime.ts

@@ -13,7 +13,7 @@ import { RequireableComponent } from '@teambit/harmony.modules.requireable-compo
 import type { LoggerMain } from '@teambit/logger';
 import { GraphqlAspect, GraphqlMain } from '@teambit/graphql';
 import { Logger, LoggerAspect } from '@teambit/logger';
-import { CFG_PACKAGE_MANAGER_CACHE, CFG_REGISTRY_URL_KEY, CFG_USER_TOKEN_KEY } from '@teambit/legacy/dist/constants';
+import { CFG_PACKAGE_MANAGER_CACHE, CFG_REGISTRY_URL_KEY, CFG_USER_TOKEN_KEY, getCloudDomain } from '@teambit/legacy/dist/constants';
 // TODO: it's weird we take it from here.. think about it../workspace/utils
 import { DependencyResolver } from '@teambit/legacy/dist/consumer/component/dependencies/dependency-resolver';
 import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
@@ -82,7 +82,7 @@ import { EnvPolicy } from './policy/env-policy';
  * @deprecated use BIT_CLOUD_REGISTRY instead
  */
 export const BIT_DEV_REGISTRY = 'https://node.bit.dev/';
-export const BIT_CLOUD_REGISTRY = 'https://node.bit.cloud/';
+export const BIT_CLOUD_REGISTRY = `https://node.${getCloudDomain()}/`;
 export const NPM_REGISTRY = 'https://registry.npmjs.org/';
 
 export { ProxyConfig, NetworkConfig } from '@teambit/legacy/dist/scope/network/http';

scopes/dependencies/dependency-resolver/index.ts

@@ -18,6 +18,7 @@ export type {
   DependencyResolverMain,
   DependencyResolverWorkspaceConfig,
   DependencyResolverVariantConfig,
+  BIT_CLOUD_REGISTRY,
 } from './dependency-resolver.main.runtime';
 export {
   BIT_DEV_REGISTRY,

src/cli/commands/public-cmds/login-cmd.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 
 import { login } from '../../../api/consumer';
-import { BASE_CLOUD_DOMAIN } from '../../../constants';
+import { getCloudDomain } from '../../../constants';
 import { Group } from '../../command-groups';
 import { CommandOptions, LegacyCommand } from '../../legacy-command';
 
@@ -14,8 +14,8 @@ export default class Login implements LegacyCommand {
   opts = [
     ['p', 'port <port>', 'port number to open for localhost server (default 8085)'],
     ['', 'suppress-browser-launch', 'do not open a browser for authentication'],
-    ['', 'npmrc-path <path>', `path to npmrc file to configure ${BASE_CLOUD_DOMAIN} registry`],
-    ['', 'skip-registry-config', `don't configure ${BASE_CLOUD_DOMAIN} registry`],
+    ['', 'npmrc-path <path>', `path to npmrc file to configure ${getCloudDomain()} registry`],
+    ['', 'skip-registry-config', `don't configure ${getCloudDomain()} registry`],
     [
       '',
       'machine-name <name>',

src/cli/templates/eject-template.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 
-import { BASE_CLOUD_DOMAIN } from '../../constants';
+import { getCloudDomain } from '../../constants';
 import { EjectResults } from '../../consumer/component-ops/eject-components';
 
 export const successEjectMessage = 'successfully ejected the following components';
@@ -28,7 +28,7 @@ use the '--force' flag to discard local modifications and proceed with the eject
       ? `local components that were not exported yet: ${failures.notExportedComponents.toString()}\n`
       : '';
     const selfHosted = failures.selfHostedExportedComponents.length
-      ? `components that were exported to a self hosted scope (not ${BASE_CLOUD_DOMAIN}): ${failures.selfHostedExportedComponents.toString()}\n`
+      ? `components that were exported to a self hosted scope (not ${getCloudDomain()}): ${failures.selfHostedExportedComponents.toString()}\n`
       : '';
     const body = modified + staged + notExported + selfHosted;
     if (body) return chalk.underline(title) + chalk.red(body);

src/constants.ts

@@ -4,10 +4,12 @@ import * as path from 'path';
 import format from 'string-format';
 
 import { PathOsBased } from './utils/path';
+import { getSync } from './api/consumer/lib/global-config';
 
 const userHome = require('user-home');
 const packageFile = require('../package.json');
 
+
 export const IS_WINDOWS = os.platform() === 'win32';
 
 function getDirectory(): PathOsBased {
@@ -32,6 +34,34 @@ function getCacheDirectory(): PathOsBased {
   return getDirectory();
 }
 
+/**
+ * cache root directory
+ */
+export const CACHE_ROOT = getCacheDirectory();
+
+/**
+ * global config directories
+ */
+export const GLOBAL_CONFIG: PathOsBased = path.join(CACHE_ROOT, 'config');
+
+export const GLOBAL_LOGS: PathOsBased = path.join(CACHE_ROOT, 'logs');
+
+export const GLOBAL_SCOPE: PathOsBased = path.join(CACHE_ROOT, 'scope');
+
+export const GLOBALS_DEFAULT_CAPSULES = path.join(CACHE_ROOT, 'capsules');
+
+export const GLOBAL_CONFIG_FILE = 'config.json';
+
+export const GLOBAL_REMOTES = 'global-remotes.json';
+
+export const BIT_HIDDEN_DIR = '.bit';
+
+export const BIT_GIT_DIR = 'bit';
+
+export const DOT_GIT_DIR = '.git';
+
+
+
 export const BIT_USAGE = '[--version] [--help] <command> [<args>]';
 
 export const BITS_DIRNAME = 'components';
@@ -123,41 +153,56 @@ export const SPINNER_TYPE = IS_WINDOWS ? cliSpinners.dots : cliSpinners.dots12;
  */
 
 /**
- * @deprecated use 'BASE_CLOUD_DOMAIN' or 'BASE_COMMUNITY_DOMAIN'
+ * @deprecated use 'getCloudDomain()' or 'BASE_COMMUNITY_DOMAIN'
  */
 export const BASE_WEB_DOMAIN = 'bit.dev';
 
-export const BASE_CLOUD_DOMAIN = 'bit.cloud';
+export const CFG_CLOUD_DOMAIN_KEY = 'cloud_domain';
+
+export const DEFAULT_CLOUD_DOMAIN = 'bit.cloud';
+let resolvedCloudDomain;
+export const getCloudDomain = (): string => {
+  if (resolvedCloudDomain) return resolvedCloudDomain;
+  resolvedCloudDomain = getSync(CFG_CLOUD_DOMAIN_KEY) || DEFAULT_CLOUD_DOMAIN;
+  return resolvedCloudDomain;
+} 
 
 export const BASE_COMMUNITY_DOMAIN = 'bit.dev';
 
 export const PREVIOUSLY_BASE_WEB_DOMAIN = 'bitsrc.io';
 
-export const DEFAULT_HUB_DOMAIN = `hub.${BASE_CLOUD_DOMAIN}`;
+export const DEFAULT_HUB_DOMAIN = `hub.${getCloudDomain()}`;
 
-export const SYMPHONY_URL = `symphony.${BASE_CLOUD_DOMAIN}`;
+export const CFG_SYMPHONY_URL_KEY = 'symphony_url';
+
+let resolvedSymphonyUrl;
+export const getSymphonyUrl = (): string => {
+  if (resolvedSymphonyUrl) return resolvedSymphonyUrl;
+  resolvedSymphonyUrl = getSync(CFG_SYMPHONY_URL_KEY) || `symphony.${getCloudDomain()}`;
+  return resolvedSymphonyUrl;
+} 
 
-export const SYMPHONY_GRAPHQL = `http://${SYMPHONY_URL}/graphql`;
+export const SYMPHONY_GRAPHQL = `https://${getSymphonyUrl()}/graphql`;
 
 export const BASE_DOCS_DOMAIN = `${BASE_COMMUNITY_DOMAIN}/docs`;
 
 export const BASE_LEGACY_DOCS_DOMAIN = `legacy-docs.${BASE_COMMUNITY_DOMAIN}/docs`;
 
-export const DEFAULT_HUB_LOGIN = `https://${BASE_CLOUD_DOMAIN}/bit-login`;
+export const DEFAULT_HUB_LOGIN = `https://${getCloudDomain()}/bit-login`;
 
-export const DEFAULT_ANALYTICS_DOMAIN = `https://analytics.${BASE_CLOUD_DOMAIN}/`;
+export const DEFAULT_ANALYTICS_DOMAIN = `https://analytics.${getCloudDomain()}/`;
 
-export const SEARCH_DOMAIN = `api.${BASE_CLOUD_DOMAIN}`;
+export const SEARCH_DOMAIN = `api.${getCloudDomain()}`;
 
-export const RELEASE_SERVER = `https://api.${BASE_CLOUD_DOMAIN}/release`;
+export const RELEASE_SERVER = `https://api.${getCloudDomain()}/release`;
 
-export const DEFAULT_REGISTRY_URL = `https://node.bit.cloud`;
+export const DEFAULT_REGISTRY_URL = `https://node.${getCloudDomain()}`;
 
 export const PREVIOUSLY_DEFAULT_REGISTRY_URL = `https://node.${PREVIOUSLY_BASE_WEB_DOMAIN}`;
 
-export const CENTRAL_BIT_HUB_URL = `https://${SYMPHONY_URL}/exporter`;
+export const CENTRAL_BIT_HUB_URL = `https://${getSymphonyUrl()}/exporter`;
 
-export const CENTRAL_BIT_HUB_NAME = 'bit.cloud';
+export const CENTRAL_BIT_HUB_NAME = getCloudDomain();
 
 // END URLS
 
@@ -221,8 +266,6 @@ export const CFG_SSH_KEY_FILE_KEY = 'ssh_key_file';
 
 export const CFG_HUB_DOMAIN_KEY = 'hub_domain';
 
-export const CFG_SYMPHONY_URL_KEY = 'symphony_url';
-
 export const CFG_HUB_LOGIN_KEY = 'hub_domain_login';
 
 export const CFG_ANALYTICS_DOMAIN_KEY = 'analytics_domain';
@@ -377,32 +420,6 @@ export const HOOKS_NAMES = [
   POST_REMOVE_REMOTE,
 ];
 
-/**
- * cache root directory
- */
-export const CACHE_ROOT = getCacheDirectory();
-
-/**
- * global config directories
- */
-export const GLOBAL_CONFIG: PathOsBased = path.join(CACHE_ROOT, 'config');
-
-export const GLOBAL_LOGS: PathOsBased = path.join(CACHE_ROOT, 'logs');
-
-export const GLOBAL_SCOPE: PathOsBased = path.join(CACHE_ROOT, 'scope');
-
-export const GLOBALS_DEFAULT_CAPSULES = path.join(CACHE_ROOT, 'capsules');
-
-export const GLOBAL_CONFIG_FILE = 'config.json';
-
-export const GLOBAL_REMOTES = 'global-remotes.json';
-
-export const BIT_HIDDEN_DIR = '.bit';
-
-export const BIT_GIT_DIR = 'bit';
-
-export const DOT_GIT_DIR = '.git';
-
 /**
  * bit registry default URL.
  */

src/e2e-helper/e2e-config-helper.ts

@@ -1,6 +1,6 @@
 import R from 'ramda';
 
-import { BASE_CLOUD_DOMAIN, CFG_GIT_EXECUTABLE_PATH } from '../constants';
+import { getCloudDomain, CFG_GIT_EXECUTABLE_PATH } from '../constants';
 import CommandHelper from './e2e-command-helper';
 
 export default class ConfigHelper {
@@ -9,7 +9,7 @@ export default class ConfigHelper {
     this.command = command;
   }
 
-  setHubDomain(domain = `hub.${BASE_CLOUD_DOMAIN}`) {
+  setHubDomain(domain = `hub.${getCloudDomain()}`) {
     this.command.setConfig('hub_domain', domain);
   }
 

src/remotes/remote-resolver/remote-resolver.ts

@@ -5,8 +5,7 @@ import {
   CFG_HUB_DOMAIN_KEY,
   DEFAULT_HUB_DOMAIN,
   CFG_USER_TOKEN_KEY,
-  SYMPHONY_URL,
-  CFG_SYMPHONY_URL_KEY,
+  getSymphonyUrl
 } from '../../constants';
 
 import Scope from '../../scope/scope';
@@ -15,7 +14,7 @@ import logger from '../../logger/logger';
 import { ScopeNotFoundOrDenied } from '../exceptions/scope-not-found-or-denied';
 
 const hubDomain = getSync(CFG_HUB_DOMAIN_KEY) || DEFAULT_HUB_DOMAIN;
-const symphonyUrl = getSync(CFG_SYMPHONY_URL_KEY) || SYMPHONY_URL;
+const symphonyUrl = getSymphonyUrl();
 
 type ResolverFunction = (scopeName: string, thisScopeName?: string, token?: string) => Promise<string>;