From ebb36e5959d50473815225df013fae64bdbd9ad2 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Fri, 5 Mar 2021 19:15:39 -0800 Subject: [PATCH] [Rename] kbn-dev-utils to osd-dev-utils (#74) * [Rename] kbn-dev-utils to osd-dev-utils Signed-off-by: Kawika Avilla * Handle PR comments Signed-off-by: Kawika Avilla --- packages/kbn-dev-utils/README.md | 8 --- packages/kbn-dev-utils/certs/README.md | 62 ------------------ packages/osd-dev-utils/README.md | 8 +++ packages/osd-dev-utils/certs/README.md | 62 ++++++++++++++++++ .../certs/ca.crt | 6 +- .../certs/opensearch.crt} | 8 +-- .../certs/opensearch.key} | 0 .../certs/opensearch.p12} | Bin .../certs/opensearch_dashboards.crt} | 8 +-- .../certs/opensearch_dashboards.key} | 0 .../certs/opensearch_dashboards.p12} | Bin .../certs/opensearch_emptypassword.p12} | Bin .../certs/opensearch_nopassword.p12} | Bin .../package.json | 14 ++-- .../src/axios/errors.ts | 0 .../src/axios/index.ts | 0 .../src/babel.ts | 2 +- .../src/certs.ts | 22 +++---- .../src/ci_stats_reporter/README.md | 10 +-- .../ci_stats_reporter/ci_stats_reporter.ts | 16 ++--- .../src/ci_stats_reporter/index.ts | 0 .../src/index.ts | 28 ++++---- .../src/osd_client}/index.ts | 4 +- .../src/osd_client/osd_client.ts} | 50 +++++++------- .../src/osd_client/osd_client_plugins.ts} | 6 +- .../src/osd_client/osd_client_requester.ts} | 4 +- .../osd_client/osd_client_saved_objects.ts} | 6 +- .../src/osd_client/osd_client_status.ts} | 6 +- .../src/osd_client/osd_client_ui_settings.ts} | 18 ++--- .../src/osd_client/osd_client_version.ts} | 6 +- ..._opensearch_dashboards_platform_plugin.ts} | 4 +- .../src/plugin_list/discover_plugins.ts | 6 +- .../plugin_list/extract_asciidoc_info.test.ts | 0 .../src/plugin_list/extract_asciidoc_info.ts | 0 .../src/plugin_list/generate_plugin_list.ts | 10 +-- .../src/plugin_list/index.ts | 0 .../src/plugin_list/run_plugin_list_cli.ts | 2 +- .../src/precommit_hook/cli.ts | 8 +-- .../src/precommit_hook/get_git_dir.ts | 2 +- .../src/precommit_hook/script_source.ts | 2 +- .../src/proc_runner/errors.ts | 0 .../src/proc_runner/index.ts | 0 .../src/proc_runner/proc.ts | 0 .../src/proc_runner/proc_runner.ts | 0 .../src/proc_runner/with_proc_runner.test.ts | 0 .../src/proc_runner/with_proc_runner.ts | 0 .../src/run/README.md | 6 +- .../src/run/cleanup.ts | 0 .../src/run/fail.ts | 0 .../src/run/flags.test.ts | 0 .../src/run/flags.ts | 0 .../src/run/help.test.ts | 0 .../src/run/help.ts | 0 .../src/run/index.ts | 0 .../src/run/run.ts | 0 .../src/run/run_with_commands.test.ts | 0 .../src/run/run_with_commands.ts | 0 .../serializers/absolute_path_serializer.ts | 2 +- .../serializers/any_instance_serizlizer.ts | 0 .../src/serializers/index.ts | 0 .../src/serializers/recursive_serializer.ts | 0 .../src/serializers/replace_serializer.ts | 0 .../src/serializers/strip_ansi_serializer.ts | 0 ...h_dashboards_platform_plugin_discovery.ts} | 20 +++--- .../src/stdio/index.ts | 0 .../src/stdio/observe_lines.ts | 0 .../src/stdio/observe_readable.ts | 0 .../src/streams.ts | 0 .../__snapshots__/log_levels.test.ts.snap | 0 .../__snapshots__/tooling_log.test.ts.snap | 0 .../tooling_log_text_writer.test.ts.snap | 0 .../src/tooling_log/index.ts | 0 .../src/tooling_log/log_levels.test.ts | 0 .../src/tooling_log/log_levels.ts | 0 .../src/tooling_log/message.ts | 0 .../src/tooling_log/tooling_log.test.ts | 0 .../src/tooling_log/tooling_log.ts | 0 .../tooling_log_collecting_writer.ts | 0 .../tooling_log_text_writer.test.ts | 0 .../tooling_log/tooling_log_text_writer.ts | 0 .../src/tooling_log/writer.ts | 0 .../tooling_log/package.json | 0 .../tsconfig.json | 0 .../yarn.lock | 0 84 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 packages/kbn-dev-utils/README.md delete mode 100644 packages/kbn-dev-utils/certs/README.md create mode 100644 packages/osd-dev-utils/README.md create mode 100644 packages/osd-dev-utils/certs/README.md rename packages/{kbn-dev-utils => osd-dev-utils}/certs/ca.crt (90%) rename packages/{kbn-dev-utils/certs/elasticsearch.crt => osd-dev-utils/certs/opensearch.crt} (90%) rename packages/{kbn-dev-utils/certs/elasticsearch.key => osd-dev-utils/certs/opensearch.key} (100%) rename packages/{kbn-dev-utils/certs/elasticsearch.p12 => osd-dev-utils/certs/opensearch.p12} (100%) rename packages/{kbn-dev-utils/certs/kibana.crt => osd-dev-utils/certs/opensearch_dashboards.crt} (89%) rename packages/{kbn-dev-utils/certs/kibana.key => osd-dev-utils/certs/opensearch_dashboards.key} (100%) rename packages/{kbn-dev-utils/certs/kibana.p12 => osd-dev-utils/certs/opensearch_dashboards.p12} (100%) rename packages/{kbn-dev-utils/certs/elasticsearch_emptypassword.p12 => osd-dev-utils/certs/opensearch_emptypassword.p12} (100%) rename packages/{kbn-dev-utils/certs/elasticsearch_nopassword.p12 => osd-dev-utils/certs/opensearch_nopassword.p12} (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/package.json (77%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/axios/errors.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/axios/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/babel.ts (96%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/certs.ts (51%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/ci_stats_reporter/README.md (55%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/ci_stats_reporter/ci_stats_reporter.ts (81%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/ci_stats_reporter/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/index.ts (69%) rename packages/{kbn-dev-utils/src/kbn_client => osd-dev-utils/src/osd_client}/index.ts (90%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client.ts => osd-dev-utils/src/osd_client/osd_client.ts} (54%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_plugins.ts => osd-dev-utils/src/osd_client/osd_client_plugins.ts} (89%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_requester.ts => osd-dev-utils/src/osd_client/osd_client_requester.ts} (98%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts => osd-dev-utils/src/osd_client/osd_client_saved_objects.ts} (96%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_status.ts => osd-dev-utils/src/osd_client/osd_client_status.ts} (91%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts => osd-dev-utils/src/osd_client/osd_client_ui_settings.ts} (83%) rename packages/{kbn-dev-utils/src/kbn_client/kbn_client_version.ts => osd-dev-utils/src/osd_client/osd_client_version.ts} (88%) rename packages/{kbn-dev-utils/src/parse_kibana_platform_plugin.ts => osd-dev-utils/src/parse_opensearch_dashboards_platform_plugin.ts} (91%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/discover_plugins.ts (92%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/extract_asciidoc_info.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/extract_asciidoc_info.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/generate_plugin_list.ts (89%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/plugin_list/run_plugin_list_cli.ts (97%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/precommit_hook/cli.ts (82%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/precommit_hook/get_git_dir.ts (96%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/precommit_hook/script_source.ts (98%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/errors.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/proc.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/proc_runner.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/with_proc_runner.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/proc_runner/with_proc_runner.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/README.md (97%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/cleanup.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/fail.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/flags.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/flags.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/help.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/help.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/run.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/run_with_commands.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/run/run_with_commands.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/absolute_path_serializer.ts (96%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/any_instance_serizlizer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/recursive_serializer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/replace_serializer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/serializers/strip_ansi_serializer.ts (100%) rename packages/{kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts => osd-dev-utils/src/simple_opensearch_dashboards_platform_plugin_discovery.ts} (63%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/stdio/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/stdio/observe_lines.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/stdio/observe_readable.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/streams.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/__snapshots__/log_levels.test.ts.snap (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/__snapshots__/tooling_log.test.ts.snap (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/index.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/log_levels.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/log_levels.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/message.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/tooling_log.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/tooling_log.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/tooling_log_collecting_writer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/tooling_log_text_writer.test.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/tooling_log_text_writer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/src/tooling_log/writer.ts (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/tooling_log/package.json (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/tsconfig.json (100%) rename packages/{kbn-dev-utils => osd-dev-utils}/yarn.lock (100%) diff --git a/packages/kbn-dev-utils/README.md b/packages/kbn-dev-utils/README.md deleted file mode 100644 index 7f3096f24956..000000000000 --- a/packages/kbn-dev-utils/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# dev utils - -## proc runner - -For running integration tests in Kibana - -## tooling log - diff --git a/packages/kbn-dev-utils/certs/README.md b/packages/kbn-dev-utils/certs/README.md deleted file mode 100644 index fdf789278940..000000000000 --- a/packages/kbn-dev-utils/certs/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# Development certificates - -Kibana includes several development certificates to enable easy setup of TLS-encrypted communications with Elasticsearch. - -_Note: these certificates should **never** be used in production._ - -## Certificate information - -Certificates and keys are provided in multiple formats. These can be used by other packages to set up a new Elastic Stack with Kibana and Elasticsearch. The Certificate Authority (CA) private key is intentionally omitted from this package. - -### PEM - -* `ca.crt` -- A [PEM-formatted](https://tools.ietf.org/html/rfc1421) [X.509](https://tools.ietf.org/html/rfc5280) certificate that is used as a CA. -* `elasticsearch.crt` -- A PEM-formatted X.509 certificate and public key for Elasticsearch. -* `elasticsearch.key` -- A PEM-formatted [PKCS #1](https://tools.ietf.org/html/rfc8017) private key for Elasticsearch. -* `kibana.crt` -- A PEM-formatted X.509 certificate and public key for Kibana. -* `kibana.key` -- A PEM-formatted PKCS #1 private key for Kibana. - -### PKCS #12 - -* `elasticsearch.p12` -- A [PKCS #12](https://tools.ietf.org/html/rfc7292) encrypted key store / trust store that contains `ca.crt`, `elasticsearch.crt`, and a [PKCS #8](https://tools.ietf.org/html/rfc5208) encrypted version of `elasticsearch.key`. -* `kibana.p12` -- A PKCS #12 encrypted key store / trust store that contains `ca.crt`, `kibana.crt`, and a PKCS #8 encrypted version of `kibana.key`. - -The password used for both of these is "storepass". Other copies are also provided for testing purposes: - -* `elasticsearch_emptypassword.p12` -- The same PKCS #12 key store, encrypted with an empty password. -* `elasticsearch_nopassword.p12` -- The same PKCS #12 key store, not encrypted with a password. - -## Certificate generation - -[Elasticsearch cert-util](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of Elasticsearch: - -``` -# Generate the PKCS #12 keystore for a CA, valid for 50 years -bin/elasticsearch-certutil ca -days 18250 --pass castorepass - -# Generate the PKCS #12 keystore for Elasticsearch and sign it with the CA -bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name elasticsearch --dns localhost --pass storepass - -# Generate the PKCS #12 keystore for Kibana and sign it with the CA -bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name kibana --dns localhost --pass storepass - -# Copy the PKCS #12 keystore for Elasticsearch with an empty password -openssl pkcs12 -in elasticsearch.p12 -nodes -passin pass:"storepass" -passout pass:"" | openssl pkcs12 -export -out elasticsearch_emptypassword.p12 -passout pass:"" - -# Manually create "elasticsearch_nopassword.p12" -- this can be done on macOS by importing the P12 key store into the Keychain and exporting it again - -# Extract the PEM-formatted X.509 certificate for the CA -openssl pkcs12 -in elasticsearch.p12 -out ca.crt -cacerts -passin pass:"storepass" -passout pass: - -# Extract the PEM-formatted PKCS #1 private key for Elasticsearch -openssl pkcs12 -in elasticsearch.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out elasticsearch.key - -# Extract the PEM-formatted X.509 certificate for Elasticsearch -openssl pkcs12 -in elasticsearch.p12 -out elasticsearch.crt -clcerts -passin pass:"storepass" -passout pass: - -# Extract the PEM-formatted PKCS #1 private key for Kibana -openssl pkcs12 -in kibana.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out kibana.key - -# Extract the PEM-formatted X.509 certificate for Kibana -openssl pkcs12 -in kibana.p12 -out kibana.crt -clcerts -passin pass:"storepass" -passout pass: -``` diff --git a/packages/osd-dev-utils/README.md b/packages/osd-dev-utils/README.md new file mode 100644 index 000000000000..07b985570e43 --- /dev/null +++ b/packages/osd-dev-utils/README.md @@ -0,0 +1,8 @@ +# dev utils + +## proc runner + +For running integration tests in OpenSearch Dashboards + +## tooling log + diff --git a/packages/osd-dev-utils/certs/README.md b/packages/osd-dev-utils/certs/README.md new file mode 100644 index 000000000000..9e25ed0fd6c6 --- /dev/null +++ b/packages/osd-dev-utils/certs/README.md @@ -0,0 +1,62 @@ +# Development certificates + +OpenSearch Dashboards includes several development certificates to enable easy setup of TLS-encrypted communications with OpenSearch. + +_Note: these certificates should **never** be used in production._ + +## Certificate information + +Certificates and keys are provided in multiple formats. These can be used by other packages to set up a new OpenSearch Stack with OpenSearch Dashboards and OpenSearch. The Certificate Authority (CA) private key is intentionally omitted from this package. + +### PEM + +* `ca.crt` -- A [PEM-formatted](https://tools.ietf.org/html/rfc1421) [X.509](https://tools.ietf.org/html/rfc5280) certificate that is used as a CA. +* `opensearch.crt` -- A PEM-formatted X.509 certificate and public key for OpenSearch. +* `opensearch.key` -- A PEM-formatted [PKCS #1](https://tools.ietf.org/html/rfc8017) private key for OpenSearch. +* `opensearch_dashboards.crt` -- A PEM-formatted X.509 certificate and public key for OpenSearch Dashboards. +* `opensearch_dashboards.key` -- A PEM-formatted PKCS #1 private key for OpenSearch Dashboards. + +### PKCS #12 + +* `opensearch.p12` -- A [PKCS #12](https://tools.ietf.org/html/rfc7292) encrypted key store / trust store that contains `ca.crt`, `opensearch.crt`, and a [PKCS #8](https://tools.ietf.org/html/rfc5208) encrypted version of `opensearch.key`. +* `opensearch_dashboards.p12` -- A PKCS #12 encrypted key store / trust store that contains `ca.crt`, `opensearch_dashboards.crt`, and a PKCS #8 encrypted version of `opensearch_dashboards.key`. + +The password used for both of these is "storepass". Other copies are also provided for testing purposes: + +* `opensearch_emptypassword.p12` -- The same PKCS #12 key store, encrypted with an empty password. +* `opensearch_nopassword.p12` -- The same PKCS #12 key store, not encrypted with a password. + +## Certificate generation + +[OpenSearch cert-util](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of OpenSearch: + +``` +# Generate the PKCS #12 keystore for a CA, valid for 50 years +bin/opensearch-certutil ca -days 18250 --pass castorepass + +# Generate the PKCS #12 keystore for OpenSearch and sign it with the CA +bin/opensearch-certutil cert -days 18250 --ca opensearch-stack-ca.p12 --ca-pass castorepass --name opensearch --dns localhost --pass storepass + +# Generate the PKCS #12 keystore for OpenSearch Dashboards and sign it with the CA +bin/opensearch-certutil cert -days 18250 --ca opensearch-stack-ca.p12 --ca-pass castorepass --name opensearch-dashboards --dns localhost --pass storepass + +# Copy the PKCS #12 keystore for OpenSearch with an empty password +openssl pkcs12 -in opensearch.p12 -nodes -passin pass:"storepass" -passout pass:"" | openssl pkcs12 -export -out opensearch_emptypassword.p12 -passout pass:"" + +# Manually create "opensearch_nopassword.p12" -- this can be done on macOS by importing the P12 key store into the Keychain and exporting it again + +# Extract the PEM-formatted X.509 certificate for the CA +openssl pkcs12 -in opensearch.p12 -out ca.crt -cacerts -passin pass:"storepass" -passout pass: + +# Extract the PEM-formatted PKCS #1 private key for OpenSearch +openssl pkcs12 -in opensearch.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out opensearch.key + +# Extract the PEM-formatted X.509 certificate for OpenSearch +openssl pkcs12 -in opensearch.p12 -out opensearch.crt -clcerts -passin pass:"storepass" -passout pass: + +# Extract the PEM-formatted PKCS #1 private key for OpenSearch Dashboards +openssl pkcs12 -in opensearch_dashboards.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out opensearch_dashboards.key + +# Extract the PEM-formatted X.509 certificate for OpenSearch Dashboards +openssl pkcs12 -in opensearch_dashboards.p12 -out opensearch_dashboards.crt -clcerts -passin pass:"storepass" -passout pass: +``` diff --git a/packages/kbn-dev-utils/certs/ca.crt b/packages/osd-dev-utils/certs/ca.crt similarity index 90% rename from packages/kbn-dev-utils/certs/ca.crt rename to packages/osd-dev-utils/certs/ca.crt index 217935b8d83f..0fc61d440091 100644 --- a/packages/kbn-dev-utils/certs/ca.crt +++ b/packages/osd-dev-utils/certs/ca.crt @@ -1,12 +1,12 @@ Bag Attributes - friendlyName: elasticsearch + friendlyName: opensearch localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 Key Attributes: Bag Attributes friendlyName: ca 2.16.840.1.113894.746875.1.1: -subject=/CN=Elastic Certificate Tool Autogenerated CA -issuer=/CN=Elastic Certificate Tool Autogenerated CA +subject=/CN=OpenSearch Certificate Tool Autogenerated CA +issuer=/CN=OpenSearch Certificate Tool Autogenerated CA -----BEGIN CERTIFICATE----- MIIDSzCCAjOgAwIBAgIUW0brhEtYK3tUBYlXnUa+AMmAX6kwDQYJKoZIhvcNAQEL BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l diff --git a/packages/kbn-dev-utils/certs/elasticsearch.crt b/packages/osd-dev-utils/certs/opensearch.crt similarity index 90% rename from packages/kbn-dev-utils/certs/elasticsearch.crt rename to packages/osd-dev-utils/certs/opensearch.crt index 87ba02019903..d99e5837f044 100644 --- a/packages/kbn-dev-utils/certs/elasticsearch.crt +++ b/packages/osd-dev-utils/certs/opensearch.crt @@ -1,12 +1,12 @@ Bag Attributes - friendlyName: elasticsearch + friendlyName: opensearch localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 Key Attributes: Bag Attributes - friendlyName: elasticsearch + friendlyName: opensearch localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 -subject=/CN=elasticsearch -issuer=/CN=Elastic Certificate Tool Autogenerated CA +subject=/CN=opensearch +issuer=/CN=OpenSearch Certificate Tool Autogenerated CA -----BEGIN CERTIFICATE----- MIIDQDCCAiigAwIBAgIVAI93OQE6tZffPyzenSg3ljE3JJBzMA0GCSqGSIb3DQEB CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu diff --git a/packages/kbn-dev-utils/certs/elasticsearch.key b/packages/osd-dev-utils/certs/opensearch.key similarity index 100% rename from packages/kbn-dev-utils/certs/elasticsearch.key rename to packages/osd-dev-utils/certs/opensearch.key diff --git a/packages/kbn-dev-utils/certs/elasticsearch.p12 b/packages/osd-dev-utils/certs/opensearch.p12 similarity index 100% rename from packages/kbn-dev-utils/certs/elasticsearch.p12 rename to packages/osd-dev-utils/certs/opensearch.p12 diff --git a/packages/kbn-dev-utils/certs/kibana.crt b/packages/osd-dev-utils/certs/opensearch_dashboards.crt similarity index 89% rename from packages/kbn-dev-utils/certs/kibana.crt rename to packages/osd-dev-utils/certs/opensearch_dashboards.crt index 1c83be587bff..67103f8065f0 100644 --- a/packages/kbn-dev-utils/certs/kibana.crt +++ b/packages/osd-dev-utils/certs/opensearch_dashboards.crt @@ -1,12 +1,12 @@ Bag Attributes - friendlyName: kibana + friendlyName: opensearchDashboards localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 Key Attributes: Bag Attributes - friendlyName: kibana + friendlyName: opensearchDashboards localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 -subject=/CN=kibana -issuer=/CN=Elastic Certificate Tool Autogenerated CA +subject=/CN=opensearchDashboards +issuer=/CN=OpenSearch Certificate Tool Autogenerated CA -----BEGIN CERTIFICATE----- MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu diff --git a/packages/kbn-dev-utils/certs/kibana.key b/packages/osd-dev-utils/certs/opensearch_dashboards.key similarity index 100% rename from packages/kbn-dev-utils/certs/kibana.key rename to packages/osd-dev-utils/certs/opensearch_dashboards.key diff --git a/packages/kbn-dev-utils/certs/kibana.p12 b/packages/osd-dev-utils/certs/opensearch_dashboards.p12 similarity index 100% rename from packages/kbn-dev-utils/certs/kibana.p12 rename to packages/osd-dev-utils/certs/opensearch_dashboards.p12 diff --git a/packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12 b/packages/osd-dev-utils/certs/opensearch_emptypassword.p12 similarity index 100% rename from packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12 rename to packages/osd-dev-utils/certs/opensearch_emptypassword.p12 diff --git a/packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12 b/packages/osd-dev-utils/certs/opensearch_nopassword.p12 similarity index 100% rename from packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12 rename to packages/osd-dev-utils/certs/opensearch_nopassword.p12 diff --git a/packages/kbn-dev-utils/package.json b/packages/osd-dev-utils/package.json similarity index 77% rename from packages/kbn-dev-utils/package.json rename to packages/osd-dev-utils/package.json index 7fd9a9e7d67e..ba073a1d1f59 100644 --- a/packages/kbn-dev-utils/package.json +++ b/packages/osd-dev-utils/package.json @@ -1,20 +1,20 @@ { - "name": "@kbn/dev-utils", + "name": "@osd/dev-utils", "version": "1.0.0", "private": true, "license": "Apache-2.0", "main": "./target/index.js", "scripts": { "build": "tsc", - "kbn:bootstrap": "yarn build", - "kbn:watch": "yarn build --watch" + "osd:bootstrap": "yarn build", + "osd:watch": "yarn build --watch" }, - "kibana": { + "opensearchDashboards": { "devOnly": true }, "dependencies": { "@babel/core": "^7.11.6", - "@kbn/utils": "1.0.0", + "@osd/utils": "1.0.0", "axios": "^0.19.2", "chalk": "^4.1.0", "cheerio": "0.22.0", @@ -33,8 +33,8 @@ "vinyl": "^2.2.0" }, "devDependencies": { - "@kbn/babel-preset": "1.0.0", - "@kbn/expect": "1.0.0", + "@osd/babel-preset": "1.0.0", + "@osd/expect": "1.0.0", "@types/vinyl": "^2.0.4", "chance": "1.0.18", "typescript": "4.0.2" diff --git a/packages/kbn-dev-utils/src/axios/errors.ts b/packages/osd-dev-utils/src/axios/errors.ts similarity index 100% rename from packages/kbn-dev-utils/src/axios/errors.ts rename to packages/osd-dev-utils/src/axios/errors.ts diff --git a/packages/kbn-dev-utils/src/axios/index.ts b/packages/osd-dev-utils/src/axios/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/axios/index.ts rename to packages/osd-dev-utils/src/axios/index.ts diff --git a/packages/kbn-dev-utils/src/babel.ts b/packages/osd-dev-utils/src/babel.ts similarity index 96% rename from packages/kbn-dev-utils/src/babel.ts rename to packages/osd-dev-utils/src/babel.ts index e48fe81d0232..94734faf18e3 100644 --- a/packages/kbn-dev-utils/src/babel.ts +++ b/packages/osd-dev-utils/src/babel.ts @@ -46,7 +46,7 @@ export async function transformFileWithBabel(file: File) { configFile: false, sourceMaps: 'inline', filename: file.path, - presets: [require.resolve('@kbn/babel-preset/node_preset')], + presets: [require.resolve('@osd/babel-preset/node_preset')], }); if (!result || typeof result.code !== 'string') { diff --git a/packages/kbn-dev-utils/src/certs.ts b/packages/osd-dev-utils/src/certs.ts similarity index 51% rename from packages/kbn-dev-utils/src/certs.ts rename to packages/osd-dev-utils/src/certs.ts index f72e3ee547b5..4cfc508dee9e 100644 --- a/packages/kbn-dev-utils/src/certs.ts +++ b/packages/osd-dev-utils/src/certs.ts @@ -20,16 +20,16 @@ import { resolve } from 'path'; export const CA_CERT_PATH = resolve(__dirname, '../certs/ca.crt'); -export const ES_KEY_PATH = resolve(__dirname, '../certs/elasticsearch.key'); -export const ES_CERT_PATH = resolve(__dirname, '../certs/elasticsearch.crt'); -export const ES_P12_PATH = resolve(__dirname, '../certs/elasticsearch.p12'); -export const ES_P12_PASSWORD = 'storepass'; -export const ES_EMPTYPASSWORD_P12_PATH = resolve( +export const OPENSEARCH_KEY_PATH = resolve(__dirname, '../certs/opensearch.key'); +export const OPENSEARCH_CERT_PATH = resolve(__dirname, '../certs/opensearch.crt'); +export const OPENSEARCH_P12_PATH = resolve(__dirname, '../certs/opensearch.p12'); +export const OPENSEARCH_P12_PASSWORD = 'storepass'; +export const OPENSEARCH_EMPTYPASSWORD_P12_PATH = resolve( __dirname, - '../certs/elasticsearch_emptypassword.p12' + '../certs/opensearch_emptypassword.p12' ); -export const ES_NOPASSWORD_P12_PATH = resolve(__dirname, '../certs/elasticsearch_nopassword.p12'); -export const KBN_KEY_PATH = resolve(__dirname, '../certs/kibana.key'); -export const KBN_CERT_PATH = resolve(__dirname, '../certs/kibana.crt'); -export const KBN_P12_PATH = resolve(__dirname, '../certs/kibana.p12'); -export const KBN_P12_PASSWORD = 'storepass'; +export const OPENSEARCH_NOPASSWORD_P12_PATH = resolve(__dirname, '../certs/opensearch_nopassword.p12'); +export const OPENSEARCH_DASHBOARDS_KEY_PATH = resolve(__dirname, '../certs/opensearch_dashboards.key'); +export const OPENSEARCH_DASHBOARDS_CERT_PATH = resolve(__dirname, '../certs/opensearch_dashboards.crt'); +export const OPENSEARCH_DASHBOARDS_P12_PATH = resolve(__dirname, '../certs/opensearch_dashboards.p12'); +export const OPENSEARCH_DASHBOARDS_P12_PASSWORD = 'storepass'; diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/README.md b/packages/osd-dev-utils/src/ci_stats_reporter/README.md similarity index 55% rename from packages/kbn-dev-utils/src/ci_stats_reporter/README.md rename to packages/osd-dev-utils/src/ci_stats_reporter/README.md index 12fc33dfaffb..432896b57403 100644 --- a/packages/kbn-dev-utils/src/ci_stats_reporter/README.md +++ b/packages/osd-dev-utils/src/ci_stats_reporter/README.md @@ -1,16 +1,16 @@ -# Kibana CI Stats reporter +# OpenSearch Dashboards CI Stats reporter -We're working on building a new service, the Kibana CI Stats service, which will collect information about CI runs and metrics produced while testing Kibana, and then provide tools for reporting on those metrics in specific PRs and overall as a way to spot trends. +We're working on building a new service, the OpenSearch Dashboards CI Stats service, which will collect information about CI runs and metrics produced while testing OpenSearch Dashboards, and then provide tools for reporting on those metrics in specific PRs and overall as a way to spot trends. ### `CiStatsReporter` -This class integrates with the `ciStats.trackBuild {}` Jenkins Pipeline function, consuming the `KIBANA_CI_STATS_CONFIG` variable produced by that wrapper, and then allowing test code to report stats to the service. +This class integrates with the `ciStats.trackBuild {}` Jenkins Pipeline function, consuming the `OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG` variable produced by that wrapper, and then allowing test code to report stats to the service. To create an instance of the reporter, import the class and call `CiStatsReporter.fromEnv(log)` (passing it a tooling log). #### `CiStatsReporter#metrics(metrics: Metric[])` -Use this method to record metrics in the Kibana CI Stats service. +Use this method to record metrics in the OpenSearch Dashboards CI Stats service. ```ts interface Metric { @@ -28,7 +28,7 @@ interface Metric { Example: ```ts -import { CiStatsReporter, ToolingLog } from '@kbn/dev-utils'; +import { CiStatsReporter, ToolingLog } from '@osd/dev-utils'; const log = new ToolingLog(...); const reporter = CiStatsReporter.fromEnv(log) diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts b/packages/osd-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts similarity index 81% rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts rename to packages/osd-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts index a2f3b63daec5..fb9c300261c1 100644 --- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts +++ b/packages/osd-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts @@ -38,9 +38,9 @@ export type CiStatsMetrics = Array<{ }>; function parseConfig(log: ToolingLog) { - const configJson = process.env.KIBANA_CI_STATS_CONFIG; + const configJson = process.env.OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG; if (!configJson) { - log.debug('KIBANA_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter'); + log.debug('OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter'); return; } @@ -55,26 +55,26 @@ function parseConfig(log: ToolingLog) { return validateConfig(log, config as { [k in keyof Config]: unknown }); } - log.warning('KIBANA_CI_STATS_CONFIG is invalid, stats will not be reported'); + log.warning('OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG is invalid, stats will not be reported'); return; } function validateConfig(log: ToolingLog, config: { [k in keyof Config]: unknown }) { const validApiUrl = typeof config.apiUrl === 'string' && config.apiUrl.length !== 0; if (!validApiUrl) { - log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api url, stats will not be reported'); + log.warning('OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG is missing a valid api url, stats will not be reported'); return; } const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0; if (!validApiToken) { - log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api token, stats will not be reported'); + log.warning('OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG is missing a valid api token, stats will not be reported'); return; } const validId = typeof config.buildId === 'string' && config.buildId.length !== 0; if (!validId) { - log.warning('KIBANA_CI_STATS_CONFIG is missing a valid build id, stats will not be reported'); + log.warning('OPENSEARCH_DASHBOARDS_CI_STATS_CONFIG is missing a valid build id, stats will not be reported'); return; } @@ -139,7 +139,7 @@ export class CiStatsReporter { if (attempt === maxAttempts) { this.log.warning( - `failed to reach kibana-ci-stats service too many times, unable to record metric ${bodySummary}` + `failed to reach opensearch-dashboards-ci-stats service too many times, unable to record metric ${bodySummary}` ); return; } @@ -150,7 +150,7 @@ export class CiStatsReporter { : 'no response'; this.log.warning( - `failed to reach kibana-ci-stats service [reason=${reason}], retrying in ${attempt} seconds` + `failed to reach opensearch-dashboards-ci-stats service [reason=${reason}], retrying in ${attempt} seconds` ); await new Promise((resolve) => setTimeout(resolve, attempt * 1000)); diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts b/packages/osd-dev-utils/src/ci_stats_reporter/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/ci_stats_reporter/index.ts rename to packages/osd-dev-utils/src/ci_stats_reporter/index.ts diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/osd-dev-utils/src/index.ts similarity index 69% rename from packages/kbn-dev-utils/src/index.ts rename to packages/osd-dev-utils/src/index.ts index 38b12a96f17e..8de1c885db82 100644 --- a/packages/kbn-dev-utils/src/index.ts +++ b/packages/osd-dev-utils/src/index.ts @@ -17,30 +17,30 @@ * under the License. */ -export * from '@kbn/utils'; +export * from '@osd/utils'; export { withProcRunner, ProcRunner } from './proc_runner'; export * from './tooling_log'; export * from './serializers'; export { CA_CERT_PATH, - ES_KEY_PATH, - ES_CERT_PATH, - ES_P12_PATH, - ES_P12_PASSWORD, - ES_EMPTYPASSWORD_P12_PATH, - ES_NOPASSWORD_P12_PATH, - KBN_KEY_PATH, - KBN_CERT_PATH, - KBN_P12_PATH, - KBN_P12_PASSWORD, + OPENSEARCH_KEY_PATH, + OPENSEARCH_CERT_PATH, + OPENSEARCH_P12_PATH, + OPENSEARCH_P12_PASSWORD, + OPENSEARCH_EMPTYPASSWORD_P12_PATH, + OPENSEARCH_NOPASSWORD_P12_PATH, + OPENSEARCH_DASHBOARDS_KEY_PATH, + OPENSEARCH_DASHBOARDS_CERT_PATH, + OPENSEARCH_DASHBOARDS_P12_PATH, + OPENSEARCH_DASHBOARDS_P12_PASSWORD, } from './certs'; -export * from './kbn_client'; +export * from './osd_client'; export * from './run'; export * from './axios'; export * from './stdio'; export * from './ci_stats_reporter'; export * from './plugin_list'; -export * from './simple_kibana_platform_plugin_discovery'; +export * from './simple_opensearch_dashboards_platform_plugin_discovery'; export * from './streams'; export * from './babel'; -export * from './parse_kibana_platform_plugin'; +export * from './parse_opensearch_dashboards_platform_plugin'; diff --git a/packages/kbn-dev-utils/src/kbn_client/index.ts b/packages/osd-dev-utils/src/osd_client/index.ts similarity index 90% rename from packages/kbn-dev-utils/src/kbn_client/index.ts rename to packages/osd-dev-utils/src/osd_client/index.ts index 47ef47143a6d..56fa1d6241e7 100644 --- a/packages/kbn-dev-utils/src/kbn_client/index.ts +++ b/packages/osd-dev-utils/src/osd_client/index.ts @@ -17,5 +17,5 @@ * under the License. */ -export * from './kbn_client'; -export { uriencode } from './kbn_client_requester'; +export * from './osd_client'; +export { uriencode } from './osd_client_requester'; diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts b/packages/osd-dev-utils/src/osd_client/osd_client.ts similarity index 54% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client.ts rename to packages/osd-dev-utils/src/osd_client/osd_client.ts index 6539f5b50b56..74a63ab05e00 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client.ts @@ -18,38 +18,38 @@ */ import { ToolingLog } from '../tooling_log'; -import { KbnClientRequester, ReqOptions } from './kbn_client_requester'; -import { KbnClientStatus } from './kbn_client_status'; -import { KbnClientPlugins } from './kbn_client_plugins'; -import { KbnClientVersion } from './kbn_client_version'; -import { KbnClientSavedObjects } from './kbn_client_saved_objects'; -import { KbnClientUiSettings, UiSettingValues } from './kbn_client_ui_settings'; +import { OsdClientRequester, ReqOptions } from './osd_client_requester'; +import { OsdClientStatus } from './osd_client_status'; +import { OsdClientPlugins } from './osd_client_plugins'; +import { OsdClientVersion } from './osd_client_version'; +import { OsdClientSavedObjects } from './osd_client_saved_objects'; +import { OsdClientUiSettings, UiSettingValues } from './osd_client_ui_settings'; -export interface KbnClientOptions { +export interface OsdClientOptions { url: string; certificateAuthorities?: Buffer[]; log: ToolingLog; uiSettingDefaults?: UiSettingValues; } -export class KbnClient { - readonly status: KbnClientStatus; - readonly plugins: KbnClientPlugins; - readonly version: KbnClientVersion; - readonly savedObjects: KbnClientSavedObjects; - readonly uiSettings: KbnClientUiSettings; +export class OsdClient { + readonly status: OsdClientStatus; + readonly plugins: OsdClientPlugins; + readonly version: OsdClientVersion; + readonly savedObjects: OsdClientSavedObjects; + readonly uiSettings: OsdClientUiSettings; - private readonly requester: KbnClientRequester; + private readonly requester: OsdClientRequester; private readonly log: ToolingLog; private readonly uiSettingDefaults?: UiSettingValues; /** - * Basic Kibana server client that implements common behaviors for talking - * to the Kibana server from dev tooling. + * Basic OpenSearch Dashboards server client that implements common behaviors for talking + * to the OpenSearch Dashboards server from dev tooling. */ - constructor(options: KbnClientOptions) { + constructor(options: OsdClientOptions) { if (!options.url) { - throw new Error('missing Kibana url'); + throw new Error('missing OpenSearch Dashboards url'); } if (!options.log) { throw new Error('missing ToolingLog'); @@ -58,19 +58,19 @@ export class KbnClient { this.log = options.log; this.uiSettingDefaults = options.uiSettingDefaults; - this.requester = new KbnClientRequester(this.log, { + this.requester = new OsdClientRequester(this.log, { url: options.url, certificateAuthorities: options.certificateAuthorities, }); - this.status = new KbnClientStatus(this.requester); - this.plugins = new KbnClientPlugins(this.status); - this.version = new KbnClientVersion(this.status); - this.savedObjects = new KbnClientSavedObjects(this.log, this.requester); - this.uiSettings = new KbnClientUiSettings(this.log, this.requester, this.uiSettingDefaults); + this.status = new OsdClientStatus(this.requester); + this.plugins = new OsdClientPlugins(this.status); + this.version = new OsdClientVersion(this.status); + this.savedObjects = new OsdClientSavedObjects(this.log, this.requester); + this.uiSettings = new OsdClientUiSettings(this.log, this.requester, this.uiSettingDefaults); } /** - * Make a direct request to the Kibana server + * Make a direct request to the OpenSearch Dashboards server */ async request(options: ReqOptions) { return await this.requester.request(options); diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_plugins.ts b/packages/osd-dev-utils/src/osd_client/osd_client_plugins.ts similarity index 89% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_plugins.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_plugins.ts index 80285caf365a..28b3a28ddfe5 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_plugins.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_plugins.ts @@ -17,12 +17,12 @@ * under the License. */ -import { KbnClientStatus } from './kbn_client_status'; +import { OsdClientStatus } from './osd_client_status'; const PLUGIN_STATUS_ID = /^plugin:(.+?)@/; -export class KbnClientPlugins { - constructor(private readonly status: KbnClientStatus) {} +export class OsdClientPlugins { + constructor(private readonly status: OsdClientStatus) {} /** * Get a list of plugin ids that are enabled on the server */ diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts b/packages/osd-dev-utils/src/osd_client/osd_client_requester.ts similarity index 98% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_requester.ts index dad0854e51b4..726c22a2999e 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_requester.ts @@ -74,7 +74,7 @@ interface Options { certificateAuthorities?: Buffer[]; } -export class KbnClientRequester { +export class OsdClientRequester { private readonly url: string; private readonly httpsAgent: Https.Agent | null; @@ -112,7 +112,7 @@ export class KbnClientRequester { data: options.body, params: options.query, headers: { - 'kbn-xsrf': 'kbn-client', + 'osd-xsrf': 'osd-client', }, httpsAgent: this.httpsAgent, }); diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts b/packages/osd-dev-utils/src/osd_client/osd_client_saved_objects.ts similarity index 96% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_saved_objects.ts index 7334c6353deb..620bfa708668 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_saved_objects.ts @@ -19,7 +19,7 @@ import { ToolingLog } from '../tooling_log'; -import { KbnClientRequester, uriencode } from './kbn_client_requester'; +import { OsdClientRequester, uriencode } from './osd_client_requester'; type MigrationVersion = Record; @@ -62,8 +62,8 @@ interface MigrateResponse { result: Array<{ status: string }>; } -export class KbnClientSavedObjects { - constructor(private readonly log: ToolingLog, private readonly requester: KbnClientRequester) {} +export class OsdClientSavedObjects { + constructor(private readonly log: ToolingLog, private readonly requester: OsdClientRequester) {} /** * Run the saved objects migration diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts b/packages/osd-dev-utils/src/osd_client/osd_client_status.ts similarity index 91% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_status.ts index 4f203e73620f..c901c896e8eb 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_status.ts @@ -17,7 +17,7 @@ * under the License. */ -import { KbnClientRequester } from './kbn_client_requester'; +import { OsdClientRequester } from './osd_client_requester'; interface Status { state: 'green' | 'red' | 'yellow'; @@ -45,8 +45,8 @@ interface ApiResponseStatus { metrics: unknown; } -export class KbnClientStatus { - constructor(private readonly requester: KbnClientRequester) {} +export class OsdClientStatus { + constructor(private readonly requester: OsdClientRequester) {} /** * Get the full server status diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts b/packages/osd-dev-utils/src/osd_client/osd_client_ui_settings.ts similarity index 83% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_ui_settings.ts index cf3f8f25476c..4beaebd9e30b 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_ui_settings.ts @@ -19,7 +19,7 @@ import { ToolingLog } from '../tooling_log'; -import { KbnClientRequester, uriencode } from './kbn_client_requester'; +import { OsdClientRequester, uriencode } from './osd_client_requester'; export type UiSettingValues = Record; interface UiSettingsApiResponse { @@ -31,10 +31,10 @@ interface UiSettingsApiResponse { }; } -export class KbnClientUiSettings { +export class OsdClientUiSettings { constructor( private readonly log: ToolingLog, - private readonly requester: KbnClientRequester, + private readonly requester: OsdClientRequester, private readonly defaults?: UiSettingValues ) {} @@ -58,7 +58,7 @@ export class KbnClientUiSettings { */ async unset(setting: string) { const { data } = await this.requester.request({ - path: uriencode`/api/kibana/settings/${setting}`, + path: uriencode`/api/opensearch-dashboards/settings/${setting}`, method: 'DELETE', }); return data; @@ -69,7 +69,7 @@ export class KbnClientUiSettings { * with some defaults */ async replace(doc: UiSettingValues, { retries = 5 }: { retries?: number } = {}) { - this.log.debug('replacing kibana config doc: %j', doc); + this.log.debug('replacing opensearch-dashboards config doc: %j', doc); const changes: Record = { ...this.defaults, @@ -84,7 +84,7 @@ export class KbnClientUiSettings { await this.requester.request({ method: 'POST', - path: '/api/kibana/settings', + path: '/api/opensearch-dashboards/settings', body: { changes }, retries, }); @@ -94,10 +94,10 @@ export class KbnClientUiSettings { * Add fields to the config doc (like setting timezone and defaultIndex) */ async update(updates: UiSettingValues) { - this.log.debug('applying update to kibana config: %j', updates); + this.log.debug('applying update to opensearch-dashboards config: %j', updates); await this.requester.request({ - path: '/api/kibana/settings', + path: '/api/opensearch-dashboards/settings', method: 'POST', body: { changes: updates, @@ -108,7 +108,7 @@ export class KbnClientUiSettings { private async getAll() { const { data } = await this.requester.request({ - path: '/api/kibana/settings', + path: '/api/opensearch-dashboards/settings', method: 'GET', }); diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_version.ts b/packages/osd-dev-utils/src/osd_client/osd_client_version.ts similarity index 88% rename from packages/kbn-dev-utils/src/kbn_client/kbn_client_version.ts rename to packages/osd-dev-utils/src/osd_client/osd_client_version.ts index 1aacb857f12f..6d3874d7f7cf 100644 --- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_version.ts +++ b/packages/osd-dev-utils/src/osd_client/osd_client_version.ts @@ -17,12 +17,12 @@ * under the License. */ -import { KbnClientStatus } from './kbn_client_status'; +import { OsdClientStatus } from './osd_client_status'; -export class KbnClientVersion { +export class OsdClientVersion { private versionCache: string | undefined; - constructor(private readonly status: KbnClientStatus) {} + constructor(private readonly status: OsdClientStatus) {} async get() { if (this.versionCache !== undefined) { diff --git a/packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts b/packages/osd-dev-utils/src/parse_opensearch_dashboards_platform_plugin.ts similarity index 91% rename from packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts rename to packages/osd-dev-utils/src/parse_opensearch_dashboards_platform_plugin.ts index 83d8c2684d7c..857488652051 100644 --- a/packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts +++ b/packages/osd-dev-utils/src/parse_opensearch_dashboards_platform_plugin.ts @@ -20,7 +20,7 @@ import Path from 'path'; import loadJsonFile from 'load-json-file'; -export interface KibanaPlatformPlugin { +export interface OpenSearchDashboardsPlatformPlugin { readonly directory: string; readonly manifestPath: string; readonly manifest: { @@ -31,7 +31,7 @@ export interface KibanaPlatformPlugin { }; } -export function parseKibanaPlatformPlugin(manifestPath: string): KibanaPlatformPlugin { +export function parseOpenSearchDashboardsPlatformPlugin(manifestPath: string): OpenSearchDashboardsPlatformPlugin { if (!Path.isAbsolute(manifestPath)) { throw new TypeError('expected new platform manifest path to be absolute'); } diff --git a/packages/kbn-dev-utils/src/plugin_list/discover_plugins.ts b/packages/osd-dev-utils/src/plugin_list/discover_plugins.ts similarity index 92% rename from packages/kbn-dev-utils/src/plugin_list/discover_plugins.ts rename to packages/osd-dev-utils/src/plugin_list/discover_plugins.ts index e8f6735205b1..f47c1110ddf9 100644 --- a/packages/kbn-dev-utils/src/plugin_list/discover_plugins.ts +++ b/packages/osd-dev-utils/src/plugin_list/discover_plugins.ts @@ -22,9 +22,9 @@ import Fs from 'fs'; import MarkdownIt from 'markdown-it'; import cheerio from 'cheerio'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; -import { simpleKibanaPlatformPluginDiscovery } from '../simple_kibana_platform_plugin_discovery'; +import { simpleOpenSearchDashboardPlatformPluginDiscovery } from '../simple_opensearch_dashboards_platform_plugin_discovery'; import { extractAsciidocInfo } from './extract_asciidoc_info'; export interface Plugin { @@ -44,7 +44,7 @@ const getReadmeAsciidocName = (directory: string) => Fs.readdirSync(directory).find((name) => name.toLowerCase() === 'readme.asciidoc'); export const discoverPlugins = (pluginsRootDir: string): Plugins => - simpleKibanaPlatformPluginDiscovery([pluginsRootDir], []).map( + simpleOpenSearchDashboardsPlatformPluginDiscovery([pluginsRootDir], []).map( ({ directory, manifest: { id } }): Plugin => { const readmeName = getReadmeName(directory); const readmeAsciidocName = getReadmeAsciidocName(directory); diff --git a/packages/kbn-dev-utils/src/plugin_list/extract_asciidoc_info.test.ts b/packages/osd-dev-utils/src/plugin_list/extract_asciidoc_info.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/plugin_list/extract_asciidoc_info.test.ts rename to packages/osd-dev-utils/src/plugin_list/extract_asciidoc_info.test.ts diff --git a/packages/kbn-dev-utils/src/plugin_list/extract_asciidoc_info.ts b/packages/osd-dev-utils/src/plugin_list/extract_asciidoc_info.ts similarity index 100% rename from packages/kbn-dev-utils/src/plugin_list/extract_asciidoc_info.ts rename to packages/osd-dev-utils/src/plugin_list/extract_asciidoc_info.ts diff --git a/packages/kbn-dev-utils/src/plugin_list/generate_plugin_list.ts b/packages/osd-dev-utils/src/plugin_list/generate_plugin_list.ts similarity index 89% rename from packages/kbn-dev-utils/src/plugin_list/generate_plugin_list.ts rename to packages/osd-dev-utils/src/plugin_list/generate_plugin_list.ts index 680c220adb18..a5072a356e7e 100644 --- a/packages/kbn-dev-utils/src/plugin_list/generate_plugin_list.ts +++ b/packages/osd-dev-utils/src/plugin_list/generate_plugin_list.ts @@ -20,7 +20,7 @@ import Path from 'path'; import normalizePath from 'normalize-path'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { Plugins } from './discover_plugins'; @@ -34,9 +34,9 @@ function* printPlugins(plugins: Plugins, includes: string[]) { if (plugin.readmeAsciidocAnchor) { yield `|<<${plugin.readmeAsciidocAnchor}>>`; - includes.push(`include::{kibana-root}/${path}[leveloffset=+1]`); + includes.push(`include::{opensearch-dashboards-root}/${path}[leveloffset=+1]`); } else { - yield `|{kib-repo}blob/{branch}/${path}[${plugin.id}]`; + yield `|{osd-repo}blob/{branch}/${path}[${plugin.id}]`; } if (!plugin.relativeReadmePath || plugin.readmeSnippet) { @@ -53,7 +53,7 @@ export function generatePluginList(ossPlugins: Plugins, xpackPlugins: Plugins) { NOTE: This is an automatically generated file. Please do not edit directly. Instead, run the - following from within the kibana repository: + following from within the opensearch-dashboards repository: node scripts/build_plugin_list_docs @@ -64,7 +64,7 @@ NOTE: //// [[plugin-list]] -== List of {kib} plugins +== List of {osd} plugins [discrete] === src/plugins diff --git a/packages/kbn-dev-utils/src/plugin_list/index.ts b/packages/osd-dev-utils/src/plugin_list/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/plugin_list/index.ts rename to packages/osd-dev-utils/src/plugin_list/index.ts diff --git a/packages/kbn-dev-utils/src/plugin_list/run_plugin_list_cli.ts b/packages/osd-dev-utils/src/plugin_list/run_plugin_list_cli.ts similarity index 97% rename from packages/kbn-dev-utils/src/plugin_list/run_plugin_list_cli.ts rename to packages/osd-dev-utils/src/plugin_list/run_plugin_list_cli.ts index 613f9c9c2641..69c56abb814e 100644 --- a/packages/kbn-dev-utils/src/plugin_list/run_plugin_list_cli.ts +++ b/packages/osd-dev-utils/src/plugin_list/run_plugin_list_cli.ts @@ -19,7 +19,7 @@ import Path from 'path'; import Fs from 'fs'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { run } from '../run'; import { discoverPlugins } from './discover_plugins'; diff --git a/packages/kbn-dev-utils/src/precommit_hook/cli.ts b/packages/osd-dev-utils/src/precommit_hook/cli.ts similarity index 82% rename from packages/kbn-dev-utils/src/precommit_hook/cli.ts rename to packages/osd-dev-utils/src/precommit_hook/cli.ts index 28347f379150..54ff3270ef5d 100644 --- a/packages/kbn-dev-utils/src/precommit_hook/cli.ts +++ b/packages/osd-dev-utils/src/precommit_hook/cli.ts @@ -20,7 +20,7 @@ import Path from 'path'; import { chmod, writeFile } from 'fs'; import { promisify } from 'util'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { run } from '../run'; import { SCRIPT_SOURCE } from './script_source'; @@ -35,12 +35,12 @@ run( const gitDir = await getGitDir(); const installPath = Path.resolve(REPO_ROOT, gitDir, 'hooks/pre-commit'); - log.info(`Registering Kibana pre-commit git hook...`); + log.info(`Registering OpenSearch Dashboards pre-commit git hook...`); await writeFileAsync(installPath, SCRIPT_SOURCE); await chmodAsync(installPath, 0o755); - log.success(`Kibana pre-commit git hook was installed successfully.`); + log.success(`OpenSearch Dashboards pre-commit git hook was installed successfully.`); } catch (e) { - log.error(`Kibana pre-commit git hook was not installed as an error occur.`); + log.error(`OpenSearch Dashboards pre-commit git hook was not installed as an error occur.`); throw e; } }, diff --git a/packages/kbn-dev-utils/src/precommit_hook/get_git_dir.ts b/packages/osd-dev-utils/src/precommit_hook/get_git_dir.ts similarity index 96% rename from packages/kbn-dev-utils/src/precommit_hook/get_git_dir.ts rename to packages/osd-dev-utils/src/precommit_hook/get_git_dir.ts index f75c86f51009..d1893ff68953 100644 --- a/packages/kbn-dev-utils/src/precommit_hook/get_git_dir.ts +++ b/packages/osd-dev-utils/src/precommit_hook/get_git_dir.ts @@ -19,7 +19,7 @@ import execa from 'execa'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; // Retrieves the correct location for the .git dir for // every git setup (including git worktree) diff --git a/packages/kbn-dev-utils/src/precommit_hook/script_source.ts b/packages/osd-dev-utils/src/precommit_hook/script_source.ts similarity index 98% rename from packages/kbn-dev-utils/src/precommit_hook/script_source.ts rename to packages/osd-dev-utils/src/precommit_hook/script_source.ts index 61b4552f6eae..57a36cb4f58d 100644 --- a/packages/kbn-dev-utils/src/precommit_hook/script_source.ts +++ b/packages/osd-dev-utils/src/precommit_hook/script_source.ts @@ -30,7 +30,7 @@ export const SCRIPT_SOURCE = `#!/usr/bin/env bash # # GENERATED BY \`node scripts/register_git_hook\` # IF YOU WANNA CHANGE SOMETHING IN THIS SCRIPT -# PLEASE RE-RUN 'yarn kbn bootstrap' or 'node scripts/register_git_hook' +# PLEASE RE-RUN 'yarn osd bootstrap' or 'node scripts/register_git_hook' # pre-commit script takes zero arguments: https://git-scm.com/docs/githooks#_pre_commit diff --git a/packages/kbn-dev-utils/src/proc_runner/errors.ts b/packages/osd-dev-utils/src/proc_runner/errors.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/errors.ts rename to packages/osd-dev-utils/src/proc_runner/errors.ts diff --git a/packages/kbn-dev-utils/src/proc_runner/index.ts b/packages/osd-dev-utils/src/proc_runner/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/index.ts rename to packages/osd-dev-utils/src/proc_runner/index.ts diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/osd-dev-utils/src/proc_runner/proc.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/proc.ts rename to packages/osd-dev-utils/src/proc_runner/proc.ts diff --git a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts b/packages/osd-dev-utils/src/proc_runner/proc_runner.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/proc_runner.ts rename to packages/osd-dev-utils/src/proc_runner/proc_runner.ts diff --git a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts b/packages/osd-dev-utils/src/proc_runner/with_proc_runner.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts rename to packages/osd-dev-utils/src/proc_runner/with_proc_runner.test.ts diff --git a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts b/packages/osd-dev-utils/src/proc_runner/with_proc_runner.ts similarity index 100% rename from packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts rename to packages/osd-dev-utils/src/proc_runner/with_proc_runner.ts diff --git a/packages/kbn-dev-utils/src/run/README.md b/packages/osd-dev-utils/src/run/README.md similarity index 97% rename from packages/kbn-dev-utils/src/run/README.md rename to packages/osd-dev-utils/src/run/README.md index 99893a623766..7042a925ed0b 100644 --- a/packages/kbn-dev-utils/src/run/README.md +++ b/packages/osd-dev-utils/src/run/README.md @@ -1,4 +1,4 @@ -# @kbn/dev-utils > run() +# @osd/dev-utils > run() Helper functions for writing little scripts for random build/ci/dev tasks. @@ -8,7 +8,7 @@ Define the function that should validate the CLI arguments and call your task fn ```ts // dev/my_task/run_my_task.ts -import { createFlagError, run } from '@kbn/dev-utils'; +import { createFlagError, run } from '@osd/dev-utils'; run( async ({ flags, log }) => { @@ -70,7 +70,7 @@ $ node scripts/my_task Execte an async function, passing it the parsed flags and a tooling log that is configured to the requested logging level. If the returned promise is rejected with an error created by `createFailError(...)` or `createFlagError(...)` the process will exit as described by the error, otherwise the process will exit with code 1. **`fn` Params:** - - *[`log: ToolingLog`](../../../packages/kbn-dev-utils/src/tooling_log/tooling_log.js)*: + - *[`log: ToolingLog`](../../../packages/osd-dev-utils/src/tooling_log/tooling_log.js)*: An instance of the `ToolingLog` that is configured with the standard flags: `--verbose`, `--quiet`, `--silent`, and `--debug` diff --git a/packages/kbn-dev-utils/src/run/cleanup.ts b/packages/osd-dev-utils/src/run/cleanup.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/cleanup.ts rename to packages/osd-dev-utils/src/run/cleanup.ts diff --git a/packages/kbn-dev-utils/src/run/fail.ts b/packages/osd-dev-utils/src/run/fail.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/fail.ts rename to packages/osd-dev-utils/src/run/fail.ts diff --git a/packages/kbn-dev-utils/src/run/flags.test.ts b/packages/osd-dev-utils/src/run/flags.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/flags.test.ts rename to packages/osd-dev-utils/src/run/flags.test.ts diff --git a/packages/kbn-dev-utils/src/run/flags.ts b/packages/osd-dev-utils/src/run/flags.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/flags.ts rename to packages/osd-dev-utils/src/run/flags.ts diff --git a/packages/kbn-dev-utils/src/run/help.test.ts b/packages/osd-dev-utils/src/run/help.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/help.test.ts rename to packages/osd-dev-utils/src/run/help.test.ts diff --git a/packages/kbn-dev-utils/src/run/help.ts b/packages/osd-dev-utils/src/run/help.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/help.ts rename to packages/osd-dev-utils/src/run/help.ts diff --git a/packages/kbn-dev-utils/src/run/index.ts b/packages/osd-dev-utils/src/run/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/index.ts rename to packages/osd-dev-utils/src/run/index.ts diff --git a/packages/kbn-dev-utils/src/run/run.ts b/packages/osd-dev-utils/src/run/run.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/run.ts rename to packages/osd-dev-utils/src/run/run.ts diff --git a/packages/kbn-dev-utils/src/run/run_with_commands.test.ts b/packages/osd-dev-utils/src/run/run_with_commands.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/run_with_commands.test.ts rename to packages/osd-dev-utils/src/run/run_with_commands.test.ts diff --git a/packages/kbn-dev-utils/src/run/run_with_commands.ts b/packages/osd-dev-utils/src/run/run_with_commands.ts similarity index 100% rename from packages/kbn-dev-utils/src/run/run_with_commands.ts rename to packages/osd-dev-utils/src/run/run_with_commands.ts diff --git a/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts b/packages/osd-dev-utils/src/serializers/absolute_path_serializer.ts similarity index 96% rename from packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts rename to packages/osd-dev-utils/src/serializers/absolute_path_serializer.ts index cc6b8334d76c..0ff57b7d3012 100644 --- a/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts +++ b/packages/osd-dev-utils/src/serializers/absolute_path_serializer.ts @@ -17,7 +17,7 @@ * under the License. */ -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; export function createAbsolutePathSerializer( rootPath: string = REPO_ROOT, diff --git a/packages/kbn-dev-utils/src/serializers/any_instance_serizlizer.ts b/packages/osd-dev-utils/src/serializers/any_instance_serizlizer.ts similarity index 100% rename from packages/kbn-dev-utils/src/serializers/any_instance_serizlizer.ts rename to packages/osd-dev-utils/src/serializers/any_instance_serizlizer.ts diff --git a/packages/kbn-dev-utils/src/serializers/index.ts b/packages/osd-dev-utils/src/serializers/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/serializers/index.ts rename to packages/osd-dev-utils/src/serializers/index.ts diff --git a/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts b/packages/osd-dev-utils/src/serializers/recursive_serializer.ts similarity index 100% rename from packages/kbn-dev-utils/src/serializers/recursive_serializer.ts rename to packages/osd-dev-utils/src/serializers/recursive_serializer.ts diff --git a/packages/kbn-dev-utils/src/serializers/replace_serializer.ts b/packages/osd-dev-utils/src/serializers/replace_serializer.ts similarity index 100% rename from packages/kbn-dev-utils/src/serializers/replace_serializer.ts rename to packages/osd-dev-utils/src/serializers/replace_serializer.ts diff --git a/packages/kbn-dev-utils/src/serializers/strip_ansi_serializer.ts b/packages/osd-dev-utils/src/serializers/strip_ansi_serializer.ts similarity index 100% rename from packages/kbn-dev-utils/src/serializers/strip_ansi_serializer.ts rename to packages/osd-dev-utils/src/serializers/strip_ansi_serializer.ts diff --git a/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts b/packages/osd-dev-utils/src/simple_opensearch_dashboards_platform_plugin_discovery.ts similarity index 63% rename from packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts rename to packages/osd-dev-utils/src/simple_opensearch_dashboards_platform_plugin_discovery.ts index c56d63edb9ac..f6a1962ef977 100644 --- a/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts +++ b/packages/osd-dev-utils/src/simple_opensearch_dashboards_platform_plugin_discovery.ts @@ -21,27 +21,27 @@ import Path from 'path'; import globby from 'globby'; -import { parseKibanaPlatformPlugin } from './parse_kibana_platform_plugin'; +import { parseOpenSearchDashboardsPlatformPlugin } from './parse_opensearch_dashboards_platform_plugin'; /** * Helper to find the new platform plugins. */ -export function simpleKibanaPlatformPluginDiscovery(scanDirs: string[], pluginPaths: string[]) { +export function simpleOpenSearchDashboardsPlatformPluginDiscovery(scanDirs: string[], pluginPaths: string[]) { const patterns = Array.from( new Set([ - // find kibana.json files up to 5 levels within the scan dir + // find opensearch_dashboards.json files up to 5 levels within the scan dir ...scanDirs.reduce( (acc: string[], dir) => [ ...acc, - Path.resolve(dir, '*/kibana.json'), - Path.resolve(dir, '*/*/kibana.json'), - Path.resolve(dir, '*/*/*/kibana.json'), - Path.resolve(dir, '*/*/*/*/kibana.json'), - Path.resolve(dir, '*/*/*/*/*/kibana.json'), + Path.resolve(dir, '*/opensearch_dashboards.json'), + Path.resolve(dir, '*/*/opensearch_dashboards.json'), + Path.resolve(dir, '*/*/*/opensearch_dashboards.json'), + Path.resolve(dir, '*/*/*/*/opensearch_dashboards.json'), + Path.resolve(dir, '*/*/*/*/*/opensearch_dashboards.json'), ], [] ), - ...pluginPaths.map((path) => Path.resolve(path, `kibana.json`)), + ...pluginPaths.map((path) => Path.resolve(path, `opensearch_dashboards.json`)), ]) ); @@ -52,5 +52,5 @@ export function simpleKibanaPlatformPluginDiscovery(scanDirs: string[], pluginPa Path.resolve(path) ); - return manifestPaths.map(parseKibanaPlatformPlugin); + return manifestPaths.map(parseOpenSearchDashboardsPlatformPlugin); } diff --git a/packages/kbn-dev-utils/src/stdio/index.ts b/packages/osd-dev-utils/src/stdio/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/stdio/index.ts rename to packages/osd-dev-utils/src/stdio/index.ts diff --git a/packages/kbn-dev-utils/src/stdio/observe_lines.ts b/packages/osd-dev-utils/src/stdio/observe_lines.ts similarity index 100% rename from packages/kbn-dev-utils/src/stdio/observe_lines.ts rename to packages/osd-dev-utils/src/stdio/observe_lines.ts diff --git a/packages/kbn-dev-utils/src/stdio/observe_readable.ts b/packages/osd-dev-utils/src/stdio/observe_readable.ts similarity index 100% rename from packages/kbn-dev-utils/src/stdio/observe_readable.ts rename to packages/osd-dev-utils/src/stdio/observe_readable.ts diff --git a/packages/kbn-dev-utils/src/streams.ts b/packages/osd-dev-utils/src/streams.ts similarity index 100% rename from packages/kbn-dev-utils/src/streams.ts rename to packages/osd-dev-utils/src/streams.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap b/packages/osd-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap rename to packages/osd-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap b/packages/osd-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap rename to packages/osd-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap b/packages/osd-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap rename to packages/osd-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap diff --git a/packages/kbn-dev-utils/src/tooling_log/index.ts b/packages/osd-dev-utils/src/tooling_log/index.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/index.ts rename to packages/osd-dev-utils/src/tooling_log/index.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/log_levels.test.ts b/packages/osd-dev-utils/src/tooling_log/log_levels.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/log_levels.test.ts rename to packages/osd-dev-utils/src/tooling_log/log_levels.test.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/log_levels.ts b/packages/osd-dev-utils/src/tooling_log/log_levels.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/log_levels.ts rename to packages/osd-dev-utils/src/tooling_log/log_levels.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/message.ts b/packages/osd-dev-utils/src/tooling_log/message.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/message.ts rename to packages/osd-dev-utils/src/tooling_log/message.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts b/packages/osd-dev-utils/src/tooling_log/tooling_log.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts rename to packages/osd-dev-utils/src/tooling_log/tooling_log.test.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts b/packages/osd-dev-utils/src/tooling_log/tooling_log.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/tooling_log.ts rename to packages/osd-dev-utils/src/tooling_log/tooling_log.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts b/packages/osd-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts rename to packages/osd-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts b/packages/osd-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts rename to packages/osd-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts b/packages/osd-dev-utils/src/tooling_log/tooling_log_text_writer.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts rename to packages/osd-dev-utils/src/tooling_log/tooling_log_text_writer.ts diff --git a/packages/kbn-dev-utils/src/tooling_log/writer.ts b/packages/osd-dev-utils/src/tooling_log/writer.ts similarity index 100% rename from packages/kbn-dev-utils/src/tooling_log/writer.ts rename to packages/osd-dev-utils/src/tooling_log/writer.ts diff --git a/packages/kbn-dev-utils/tooling_log/package.json b/packages/osd-dev-utils/tooling_log/package.json similarity index 100% rename from packages/kbn-dev-utils/tooling_log/package.json rename to packages/osd-dev-utils/tooling_log/package.json diff --git a/packages/kbn-dev-utils/tsconfig.json b/packages/osd-dev-utils/tsconfig.json similarity index 100% rename from packages/kbn-dev-utils/tsconfig.json rename to packages/osd-dev-utils/tsconfig.json diff --git a/packages/kbn-dev-utils/yarn.lock b/packages/osd-dev-utils/yarn.lock similarity index 100% rename from packages/kbn-dev-utils/yarn.lock rename to packages/osd-dev-utils/yarn.lock