Skip to content

Commit

Permalink
Merge branch 'master' into bump-frontend-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscollins3456 authored Nov 27, 2023
2 parents 87a7b79 + 3806dc1 commit ac39112
Show file tree
Hide file tree
Showing 53 changed files with 2,103 additions and 179 deletions.
11 changes: 10 additions & 1 deletion .github/actions/docker-custom-build-and-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,20 @@ runs:
push: false
cache-from: type=registry,ref=${{ steps.docker_meta.outputs.tags }}
cache-to: type=inline
- name: Single Tag
if: ${{ inputs.publish != 'true' }}
shell: bash
run: |
TAGS="""
${{ steps.docker_meta.outputs.tags }}
"""
echo "SINGLE_TAG=$(echo $TAGS | tr '\n' ' ' | awk -F' ' '{ print $1 }')" >> $GITHUB_OUTPUT
id: single_tag
- name: Upload image locally for testing (if not publishing)
uses: ishworkh/docker-image-artifact-upload@v1
if: ${{ inputs.publish != 'true' }}
with:
image: ${{ steps.docker_meta.outputs.tags }}
image: ${{ steps.single_tag.outputs.SINGLE_TAG }}

# Code for building multi-platform images and pushing to Docker Hub.
- name: Set up QEMU
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker-unified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -876,11 +876,13 @@ jobs:
]
steps:
- uses: aws-actions/configure-aws-credentials@v1
if: ${{ needs.setup.outputs.publish != 'false' }}
with:
aws-access-key-id: ${{ secrets.AWS_SQS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SQS_ACCESS_KEY }}
aws-region: us-west-2
- uses: isbang/[email protected]
if: ${{ needs.setup.outputs.publish != 'false' }}
with:
sqs-url: ${{ secrets.DATAHUB_HEAD_SYNC_QUEUE }}
message: '{ "command": "git-sync", "args" : {"repoName": "${{ needs.setup.outputs.repository_name }}", "repoOrg": "${{ github.repository_owner }}", "repoBranch": "${{ needs.setup.outputs.branch_name }}", "repoShaShort": "${{ needs.setup.outputs.short_sha }}" }}'
2 changes: 1 addition & 1 deletion datahub-web-react/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ task yarnBuild(type: YarnTask, dependsOn: [yarnInstall, yarnTest, yarnLint]) {
}

task yarnQuickBuild(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
environment = [NODE_OPTIONS: "--max-old-space-size=3072"]
environment = [NODE_OPTIONS: "--max-old-space-size=3072 --openssl-legacy-provider"]
args = ['run', 'build']
}

