Merge pull request #2324 from atlanhq/dependencies

fix(ci+cache): decouple package tests from integration jobs; prevent CM cache refresh storms

Author: cmgrote

.github/workflows/test.yml

@@ -119,8 +119,6 @@ jobs:
     needs:
       - build
       - list-packages
-      - integration-test
-    if: ${{ always() && needs.build.result == 'success' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -161,8 +159,6 @@ jobs:
     needs:
       - build
       - list-packages
-      - integration-test
-    if: ${{ always() && needs.build.result == 'success' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

samples/packages/adoption-export/src/test/kotlin/ExportUniqueUserViewsTest.kt

@@ -8,7 +8,6 @@ import org.testng.Assert.assertFalse
 import org.testng.Assert.assertTrue
 import org.testng.annotations.Test
 import java.io.File
-import java.math.BigDecimal
 
 /**
  * Test export of asset views adoption information, sorted by number of unique users.

sdk/src/main/java/com/atlan/cache/CustomMetadataCache.java

@@ -32,6 +32,7 @@ public class CustomMetadataCache extends AbstractMassTrackingCache<CustomMetadat
     private volatile Map<String, Map<String, String>> mapAttrSidToName = new ConcurrentHashMap<>();
     private volatile Map<String, Map<String, String>> mapAttrNameToSid = new ConcurrentHashMap<>();
     private volatile Set<String> archivedAttrSids = ConcurrentHashMap.newKeySet();
+    private volatile Set<String> deletedAttrIds = ConcurrentHashMap.newKeySet();
 
     private final TypeDefsEndpoint typeDefsEndpoint;
 
@@ -69,6 +70,7 @@ protected void refreshCache() throws AtlanException {
         mapAttrSidToName.clear();
         mapAttrNameToSid.clear();
         archivedAttrSids.clear();
+        deletedAttrIds.clear();
         super.refreshCache();
         for (CustomMetadataDef bmDef : customMetadata) {
             String typeId = bmDef.getName();
@@ -529,6 +531,10 @@ private String getAttrNameForIdFromSetId(String setId, String attributeId, long
         if (setId == null || setId.isEmpty()) throw new InvalidRequestException(ErrorCode.MISSING_CM_ID);
         if (attributeId == null || attributeId.isEmpty())
             throw new InvalidRequestException(ErrorCode.MISSING_CM_ATTR_ID);
+        String compositeKey = setId + "." + attributeId;
+        if (deletedAttrIds.contains(compositeKey)) {
+            throw new NotFoundException(ErrorCode.CM_ATTR_NOT_FOUND_BY_ID, attributeId, setId);
+        }
         Map<String, String> subMap = getAttrNameFromId(setId);
         String attrName = null;
         if (subMap != null) {
@@ -539,13 +545,15 @@ private String getAttrNameForIdFromSetId(String setId, String attributeId, long
             refresh(minimumTime);
             subMap = getAttrNameFromId(setId);
             if (subMap == null) {
+                deletedAttrIds.add(compositeKey);
                 throw new NotFoundException(ErrorCode.CM_NO_ATTRIBUTES, setId);
             }
         } else {
             return attrName;
         }
         attrName = subMap.get(attributeId);
         if (attrName == null) {
+            deletedAttrIds.add(compositeKey);
             throw new NotFoundException(ErrorCode.CM_ATTR_NOT_FOUND_BY_ID, attributeId, setId);
         }
         return attrName;