Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a70c82e
Update new gx logo
DucNgoQuang Oct 13, 2025
523bd88
Fix visibility for invite token related function
DucNgoQuang Oct 21, 2025
af82381
Merge branch 'datahub-project:master' into fix/invite-token-visibility
DucNgoQuang Oct 21, 2025
938b232
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Oct 23, 2025
7ff97a9
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Oct 27, 2025
d387b99
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
ba14e5d
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
a516c7d
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
0f21225
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 29, 2025
8579b4c
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 29, 2025
cb2e04f
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 30, 2025
e19a1e3
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 31, 2025
ccf0546
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Nov 1, 2025
3d8284e
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 3, 2025
0f73ed1
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 4, 2025
9f82c91
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 5, 2025
f020b8a
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 5, 2025
2ef11e3
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Nov 6, 2025
d362678
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 7, 2025
012b424
reduce mem
chakru-r Nov 7, 2025
743bcc7
test workflow
chakru-r Nov 8, 2025
c4fa6ec
add label trigger
chakru-r Nov 8, 2025
147c0ab
skip depot docker builder
chakru-r Nov 8, 2025
4344a64
add electron launch args
v-tarasevich-blitz-brain Nov 12, 2025
76e878c
lint
chakru-r Nov 13, 2025
dd22998
debug
chakru-r Nov 13, 2025
6e97acd
temp
chakru-r Nov 13, 2025
4af4757
numTestsInMem=0
chakru-r Nov 13, 2025
8f4fc14
use head
chakru-r Nov 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/docker-unified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- master
- releases/**
pull_request:
types: [opened, synchronize, reopened, labeled]
branches:
- "**"
release:
Expand All @@ -29,7 +30,9 @@ env:
PROFILE_NAME: "${{ github.event.inputs.profileName || 'quickstart-consumers' }}"

DOCKER_CACHE: "DEPOT"
DEPOT_PROJECT_ID: "${{ vars.DEPOT_PROJECT_ID }}"
DEPOT_PROJECT_ID: "s0gr1cr3jd"
HAS_DEPOT_LABEL: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'depot') }}
IS_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
DEPOT_TOKEN: "${{ secrets.DEPOT_TOKEN }}"

permissions:
Expand All @@ -39,6 +42,7 @@ permissions:
jobs:
setup:
runs-on: depot-ubuntu-24.04-small
if: ${{ github.event_name != 'pull_request' || github.event.action != 'labeled' || github.event.label.name == 'depot' }}
outputs:
# TODO: Many of the vars below should not be required anymore.
tag: ${{ steps.tag.outputs.tag }}
Expand Down Expand Up @@ -135,22 +139,25 @@ jobs:
- name: Determine runner type
id: set-runner
# This needs to handle two scenarios:
# 1. Running on a PR from a fork. There are some auth issues that prevent us from using depot in that case.
# So, Its easier to just use the regular github actions cache and build all images for each parallel job running smoke test.
# Note, concurrency is lower when using github runners, queue times can be longer, test time is longer due to fewer parallel jobs.
# 2. Running on a PR from a branch in the datahub-project org and push/schedule events on master.
# 1. Running on a PR from a fork. We use github runners, unless the "depot" label exists -- in which case, we run
# it on depotNote, concurrency is lower when using github runners, queue times can be longer, test time is longer
# due to fewer parallel jobs.
# 3. Running on a PR from a branch in the datahub-project org and push/schedule events on master.
# Depot is used here for remote container builds in base_build and also for all runners. Depot runners support unlimited concurrency
# and hence short queue times and higher parallelism of smoke tests

run: |
if [[ "${{ env.DOCKER_CACHE }}" == "DEPOT" && "${{ env.DEPOT_PROJECT_ID }}" != "" ]]; then
if [[ "${{ env.DOCKER_CACHE }}" == "DEPOT" && "${{ env.IS_FORK }}" == "false" ]]; then
echo "build_runner_type=depot-ubuntu-24.04-4" >> "$GITHUB_OUTPUT"
echo "test_runner_type=depot-ubuntu-24.04-4" >> "$GITHUB_OUTPUT"
echo "test_runner_type_small=depot-ubuntu-24.04-small" >> "$GITHUB_OUTPUT"
echo "use_depot_cache=true" >> "$GITHUB_OUTPUT"
else
echo "build_runner_type=ubuntu-latest" >> "$GITHUB_OUTPUT"
echo "test_runner_type=ubuntu-latest" >> "$GITHUB_OUTPUT"
if [[ "${{ env.HAS_DEPOT_LABEL }}" == "true" ]]; then
echo "test_runner_type=depot-ubuntu-24.04-4" >> "$GITHUB_OUTPUT"
else
echo "test_runner_type=ubuntu-latest" >> "$GITHUB_OUTPUT"
fi
echo "test_runner_type_small=ubuntu-latest" >> "$GITHUB_OUTPUT"
echo "use_depot_cache=false" >> "$GITHUB_OUTPUT"
# publishing is currently only supported via depot
Expand Down Expand Up @@ -392,7 +399,7 @@ jobs:
# python_batch_count is used to split pytests in the smoke-test (batches of actual test functions)
# cypress_batch_count is used to split the collection of cypress test specs into batches.
run: |
if [[ "${{ needs.setup.outputs.test_runner_type }}" == "ubuntu-latest" ]]; then
if [[ "${{ env.IS_FORK }}" == "true" ]]; then
echo "cypress_batch_count=5" >> "$GITHUB_OUTPUT"
echo "python_batch_count=3" >> "$GITHUB_OUTPUT"
else
Expand Down Expand Up @@ -420,7 +427,7 @@ jobs:

includes=''
if [[ "${{ needs.setup.outputs.backend_change }}" == 'true' || "${{ needs.setup.outputs.smoke_test_change }}" == 'true' || "${{ needs.setup.outputs.publish }}" == 'true' ]]; then
includes="$python_matrix,$cypress_matrix"
includes="$cypress_matrix"
elif [[ "${{ needs.setup.outputs.frontend_only }}" == 'true' ]]; then
includes="$cypress_matrix"
elif [[ "${{ needs.setup.outputs.ingestion_only }}" == 'true' ]]; then
Expand Down Expand Up @@ -506,7 +513,7 @@ jobs:
- name: build images
if: ${{ needs.setup.outputs.use_depot_cache != 'true' }}
run: |
./gradlew :docker:buildImagesQuickstartDebugConsumers -Ptag=${{ needs.setup.outputs.tag }} -PpythonDockerVersion=${{ needs.setup.outputs.python_release_version }} -PdockerRegistry=${{ env.DOCKER_REGISTRY }}
# ./gradlew :docker:buildImagesQuickstartDebugConsumers -Ptag=${{ needs.setup.outputs.tag }} -PpythonDockerVersion=${{ needs.setup.outputs.python_release_version }} -PdockerRegistry=${{ env.DOCKER_REGISTRY }}
docker images
env:
DOCKER_CACHE: GITHUB
Expand All @@ -527,7 +534,7 @@ jobs:
- name: run quickstart
env:
DATAHUB_TELEMETRY_ENABLED: false
DATAHUB_VERSION: ${{ needs.setup.outputs.tag }}
DATAHUB_VERSION: head
DATAHUB_ACTIONS_IMAGE: ${{ env.DATAHUB_ACTIONS_IMAGE }}
ACTIONS_EXTRA_PACKAGES: "acryl-datahub-actions[executor] acryl-datahub-actions"
ACTIONS_CONFIG: "https://raw.githubusercontent.com/acryldata/datahub-actions/main/docker/config/executor.yaml"
Expand Down
10 changes: 5 additions & 5 deletions datahub-web-react/src/app/identity/user/UserList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const UserList = () => {
const [isViewingInviteToken, setIsViewingInviteToken] = useState(false);

const authenticatedUser = useUserContext();
const canManagePolicies = authenticatedUser?.platformPrivileges?.managePolicies || false;
const canManageUserCredentials = authenticatedUser?.platformPrivileges?.manageUserCredentials || false;

const pageSize = DEFAULT_USER_LIST_PAGE_SIZE;
const start = (page - 1) * pageSize;
Expand Down Expand Up @@ -115,7 +115,7 @@ export const UserList = () => {
const error = usersError || rolesError;
const selectRoleOptions = rolesData?.listRoles?.roles?.map((role) => role as DataHubRole) || [];

useToggleEducationStepIdsAllowList(canManagePolicies, USERS_INVITE_LINK_ID);
useToggleEducationStepIdsAllowList(canManageUserCredentials, USERS_INVITE_LINK_ID);

return (
<>
Expand All @@ -127,7 +127,7 @@ export const UserList = () => {
<div>
<Button
id={USERS_INVITE_LINK_ID}
disabled={!canManagePolicies}
disabled={!canManageUserCredentials}
type="text"
onClick={() => setIsViewingInviteToken(true)}
>
Expand Down Expand Up @@ -166,7 +166,7 @@ export const UserList = () => {
<UserListItem
onDelete={() => handleDelete(item.urn as string)}
user={item as CorpUser}
canManageUserCredentials={canManagePolicies}
canManageUserCredentials={canManageUserCredentials}
selectRoleOptions={selectRoleOptions}
refetch={usersRefetch}
/>
Expand All @@ -183,7 +183,7 @@ export const UserList = () => {
showSizeChanger={false}
/>
</UserPaginationContainer>
{canManagePolicies && (
{canManageUserCredentials && (
<ViewInviteTokenModal open={isViewingInviteToken} onClose={() => setIsViewingInviteToken(false)} />
)}
</UserContainer>
Expand Down
6 changes: 5 additions & 1 deletion smoke-test/tests/cypress/integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,12 @@ def test_run_cypress(auth_session):
test_spec_arg = f" --spec '{specs_str}' "

print("Running Cypress tests with command")
# node_options = "--max-old-space-size=5000"
# command = f'NO_COLOR=1 NODE_OPTIONS="{node_options}" npx cypress run {record_arg} {test_spec_arg} {tag_arg} --config numTestsKeptInMemory=0'

node_options = "--max-old-space-size=6000"
command = f'NO_COLOR=1 NODE_OPTIONS="{node_options}" npx cypress run {record_arg} {test_spec_arg} {tag_arg} --config numTestsKeptInMemory=2'
electron_args = "ELECTRON_EXTRA_LAUNCH_ARGS=\"--js-flags='--max-old-space-size=9596' --disable-dev-shm-usage --disable-gpu\""
command = f'{electron_args} NO_COLOR=1 NODE_OPTIONS="{node_options}" npx cypress run {record_arg} {test_spec_arg} {tag_arg} --config numTestsKeptInMemory=0'
print(command)
# Add --headed --spec '**/mutations/mutations.js' (change spec name)
# in case you want to see the browser for debugging
Expand Down
Loading