Merge branch 'master' into introdude-entity-aspect

datahub-project · May 20, 2022 · 56b3f38 · 56b3f38
2 parents 673d76f + b38cab0
commit 56b3f38
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 27 deletions.
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
@@ -227,15 +227,17 @@ export const EntityHeader = ({ showDeprecateOption }: Props) => {
                 </MainHeaderContent>
                 <SideHeaderContent>
                     <TopButtonsWrapper>
-                        <Tooltip title="Copy URN. An URN uniquely identifies an entity on DataHub.">
-                            <Button
-                                icon={copiedUrn ? <CheckOutlined /> : <CopyOutlined />}
-                                onClick={() => {
-                                    navigator.clipboard.writeText(urn);
-                                    setCopiedUrn(true);
-                                }}
-                            />
-                        </Tooltip>
+                        {navigator.clipboard && (
+                            <Tooltip title="Copy URN. An URN uniquely identifies an entity on DataHub.">
+                                <Button
+                                    icon={copiedUrn ? <CheckOutlined /> : <CopyOutlined />}
+                                    onClick={() => {
+                                        navigator.clipboard.writeText(urn);
+                                        setCopiedUrn(true);
+                                    }}
+                                />
+                            </Tooltip>
+                        )}
                         {showAdditionalOptions && (
                             <Dropdown
                                 overlay={

diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceExecutionList.tsx
@@ -161,7 +161,7 @@ export const IngestionSourceExecutionList = ({ urn, lastRefresh, onRefresh }: Pr
             key: 'x',
             render: (_, record: any) => (
                 <div style={{ display: 'flex', justifyContent: 'right' }}>
-                    {record.urn && (
+                    {record.urn && navigator.clipboard && (
                         <Tooltip title="Copy Execution Request URN">
                             <Button
                                 style={{ marginRight: 16 }}

diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
@@ -356,15 +356,17 @@ export const IngestionSourceList = () => {
             key: 'x',
             render: (_, record: any) => (
                 <ActionButtonContainer>
-                    <Tooltip title="Copy Ingestion Source URN">
-                        <Button
-                            style={{ marginRight: 16 }}
-                            icon={<CopyOutlined />}
-                            onClick={() => {
-                                navigator.clipboard.writeText(record.urn);
-                            }}
-                        />
-                    </Tooltip>
+                    {navigator.clipboard && (
+                        <Tooltip title="Copy Ingestion Source URN">
+                            <Button
+                                style={{ marginRight: 16 }}
+                                icon={<CopyOutlined />}
+                                onClick={() => {
+                                    navigator.clipboard.writeText(record.urn);
+                                }}
+                            />
+                        </Tooltip>
+                    )}
                     <Button style={{ marginRight: 16 }} onClick={() => onEdit(record.urn)}>
                         EDIT
                     </Button>

diff --git a/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx b/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx
@@ -83,7 +83,7 @@ export const NameSourceStep = ({ state, updateState, prev, submit }: StepProps)
                                 Advanced: Provide a custom CLI version to use for ingestion.
                             </Typography.Paragraph>
                             <Input
-                                placeholder="0.8.34.1"
+                                placeholder="0.8.35"
                                 value={state.config?.version || ''}
                                 onChange={(event) => setVersion(event.target.value)}
                             />

diff --git a/docker/datahub-gms/env/docker-without-neo4j.env b/docker/datahub-gms/env/docker-without-neo4j.env
@@ -16,7 +16,7 @@ MAE_CONSUMER_ENABLED=true
 MCE_CONSUMER_ENABLED=true
 PE_CONSUMER_ENABLED=true
 UI_INGESTION_ENABLED=true
-UI_INGESTION_DEFAULT_CLI_VERSION=0.8.34.1
+UI_INGESTION_DEFAULT_CLI_VERSION=0.8.35
 
 # Uncomment to disable persistence of client-side analytics events
 # DATAHUB_ANALYTICS_ENABLED=false

diff --git a/docker/datahub-gms/env/docker.env b/docker/datahub-gms/env/docker.env
@@ -19,7 +19,7 @@ MAE_CONSUMER_ENABLED=true
 MCE_CONSUMER_ENABLED=true
 PE_CONSUMER_ENABLED=true
 UI_INGESTION_ENABLED=true
-UI_INGESTION_DEFAULT_CLI_VERSION=0.8.34.1
+UI_INGESTION_DEFAULT_CLI_VERSION=0.8.35
 
 # Uncomment to enable Metadata Service Authentication
 # METADATA_SERVICE_AUTH_ENABLED=true

diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -81,7 +81,7 @@ services:
     - MCE_CONSUMER_ENABLED=true
     - PE_CONSUMER_ENABLED=true
     - UI_INGESTION_ENABLED=true
-    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.34.1
+    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.35
     hostname: datahub-gms
     image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}
     ports:

diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
@@ -87,7 +87,7 @@ services:
     - MCE_CONSUMER_ENABLED=true
     - PE_CONSUMER_ENABLED=true
     - UI_INGESTION_ENABLED=true
-    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.34.1
+    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.35
     hostname: datahub-gms
     image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}
     ports:

diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
@@ -8,6 +8,16 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ### Potential Downtime
 
+### Deprecations
+
+### Other notable Changes
+
+## `v0.8.35`
+
+### Breaking Changes
+
+### Potential Downtime
+
 ### Deprecations
   - #4875 Lookml view file contents will no longer be populated in custom_properties, instead view definitions will be always available in the View Definitions tab.
 

diff --git a/metadata-ingestion/sink_docs/datahub.md b/metadata-ingestion/sink_docs/datahub.md
@@ -108,6 +108,8 @@ Note that a `.` is used to denote nested fields in the YAML recipe.
 | `connection.producer_config.<option>`        |          |         | Passed to https://docs.confluent.io/platform/current/clients/confluent-kafka-python/html/index.html#confluent_kafka.SerializingProducer                  |
 | `connection.schema_registry_url`             | ✅       |         | URL of schema registry being used.                                                                                                                       |
 | `connection.schema_registry_config.<option>` |          |         | Passed to https://docs.confluent.io/platform/current/clients/confluent-kafka-python/html/index.html#confluent_kafka.schema_registry.SchemaRegistryClient |
+| `topic_routes.MetadataChangeEvent`           |          | MetadataChangeEvent     | Overridden Kafka topic name for the MetadataChangeEvent |
+| `topic_routes.MetadataChangeProposal`        |          | MetadataChangeProposal  | Overridden Kafka topic name for the MetadataChangeProposal |
 
 The options in the producer config and schema registry config are passed to the Kafka SerializingProducer and SchemaRegistryClient respectively.
 

diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -556,6 +556,7 @@ def get_entity(
         endpoint = endpoint + "?aspects=List(" + ",".join(aspect) + ")"
 
     response = session.get(gms_host + endpoint)
+    response.raise_for_status()
     return response.json()
 
 

diff --git a/metadata-service/factories/src/main/resources/application.yml b/metadata-service/factories/src/main/resources/application.yml
@@ -40,7 +40,7 @@ authorization:
 
 ingestion:
   enabled: ${UI_INGESTION_ENABLED:true}
-  defaultCliVersion: '${UI_INGESTION_DEFAULT_CLI_VERSION:0.8.34.1}'
+  defaultCliVersion: '${UI_INGESTION_DEFAULT_CLI_VERSION:0.8.35}'
 
 telemetry:
   enabledCli: ${CLI_TELEMETRY_ENABLED:true}

diff --git a/metadata-service/war/src/main/resources/boot/data_platforms.json b/metadata-service/war/src/main/resources/boot/data_platforms.json
@@ -45,7 +45,7 @@
       "name": "clickhouse",
       "displayName": "ClickHouse",
       "type": "RELATIONAL_DB",
-      "logoUrl": "https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/clickhouselogo.png"
+      "logoUrl": "/assets/platforms/clickhouselogo.png"
     }
   },
   {
@@ -475,4 +475,4 @@
       "type": "OTHERS"
     }
   }
-]
+]