yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-09 17:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix slack issue (#7185)

Browse Source 
* Fixed issue with testCases not posted in slack

* Return empty string in case of faling to build url
This commit is contained in:
mohitdeuex 2022-09-03 15:09:41 +05:30 committed by GitHub
parent 98acad6663
commit 2633ed23fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TestCaseRepository.java
View File

@ -10,11 +10,11 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.jdbi.v3.sqlobject.transaction.Transaction; import org.jdbi.v3.sqlobject.transaction.Transaction;
import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.Entity;
import org.openmetadata.catalog.EntityInterface; import org.openmetadata.catalog.EntityInterface;
import org.openmetadata.catalog.exception.EntityNotFoundException; import org.openmetadata.catalog.exception.EntityNotFoundException;
import org.openmetadata.catalog.resources.dqtests.TestSuiteResource;
import org.openmetadata.catalog.resources.feeds.MessageParser; import org.openmetadata.catalog.resources.feeds.MessageParser;
import org.openmetadata.catalog.test.TestCaseParameter; import org.openmetadata.catalog.test.TestCaseParameter;
import org.openmetadata.catalog.test.TestCaseParameterValue; import org.openmetadata.catalog.test.TestCaseParameterValue;
@ -35,19 +35,13 @@ import org.openmetadata.catalog.util.RestUtil;
import org.openmetadata.catalog.util.ResultList; import org.openmetadata.catalog.util.ResultList;
public class TestCaseRepository extends EntityRepository<TestCase> { public class TestCaseRepository extends EntityRepository<TestCase> {
public static final String COLLECTION_PATH = "/v1/testCase";
private static final String UPDATE_FIELDS = "owner,entityLink,testSuite,testDefinition"; private static final String UPDATE_FIELDS = "owner,entityLink,testSuite,testDefinition";
private static final String PATCH_FIELDS = "owner,entityLink,testSuite,testDefinition"; private static final String PATCH_FIELDS = "owner,entityLink,testSuite,testDefinition";
public static final String TESTCASE_RESULT_EXTENSION = "testCase.testCaseResult"; public static final String TESTCASE_RESULT_EXTENSION = "testCase.testCaseResult";
public TestCaseRepository(CollectionDAO dao) { public TestCaseRepository(CollectionDAO dao) {
super( super(COLLECTION_PATH, TEST_CASE, TestCase.class, dao.testCaseDAO(), dao, PATCH_FIELDS, UPDATE_FIELDS);
TestSuiteResource.COLLECTION_PATH,
TEST_CASE,
TestCase.class,
dao.testCaseDAO(),
dao,
PATCH_FIELDS,
UPDATE_FIELDS);
} }
@Override @Override
@ -129,7 +123,8 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
} }
@Transaction @Transaction
public RestUtil.PutResponse<?> addTestCaseResult(String fqn, TestCaseResult testCaseResult) throws IOException { public RestUtil.PutResponse<?> addTestCaseResult(UriInfo uriInfo, String fqn, TestCaseResult testCaseResult)
throws IOException {
// Validate the request content // Validate the request content
TestCase testCase = dao.findEntityByName(fqn); TestCase testCase = dao.findEntityByName(fqn);
@ -158,11 +153,10 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
JsonUtils.pojoToJson(testCaseResult)); JsonUtils.pojoToJson(testCaseResult));
setFields(testCase, EntityUtil.Fields.EMPTY_FIELDS); setFields(testCase, EntityUtil.Fields.EMPTY_FIELDS);
} }
setFields(testCase, new EntityUtil.Fields(allowedFields, "testSuite")); setFields(testCase, new EntityUtil.Fields(allowedFields, "testSuite"));
ChangeDescription change = ChangeDescription change =
addTestCaseChangeDescription(testCase.getVersion(), testCaseResult, storedTestCaseResult); addTestCaseChangeDescription(testCase.getVersion(), testCaseResult, storedTestCaseResult);
ChangeEvent changeEvent = getChangeEvent(testCase, change, entityType, testCase.getVersion()); ChangeEvent changeEvent = getChangeEvent(withHref(uriInfo, testCase), change, entityType, testCase.getVersion());
return new RestUtil.PutResponse<>(Response.Status.CREATED, changeEvent, RestUtil.ENTITY_FIELDS_CHANGED); return new RestUtil.PutResponse<>(Response.Status.CREATED, changeEvent, RestUtil.ENTITY_FIELDS_CHANGED);
} }

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dqtests/TestCaseResource.java
View File

@ -441,7 +441,7 @@ public class TestCaseResource extends EntityResource<TestCase, TestCaseRepositor
@Valid TestCaseResult testCaseResult) @Valid TestCaseResult testCaseResult)
throws IOException { throws IOException {
authorizer.authorizeAdmin(securityContext, true); authorizer.authorizeAdmin(securityContext, true);
return dao.addTestCaseResult(fqn, testCaseResult).toResponse(); return dao.addTestCaseResult(uriInfo, fqn, testCaseResult).toResponse();
} }
@GET @GET

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java
View File

@ -170,7 +170,7 @@ public final class ChangeEventParser {
return String.format("[%s](%s://%s/%s/%s)", fqn, scheme, host, event.getEntityType(), fqn); return String.format("[%s](%s://%s/%s/%s)", fqn, scheme, host, event.getEntityType(), fqn);
} }
} }
return urlInstance.toString(); return "";
} }
public static SlackMessage buildSlackMessage(ChangeEvent event) { public static SlackMessage buildSlackMessage(ChangeEvent event) {