Expand Down
2 changes: 1 addition & 1 deletion datahub-web-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"start:mock": "yarn run generate && BROWSER=none REACT_APP_MOCK=true craco start",
"start:e2e": "REACT_APP_MOCK=cy BROWSER=none PORT=3010 craco start",
"ec2-dev": "yarn run generate && CI=true;export CI;BROWSER=none craco start",
"build": "yarn run generate && NODE_OPTIONS=--openssl-legacy-provider CI=false REACT_APP_MOCK=false craco build && rm -rf dist/ && cp -r build/yarn/ dist/ && rm -r build/yarn/",
"build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=3072 --openssl-legacy-provider' CI=false REACT_APP_MOCK=false craco build && rm -rf dist/ && cp -r build/yarn/ dist/ && rm -r build/yarn/",
"test": "craco test",
"pretest:e2e:ci": "yarn generate",
"test:e2e": "start-server-and-test start:e2e 3010",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import ExpandingStat from '../../dataset/shared/ExpandingStat';
const StatText = styled.span`
color: ${ANTD_GRAY[8]};
@media (min-width: 1024px) {
width: 100%;
white-space: nowrap;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import ExpandingStat from './ExpandingStat';
const StatText = styled.span<{ color: string }>`
color: ${(props) => props.color};
@media (min-width: 1160px) {
width: 100%;
white-space: nowrap;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const UpdateDeprecationModal = ({ urns, onClose, refetch }: Props) => {
resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
deprecated: true,
note: formData.note,
decommissionTime: formData.decommissionTime && formData.decommissionTime.unix(),
decommissionTime: formData.decommissionTime && formData.decommissionTime.unix() * 1000,
},
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,24 @@ export const DeprecationPill = ({ deprecation, urn, refetch, showUndeprecate }:
* Deprecation Decommission Timestamp
*/
const localeTimezone = getLocaleTimezone();

let decommissionTimeSeconds;
if (deprecation.decommissionTime) {
if (deprecation.decommissionTime < 943920000000) {
// Time is set in way past if it was milli-second so considering this as set in seconds
decommissionTimeSeconds = deprecation.decommissionTime;
} else {
decommissionTimeSeconds = deprecation.decommissionTime / 1000;
}
}
const decommissionTimeLocal =
(deprecation.decommissionTime &&
(decommissionTimeSeconds &&
`Scheduled to be decommissioned on ${moment
.unix(deprecation.decommissionTime)
.unix(decommissionTimeSeconds)
.format('DD/MMM/YYYY')} (${localeTimezone})`) ||
undefined;
const decommissionTimeGMT =
deprecation.decommissionTime &&
moment.unix(deprecation.decommissionTime).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');
decommissionTimeSeconds && moment.unix(decommissionTimeSeconds).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');

const hasDetails = deprecation.note !== '' || deprecation.decommissionTime !== null;
const isDividerNeeded = deprecation.note !== '' && deprecation.decommissionTime !== null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const TRINO_HOST_PORT: RecipeField = {
name: 'host_port',
label: 'Host and Port',
tooltip:
"The host and port where Trino is running. For example, 'trino-server:5432'. Note: this host must be accessible on the network where DataHub is running (or allowed via an IP Allow List, AWS PrivateLink, etc).",
"The host (without protocol and ://) and port where Trino is running. For example, 'trino-server:5432'. Note: this host must be accessible on the network where DataHub is running (or allowed via an IP Allow List, AWS PrivateLink, etc).",
type: FieldType.TEXT,
fieldPath: 'source.config.host_port',
placeholder: 'trino-server:5432',
Expand Down
2 changes: 1 addition & 1 deletion datahub-web-react/src/app/settings/SettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import ManagePosts from './posts/ManagePosts';
const PageContainer = styled.div`
display: flex;
overflow: auto;
flex: 1;
`;

const SettingsBarContainer = styled.div`
padding-top: 20px;
max-height: 100vh;
border-right: 1px solid ${ANTD_GRAY[5]};
display: flex;
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-without-neo4j.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
Expand Down
2 changes: 1 addition & 1 deletion docker/mysql/docker-compose.mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
env_file: env/docker.env
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ services:
test: mysqladmin ping -h mysql -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
timeout: 5s
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
restart: on-failure
Expand Down
2 changes: 1 addition & 1 deletion docker/quickstart/docker-compose.quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ services:
test: mysqladmin ping -h mysql -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
timeout: 5s
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
restart: on-failure
Expand Down
9 changes: 9 additions & 0 deletions docker/quickstart/quickstart_version_mapping.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,27 @@ quickstart_version_map:
default:
composefile_git_ref: master
docker_tag: head
mysql_tag: 5.7
# default: # Use this to pin default to a specific version.
# composefile_git_ref: fd1bd51541a132017a648f4a2f037eec8f70ba26 # v0.10.0 + quickstart compose file fixes
# docker_tag: v0.10.0

head:
composefile_git_ref: master
docker_tag: head
mysql_tag: 5.7

# v0.13.0 we upgraded MySQL image for EOL
v0.13.0:
composefile_git_ref: master
docker_tag: head
mysql_tag: 8.2

# v0.9.6 images contain security vulnerabilities
v0.9.6:
composefile_git_ref: v0.9.6.1
docker_tag: v0.9.6.1
mysql_tag: 5.7

# If stable is not defined the latest released version will be used.
# stable:
Expand Down
1 change: 1 addition & 0 deletions docs-website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ module.exports = {
},
{
"Managed DataHub Release History": [
"docs/managed-datahub/release-notes/v_0_2_13",
"docs/managed-datahub/release-notes/v_0_2_12",
"docs/managed-datahub/release-notes/v_0_2_11",
"docs/managed-datahub/release-notes/v_0_2_10",
Expand Down
2 changes: 2 additions & 0 deletions docs-website/src/pages/_components/Hero/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { QuestionCircleOutlined } from "@ant-design/icons";
import styles from "./hero.module.scss";
import CodeBlock from "@theme/CodeBlock";
import CardCTAs from "../CardCTAs";
import TownhallButton from "../TownhallButton";

const HeroAnnouncement = ({ message, linkUrl, linkText }) => (
<div className={clsx("hero__alert alert alert--primary", styles.hero__alert)}>
Expand Down Expand Up @@ -46,6 +47,7 @@ const Hero = ({}) => {
<Link className="button button--secondary button--md" to="https://slack.datahubproject.io">
Join our Slack
</Link>
<TownhallButton />
</div>
</div>
<CardCTAs />
Expand Down
31 changes: 31 additions & 0 deletions docs-website/src/pages/_components/TownhallButton/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';
import styles from "./townhallbutton.module.scss";
import clsx from "clsx";
import Link from "@docusaurus/Link";

const TownhallButton = () => {
const today = new Date();
const currentDay = today.getDate();
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0);
const lastThursday = lastDayOfMonth.getDate() - ((lastDayOfMonth.getDay() + 7 - 4) % 7);

const daysUntilLastThursday = lastThursday - currentDay;

let showButton = false;
let currentMonth = '';

if (daysUntilLastThursday > 0 && daysUntilLastThursday <= 14) {
showButton = true;
currentMonth = new Intl.DateTimeFormat('en-US', { month: 'long' }).format(today);
}

return (
showButton && (
<Link to="http://rsvp.datahubproject.io" className={clsx('button button--primary button--md', styles.feature)}>
Join {currentMonth} Townhall!&nbsp;✨
</Link>
)
);
};

export default TownhallButton;
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.feature {
color: white;
border: 1px solid transparent;
background-image: linear-gradient(to right, #1890ff 0%, #9c27b0 100%);
background-origin: border-box;
opacity: 90%;

&:hover {
opacity: 100%;
background: linear-gradient(to right, #1890ff 0%, #9c27b0 100%);
background-image: linear-gradient(to right, #1890ff 0%, #9c27b0 100%);
background-origin: border-box;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.feature {
flex-direction: row;
padding: 1.75rem;
color: var(--ifm-hero-text-color);
margin: 0rem 2rem 1rem 0rem;
min-height: 14rem;
max-height: 15rem;
overflow: hidden;
text-decoration: none !important;

img {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
svg {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
strong,
span {
display: block;
margin-bottom: 0.75rem;
}
strong {
font-weight: 600;
font-size: 1.1rem;
}

span {
font-size: 1rem;
line-height: 1.25em;
}
&:hover {
border-color: var(--ifm-color-primary);
}
}
21 changes: 21 additions & 0 deletions docs-website/src/pages/docs/_components/FeatureCard/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from "react";
import clsx from "clsx";
import styles from "./featurecard.module.scss";
import useBaseUrl from "@docusaurus/useBaseUrl";
import Link from "@docusaurus/Link";

const FeatureCard = ({icon, title, description, to}) => {
return (
<div className="col col--4">
<Link to={useBaseUrl(to)} className={clsx("card", styles.feature)}>
<div>
{icon}
<strong>{title}&nbsp;→</strong>
<span>{description}</span>
</div>
</Link>
</div>
);
};

export default FeatureCard;
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@


.feature {
flex-direction: row;
padding: 0.675rem;
color: var(--ifm-text-color);
margin: 0.5rem;
min-height: calc(100% - 1rem);
text-decoration: none !important;
img {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
svg {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
strong,
span {
display: block;
margin-bottom: 0.25rem;
}
strong {
font-weight: 600;
}

span {
font-size: 0.875rem;
line-height: 1.25em;
}
&:hover {
border-color: var(--ifm-color-primary);
}
}
Loading

0 comments on commit ac39112

Please sign in to comment.