diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index 1c33af417390..4dc3e0d2583e 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -340,8 +340,8 @@ variable can’t be null has changed (potentially even due to changes in compelt assertion would now wrongly disable proper type checking for us. If you’re not using non-null assertions in your plugin or are starting a new plugin, consider enabling the -[`@typescript-eslint/no-non-null-assertion`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-non-null-assertion.md) -linting rule for you plugin in the [`.eslintrc.js`](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/.eslintrc.js) config. +[`@typescript-eslint/no-non-null-assertion`](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/no-non-null-assertion.md) +linting rule for you plugin in the [`.eslintrc.js`](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/.eslintrc.js) config. ### Return/throw early from functions diff --git a/examples/bfetch_explorer/public/plugin.tsx b/examples/bfetch_explorer/public/plugin.tsx index 140369e08da0..b3645eb90379 100644 --- a/examples/bfetch_explorer/public/plugin.tsx +++ b/examples/bfetch_explorer/public/plugin.tsx @@ -75,7 +75,7 @@ export class BfetchExplorerPlugin implements Plugin { { label: 'README', href: - 'https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/src/plugins/bfetch/README.md', + 'https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/plugins/bfetch/README.md', iconType: 'logoGithub', size: 's', target: '_blank', diff --git a/examples/developer_examples/README.md b/examples/developer_examples/README.md index e33d7cc8f64f..0453b90162b2 100644 --- a/examples/developer_examples/README.md +++ b/examples/developer_examples/README.md @@ -14,7 +14,7 @@ services. Add your a link to your example using the developerExamples `register` links: [ { label: 'README', - href: 'https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/foo/README.md', + href: 'https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/foo/README.md', iconType: 'logoGithub', target: '_blank', size: 's', diff --git a/examples/embeddable_explorer/public/plugin.tsx b/examples/embeddable_explorer/public/plugin.tsx index 18b694c8480b..f36a556ea93a 100644 --- a/examples/embeddable_explorer/public/plugin.tsx +++ b/examples/embeddable_explorer/public/plugin.tsx @@ -86,7 +86,7 @@ export class EmbeddableExplorerPlugin implements Plugin ***NOTE:*** These commands should be run from the OpenSearch Dashboards repo, and `upstream` is our convention for the git remote that references https://github.com/opensearch-project/OpenSearch-Dashboards.git, unless you added this remote you might need to use `origin`. ```sh -git pull upstream master +git pull upstream main yarn osd bootstrap ``` diff --git a/packages/osd-plugin-generator/template/README.md.ejs b/packages/osd-plugin-generator/template/README.md.ejs index ee1184e7e238..b28e29d36144 100755 --- a/packages/osd-plugin-generator/template/README.md.ejs +++ b/packages/osd-plugin-generator/template/README.md.ejs @@ -7,7 +7,7 @@ ## Development See the [OpenSearch Dashboards contributing - guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/CONTRIBUTING.md) for instructions + guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/CONTRIBUTING.md) for instructions setting up your development environment. <% if (thirdPartyPlugin) { %> diff --git a/packages/osd-spec-to-console/README.md b/packages/osd-spec-to-console/README.md index 11c6570c96ce..52bf6681c7a4 100644 --- a/packages/osd-spec-to-console/README.md +++ b/packages/osd-spec-to-console/README.md @@ -1,4 +1,4 @@ -\ mini utility to convert [OpenSearch's REST spec](https://github.com/opensearch-project/OpenSearch/blob/master/rest-api-spec) to Console's (OpenSearch Dashboards) autocomplete format. +\ mini utility to convert [OpenSearch's REST spec](https://github.com/opensearch-project/OpenSearch/blob/main/rest-api-spec) to Console's (OpenSearch Dashboards) autocomplete format. It is used to semi-manually update Console's autocompletion rules. @@ -13,7 +13,7 @@ git init git remote add origin https://github.com/opensearch-project/OpenSearch git config core.sparsecheckout true echo "rest-api-spec/src/main/resources/rest-api-spec/api/*\nx-pack/plugin/src/test/resources/rest-api-spec/api/*" > .git/info/sparse-checkout -git pull --depth=1 origin master +git pull --depth=1 origin main ``` ### Usage diff --git a/packages/osd-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts b/packages/osd-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts index 86fff0dec924..74604dc51690 100644 --- a/packages/osd-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts +++ b/packages/osd-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts @@ -65,9 +65,9 @@ export function runFailedTestsReporterCli() { } const isPr = !!process.env.ghprbPullId; - const isMasterOrVersion = branch === 'master' || branch.match(/^\d+\.(x|\d+)$/); - if (!isMasterOrVersion || isPr) { - log.info('Failure issues only created on master/version branch jobs'); + const isMainOrVersion = branch === 'main' || branch.match(/^\d+\.(x|\d+)$/); + if (!isMainOrVersion || isPr) { + log.info('Failure issues only created on main/version branch jobs'); updateGithub = false; } } diff --git a/release-notes/opensearch-dashboards.release-notes-1.1.0.md b/release-notes/opensearch-dashboards.release-notes-1.1.0.md index 73238dbc186e..88dd91f0be81 100644 --- a/release-notes/opensearch-dashboards.release-notes-1.1.0.md +++ b/release-notes/opensearch-dashboards.release-notes-1.1.0.md @@ -198,7 +198,7 @@ Bumps [jszip](https://github.com/Stuk/jszip) from 3.3.0 to 3.7.1. - [Release notes](https://github.com/Stuk/jszip/releases) - - [Changelog](https://github.com/Stuk/jszip/blob/master/CHANGES.md) + - [Changelog](https://github.com/Stuk/jszip/blob/main/CHANGES.md) - [Commits](https://github.com/Stuk/jszip/compare/v3.3.0...v3.7.1) updated-dependencies: diff --git a/src/core/server/core_app/assets/legacy_dark_theme.css b/src/core/server/core_app/assets/legacy_dark_theme.css index b79f3835acf1..4ef4c726e414 100644 --- a/src/core/server/core_app/assets/legacy_dark_theme.css +++ b/src/core/server/core_app/assets/legacy_dark_theme.css @@ -12,7 +12,7 @@ /*! * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ /* @notice * This product bundles bootstrap@3.3.6 which is available under a diff --git a/src/core/server/core_app/assets/legacy_light_theme.css b/src/core/server/core_app/assets/legacy_light_theme.css index 27252f6548fe..9f9a0dc118d1 100644 --- a/src/core/server/core_app/assets/legacy_light_theme.css +++ b/src/core/server/core_app/assets/legacy_light_theme.css @@ -12,7 +12,7 @@ /*! * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ /* @notice * This product bundles bootstrap@3.3.6 which is available under a diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts index 38d9e755ef30..e3a1b066db23 100644 --- a/src/core/server/http/http_config.ts +++ b/src/core/server/http/http_config.ts @@ -41,7 +41,7 @@ const match = (regex: RegExp, errorMsg: string) => (str: string) => regex.test(str) ? undefined : errorMsg; // before update to make sure it's in sync with validation rules in Legacy -// https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/src/legacy/server/config/schema.js +// https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/legacy/server/config/schema.js export const config = { path: 'server', schema: schema.object( diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts index fec3fb0e677f..6103b2d748b6 100644 --- a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts @@ -40,7 +40,7 @@ const logger = loggingSystemMock.createLogger(); const pluginPath = resolve('path', 'existent-dir'); const pluginManifestPath = resolve(pluginPath, 'opensearch_dashboards.json'); const packageInfo = { - branch: 'master', + branch: 'main', buildNum: 1, buildSha: '', version: '7.0.0-alpha1', diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts index a6828e4bd3b3..bc7480bb8adb 100644 --- a/src/core/server/plugins/discovery/plugins_discovery.test.ts +++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts @@ -76,7 +76,7 @@ const Plugins = { }; const packageMock = { - branch: 'master', + branch: 'main', version: '1.2.3', build: { distributable: true, diff --git a/src/dev/ci_setup/checkout_sibling_opensearch.sh b/src/dev/ci_setup/checkout_sibling_opensearch.sh index dcab2b356d43..1ca3fcf4291c 100755 --- a/src/dev/ci_setup/checkout_sibling_opensearch.sh +++ b/src/dev/ci_setup/checkout_sibling_opensearch.sh @@ -45,7 +45,7 @@ function checkout_sibling { function pick_clone_target { echo "To develop OpenSearch Dashboards features against a specific branch of ${project} and being able to" echo "test that feature also on CI, the CI is trying to find branches on ${project} with the same name as" - echo "the OpenSearch Dashboards branch (first on your fork and then upstream) before building from master." + echo "the OpenSearch Dashboards branch (first on your fork and then upstream) before building from main." echo "picking which branch of ${project} to clone:" if [[ -n "$PR_AUTHOR" && -n "$PR_SOURCE_BRANCH" ]]; then cloneAuthor="$PR_AUTHOR" diff --git a/src/dev/ci_setup/get_percy_env.js b/src/dev/ci_setup/get_percy_env.js index d5ce19f5f834..e3890ad6846f 100644 --- a/src/dev/ci_setup/get_percy_env.js +++ b/src/dev/ci_setup/get_percy_env.js @@ -63,5 +63,5 @@ console.log( `export PERCY_PARALLEL_NONCE="${shortCommit}/${isPr ? 'PR' : branch}/${process.env.BUILD_ID}";` ); console.log(`export PERCY_BRANCH="${branch}";`); -// percy snapshots always target pkg.branch, so that feature branches can be based on master/7.x/etc. +// percy snapshots always target pkg.branch, so that feature branches can be based on main/7.x/etc. console.log(`export PERCY_TARGET_BRANCH="${isPr ? process.env.PR_TARGET_BRANCH : pkg.branch}";`); diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js index d1d1a9337f05..c4818a54f7cd 100644 --- a/src/legacy/server/config/schema.js +++ b/src/legacy/server/config/schema.js @@ -61,7 +61,7 @@ export default () => name: Joi.string().default(os.hostname()), // keep them for BWC, remove when not used in Legacy. // validation should be in sync with one in New platform. - // https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/src/core/server/http/http_config.ts + // https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/core/server/http/http_config.ts basePath: Joi.string() .default('') .allow('') diff --git a/src/plugins/embeddable/README.md b/src/plugins/embeddable/README.md index fb03e5893060..88b91125f8d9 100644 --- a/src/plugins/embeddable/README.md +++ b/src/plugins/embeddable/README.md @@ -8,7 +8,7 @@ Containers are a special type of embeddable that can contain nested embeddables. ## Examples -Many example embeddables are implemented and registered [here](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/examples/embeddable_examples). They can be played around with and explored [in the Embeddable Explorer example plugin](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/examples/embeddable_explorer). Just run OpenSearch Dashboards with +Many example embeddables are implemented and registered [here](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/examples/embeddable_examples). They can be played around with and explored [in the Embeddable Explorer example plugin](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/examples/embeddable_explorer). Just run OpenSearch Dashboards with ``` yarn start --run-examples @@ -16,7 +16,7 @@ yarn start --run-examples and navigate to the Embeddable explorer app. -There is also an example of rendering dashboard container outside of dashboard app [here](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/examples/dashboard_embeddable_examples). +There is also an example of rendering dashboard container outside of dashboard app [here](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/examples/dashboard_embeddable_examples). ## Docs diff --git a/src/plugins/opensearch_dashboards_overview/README.md b/src/plugins/opensearch_dashboards_overview/README.md index 1183b109d76f..a49b549e3dcd 100644 --- a/src/plugins/opensearch_dashboards_overview/README.md +++ b/src/plugins/opensearch_dashboards_overview/README.md @@ -6,4 +6,4 @@ ## Development -See the [OpenSearch Dashboards contributing guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/CONTRIBUTING.md) for instructions setting up your development environment. +See the [OpenSearch Dashboards contributing guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/CONTRIBUTING.md) for instructions setting up your development environment. diff --git a/src/plugins/opensearch_dashboards_utils/common/state_containers/README.md b/src/plugins/opensearch_dashboards_utils/common/state_containers/README.md index 42c072290d3e..df154168499b 100644 --- a/src/plugins/opensearch_dashboards_utils/common/state_containers/README.md +++ b/src/plugins/opensearch_dashboards_utils/common/state_containers/README.md @@ -1,2 +1,2 @@ * [docs](../../docs/state_containers) -* [api reference](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/opensearch_dashboards_utils/docs/state_containers) \ No newline at end of file +* [api reference](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/opensearch_dashboards_utils/docs/state_containers) \ No newline at end of file diff --git a/src/plugins/opensearch_dashboards_utils/common/state_containers/create_state_container_react_helpers.ts b/src/plugins/opensearch_dashboards_utils/common/state_containers/create_state_container_react_helpers.ts index ea38f73848df..97f4131c45a4 100644 --- a/src/plugins/opensearch_dashboards_utils/common/state_containers/create_state_container_react_helpers.ts +++ b/src/plugins/opensearch_dashboards_utils/common/state_containers/create_state_container_react_helpers.ts @@ -87,7 +87,7 @@ export const useContainerSelector = , * Creates helpers for using {@link StateContainer | State Containers} with react * * TODO Update link - * Refer to {@link https://github.com/opensearch-project/OpenSearch-Dashboards/blob/master/src/plugins/opensearch_dashboards_utils/docs/state_containers/react.md | guide} for details + * Refer to {@link https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/plugins/opensearch_dashboards_utils/docs/state_containers/react.md | guide} for details * @public */ export const createStateContainerReactHelpers = >() => { diff --git a/src/plugins/opensearch_dashboards_utils/common/state_containers/index.ts b/src/plugins/opensearch_dashboards_utils/common/state_containers/index.ts index ba2d8d6a26d3..e4522710e30c 100644 --- a/src/plugins/opensearch_dashboards_utils/common/state_containers/index.ts +++ b/src/plugins/opensearch_dashboards_utils/common/state_containers/index.ts @@ -31,7 +31,7 @@ /** * State containers are Redux-store-like objects meant to help you manage state in your services or apps. * TODO: Update link - * Refer to {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/opensearch_dashboards_utils/docs/state_containers | guides and examples} for more info + * Refer to {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/opensearch_dashboards_utils/docs/state_containers | guides and examples} for more info * * @packageDocumentation */ diff --git a/src/plugins/opensearch_dashboards_utils/public/state_sync/README.md b/src/plugins/opensearch_dashboards_utils/public/state_sync/README.md index a78616a8980e..c1e1f70c381a 100644 --- a/src/plugins/opensearch_dashboards_utils/public/state_sync/README.md +++ b/src/plugins/opensearch_dashboards_utils/public/state_sync/README.md @@ -1,3 +1,3 @@ - [docs](../../docs/state_sync) - [demo plugins](../../../../../examples/state_containers_examples): run OpenSearch Dashboards with `--run-examples` flag. -- [api reference](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/opensearch_dashboards_utils/docs/state_sync) +- [api reference](https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/opensearch_dashboards_utils/docs/state_sync) diff --git a/src/plugins/opensearch_dashboards_utils/public/state_sync/index.ts b/src/plugins/opensearch_dashboards_utils/public/state_sync/index.ts index 15d1d8ddf78f..5d538679e1f9 100644 --- a/src/plugins/opensearch_dashboards_utils/public/state_sync/index.ts +++ b/src/plugins/opensearch_dashboards_utils/public/state_sync/index.ts @@ -32,7 +32,7 @@ * State syncing utilities are a set of helpers for syncing your application state * with browser URL or browser storage. * - * They are designed to work together with {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/opensearch_dashboards_utils/docs/state_containers | state containers}. But state containers are not required. + * They are designed to work together with {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/opensearch_dashboards_utils/docs/state_containers | state containers}. But state containers are not required. * * State syncing utilities include: * @@ -44,7 +44,7 @@ * Listens for state updates in the URL and pushes them back to state. * * {@link ISessionStorageStateStorage} - Serializes state and persists it to browser storage. * - * Refer {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/master/src/plugins/opensearch_dashboards_utils/docs/state_sync | here} for a complete guide and examples. + * Refer {@link https://github.com/opensearch-project/OpenSearch-Dashboards/tree/main/src/plugins/opensearch_dashboards_utils/docs/state_sync | here} for a complete guide and examples. * @packageDocumentation */ diff --git a/src/plugins/opensearch_dashboards_utils/public/state_sync/state_sync.ts b/src/plugins/opensearch_dashboards_utils/public/state_sync/state_sync.ts index 8745ed436a5b..92185d004091 100644 --- a/src/plugins/opensearch_dashboards_utils/public/state_sync/state_sync.ts +++ b/src/plugins/opensearch_dashboards_utils/public/state_sync/state_sync.ts @@ -64,7 +64,7 @@ export interface ISyncStateRef