Skip to content

Commit

Permalink
Merge branch 'main' into ISSUE-19095
Browse files Browse the repository at this point in the history
  • Loading branch information
IceS2 authored and Abdallah Serghine committed Dec 17, 2024
2 parents 61c2cd9 + c96c778 commit ce52674
Show file tree
Hide file tree
Showing 6,255 changed files with 271,096 additions and 124,304 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Individual scopes

# Review from UI owners for changes around UI code
/openmetadata-ui/src/main/resources/ui/ @ShaileshParmar11 @karanh37 @chirag-madlani @Sachin-chaurasiya
/openmetadata-ui/src/main/resources/ui/ @open-metadata/ui

# Review from Backend owners for changes around Backend code
/openmetadata-service/ @open-metadata/backend
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/auto-cherry-pick-labeled-prs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
---
name: Cherry-pick labeled PRs to OpenMetadata release branch on merge
# yamllint disable-line rule:comments
run-name: OpenMetadata release cherry-pick PR #${{ github.event.pull_request.number }}

# yamllint disable-line rule:truthy
on:
pull_request:
types: [closed]
branches:
- main
permissions:
contents: write
pull-requests: write
env:
CURRENT_RELEASE_ENDPOINT: ${{ vars.CURRENT_RELEASE_ENDPOINT }} # Endpoint that returns the current release version in json format
jobs:
cherry_pick_to_release_branch:
if: github.event.pull_request.merged == true &&
contains(github.event.pull_request.labels.*.name, 'To release')
runs-on: ubuntu-latest # Running it on ubuntu-latest on purpose (we're not using all the free minutes)
steps:
- name: Checkout main branch
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
- name: Get the release version
id: get_release_version
run: |
CURRENT_RELEASE=$(curl -s $CURRENT_RELEASE_ENDPOINT | jq -r .om_branch)
echo "CURRENT_RELEASE=${CURRENT_RELEASE}" >> $GITHUB_ENV
- name: Cherry-pick changes from PR
id: cherry_pick
continue-on-error: true
run: |
git config --global user.email "[email protected]"
git config --global user.name "OpenMetadata Release Bot"
git fetch origin ${CURRENT_RELEASE}
git checkout ${CURRENT_RELEASE}
git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }}
- name: Push changes to release branch
id: push_changes
continue-on-error: true
if: steps.cherry_pick.outcome == 'success'
run: |
git push origin ${CURRENT_RELEASE}
- name: Post a comment on failure
if: steps.cherry_pick.outcome != 'success' || steps.push_changes.outcome != 'success'
uses: actions/github-script@v7
with:
script: |
const prNumber = context.payload.pull_request.number;
const releaseVersion = process.env.CURRENT_RELEASE;
const workflowRunUrl = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: prNumber,
body: `Failed to cherry-pick changes to the ${releaseVersion} branch.
Please cherry-pick the changes manually.
You can find more details [here](${workflowRunUrl}).`
})
- name: Post a comment on success
if: steps.cherry_pick.outcome == 'success' && steps.push_changes.outcome == 'success'
uses: actions/github-script@v7
with:
script: |
const prNumber = context.payload.pull_request.number;
const releaseVersion = process.env.CURRENT_RELEASE;
github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: prNumber,
body: `Changes have been cherry-picked to the ${releaseVersion} branch.`
})
4 changes: 2 additions & 2 deletions .github/workflows/sync-docs-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Prepare Collate content and partials
id: prepare_collate
continue-on-error: true
run: cp -R openmetadata-docs/content/partials/ openmetadata-docs/content/v1.5.x/partials
run: cp -R openmetadata-docs/content/partials/ openmetadata-docs/content/v1.6.x/partials

- name: Push content Collate
id: push_content_collate
Expand All @@ -68,7 +68,7 @@ jobs:
env:
SSH_DEPLOY_KEY: ${{ secrets.DOCS_COLLATE_SSH_DEPLOY_KEY }}
with:
source-directory: openmetadata-docs/content/v1.5.x
source-directory: openmetadata-docs/content/v1.6.x
target-directory: content/
destination-github-username: 'open-metadata'
destination-repository-name: 'docs-collate'
Expand Down
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ openmetadata-ui/src/main/resources/ui/src/jsons/connectionSchemas
openmetadata-ui/src/main/resources/ui/src/jsons/ingestionSchemas
openmetadata-ui/src/main/resources/ui/src/jsons/governanceSchemas

#UI - Generated TS
openmetadata-ui/src/main/resources/ui/src/generated

#vscode
*/.vscode/*
Expand All @@ -111,10 +109,7 @@ mlruns/
/ingestion/tests/integration/source/mlflow/tests/db/

# Antlr
/openmetadata-ui/src/main/resources/ui/src/antlr/generated/Fqn.interp
/openmetadata-ui/src/main/resources/ui/src/antlr/generated/Fqn.tokens
/openmetadata-ui/src/main/resources/ui/src/antlr/generated/FqnLexer.interp
/openmetadata-ui/src/main/resources/ui/src/antlr/generated/FqnLexer.tokens
openmetadata-ui/src/main/resources/ui/src/generated/antlr/
.antlr

# SQLAlchemy tests
Expand All @@ -132,4 +127,4 @@ ingestion/tests/cli_e2e/**/*test.yaml
/ingestion/tests/integration/great_expectations/gx/*

# Tests
**/metastore_db/
**/metastore_db/
13 changes: 0 additions & 13 deletions .run/Template JUnit.run.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Make domain policy and role non-system
UPDATE policy_entity SET json = JSON_SET(json, '$.provider', 'user') where name = 'DomainOnlyAccessPolicy';
UPDATE policy_entity SET json = JSON_SET(json, '$.allowDelete', true) where name = 'DomainOnlyAccessPolicy';
UPDATE role_entity SET json = JSON_SET(json, '$.provider', 'user') where name = 'DomainOnlyAccessRole';
UPDATE role_entity SET json = JSON_SET(json, '$.allowDelete', true) where name = 'DomainOnlyAccessRole';
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Make domain policy and role non-system
UPDATE policy_entity SET json = JSONB_SET(json::jsonb, '{provider}', '"user"', true) where name = 'DomainOnlyAccessPolicy';
UPDATE policy_entity SET json = JSONB_SET(json::jsonb, '{allowDelete}', 'true', true) WHERE name = 'DomainOnlyAccessPolicy';
UPDATE role_entity SET json = JSONB_SET(json::jsonb, '{provider}', '"user"', true) where name = 'DomainOnlyAccessRole';
UPDATE role_entity SET json = JSONB_SET(json::jsonb, '{allowDelete}', 'true', true) WHERE name = 'DomainOnlyAccessRole';
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,10 @@ set json = JSON_SET(json, '$.connection.config.supportsSystemProfile', true)
where serviceType in ('Snowflake', 'Redshift', 'BigQuery');

-- Update all rows in the consumers_dlq table to set the source column to 'publisher'
UPDATE consumers_dlq SET source = 'publisher';
UPDATE consumers_dlq SET source = 'publisher';

DELETE from event_subscription_entity where name = "ActivityFeedAlert";

DROP INDEX event_time_index ON change_event;

CREATE INDEX idx_offset_event_time ON change_event (offset, eventTime);
Loading

0 comments on commit ce52674

Please sign in to comment.