Skip to content

Commit

Permalink
Merge branch '2.x' into backport-dynamic-config-to-2.x
Browse files Browse the repository at this point in the history
Signed-off-by: Huy Nguyen <[email protected]>
  • Loading branch information
huyaboo authored Sep 2, 2024
2 parents b40165e + cf6255c commit 98a3269
Show file tree
Hide file tree
Showing 1,863 changed files with 186,613 additions and 45,723 deletions.
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ target
/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/
/packages/osd-ui-framework/dist
/packages/osd-ui-shared-deps/flot_charts

# antlr overrides
/src/plugins/data/public/antlr/opensearch_sql/.generated/*
/src/plugins/data/public/antlr/opensearch_sql/grammar/**/*
43 changes: 24 additions & 19 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,26 +272,22 @@ module.exports = {
basePath: __dirname,
zones: [
{
target: ['(src)/**/*', '!src/core/**/*'],
target: ['src/**/*', '!src/core/**/*'],
from: ['src/core/utils/**/*'],
errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
},
{
target: ['(src)/plugins/*/server/**/*'],
from: ['(src)/plugins/*/public/**/*'],
target: ['src/plugins/*/server/**/*'],
from: ['src/plugins/*/public/**/*'],
errorMessage: `Server code can not import from public, use a common directory.`,
},
{
target: ['(src)/plugins/*/common/**/*'],
from: ['(src)/plugins/*/(server|public)/**/*'],
target: ['src/plugins/*/common/**/*'],
from: ['src/plugins/*/(server|public)/**/*'],
errorMessage: `Common code can not import from server or public, use a common directory.`,
},
{
target: [
'src/legacy/**/*',
'(src)/plugins/**/(public|server)/**/*',
'examples/**/*',
],
target: ['src/legacy/**/*', 'src/plugins/**/(public|server)/**/*', 'examples/**/*'],
from: [
'src/core/public/**/*',
'!src/core/public/index.ts', // relative import
Expand Down Expand Up @@ -320,30 +316,30 @@ module.exports = {
{
target: [
'src/legacy/**/*',
'(src)/plugins/**/(public|server)/**/*',
'src/plugins/**/(public|server)/**/*',
'examples/**/*',
'!(src)/**/*.test.*',
'!src/**/*.test.*',
],
from: [
'(src)/plugins/**/(public|server)/**/*',
'!(src)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
'!(src)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
'src/plugins/**/(public|server)/**/*',
'!src/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
'!src/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
],
allowSameFolder: true,
errorMessage: 'Plugins may only import from top-level public and server modules.',
},
{
target: [
'(src)/plugins/**/*',
'!(src)/plugins/**/server/**/*',
'src/plugins/**/*',
'!src/plugins/**/server/**/*',

'examples/**/*',
'!examples/**/server/**/*',
],
from: [
'src/core/server',
'src/core/server/**/*',
'(src)/plugins/*/server/**/*',
'src/plugins/*/server/**/*',
'examples/**/server/**/*',
],
errorMessage:
Expand All @@ -355,7 +351,7 @@ module.exports = {
errorMessage: 'The core cannot depend on any plugins.',
},
{
target: ['(src)/plugins/*/public/**/*'],
target: ['src/plugins/*/public/**/*'],
from: ['ui/**/*'],
errorMessage: 'Plugins cannot import legacy UI code.',
},
Expand Down Expand Up @@ -755,5 +751,14 @@ module.exports = {
'no-undef': 'off',
},
},
{
files: [
'src/plugins/data/public/antlr/opensearch_sql/.generated/*',
'src/plugins/data/public/antlr/opensearch_sql/grammar/**/*',
],
rules: {
'filenames/match-regex': 'off',
},
},
],
};
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba @zhyuanqi @mengweieric
* @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba @zhyuanqi @mengweieric @LDrago27 @virajsanghvi @sejli @joshuali925
37 changes: 37 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# .github/release.yml

changelog:
exclude:
labels:
- ignore-for-release
authors:
- amazon-auto
categories:
- title: 💥 Breaking Changes
labels:
- breaking
- title: 📈 Features/Enhancements
labels:
- enhancement
- title: 🐛 Bug Fixes
labels:
- bug
- title: 🛡 Security
labels:
- cve
- security vulnerability
- title: 🚞 Infrastructure
labels:
- infra
- title: 📝 Documentation
labels:
- docs
- title: 🛠 Maintenance
labels:
- maintenance
- title: 🪛 Refactoring
labels:
- refactor
- title: 🔩 Tests
labels:
- test
2 changes: 2 additions & 0 deletions .github/workflows/build_and_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ on:
- '**/*.md'
- 'docs/**'
- '.lycheeignore'
- 'CODEOWNERS'
- 'changelogs/fragments/**'
pull_request:
branches: [ '**', '!feature/**' ]
paths-ignore:
- '**/*.md'
- 'docs/**'
- '.lycheeignore'
- 'CODEOWNERS'
- 'changelogs/fragments/**'

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:
TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }}
TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}"
FTR_PATH: 'ftr'
START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false'
START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false'
OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
CYPRESS_BROWSER: 'chromium'
CYPRESS_VISBUILDER_ENABLED: true
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@ snapshots.js

# Yarn local mirror content
.yarn-local-mirror

# Ignore the generated antlr files
/src/plugins/data/public/antlr/**/grammar/.antlr/
1 change: 1 addition & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,5 @@ https://unpkg.com/@elastic/
https://codeload.github.com/
https://www.quandl.com/api/v1/datasets/
https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
http:/adomas.org/javascript-mouse-wheel/
site.com
Loading

0 comments on commit 98a3269

Please sign in to comment.