All three previously hardcoded {@code dryRun=false} on the result and proceeded straight to - * the destructive path, so a caller passing {@code dryRun=true} still had the relationship - * removed. These tests pin the corrected behavior alongside the tag-side fix in - * {@link TagBulkAssetsDryRunIT}. - * - *
The tag remove endpoint is async and is covered separately. The endpoints exercised here are
- * synchronous, so the tests can assert on the {@link BulkOperationResult} response and on a
- * follow-up read in the same test.
- */
-@Execution(ExecutionMode.CONCURRENT)
-@ExtendWith(TestNamespaceExtension.class)
-public class BulkAssetsRemoveDryRunIT {
-
- // -----------------------------------------------------------------------
- // Glossary term remove (tag_usage path)
- // -----------------------------------------------------------------------
-
- @Test
- void test_glossaryRemove_dryRunTrue_doesNotRemoveTagFromAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- GlossaryTerm term = createGlossaryTerm(ns, client, "dry_run");
- TagLabel termLabel = toGlossaryTagLabel(term);
- Table table = createTableWithTag(ns, termLabel);
-
- AddGlossaryToAssetsRequest dryRunRemove =
- new AddGlossaryToAssetsRequest()
- .withDryRun(true)
- .withAssets(List.of(table.getEntityReference()));
- String removePath = "/v1/glossaryTerms/" + term.getId() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, dryRunRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertTrue(result.getDryRun(), "Result must propagate dryRun=true");
-
- Table refreshed = client.tables().get(table.getId().toString(), "tags");
- assertTrue(
- hasTag(refreshed, term.getFullyQualifiedName()),
- "Glossary tag must still be on the table after a dryRun=true remove");
- }
-
- @Test
- void test_glossaryRemove_dryRunFalse_removesTagFromAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- GlossaryTerm term = createGlossaryTerm(ns, client, "real_remove");
- TagLabel termLabel = toGlossaryTagLabel(term);
- Table table = createTableWithTag(ns, termLabel);
-
- AddGlossaryToAssetsRequest realRemove =
- new AddGlossaryToAssetsRequest()
- .withDryRun(false)
- .withAssets(List.of(table.getEntityReference()));
- String removePath = "/v1/glossaryTerms/" + term.getId() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, realRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertFalse(Boolean.TRUE.equals(result.getDryRun()));
-
- Table refreshed = client.tables().get(table.getId().toString(), "tags");
- assertFalse(
- hasTag(refreshed, term.getFullyQualifiedName()),
- "Glossary tag should be removed from the table when dryRun=false");
- }
-
- // -----------------------------------------------------------------------
- // DataProduct remove (entity_relationship path)
- // -----------------------------------------------------------------------
-
- @Test
- void test_dataProductRemove_dryRunTrue_doesNotDetachAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Domain domain = createDomain(ns, client, "dp_dry_run");
- DataProduct dataProduct = createDataProduct(ns, client, "dp_dry_run", domain);
- Table table = createTable(ns);
-
- BulkAssets addRequest =
- new BulkAssets().withAssets(List.of(table.getEntityReference())).withDryRun(false);
- String addPath = "/v1/dataProducts/" + dataProduct.getFullyQualifiedName() + "/assets/add";
- client.getHttpClient().execute(HttpMethod.PUT, addPath, addRequest, BulkOperationResult.class);
-
- BulkAssets dryRunRemove =
- new BulkAssets().withAssets(List.of(table.getEntityReference())).withDryRun(true);
- String removePath =
- "/v1/dataProducts/" + dataProduct.getFullyQualifiedName() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, dryRunRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertTrue(result.getDryRun(), "Result must propagate dryRun=true");
- assertEquals(1, result.getNumberOfRowsProcessed());
- assertEquals(1, result.getNumberOfRowsPassed());
-
- Table refreshed = client.tables().get(table.getId().toString(), "dataProducts");
- assertNotNull(refreshed.getDataProducts(), "dataProducts field should be populated");
- assertTrue(
- refreshed.getDataProducts().stream().anyMatch(d -> dataProduct.getId().equals(d.getId())),
- "Table must still be attached to the data product after a dryRun=true remove");
- }
-
- @Test
- void test_dataProductRemove_dryRunFalse_detachesAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Domain domain = createDomain(ns, client, "dp_real");
- DataProduct dataProduct = createDataProduct(ns, client, "dp_real", domain);
- Table table = createTable(ns);
-
- BulkAssets addRequest =
- new BulkAssets().withAssets(List.of(table.getEntityReference())).withDryRun(false);
- String addPath = "/v1/dataProducts/" + dataProduct.getFullyQualifiedName() + "/assets/add";
- client.getHttpClient().execute(HttpMethod.PUT, addPath, addRequest, BulkOperationResult.class);
-
- BulkAssets realRemove =
- new BulkAssets().withAssets(List.of(table.getEntityReference())).withDryRun(false);
- String removePath =
- "/v1/dataProducts/" + dataProduct.getFullyQualifiedName() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, realRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertFalse(Boolean.TRUE.equals(result.getDryRun()));
- assertEquals(1, result.getNumberOfRowsPassed());
-
- Table refreshed = client.tables().get(table.getId().toString(), "dataProducts");
- assertTrue(
- refreshed.getDataProducts() == null
- || refreshed.getDataProducts().stream()
- .noneMatch(d -> dataProduct.getId().equals(d.getId())),
- "Table should no longer be attached to the data product when dryRun=false");
- }
-
- // -----------------------------------------------------------------------
- // Team remove (entity_relationship path through base bulkAssetsOperation)
- // -----------------------------------------------------------------------
-
- @Test
- void test_teamRemove_dryRunTrue_doesNotDetachUser(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Team team = createTeam(ns, client, "team_dry_run");
- User user = createUser(ns, client, "user_dry_run");
-
- BulkAssets addRequest =
- new BulkAssets().withAssets(List.of(user.getEntityReference())).withDryRun(false);
- String addPath = "/v1/teams/" + team.getName() + "/assets/add";
- client.getHttpClient().execute(HttpMethod.PUT, addPath, addRequest, BulkOperationResult.class);
-
- BulkAssets dryRunRemove =
- new BulkAssets().withAssets(List.of(user.getEntityReference())).withDryRun(true);
- String removePath = "/v1/teams/" + team.getName() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, dryRunRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertTrue(result.getDryRun(), "Result must propagate dryRun=true");
- assertEquals(1, result.getNumberOfRowsProcessed());
- assertEquals(1, result.getNumberOfRowsPassed());
-
- User refreshed = client.users().get(user.getId().toString(), "teams");
- assertNotNull(refreshed.getTeams(), "User teams field must be populated");
- assertTrue(
- refreshed.getTeams().stream().anyMatch(t -> team.getId().equals(t.getId())),
- "User must still belong to the team after a dryRun=true remove");
- }
-
- @Test
- void test_teamRemove_dryRunFalse_detachesUser(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Team team = createTeam(ns, client, "team_real");
- User user = createUser(ns, client, "user_real");
-
- BulkAssets addRequest =
- new BulkAssets().withAssets(List.of(user.getEntityReference())).withDryRun(false);
- String addPath = "/v1/teams/" + team.getName() + "/assets/add";
- client.getHttpClient().execute(HttpMethod.PUT, addPath, addRequest, BulkOperationResult.class);
-
- BulkAssets realRemove =
- new BulkAssets().withAssets(List.of(user.getEntityReference())).withDryRun(false);
- String removePath = "/v1/teams/" + team.getName() + "/assets/remove";
- BulkOperationResult result =
- client
- .getHttpClient()
- .execute(HttpMethod.PUT, removePath, realRemove, BulkOperationResult.class);
-
- assertNotNull(result);
- assertFalse(Boolean.TRUE.equals(result.getDryRun()));
- assertEquals(1, result.getNumberOfRowsPassed());
-
- User refreshed = client.users().get(user.getId().toString(), "teams");
- assertTrue(
- refreshed.getTeams() == null
- || refreshed.getTeams().stream().noneMatch(t -> team.getId().equals(t.getId())),
- "User should no longer belong to the team when dryRun=false");
- }
-
- // -----------------------------------------------------------------------
- // Helpers
- // -----------------------------------------------------------------------
-
- private GlossaryTerm createGlossaryTerm(
- TestNamespace ns, OpenMetadataClient client, String suffix) {
- Glossary glossary =
- client
- .glossaries()
- .create(
- new CreateGlossary()
- .withName(ns.prefix("glossary_" + suffix))
- .withDescription("Glossary for dryRun remove test"));
- return client
- .glossaryTerms()
- .create(
- new CreateGlossaryTerm()
- .withName(ns.prefix("term_" + suffix))
- .withGlossary(glossary.getFullyQualifiedName())
- .withDescription("Term for dryRun remove test"));
- }
-
- private TagLabel toGlossaryTagLabel(GlossaryTerm term) {
- return new TagLabel()
- .withTagFQN(term.getFullyQualifiedName())
- .withSource(TagSource.GLOSSARY)
- .withLabelType(TagLabel.LabelType.MANUAL);
- }
-
- private Domain createDomain(TestNamespace ns, OpenMetadataClient client, String suffix) {
- return client
- .domains()
- .create(
- new CreateDomain()
- .withName(ns.prefix("domain_" + suffix))
- .withDomainType(DomainType.AGGREGATE)
- .withDescription("Domain for dryRun remove test"));
- }
-
- private DataProduct createDataProduct(
- TestNamespace ns, OpenMetadataClient client, String suffix, Domain domain) {
- return client
- .dataProducts()
- .create(
- new CreateDataProduct()
- .withName(ns.prefix("dp_" + suffix))
- .withDomains(List.of(domain.getFullyQualifiedName()))
- .withDescription("Data product for dryRun remove test"));
- }
-
- private Team createTeam(TestNamespace ns, OpenMetadataClient client, String suffix) {
- return client
- .teams()
- .create(
- new CreateTeam()
- .withName(ns.prefix("team_" + suffix))
- .withTeamType(TeamType.GROUP)
- .withDescription("Team for dryRun remove test"));
- }
-
- private User createUser(TestNamespace ns, OpenMetadataClient client, String suffix) {
- String name = ns.prefix("user_" + suffix);
- return client
- .users()
- .create(
- new CreateUser()
- .withName(name)
- .withEmail(name + "@test.om.org")
- .withDescription("User for dryRun remove test"));
- }
-
- private Table createTable(TestNamespace ns) throws Exception {
- DatabaseService service = DatabaseServiceTestFactory.createPostgres(ns);
- Database database =
- Databases.create().name(ns.prefix("db")).in(service.getFullyQualifiedName()).execute();
- DatabaseSchema schema = DatabaseSchemaTestFactory.create(ns, database.getFullyQualifiedName());
-
- CreateTable createTable =
- new CreateTable()
- .withName(ns.prefix("table"))
- .withDatabaseSchema(schema.getFullyQualifiedName())
- .withColumns(
- List.of(
- new Column()
- .withName("id")
- .withDataType(ColumnDataType.BIGINT)
- .withDescription("ID column")));
- return SdkClients.adminClient().tables().create(createTable);
- }
-
- private Table createTableWithTag(TestNamespace ns, TagLabel tagLabel) throws Exception {
- DatabaseService service = DatabaseServiceTestFactory.createPostgres(ns);
- Database database =
- Databases.create().name(ns.prefix("db")).in(service.getFullyQualifiedName()).execute();
- DatabaseSchema schema = DatabaseSchemaTestFactory.create(ns, database.getFullyQualifiedName());
-
- CreateTable createTable =
- new CreateTable()
- .withName(ns.prefix("table"))
- .withDatabaseSchema(schema.getFullyQualifiedName())
- .withColumns(
- List.of(
- new Column()
- .withName("id")
- .withDataType(ColumnDataType.BIGINT)
- .withDescription("ID column")))
- .withTags(List.of(tagLabel));
-
- Table created = SdkClients.adminClient().tables().create(createTable);
- Table fetched = SdkClients.adminClient().tables().get(created.getId().toString(), "tags");
- assertTrue(
- hasTag(fetched, tagLabel.getTagFQN()), "Newly created table should already have the tag");
- return fetched;
- }
-
- private boolean hasTag(Table table, String tagFqn) {
- return table.getTags() != null
- && table.getTags().stream().anyMatch(t -> tagFqn.equals(t.getTagFQN()));
- }
-}
diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/DataProductResourceIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/DataProductResourceIT.java
index d12b2750f29..c60c4334939 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/DataProductResourceIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/DataProductResourceIT.java
@@ -2993,4 +2993,87 @@ public class DataProductResourceIT extends BaseEntityIT Covers the fix for issue #27954 where dryRun=true on the remove endpoint
- * still removed the tag from the target asset.
- *
- * Notes on async behavior: the tag bulk asset endpoints are async — the HTTP
- * response is a job id, and the actual mutation runs on a background executor.
- * Tests use Awaitility with {@code during(...)} to assert that no mutation occurs
- * during a sustained window for dryRun=true, and {@code untilAsserted(...)} to wait
- * for the mutation to land for dryRun=false.
- */
-@Execution(ExecutionMode.CONCURRENT)
-@ExtendWith(TestNamespaceExtension.class)
-public class TagBulkAssetsDryRunIT {
-
- private static final Duration DRY_RUN_NO_OP_WINDOW = Duration.ofSeconds(5);
- private static final Duration ASYNC_COMPLETION_TIMEOUT = Duration.ofSeconds(30);
-
- @Test
- void test_dryRunRemove_doesNotRemoveTagFromAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Tag tag = createTag(ns, client, "dry_run_remove");
- TagLabel tagLabel = toTagLabel(tag);
- Table table = createTableWithTag(ns, tagLabel);
-
- AddTagToAssetsRequest dryRunRemove =
- new AddTagToAssetsRequest()
- .withDryRun(true)
- .withAssets(List.of(table.getEntityReference()));
- String removePath = "/v1/tags/" + tag.getId() + "/assets/remove";
- client.getHttpClient().execute(HttpMethod.PUT, removePath, dryRunRemove, Void.class);
-
- UUID tableId = table.getId();
- String tagFqn = tag.getFullyQualifiedName();
- Awaitility.await("Tag must remain on the asset throughout the dryRun window")
- .pollDelay(Duration.ofMillis(500))
- .pollInterval(Duration.ofSeconds(1))
- .atMost(DRY_RUN_NO_OP_WINDOW.plusSeconds(5))
- .during(DRY_RUN_NO_OP_WINDOW)
- .until(() -> hasTag(client, tableId, tagFqn));
- }
-
- @Test
- void test_dryRunRemove_defaultDryRunTrue_doesNotRemoveTagFromAsset(TestNamespace ns)
- throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Tag tag = createTag(ns, client, "default_dry_run");
- TagLabel tagLabel = toTagLabel(tag);
- Table table = createTableWithTag(ns, tagLabel);
-
- AddTagToAssetsRequest defaultDryRun =
- new AddTagToAssetsRequest().withAssets(List.of(table.getEntityReference()));
- String removePath = "/v1/tags/" + tag.getId() + "/assets/remove";
- client.getHttpClient().execute(HttpMethod.PUT, removePath, defaultDryRun, Void.class);
-
- UUID tableId = table.getId();
- String tagFqn = tag.getFullyQualifiedName();
- Awaitility.await("Tag must remain on the asset when dryRun field is omitted (defaults to true)")
- .pollDelay(Duration.ofMillis(500))
- .pollInterval(Duration.ofSeconds(1))
- .atMost(DRY_RUN_NO_OP_WINDOW.plusSeconds(5))
- .during(DRY_RUN_NO_OP_WINDOW)
- .until(() -> hasTag(client, tableId, tagFqn));
- }
-
- @Test
- void test_actualRemove_withoutDryRun_removesTagFromAsset(TestNamespace ns) throws Exception {
- OpenMetadataClient client = SdkClients.adminClient();
-
- Tag tag = createTag(ns, client, "real_remove");
- TagLabel tagLabel = toTagLabel(tag);
- Table table = createTableWithTag(ns, tagLabel);
-
- AddTagToAssetsRequest realRemove =
- new AddTagToAssetsRequest()
- .withDryRun(false)
- .withAssets(List.of(table.getEntityReference()));
- String removePath = "/v1/tags/" + tag.getId() + "/assets/remove";
- client.getHttpClient().execute(HttpMethod.PUT, removePath, realRemove, Void.class);
-
- UUID tableId = table.getId();
- String tagFqn = tag.getFullyQualifiedName();
- Awaitility.await("Tag should be removed from the asset when dryRun=false")
- .pollDelay(Duration.ofMillis(500))
- .pollInterval(Duration.ofSeconds(1))
- .atMost(ASYNC_COMPLETION_TIMEOUT)
- .untilAsserted(() -> assertFalse(hasTag(client, tableId, tagFqn)));
- }
-
- // -----------------------------------------------------------------------
- // Helpers
- // -----------------------------------------------------------------------
-
- private Tag createTag(TestNamespace ns, OpenMetadataClient client, String suffix) {
- Classification classification =
- client
- .classifications()
- .create(
- new CreateClassification()
- .withName(ns.prefix("classification_" + suffix))
- .withDescription("Classification for dryRun remove test"));
-
- return client
- .tags()
- .create(
- new CreateTag()
- .withName(ns.prefix("tag_" + suffix))
- .withClassification(classification.getFullyQualifiedName())
- .withDescription("Tag for dryRun remove test"));
- }
-
- private TagLabel toTagLabel(Tag tag) {
- return new TagLabel()
- .withTagFQN(tag.getFullyQualifiedName())
- .withSource(TagSource.CLASSIFICATION)
- .withLabelType(TagLabel.LabelType.MANUAL);
- }
-
- private Table createTableWithTag(TestNamespace ns, TagLabel tagLabel) throws Exception {
- DatabaseService service = DatabaseServiceTestFactory.createPostgres(ns);
- Database database =
- Databases.create().name(ns.prefix("db")).in(service.getFullyQualifiedName()).execute();
- DatabaseSchema schema = DatabaseSchemaTestFactory.create(ns, database.getFullyQualifiedName());
-
- CreateTable createTable =
- new CreateTable()
- .withName(ns.prefix("table"))
- .withDatabaseSchema(schema.getFullyQualifiedName())
- .withColumns(
- List.of(
- new Column()
- .withName("id")
- .withDataType(ColumnDataType.BIGINT)
- .withDescription("ID column")))
- .withTags(List.of(tagLabel));
-
- Table created = SdkClients.adminClient().tables().create(createTable);
- Table fetched = SdkClients.adminClient().tables().get(created.getId().toString(), "tags");
- assertNotNull(fetched.getTags(), "Newly created table should expose its tags");
- assertTrue(
- fetched.getTags().stream().anyMatch(t -> tagLabel.getTagFQN().equals(t.getTagFQN())),
- "Newly created table should already have the test tag applied");
- return fetched;
- }
-
- private boolean hasTag(OpenMetadataClient client, UUID tableId, String tagFqn) {
- Table refreshed = client.tables().get(tableId.toString(), "tags");
- return refreshed.getTags() != null
- && refreshed.getTags().stream().anyMatch(t -> tagFqn.equals(t.getTagFQN()));
- }
-}
diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TagResourceIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TagResourceIT.java
index bda1062037a..ece5d5884e9 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TagResourceIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TagResourceIT.java
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -26,16 +27,19 @@ import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.openmetadata.it.util.SdkClients;
import org.openmetadata.it.util.TestNamespace;
+import org.openmetadata.schema.api.AddTagToAssetsRequest;
import org.openmetadata.schema.api.classification.CreateClassification;
import org.openmetadata.schema.api.classification.CreateTag;
import org.openmetadata.schema.entity.classification.Classification;
import org.openmetadata.schema.entity.classification.Tag;
import org.openmetadata.schema.entity.data.DatabaseSchema;
+import org.openmetadata.schema.entity.data.Table;
import org.openmetadata.schema.type.AssetCertification;
import org.openmetadata.schema.type.EntityHistory;
import org.openmetadata.schema.type.Paging;
import org.openmetadata.schema.type.PredefinedRecognizer;
import org.openmetadata.schema.type.Recognizer;
+import org.openmetadata.schema.type.TagLabel;
import org.openmetadata.schema.utils.ResultList;
import org.openmetadata.sdk.client.OpenMetadataClient;
import org.openmetadata.sdk.exceptions.InvalidRequestException;
@@ -1893,4 +1897,104 @@ public class TagResourceIT extends BaseEntityIT