Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit fddd27d

Browse files
cstrykercstryker
committed
pass o11y server url up to client
1 parent 054fb14 commit fddd27d

File tree

14 files changed

+275
-28
lines changed

14 files changed

+275
-28
lines changed

‎api_server/modules/users/login_helper.js

+2
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ class LoginHelper {
277277
isOnPrem,
278278
isProductionCloud = false,
279279
newRelicLandingServiceUrl,
280+
o11yServerUrl,
280281
newRelicApiUrl,
281282
newRelicSecApiUrl,
282283
csecApiUrl,
@@ -312,6 +313,7 @@ class LoginHelper {
312313
isWebmail: this.isWebmail,
313314
accountIsConnected: this.accountIsConnected,
314315
newRelicLandingServiceUrl,
316+
o11yServerUrl,
315317
newRelicApiUrl,
316318
newRelicSecApiUrl,
317319
telemetryEndpoint,

‎api_server/modules/users/test/check_signup/check_signup_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ class CheckSignupTest extends Aggregation(CodeStreamAPITest, CommonInit) {
8080
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem, 'isOnPrem not correct');
8181
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false, 'isProductionCloud not correct');
8282
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl, 'newRelicLandingServiceUrl not correct');
83+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
8384
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
8485
Assert(
8586
data.user.providerInfo &&

‎api_server/modules/users/test/login/login_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class LoginTest extends CodeStreamAPITest {
107107
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem, 'isOnPrem not correct');
108108
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false, 'isProductionCloud not correct');
109109
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl, 'newRelicLandingServiceUrl not correct');
110+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
110111
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
111112
this.validateSanitized(data.user, UserTestConstants.UNSANITIZED_ATTRIBUTES_FOR_ME);
112113
}

‎api_server/modules/users/test/login_by_code/login_by_code_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class LoginByCodeTest extends CodeStreamAPITest {
112112
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem);
113113
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false);
114114
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl);
115+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
115116
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
116117
this.validateSanitized(data.user, UserTestConstants.UNSANITIZED_ATTRIBUTES_FOR_ME);
117118
}

‎api_server/modules/users/test/nr_registration/nr_registration_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class NRRegistrationTest extends CodeStreamAPITest {
124124
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem, 'isOnPrem not correct');
125125
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false, 'isProductionCloud not correct');
126126
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl, 'newRelicLandingServiceUrl not correct');
127+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
127128
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
128129
}
129130
}

‎api_server/modules/users/test/raw_login/login_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class LoginTest extends CodeStreamAPITest {
9696
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem);
9797
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false);
9898
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl);
99+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
99100
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
100101
this.validateSanitized(data.user, UserTestConstants.UNSANITIZED_ATTRIBUTES_FOR_ME);
101102
}

‎api_server/modules/users/test/user_test_constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ const EXPECTED_LOGIN_RESPONSE = {
6161
pubnubToken: true,
6262
broadcasterToken: true,
6363
pubnubKey: true,
64-
6564
teams: true,
6665
isOnPrem: true,
6766
isProductionCloud: true,
6867
runtimeEnvironment: true,
6968
newRelicLandingServiceUrl: true,
69+
o11yServerUrl: true,
7070
newRelicApiUrl: true
7171
};
7272

‎api_server/modules/versioner/capabilities_request.js

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class CapabilitiesRequest extends RestfulRequest {
1818
isOnPrem,
1919
isProductionCloud,
2020
newRelicLandingServiceUrl,
21+
o11yServerUrl,
2122
newRelicApiUrl,
2223
newRelicSecApiUrl,
2324
csecApiUrl
@@ -43,6 +44,7 @@ class CapabilitiesRequest extends RestfulRequest {
4344
isOnPrem: isOnPrem,
4445
isProductionCloud: isProductionCloud,
4546
newRelicLandingServiceUrl: newRelicLandingServiceUrl,
47+
o11yServerUrl: o11yServerUrl,
4648
newRelicApiUrl: newRelicApiUrl,
4749
newRelicSecApiUrl: newRelicSecApiUrl,
4850
csecApiUrl: csecApiUrl,

‎api_server/modules/versioner/test/capabilities_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class CapabilitiesTest extends CodeStreamAPITest {
4242
Assert.deepStrictEqual(data.isOnPrem, this.apiConfig.sharedGeneral.isOnPrem, 'isOnPrem is not correct');
4343
Assert.deepStrictEqual(data.isProductionCloud, this.apiConfig.sharedGeneral.isProductionCloud || false, 'isProductionCloud is not correct');
4444
Assert.deepStrictEqual(data.newRelicLandingServiceUrl, this.apiConfig.sharedGeneral.newRelicLandingServiceUrl, 'newRelicLandingServiceUrl is not correct');
45+
Assert.deepStrictEqual(data.o11yServerUrl, this.apiConfig.sharedGeneral.o11yServerUrl, 'o11yServerUrl not correct');
4546
Assert.deepStrictEqual(data.newRelicApiUrl, this.apiConfig.sharedGeneral.newRelicApiUrl, 'newRelicApiUrl not correct');
4647
}
4748
}

0 commit comments

Comments
 (0)