Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Branding] assets folder and SSL support #1329

Merged

Conversation

kavilla
Copy link
Member

@kavilla kavilla commented Mar 8, 2022

Description

Adding assets folder that gets served up under UI for ease of us.

SSL support when OpenSearch Dashboards SSL is enabled.

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

Issues Resolved

#1164

Check List

  • New functionality includes testing.
    • All tests pass
      • yarn test:jest
      • yarn test:jest_integration
      • yarn test:ftr
  • New functionality has been documented.
  • Commits are signed per the DCO using --signoff

Adding `assets` folder that gets served up under UI for ease of us.

SSL support when OpenSearch Dashboards SSL is enabled.

Issue Resolved:
opensearch-project#1164

Signed-off-by: Kawika Avilla <[email protected]>
@kavilla kavilla requested a review from a team as a code owner March 8, 2022 20:21
@kavilla
Copy link
Member Author

kavilla commented Mar 8, 2022

I had to create a new issue for more tests since it's more involved: #1330.

One thing to guarantee is that this will have no impact and will go unnoticed on default behavior (SSL not enabled) so this is a relatively safe change.

Copy link
Member

@ashwin-pc ashwin-pc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -89,6 +89,7 @@ export class CoreApp {
}
private registerStaticDirs(coreSetup: InternalCoreSetup) {
coreSetup.http.registerStaticDir('/ui/{path*}', Path.resolve(__dirname, './assets'));
coreSetup.http.registerStaticDir('/ui/assets/{path*}', fromRoot('assets'));

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove this blank line or add another blank one after line 91

@kavilla kavilla merged commit 289ad24 into opensearch-project:main Mar 8, 2022
@kavilla kavilla deleted the avillk/custom_branding_improvements branch March 8, 2022 23:24
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 8, 2022
Adding `assets` folder that gets served up under UI for ease of us.

SSL support when OpenSearch Dashboards SSL is enabled.

Issue Resolved:
#1164

Signed-off-by: Kawika Avilla <[email protected]>
(cherry picked from commit 289ad24)
ananzh pushed a commit that referenced this pull request Mar 8, 2022
Adding `assets` folder that gets served up under UI for ease of us.

SSL support when OpenSearch Dashboards SSL is enabled.

Issue Resolved:
#1164

Signed-off-by: Kawika Avilla <[email protected]>
(cherry picked from commit 289ad24)

Co-authored-by: Kawika Avilla <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Custom branding fails for SSL enabled because certs aren't passed in the verification
3 participants