@@ -78,6 +78,9 @@ function shallowRender(props = {}) { | |||
'Web Logging': { 'Logs Level': 'INFO' } | |||
} | |||
], | |||
ALMs: [{}], | |||
Bundled: [{}], | |||
Plugins: [{}], | |||
'Search Nodes': [ | |||
{ | |||
Name: 'Baz', |
@@ -228,6 +228,8 @@ exports[`should render correctly: stand-alone sysinfo 1`] = ` | |||
expandedCards={Array []} | |||
sysInfoData={ | |||
Object { | |||
"ALMs": Object {}, | |||
"Bundled": Object {}, | |||
"Compute Engine Database Connection": Object { | |||
"Pool Active Connections": 0, | |||
"Pool Initial Size": 0, | |||
@@ -258,6 +260,7 @@ exports[`should render correctly: stand-alone sysinfo 1`] = ` | |||
}, | |||
"Health": "GREEN", | |||
"Health Causes": Array [], | |||
"Plugins": Object {}, | |||
"Search Indexes": Object { | |||
"Index components - Docs": 30445, | |||
"Index components - Shards": 10, |
@@ -35,6 +35,8 @@ export const LOGS_LEVELS = ['INFO', 'DEBUG', 'TRACE']; | |||
const DEFAULT_LOG_LEVEL = LOGS_LEVELS[0]; | |||
export const APP_NODES_FIELD = 'Application Nodes'; | |||
export const ALMS_FIELD = 'ALMs'; | |||
export const BUNDLED_FIELD = 'Bundled'; | |||
export const CE_FIELD_PREFIX = 'Compute Engine'; | |||
export const CE_LOGGING_FIELD = 'Compute Engine Logging'; | |||
export const HA_FIELD = 'High Availability'; | |||
@@ -57,6 +59,8 @@ export const WEB_PREFIX = 'Web'; | |||
export function ignoreInfoFields(sysInfoObject: T.SysInfoValueObject) { | |||
return omit(sysInfoObject, [ | |||
ALMS_FIELD, | |||
BUNDLED_FIELD, | |||
HEALTH_FIELD, | |||
HEALTH_CAUSES_FIELD, | |||
NAME_FIELD, |
@@ -679,6 +679,9 @@ export function mockStandaloneSysInfo(overrides: Partial<any> = {}): T.SysInfoSt | |||
'file.encoding': 'UTF-8', | |||
'file.separator': '/' | |||
}, | |||
ALMs: {}, | |||
Bundled: {}, | |||
Plugins: {}, | |||
...overrides | |||
}; | |||
} |
@@ -54,18 +54,18 @@ public class AlmConfigurationSection implements SystemInfoSection { | |||
} | |||
private static String buildValue(AlmSettingDto almSettingDto) { | |||
String value = String.format("alm:%s", almSettingDto.getRawAlm()); | |||
String value = String.format("Alm:%s", almSettingDto.getRawAlm()); | |||
if (almSettingDto.getUrl() != null) { | |||
value += String.format(", url:%s", almSettingDto.getUrl()); | |||
value += String.format(", Url:%s", almSettingDto.getUrl()); | |||
} | |||
switch (almSettingDto.getAlm()) { | |||
case GITHUB: | |||
// add APP_ID and CLIENT_ID | |||
value += String.format(", appId:%s, clientId:%s", almSettingDto.getAppId(), almSettingDto.getClientId()); | |||
value += String.format(", App Id:%s, Client Id:%s", almSettingDto.getAppId(), almSettingDto.getClientId()); | |||
break; | |||
case BITBUCKET_CLOUD: | |||
// WORKSPACE ID & OAuth key | |||
value += String.format(", workspace id:%s, OAuth Key:%s", almSettingDto.getAppId(), almSettingDto.getClientId()); | |||
value += String.format(", Workspace Id:%s, OAuth Key:%s", almSettingDto.getAppId(), almSettingDto.getClientId()); | |||
break; | |||
default: | |||
// no additional information for the other ALMs |
@@ -50,11 +50,11 @@ public class AlmConfigurationSectionTest { | |||
assertThat(section.getAttributesList()) | |||
.extracting(Attribute::getKey, Attribute::getStringValue) | |||
.containsExactlyInAnyOrder( | |||
tuple(azure.getKey(), String.format("alm:%s, url:%s", azure.getRawAlm(), azure.getUrl())), | |||
tuple(github.getKey(), String.format("alm:%s, url:%s, appId:%s, clientId:%s", github.getRawAlm(), github.getUrl(), github.getAppId(), github.getClientId())), | |||
tuple(gitlab.getKey(), String.format("alm:%s, url:%s", gitlab.getRawAlm(), gitlab.getUrl())), | |||
tuple(bitbucket.getKey(), String.format("alm:%s, url:%s", bitbucket.getRawAlm(), bitbucket.getUrl())), | |||
tuple(bitbucketCloud.getKey(), String.format("alm:%s, workspace id:%s, OAuth Key:%s", bitbucketCloud.getRawAlm(), bitbucketCloud.getAppId(), bitbucketCloud.getClientId()))); | |||
tuple(azure.getKey(), String.format("Alm:%s, Url:%s", azure.getRawAlm(), azure.getUrl())), | |||
tuple(github.getKey(), String.format("Alm:%s, Url:%s, App Id:%s, Client Id:%s", github.getRawAlm(), github.getUrl(), github.getAppId(), github.getClientId())), | |||
tuple(gitlab.getKey(), String.format("Alm:%s, Url:%s", gitlab.getRawAlm(), gitlab.getUrl())), | |||
tuple(bitbucket.getKey(), String.format("Alm:%s, Url:%s", bitbucket.getRawAlm(), bitbucket.getUrl())), | |||
tuple(bitbucketCloud.getKey(), String.format("Alm:%s, Workspace Id:%s, OAuth Key:%s", bitbucketCloud.getRawAlm(), bitbucketCloud.getAppId(), bitbucketCloud.getClientId()))); | |||
} | |||
@Test | |||
@@ -68,8 +68,8 @@ public class AlmConfigurationSectionTest { | |||
assertThat(section.getAttributesList()) | |||
.extracting(Attribute::getKey, Attribute::getStringValue) | |||
.containsExactlyInAnyOrder( | |||
tuple(gitlab1.getKey(), String.format("alm:%s, url:%s", gitlab1.getRawAlm(), gitlab1.getUrl())), | |||
tuple(gitlab2.getKey(), String.format("alm:%s, url:%s", gitlab2.getRawAlm(), gitlab2.getUrl()))); | |||
tuple(gitlab1.getKey(), String.format("Alm:%s, Url:%s", gitlab1.getRawAlm(), gitlab1.getUrl())), | |||
tuple(gitlab2.getKey(), String.format("Alm:%s, Url:%s", gitlab2.getRawAlm(), gitlab2.getUrl()))); | |||
} | |||
@Test | |||
@@ -82,7 +82,7 @@ public class AlmConfigurationSectionTest { | |||
assertThat(section.getAttributesList()) | |||
.extracting(Attribute::getKey, Attribute::getStringValue) | |||
.containsExactlyInAnyOrder( | |||
tuple(azure.getKey(), String.format("alm:%s", azure.getRawAlm()))); | |||
tuple(azure.getKey(), String.format("Alm:%s", azure.getRawAlm()))); | |||
} | |||
} |