WIP: 🕸️ Bug / Support AWS OpenSearch Auth #1081
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,4 +16,5 @@ lerna-debug.log | |
| !.env.test | ||
| !**/.env.schema | ||
|
|
||
| /configs | ||
| /modules/graphql-router/src/admin/** | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,10 +7,9 @@ import enforceAccessControl, { getDefaultServerSideFilter } from '#accessControl | |
| import fallbackConfigs, { validateConfigs } from '#config/index.js'; | ||
| import downloadRoutes from '#download/index.js'; | ||
| import getGraphQLRoutes from '#graphqlRoutes.js'; | ||
| import { buildCatalogueIntrospectionBody } from '#introspection/buildCatalogueIntrospection.js'; | ||
| import resolveCatalogueFields from '#mapping/resolveCatalogueFields.js'; | ||
| import buildSearchClient, { getIndexMapping, type SearchClient } from '#searchClient/index.js'; | ||
| import type { ArrangerBaseContext } from '#types.js'; | ||
| import { addContext } from '#utils/context.js'; | ||
| import { warnDeprecatedConfigsSource } from '#utils/noops.js'; | ||
|
|
@@ -56,10 +55,18 @@ const arrangerRouter = async <Context extends ArrangerBaseContext>({ | |
| try { | ||
| const aggregatedConfigs = mergeConfigs(fallbackConfigs, customConfigs); | ||
|
|
||
| const { | ||
| enableAdmin, | ||
| enableDebug, | ||
| esHost, | ||
| esPass, | ||
| esUser, | ||
| searchEngine, | ||
| searchEngineAuthType, | ||
| searchEngineAuthRegion, | ||
| searchEngineAuthService, | ||
| ...configs | ||
| } = validateConfigs(aggregatedConfigs, customEsClient); | ||
|
|
||
| warnDeprecatedConfigsSource({ configsSource, enableDebug: aggregatedConfigs.enableDebug }); | ||
|
|
||
|
|
@@ -69,14 +76,24 @@ const arrangerRouter = async <Context extends ArrangerBaseContext>({ | |
| const esClient = | ||
| customEsClient || | ||
| (await buildSearchClient({ | ||
| clientType: searchEngine, | ||
| node: esHost, | ||
| auth: { | ||
| password: esPass, | ||
| username: esUser, | ||
| type: searchEngineAuthType, | ||
| region: searchEngineAuthRegion, | ||
| service: searchEngineAuthService, | ||
| }, | ||
| })); | ||
|
|
||
| if (!esClient) | ||
| throw new Error( | ||
| 'Failure with buildSearchClient while initializing Arranger Server. Unable to fetch index mappings.', | ||
| ); | ||
|
|
||
| const mappingFromIndex = await getIndexMapping({ | ||
| enableDebug: !!enableDebug, | ||
|
Member
There was a problem hiding this comment. how is this change necessary?
Contributor
Author
There was a problem hiding this comment. This is a Type error, enableDebug at line 58 is
Contributor
There was a problem hiding this comment. Alternately we could change the
Member
There was a problem hiding this comment. sounds like a type problem in the function's definition, rather than something to be coerced in this manner 🤔 @joneubank thoughts on this? |
||
| searchClient: esClient, | ||
| esIndex: configs[configRootProperties.ES_INDEX], | ||
| }); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We aren't adding any code to consume these env variables, in fact we make no code changes to the server. Let's not add new env variables to our schema that are unused.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted get a start on documenting the Auth changes and new config values, then updated the client side without revisiting. Will revise.