Skip to content

Commit

Permalink
[Rename] remove remaining references (#341)
Browse files Browse the repository at this point in the history
* [Rename] remove remaining references

Some values were added but should not impact current cuts for the
public.

Signed-off-by: Kawika Avilla <[email protected]>

* [Rename] update url for configs

Signed-off-by: Kawika Avilla <[email protected]>
  • Loading branch information
kavilla authored May 13, 2021
1 parent 439e67a commit a408c7a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/core/server/saved_objects/status.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('calculateStatus$', () => {
const expectUnavailableDueToOpenSearch = (status$: Observable<ServiceStatus>) =>
expect(status$.pipe(take(1)).toPromise()).resolves.toEqual({
level: ServiceStatusLevels.unavailable,
summary: `SavedObjects service is not available without a healthy Elasticearch connection`,
summary: `SavedObjects service is not available without a healthy OpenSearch connection`,
});

const expectUnavailableDueToMigrations = (status$: Observable<ServiceStatus>) =>
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/saved_objects/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const calculateStatus$ = (
if (openSearchStatus.level >= ServiceStatusLevels.unavailable) {
return {
level: ServiceStatusLevels.unavailable,
summary: `SavedObjects service is not available without a healthy Elasticearch connection`,
summary: `SavedObjects service is not available without a healthy OpenSearch connection`,
};
} else if (migratorStatus.level === ServiceStatusLevels.unavailable) {
return migratorStatus;
Expand Down
8 changes: 4 additions & 4 deletions src/legacy/server/config/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,11 @@ export default () =>
opensearchManifestServiceUrl: Joi.string().default(
'https://maps.search-services.aws.a2z.com/v4/ap-southeast-1/manifest'
),
emsFileApiUrl: Joi.string().default('https://vector.maps.elastic.co'),
emsTileApiUrl: Joi.string().default('https://tiles.maps.elastic.co'),
emsLandingPageUrl: Joi.string().default('https://maps.elastic.co/v7.9'),
emsFileApiUrl: Joi.string().default('https://vectors.maps.search-services.aws.a2z.com'),
emsTileApiUrl: Joi.string().default('https://tiles.maps.search-services.aws.a2z.com'),
emsLandingPageUrl: Joi.string().default('https://maps.search-services.aws.a2z.com/v4'),
emsFontLibraryUrl: Joi.string().default(
'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf'
'https://tiles.maps.search-services.aws.a2z.com/fonts/{fontstack}/{range}.pbf'
),
emsTileLayerId: Joi.object({
bright: Joi.string().default('road_map'),
Expand Down
10 changes: 6 additions & 4 deletions src/plugins/maps_legacy/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ export const configSchema = schema.object({
opensearchManifestServiceUrl: schema.string({
defaultValue: 'https://maps.search-services.aws.a2z.com/v4/us-east-1/manifest',
}),
emsFileApiUrl: schema.string({ defaultValue: 'https://vector.maps.opensearch.org' }),
emsTileApiUrl: schema.string({ defaultValue: 'https://tiles.maps.opensearch.org' }),
emsLandingPageUrl: schema.string({ defaultValue: 'https://maps.opensearch.org/v7.10' }),
emsFileApiUrl: schema.string({
defaultValue: 'https://vectors.maps.search-services.aws.a2z.com',
}),
emsTileApiUrl: schema.string({ defaultValue: 'https://tiles.maps.search-services.aws.a2z.com' }),
emsLandingPageUrl: schema.string({ defaultValue: 'https://maps.search-services.aws.a2z.com/v4' }),
emsFontLibraryUrl: schema.string({
defaultValue: 'https://tiles.maps.opensearch.org/fonts/{fontstack}/{range}.pbf',
defaultValue: 'https://tiles.maps.search-services.aws.a2z.com/fonts/{fontstack}/{range}.pbf',
}),
emsTileLayerId: schema.object({
bright: schema.string({ defaultValue: 'road_map' }),
Expand Down
Loading

0 comments on commit a408c7a

Please sign in to comment.