Merge branch 'master' into cassandra-boot-fixes

datahub-project · Jul 1, 2022 · 170412b · 170412b
2 parents cdff59a + 0fc8a65
commit 170412b
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 31 deletions.
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.38.2"
+                                placeholder="0.8.40"
                                 value={state.config?.version || ''}
                                 onChange={(event) => setVersion(event.target.value)}
                             />

diff --git a/datahub-web-react/src/app/settings/SettingsPage.tsx b/datahub-web-react/src/app/settings/SettingsPage.tsx
@@ -17,7 +17,7 @@ const PageContainer = styled.div`
 
 const SettingsBarContainer = styled.div`
     padding-top: 20px;
-    height: 100vh;
+    min-height: 100vh;
     border-right: 1px solid ${ANTD_GRAY[5]};
 `;
 

diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
@@ -141,25 +141,6 @@ fragment lineageNodeProperties on EntityWithRelationships {
     }
 }
 
-fragment relationshipFieldsWithoutSiblings on EntityWithRelationships {
-    ...lineageNodeProperties
-    ... on Dataset {
-        siblings {
-            isPrimary
-            siblings {
-                urn
-                type
-            }
-        }
-    }
-    upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100 }) {
-        ...leafLineageResults
-    }
-    downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 100 }) {
-        ...leafLineageResults
-    }
-}
-
 fragment relationshipFields on EntityWithRelationships {
     ...lineageNodeProperties
     ... on Dataset {
@@ -168,7 +149,7 @@ fragment relationshipFields on EntityWithRelationships {
             siblings {
                 urn
                 type
-                ...relationshipFieldsWithoutSiblings
+                ...lineageNodeProperties
             }
         }
     }
@@ -222,7 +203,7 @@ query getEntityLineage($urn: String!) {
                 siblings {
                     urn
                     type
-                    ...relationshipFieldsWithoutSiblings
+                    ...lineageNodeProperties
                 }
             }
         }

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.38.2
+UI_INGESTION_DEFAULT_CLI_VERSION=0.8.40
 
 # 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.38.2
+UI_INGESTION_DEFAULT_CLI_VERSION=0.8.40
 
 # 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
@@ -84,7 +84,7 @@ services:
     - MCE_CONSUMER_ENABLED=true
     - PE_CONSUMER_ENABLED=true
     - UI_INGESTION_ENABLED=true
-    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.38.2
+    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.40
     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
@@ -90,7 +90,7 @@ services:
     - MCE_CONSUMER_ENABLED=true
     - PE_CONSUMER_ENABLED=true
     - UI_INGESTION_ENABLED=true
-    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.38.2
+    - UI_INGESTION_DEFAULT_CLI_VERSION=0.8.40
     hostname: datahub-gms
     image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}
     ports:

diff --git a/docs/deploy/confluent-cloud.md b/docs/deploy/confluent-cloud.md
@@ -135,7 +135,7 @@ credentialsAndCertsSecrets:
 
 
 springKafkaConfigurationOverrides:
-      security.protocol: SASL
+      security.protocol: SASL_SSL
       sasl.mechanism: PLAIN
       client.dns.lookup: use_all_dns_ips
       basic.auth.credentials.source: USER_INFO

diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
@@ -4,6 +4,16 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ## Next
 
+### Breaking Changes
+
+### Potential Downtime
+
+### Deprecations
+
+### Other notable Changes
+
+## `v0.8.40`
+
 ### Breaking Changes
 - #5240 `lineage_client_project_id` in `bigquery` source is removed. Use `storage_project_id` instead.
 

diff --git a/metadata-ingestion/src/datahub/cli/timeline_cli.py b/metadata-ingestion/src/datahub/cli/timeline_cli.py
@@ -114,7 +114,7 @@ def get_timeline(
     required=True,
     multiple=True,
     type=str,
-    help="One of tag, glossary_term, technical_schema, documentation, ownership",
+    help="One of tag, glossary_term, technical_schema, documentation, owner",
 )
 @click.option(
     "--start",
@@ -148,7 +148,7 @@ def timeline(
 
     all_categories = [
         "TAG",
-        "OWNERSHIP",
+        "OWNER",
         "GLOSSARY_TERM",
         "TECHNICAL_SCHEMA",
         "DOCUMENTATION",

diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
@@ -169,6 +169,17 @@ def main(**kwargs):
                     exc,
                     line_wrap=MAX_CONTENT_WIDTH,
                     truncate_vals=10 * MAX_CONTENT_WIDTH,
+                    suppressed_vars=[
+                        r".*password.*",
+                        r".*secret.*",
+                        r".*key.*",
+                        r".*access.*",
+                        # needed because sometimes secrets are in url
+                        r".*url.*",
+                        # needed because sqlalchemy uses it underneath
+                        # and passes all params
+                        r".*cparams.*",
+                    ],
                     suppressed_paths=[r"lib/python.*/site-packages/click/"],
                     **kwargs,
                 )

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