Merge branch 'apache:master' into ATLAS-5055

chaitalicod · web-flow · commit 01a700f6ac5f · 2025-07-14T16:37:24.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,6 +79,12 @@ jobs:
             exit 1
           fi
 
+      - name: Upload Code Coverage Results
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage
+          path: dev-support/atlas-docker/dist/coverage/*
+
       - name: Cache downloaded archives
         if: success()
         uses: actions/cache@v4
@@ -98,17 +104,16 @@ jobs:
           cd dev-support/atlas-docker
           export DOCKER_BUILDKIT=1
           export COMPOSE_DOCKER_CLI_BUILD=1
+          docker compose -f docker-compose.atlas-base.yml build 
           docker compose \
-          -f docker-compose.atlas-base.yml \
           -f docker-compose.atlas.yml \
           -f docker-compose.atlas-hadoop.yml \
           -f docker-compose.atlas-hbase.yml \
           -f docker-compose.atlas-kafka.yml \
-          -f docker-compose.atlas-hive.yml up -d
+          -f docker-compose.atlas-hive.yml up -d --wait
 
       - name: Check status of containers and remove them
         run: |
-          sleep 60
           containers=(atlas atlas-hadoop atlas-hbase atlas-kafka atlas-hive);
           flag=true;
           for container in "${containers[@]}"; do
diff --git a/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java b/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java
@@ -90,7 +90,7 @@ private AtlasPathExtractorUtil() {
     }
 
     public static AtlasEntityWithExtInfo getPathEntity(Path path, PathExtractorContext context) {
-        if (StringUtils.isEmpty(path.toString())) {
+        if (path == null || StringUtils.isEmpty(path.toString())) {
             throw new IllegalArgumentException("Invalid Input: Path is Null");
         }
 
@@ -500,7 +500,7 @@ private static AtlasEntity addOfsPathEntity(Path path, AtlasEntityExtInfo extInf
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== addOzonePathEntity(strPath={})", path.toString());
+            LOG.debug("<== addOzonePathEntity(strPath={})", path);
         }
 
         return currentOfsKeyEntity;
@@ -555,7 +555,7 @@ private static AtlasEntity addO3fsPathEntity(Path path, AtlasEntityExtInfo extIn
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== addOzonePathEntity(strPath={})", path.toString());
+            LOG.debug("<== addOzonePathEntity(strPath={})", path);
         }
 
         return currentO3fsKeyEntity;
diff --git a/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java b/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.atlas.model.instance.AtlasEntity;
 import org.apache.atlas.model.instance.AtlasEntity.AtlasEntityWithExtInfo;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.fs.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +29,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -101,11 +101,11 @@ public void testGetPathEntityOzone3Path(OzoneKeyValidator validator) {
         assertNotNull(entity);
         verifyOzoneKeyEntity(entity, validator);
 
-        if (entity.getTypeName() == OZONE_KEY) {
+        if (StringUtils.equals(entity.getTypeName(), OZONE_KEY)) {
             verifyReferredAndKnownEntities(entityWithExtInfo, extractorContext, validator, validator.knownEntitiesCountTillKey, 2);
-        } else if (entity.getTypeName() == OZONE_BUCKET) {
+        } else if (StringUtils.equals(entity.getTypeName(), OZONE_BUCKET)) {
             verifyReferredAndKnownEntities(entityWithExtInfo, extractorContext, validator, validator.knownEntitiesCountTillBucket, 2);
-        } else if (entity.getTypeName() == OZONE_VOLUME) {
+        } else if (StringUtils.equals(entity.getTypeName(), OZONE_VOLUME)) {
             verifyReferredAndKnownEntities(entityWithExtInfo, extractorContext, validator, validator.knownEntitiesCountTillVolume, 1);
         }
     }
@@ -340,14 +340,11 @@ private void verifyOzoneEntities(Map<String, AtlasEntity> knownEntities, OzoneKe
     }
 
     private void verifyOzoneKeyEntity(AtlasEntity entity, OzoneKeyValidator validator) {
-        if (Objects.equals(entity.getTypeName(), OZONE_KEY)) {
-            assertEquals(entity.getTypeName(), OZONE_KEY);
+        if (StringUtils.equals(entity.getTypeName(), OZONE_KEY)) {
             assertTrue(validator.validateNameQName(entity));
-        } else if (Objects.equals(entity.getTypeName(), OZONE_BUCKET)) {
-            assertEquals(entity.getTypeName(), OZONE_BUCKET);
+        } else if (StringUtils.equals(entity.getTypeName(), OZONE_BUCKET)) {
             assertTrue(validator.validateNameQName(entity));
-        } else if (Objects.equals(entity.getTypeName(), OZONE_VOLUME)) {
-            assertEquals(entity.getTypeName(), OZONE_VOLUME);
+        } else if (StringUtils.equals(entity.getTypeName(), OZONE_VOLUME)) {
             assertTrue(validator.validateNameQName(entity));
         }
     }
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -245,11 +245,8 @@ define(['require',
                     }
                 } else {;
                     Utils.showTitleLoader(this.$('.page-title .fontLoader'), this.ui.details);
-                    var getApiFunctionKey = "getCategory",
+                    var getApiFunctionKey =this.isTermView? "getTerm" : "getCategory",
                         that = this;
-                    if (this.isTermView) {
-                        getApiFunctionKey = "getTerm";
-                    }
                     this.glossaryCollection[getApiFunctionKey]({
                         "guid": this.guid,
                         "ajaxOptions": {
@@ -542,7 +539,9 @@ define(['require',
                             "value": {
                                 "searchType": "basic",
                                 "term": that.data.qualifiedName,
-                                "includeDE": options.value.includeDE || false
+                                "includeDE": options.value.includeDE || false,
+                                "pageLimit": options.value.pageLimit || 25,
+                                "pageOffset": options.value.pageOffset || 0,
                             },
                             "fromView": "glossary"
                         })));
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -363,7 +363,7 @@ define(['require',
                 Utils.setUrl(_.extend({
                     url: Utils.getUrlState.getQueryUrl().queyParams[0],
                     urlParams: this.columnOrder ? _.extend(this.value, { 'uiParameters': this.getColumnOrderWithPosition() }) : this.value,
-                    mergeBrowserUrl: false,
+                    mergeBrowserUrl: Utils.getUrlState.isGlossaryTab()?true:false,
                     trigger: false,
                     updateTabState: true
                 }, options));
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-build b/dev-support/atlas-docker/Dockerfile.atlas-build
@@ -20,7 +20,7 @@ ARG ATLAS_BUILD_JAVA_VERSION
 ARG TARGETARCH
 
 # Install necessary packages to build Atlas
-RUN apt-get update && apt-get -y install git maven
+RUN apt-get update && apt-get -y install git maven unzip
 
 # Set environment variables
 ENV JAVA_HOME=/usr/lib/jvm/java-${ATLAS_BUILD_JAVA_VERSION}-openjdk-${TARGETARCH}
diff --git a/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml b/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml
@@ -15,11 +15,9 @@ services:
     ports:
       - "9000:9000"
       - "8088:8088"
-    depends_on:
-      - atlas-base
     healthcheck:
-      test: "hdfs dfs -ls /"
-      interval: 1m30s
+      test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ]
+      interval: 30s
       timeout: 10s
       retries: 30
       start_period: 40s
diff --git a/dev-support/atlas-docker/docker-compose.atlas-hbase.yml b/dev-support/atlas-docker/docker-compose.atlas-hbase.yml
@@ -25,6 +25,12 @@ services:
         condition: service_started
       atlas-kafka:
         condition: service_started
+    healthcheck:
+      test: [ "CMD", "wget", "-q", "--spider", "http://localhost:16030/rs-status" ]
+      interval: 30s
+      timeout: 10s
+      retries: 30
+      start_period: 40s
     environment:
       - HBASE_VERSION
       - ATLAS_VERSION
diff --git a/dev-support/atlas-docker/docker-compose.atlas-hive.yml b/dev-support/atlas-docker/docker-compose.atlas-hive.yml
@@ -14,6 +14,12 @@ services:
     tty: true
     networks:
       - atlas
+    healthcheck:
+      test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ]
+      interval: 30s
+      timeout: 10s
+      retries: 30
+      start_period: 40s
     ports:
       - "10000:10000"
     depends_on:
@@ -39,6 +45,11 @@ services:
     hostname: atlas-db.example.com
     networks:
       - atlas
+    healthcheck:
+      test: 'su -c "pg_isready -q" postgres'
+      interval: 10s
+      timeout: 2s
+      retries: 30
 
 networks:
   atlas:
diff --git a/dev-support/atlas-docker/docker-compose.atlas.yml b/dev-support/atlas-docker/docker-compose.atlas.yml
@@ -19,7 +19,7 @@ services:
       - "21000:21000"
     depends_on:
       atlas-hbase:
-        condition: service_started
+        condition: service_healthy
       atlas-kafka:
         condition: service_started
       atlas-solr:
diff --git a/dev-support/atlas-docker/scripts/atlas-build.sh b/dev-support/atlas-docker/scripts/atlas-build.sh
@@ -92,3 +92,11 @@ mv -f distro/target/apache-atlas-${ATLAS_VERSION}-server.tar.gz     /home/atlas/
 mv -f distro/target/apache-atlas-${ATLAS_VERSION}-hive-hook.tar.gz  /home/atlas/dist/
 mv -f distro/target/apache-atlas-${ATLAS_VERSION}-hbase-hook.tar.gz /home/atlas/dist/
 mv -f distro/target/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz /home/atlas/dist/
+
+# Run code coverage and generate reports
+./dev-support/checks/coverage.sh
+status=$?
+
+# save coverage reports to the dist directory before container shutdown
+mv -f target/coverage /home/atlas/dist/
+exit $status
diff --git a/dev-support/checks/coverage.sh b/dev-support/checks/coverage.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script merges the jacoco exec files and generates a report in HTML and XML formats
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+cd "$DIR/../.." || exit 1
+
+set -ex
+
+REPORT_DIR="$DIR/../../target/coverage"
+
+mkdir -p "$REPORT_DIR"
+
+JACOCO_VERSION=$(mvn help:evaluate -Dexpression=jacoco.version -q -DforceStdout -Dscan=false)
+
+# Install jacoco cli
+mvn --non-recursive --no-transfer-progress -Dscan=false \
+  org.apache.maven.plugins:maven-dependency-plugin:copy \
+  -Dartifact=org.jacoco:org.jacoco.cli:${JACOCO_VERSION}:jar:nodeps
+
+jacoco() {
+  java -jar target/dependency/org.jacoco.cli-${JACOCO_VERSION}-nodeps.jar "$@"
+}
+
+# Merge all the jacoco.exec files
+jacoco merge $(find **/target -name jacoco.exec) --destfile "$REPORT_DIR/jacoco-all.exec"
+
+rm -rf target/coverage-classes || true
+mkdir -p target/coverage-classes
+
+# Unzip all the classes from the last build
+{ find */target/ -name 'atlas-*.jar'; find addons/**/target/*.jar -name '*-bridge-*.jar'; } | grep -v 'tests' | xargs -n1 unzip -o -q -d target/coverage-classes
+
+# get all source file paths
+src=$(find . -path '*/src/main/java' -o -path './target' -prune | sed 's/^/--sourcefiles /g' | xargs echo)
+
+# generate the reports
+jacoco report "$REPORT_DIR/jacoco-all.exec" $src --classfiles target/coverage-classes --html "$REPORT_DIR/all" --xml "$REPORT_DIR/all.xml"
diff --git a/intg/src/main/java/org/apache/atlas/security/SecurityProperties.java b/intg/src/main/java/org/apache/atlas/security/SecurityProperties.java
@@ -40,9 +40,12 @@ public final class SecurityProperties {
     public static final String       SSL_CLIENT_PROPERTIES                    = "ssl-client.xml";
     public static final String       BIND_ADDRESS                             = "atlas.server.bind.address";
     public static final String       ATLAS_SSL_EXCLUDE_CIPHER_SUITES          = "atlas.ssl.exclude.cipher.suites";
+    public static final String       ATLAS_SSL_ENABLED_ALGORITHMS             = "atlas.ssl.enabled.algorithms";
     public static final List<String> DEFAULT_CIPHER_SUITES                    = Arrays.asList(".*NULL.*", ".*RC4.*", ".*MD5.*", ".*DES.*", ".*DSS.*");
     public static final String       ATLAS_SSL_EXCLUDE_PROTOCOLS              = "atlas.ssl.exclude.protocols";
+    public static final String       ATLAS_SSL_ENABLED_PROTOCOLS              = "atlas.ssl.enabled.protocols";
     public static final String[]     DEFAULT_EXCLUDE_PROTOCOLS                = new String[] {"TLSv1", "TLSv1.1"};
+    public static final String[]     ATLAS_SSL_DEFAULT_PROTOCOL               = new String[] {"TLSv1.2"};
 
     private SecurityProperties() {
     }
diff --git a/pom.xml b/pom.xml
@@ -129,6 +129,7 @@
         <ivy.version>2.5.2</ivy.version>
         <jackson.databind.version>2.12.7</jackson.databind.version>
         <jackson.version>2.12.7</jackson.version>
+        <jacoco.version>0.8.13</jacoco.version>
         <janusgraph.cassandra.version>0.5.3</janusgraph.cassandra.version>
         <janusgraph.version>1.0.0</janusgraph.version>
         <java.version.required>1.8</java.version.required>
@@ -182,6 +183,7 @@
         <solr-test-framework.version>8.11.3</solr-test-framework.version>
         <solr.version>8.11.3</solr.version>
         <spray.version>1.3.1</spray.version>
+        <spring-ldap-core.version>2.4.4</spring-ldap-core.version>
         <spring.security.version>5.8.15</spring.security.version>
         <spring.version>5.3.39</spring.version>
         <sqoop.classifier>hadoop260</sqoop.classifier>
@@ -904,6 +906,12 @@
                 <version>3.0.0</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jul-to-slf4j</artifactId>
@@ -1045,11 +1053,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -1338,7 +1341,7 @@
                     <forkCount>${surefire.forkCount}</forkCount>
                     <reuseForks>false</reuseForks>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
+                    <argLine>${argLine} -Djava.awt.headless=true -Dproject.version=${project.version}
                         -Dhadoop.tmp.dir="${project.build.directory}/tmp-hadoop-${user.name}"
                         -Xmx1024m -Djava.net.preferIPv4Stack=true ${atlas.surefire.options}</argLine>
                     <skip>${skipUTs}</skip>
@@ -1571,6 +1574,27 @@
                 <artifactId>javancss-maven-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java
diff --git a/webapp/pom.xml b/webapp/pom.xml
diff --git a/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java b/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java
diff --git a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
diff --git a/webapp/src/test/java/org/apache/atlas/notification/ImportTaskListenerImplTest.java b/webapp/src/test/java/org/apache/atlas/notification/ImportTaskListenerImplTest.java

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private AtlasPathExtractorUtil() {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public static AtlasEntityWithExtInfo getPathEntity(Path path, PathExtractorContext context) {`
`93`		`- if (StringUtils.isEmpty(path.toString())) {`
	`93`	`+ if (path == null \|\| StringUtils.isEmpty(path.toString())) {`
`94`	`94`	`throw new IllegalArgumentException("Invalid Input: Path is Null");`
`95`	`95`	`}`
`96`	`96`
`@@ -500,7 +500,7 @@ private static AtlasEntity addOfsPathEntity(Path path, AtlasEntityExtInfo extInf`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`if (LOG.isDebugEnabled()) {`
`503`		`- LOG.debug("<== addOzonePathEntity(strPath={})", path.toString());`
	`503`	`+ LOG.debug("<== addOzonePathEntity(strPath={})", path);`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`return currentOfsKeyEntity;`
`@@ -555,7 +555,7 @@ private static AtlasEntity addO3fsPathEntity(Path path, AtlasEntityExtInfo extIn`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`if (LOG.isDebugEnabled()) {`
`558`		`- LOG.debug("<== addOzonePathEntity(strPath={})", path.toString());`
	`558`	`+ LOG.debug("<== addOzonePathEntity(strPath={})", path);`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`return currentO3fsKeyEntity;`