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

Migrate workbench to OpenSearch Dashboards #6

Merged
merged 6 commits into from
Apr 17, 2021

Conversation

davidcui1225
Copy link
Contributor

Issue #, if available:
N/A
Description of changes:

  • Migrate workbench to OpenSearch Dashboards
  • bump version to 1.15

TODO: Update GitHub workflows, get feedback on changes needed in tslint.yaml with Elasticsearch BV license statement.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

uses: actions/checkout@v1
with:
repository: elastic/kibana
ref: v7.10.2
path: sql/kibana
path: sql/OpenSearch-Dashboards
Copy link
Member

Choose a reason for hiding this comment

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

I think paths should remain lowercase. + below many

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Even though the OpenSearch-Dashboards repo has the upper case?

Copy link
Member

Choose a reason for hiding this comment

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

You're right. In hindsight maybe we should have made repo names lowercase, but YOLO.

workbench/.cypress/integration/ui.spec.js Show resolved Hide resolved
workbench/README.md Show resolved Hide resolved
workbench/README.md Show resolved Hide resolved
workbench/opensearch_dashboards.json Outdated Show resolved Hide resolved
workbench/public/components/app.tsx Show resolved Hide resolved
@@ -40,7 +40,7 @@ export default function translate(server: IRouter, service: TranslateService) {
body: schema.any(),
},
},
async (context, request, response): Promise<IKibanaResponse<any | ResponseError>> => {
async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
Copy link
Member

Choose a reason for hiding this comment

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

I think this becomes IDashboardsResponse, if it's in this repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it's IOpenSearchDashboardsResponse based on

/**
 * A response data object, expected to returned as a result of {@link RequestHandler} execution
 * @public
 */
export interface IOpenSearchDashboardsResponse<
  T extends HttpResponsePayload | ResponseError = any
> {
  readonly status: number;
  readonly payload?: T;
  readonly options: HttpResponseOptions;
}

From the OpenSearch-Dashboards source code

@@ -26,7 +26,6 @@ export const FORMAT_TEXT = `format=raw`;
export const DEFAULT_HEADERS = {
'Content-Type': 'application/json',
Accept: 'application/json',
'User-Agent': 'Kibana',
Copy link
Member

Choose a reason for hiding this comment

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

I don't know the context for this, but if we were returning a certain UA header we probably want to continue returning one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I just change it to 'User-Agent': 'OpenSearch Dashboards' then?

Copy link
Member

Choose a reason for hiding this comment

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

AFAIK spaces in the user agent strings are considered separators according to the HTTP spec, so this would need to be OpenSearch-Dashboards.

@davidcui1225 davidcui1225 merged commit 1cc931c into develop Apr 17, 2021
joshuali925 pushed a commit to joshuali925/sql that referenced this pull request Jan 4, 2022
…s-AOS-202-CAST

Dialect: Added CAST to convert to int and string as of AOS-202
YANG-DB pushed a commit to YANG-DB/sql that referenced this pull request Jan 6, 2023
…pensearch-project#1181)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Creation and updating 2.x branch (opensearch-project#6)

* Create the 2.x branch
* Add  workflow_dispatch: to github CLI

Signed-off-by: YANGDB <[email protected]>
YANG-DB added a commit that referenced this pull request Jan 13, 2023
* remove sub-folders which upgraded as new repositories
 - sql-cli
 - sql-odbc
 - sql-jdbc
 - dashboards-query-workbench
 - add additional workflow run triggers
 - move the BI tests to jdbc/odbc
 - move the sql-cli outside and clone for the doctest build

Signed-off-by: YANGDB <[email protected]>

* Merge remote-tracking branch 'upstream/main'

Signed-off-by: YANGDB <[email protected]>

* add sql-jdbc dependendcy to gradle

Signed-off-by: YANGDB <[email protected]>

* Disallow unquoted literals in `LIKE` clause in `DESCRIBE` statement (#1181)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Creation and updating 2.x branch (#6)

* Create the 2.x branch
* Add  workflow_dispatch: to github CLI

Signed-off-by: YANGDB <[email protected]>

* remove sub-folders which upgraded as new repositories
 - sql-cli
 - sql-odbc
 - sql-jdbc
 - dashboards-query-workbench

Signed-off-by: YANG-DB <[email protected]>

* add additional workflow run triggers

Signed-off-by: YANGDB <[email protected]>

* Merge remote-tracking branch 'upstream/main'
 - move the BI tests to jdbc/odbc
 - move the sql-cli outside and clone for the doctest build

Signed-off-by: YANGDB <[email protected]>

* Disallow unquoted literals in `LIKE` clause in `DESCRIBE` statement (#1181) (#3)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <[email protected]>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>

Signed-off-by: YANG-DB <[email protected]>
Signed-off-by: YANGDB <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: lior perry <[email protected]>
Co-authored-by: yang-db <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>
GumpacG pushed a commit that referenced this pull request Aug 9, 2023
)

* # This is a combination of 9 commits.
# This is the 1st commit message:

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <[email protected]>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <[email protected]>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #2:

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #3:

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #4:

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #5:

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #6:

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #7:

improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #8:

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #9:

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <[email protected]>

* parent 496fe8e
author Mitchell Gale <[email protected]> 1691080710 -0700
committer Mitchell Gale <[email protected]> 1691080766 -0700

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <[email protected]>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <[email protected]>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <[email protected]>

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <[email protected]>

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Removing unused import in OpenSearchRestClientTest.java

Signed-off-by: Mitchell Gale <[email protected]>

* running spotless apply.

Signed-off-by: Mitchell Gale <[email protected]>

* Addressed comments in PR 5.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
GumpacG pushed a commit that referenced this pull request Aug 10, 2023
* Spotless apply for datasources.

Signed-off-by: Mitchell Gale <[email protected]>

* ignore checkstyle for datasources

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants