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

Fix #7909: Remove ElasticSearch configs from tests (#7910)

Browse Source
This commit is contained in:
Sriharsha Chintalapani 2022-10-03 21:51:57 -07:00 committed by GitHub
parent 8efc0370e5
commit ba37fda0f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openmetadata-service/src/main/java/org/openmetadata/service/resources/elasticSearch/BuildSearchIndexResource.java
View File

@ -80,21 +80,25 @@ public class BuildSearchIndexResource {
public static final String ELASTIC_SEARCH_EXTENSION = "service.eventPublisher";
public static final String ELASTIC_SEARCH_ENTITY_FQN_STREAM = "eventPublisher:ElasticSearch:STREAM";
public static final String ELASTIC_SEARCH_ENTITY_FQN_BATCH = "eventPublisher:ElasticSearch:BATCH";
private final RestHighLevelClient client;
private final ElasticSearchIndexDefinition elasticSearchIndexDefinition;
private RestHighLevelClient client;
private ElasticSearchIndexDefinition elasticSearchIndexDefinition;
private final CollectionDAO dao;
private final Authorizer authorizer;
private final ExecutorService threadScheduler;
public BuildSearchIndexResource(CollectionDAO dao, Authorizer authorizer) {
this.client =
ElasticSearchClientUtils.createElasticSearchClient(
ConfigurationHolder.getInstance()
.getConfig(
ConfigurationHolder.ConfigurationType.ELASTICSEARCH_CONFIG, ElasticSearchConfiguration.class));
if (ConfigurationHolder.getInstance()
.getConfig(ConfigurationHolder.ConfigurationType.ELASTICSEARCH_CONFIG, ElasticSearchConfiguration.class)
!= null) {
this.client =
ElasticSearchClientUtils.createElasticSearchClient(
ConfigurationHolder.getInstance()
.getConfig(
ConfigurationHolder.ConfigurationType.ELASTICSEARCH_CONFIG, ElasticSearchConfiguration.class));
this.elasticSearchIndexDefinition = new ElasticSearchIndexDefinition(client, dao);
}
this.dao = dao;
this.authorizer = authorizer;
this.elasticSearchIndexDefinition = new ElasticSearchIndexDefinition(client, dao);
this.threadScheduler =
new ThreadPoolExecutor(
2, 2, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(5), new ThreadPoolExecutor.CallerRunsPolicy());

10
openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java
View File

@ -798,14 +798,14 @@ public class UserResource extends EntityResource<User, UserRepository> {
sendEmailVerification(uriInfo, registeredUser);
} catch (Exception e) {
LOG.error("Error in sending mail to the User : {}", e.getMessage());
return Response.status(424).entity(new ErrorMessage(424, EMAIL_SENDING_ISSUE)).build();
return Response.status(424, EMAIL_SENDING_ISSUE).build();
}
}
return Response.status(Response.Status.CREATED).entity("User Registration Successful.").build();
} else {
return Response.status(Response.Status.BAD_REQUEST)
.entity(new ErrorMessage(400, "Signup is not Available"))
return Response.status(Response.Status.CREATED.getStatusCode(), "User Registration Successful.")
.entity(registeredUser)
.build();
} else {
return Response.status(Response.Status.BAD_REQUEST.getStatusCode(), "Signup is not available").build();
}
}

4
openmetadata-service/src/main/java/org/openmetadata/service/util/ConfigurationHolder.java
View File

@ -62,7 +62,9 @@ public class ConfigurationHolder {
CONFIG_MAP.put(ConfigurationType.SMTP_CONFIG, config.getSmtpSettings());
break;
case ELASTICSEARCH_CONFIG:
CONFIG_MAP.put(ConfigurationType.ELASTICSEARCH_CONFIG, config.getElasticSearchConfiguration());
if (config.getElasticSearchConfiguration() != null) {
CONFIG_MAP.put(ConfigurationType.ELASTICSEARCH_CONFIG, config.getElasticSearchConfiguration());
}
break;
case LOGIN_CONFIG:
CONFIG_MAP.put(ConfigurationType.LOGIN_CONFIG, config.getLoginSettings());

1
openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java
View File

@ -85,6 +85,7 @@ public abstract class OpenMetadataApplicationTest {
ConfigOverride.config("database.password", SQL_CONTAINER.getPassword()),
// Migration overrides
ConfigOverride.config("migrationConfiguration.path", migrationScripsLocation));
APP.before();
}

12
openmetadata-service/src/test/resources/openmetadata-secure-test.yaml
View File

@ -182,18 +182,6 @@ email:
password: ""
transportationStrategy: "SMTP_TLS"
elasticsearch:
host: "localhost"
port: "9200"
scheme: "http"
username: ""
password: ""
truststorePath: ""
truststorePassword: ""
connectionTimeoutSecs: 5
socketTimeoutSecs: 60
batchSize: 10
slackChat:
slackUrl: "http://localhost:8080"