-
Notifications
You must be signed in to change notification settings - Fork 806
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(tests): add new containerized integration tests to run orca with …
…mysql and postgres (#4736) (#4742) (cherry picked from commit 6dcc522) Co-authored-by: Kiran Godishala <[email protected]>
- Loading branch information
1 parent
ae78796
commit 680121f
Showing
7 changed files
with
401 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
orca-integration/src/test/java/com/netflix/spinnaker/orca/MySqlContainerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Copyright 2024 Salesforce, Inc. | ||
| * | ||
| * Licensed 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. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.util.Map; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInstance; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.testcontainers.containers.MySQLContainer; | ||
| import org.testcontainers.containers.output.Slf4jLogConsumer; | ||
| import org.testcontainers.junit.jupiter.Testcontainers; | ||
|
|
||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| @Testcontainers | ||
| public class MySqlContainerTest extends BaseContainerTest { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(MySqlContainerTest.class); | ||
|
|
||
| private static final String MYSQL_NETWORK_ALIAS = "mysqlHost"; | ||
|
|
||
| private static final int MYSQL_PORT = 3306; | ||
|
|
||
| private MySQLContainer<?> mysql; | ||
|
|
||
| private String jdbcUrl = ""; | ||
|
|
||
| @BeforeEach | ||
| void setup() throws Exception { | ||
| mysql = | ||
| new MySQLContainer<>("mysql:8.0.37") | ||
| .withDatabaseName("orca") | ||
| .withUsername("root") | ||
| .withPassword("root") | ||
| .withNetwork(network) | ||
| .withNetworkAliases(MYSQL_NETWORK_ALIAS) | ||
| .withInitScript("mysql_init.sql"); | ||
| mysql.start(); | ||
| jdbcUrl = String.format("jdbc:mysql://%s:%d/orca", MYSQL_NETWORK_ALIAS, MYSQL_PORT); | ||
| orcaContainer | ||
| .dependsOn(mysql) | ||
| .withEnv("SPRING_APPLICATION_JSON", getSpringApplicationJson()) | ||
| .start(); | ||
|
|
||
| Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(logger); | ||
| orcaContainer.followOutput(logConsumer); | ||
| } | ||
|
|
||
| private String getSpringApplicationJson() throws JsonProcessingException { | ||
| logger.info("--------- jdbcUrl: '{}'", jdbcUrl); | ||
| Map<String, String> connectionPool = | ||
| Map.of("jdbcUrl", jdbcUrl, "user", "orca_service", "password", "0rcaPassw0rd"); | ||
| Map<String, String> migration = | ||
| Map.of("jdbcUrl", jdbcUrl, "user", "orca_migrate", "password", "0rcaPassw0rd"); | ||
| Map<String, Boolean> sql = Map.of("enabled", true); | ||
| Map<String, Boolean> redis = Map.of("enabled", false); | ||
| Map<String, Object> pendingExecutionService = Map.of("sql", sql, "redis", redis); | ||
| Map<String, Object> executionRepository = Map.of("sql", sql, "redis", redis); | ||
| Map<String, Object> keiko = Map.of("sql", sql, "redis", redis); | ||
|
|
||
| Map<String, Object> properties = | ||
| Map.of( | ||
| "sql.enabled", | ||
| "true", | ||
| "services.fiat.baseUrl", | ||
| "http://nowhere", | ||
| "sql.connectionPool", | ||
| connectionPool, | ||
| "redis.enabled", | ||
| "false", | ||
| "sql.migration", | ||
| migration, | ||
| "executionRepository", | ||
| executionRepository, | ||
| "keiko.queue", | ||
| keiko, | ||
| "queue.pendingExecutionService", | ||
| pendingExecutionService, | ||
| "monitor.activeExecutions.redis", | ||
| "false"); | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
| return mapper.writeValueAsString(properties); | ||
| } | ||
|
|
||
| @AfterAll | ||
| void cleanupOnce() { | ||
| if (orcaContainer != null) { | ||
| orcaContainer.stop(); | ||
| } | ||
|
|
||
| if (mysql != null) { | ||
| mysql.stop(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testHealthCheckWithMySql() throws Exception { | ||
| super.testHealthCheck(); | ||
| } | ||
| } |
126 changes: 126 additions & 0 deletions
126
orca-integration/src/test/java/com/netflix/spinnaker/orca/PostgresContainerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /* | ||
| * Copyright 2024 Salesforce, Inc. | ||
| * | ||
| * Licensed 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. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.util.Map; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInstance; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.testcontainers.containers.PostgreSQLContainer; | ||
| import org.testcontainers.containers.output.Slf4jLogConsumer; | ||
| import org.testcontainers.junit.jupiter.Testcontainers; | ||
|
|
||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| @Testcontainers | ||
| public class PostgresContainerTest extends BaseContainerTest { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(PostgresContainerTest.class); | ||
|
|
||
| private static final String POSTGRES_NETWORK_ALIAS = "postgresHost"; | ||
|
|
||
| private static final int POSTGRES_PORT = 5432; | ||
|
|
||
| private PostgreSQLContainer<?> postgres; | ||
|
|
||
| private String jdbcUrl = ""; | ||
|
|
||
| @BeforeEach | ||
| void setup() throws Exception { | ||
| postgres = | ||
| new PostgreSQLContainer<>("postgres:15") | ||
| .withDatabaseName("orca") | ||
| .withUsername("postgres") | ||
| .withPassword("postgres") | ||
| .withNetwork(network) | ||
| .withNetworkAliases(POSTGRES_NETWORK_ALIAS) | ||
| .withInitScript("postgres_init.sql"); | ||
| postgres.start(); | ||
| jdbcUrl = String.format("jdbc:postgresql://%s:%d/orca", POSTGRES_NETWORK_ALIAS, POSTGRES_PORT); | ||
| orcaContainer | ||
| .dependsOn(postgres) | ||
| .withEnv("SPRING_APPLICATION_JSON", getSpringApplicationJson()) | ||
| .start(); | ||
|
|
||
| Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(logger); | ||
| orcaContainer.followOutput(logConsumer); | ||
| } | ||
|
|
||
| private String getSpringApplicationJson() throws JsonProcessingException { | ||
| logger.info("--------- jdbcUrl: '{}'", jdbcUrl); | ||
| Map<String, String> connectionPool = | ||
| Map.of( | ||
| "dialect", | ||
| "POSTGRES", | ||
| "jdbcUrl", | ||
| jdbcUrl, | ||
| "user", | ||
| "orca_service", | ||
| "password", | ||
| "0rcaPassw0rd"); | ||
| Map<String, String> migration = | ||
| Map.of("jdbcUrl", jdbcUrl, "user", "orca_migrate", "password", "0rcaPassw0rd"); | ||
| Map<String, Boolean> sql = Map.of("enabled", true); | ||
| Map<String, Boolean> redis = Map.of("enabled", false); | ||
| Map<String, Object> pendingExecutionService = Map.of("sql", sql, "redis", redis); | ||
| Map<String, Object> executionRepository = Map.of("sql", sql, "redis", redis); | ||
| Map<String, Object> keiko = Map.of("sql", sql, "redis", redis); | ||
|
|
||
| Map<String, Object> properties = | ||
| Map.of( | ||
| "sql.enabled", | ||
| "true", | ||
| "services.fiat.baseUrl", | ||
| "http://nowhere", | ||
| "sql.connectionPool", | ||
| connectionPool, | ||
| "redis.enabled", | ||
| "false", | ||
| "sql.migration", | ||
| migration, | ||
| "executionRepository", | ||
| executionRepository, | ||
| "keiko.queue", | ||
| keiko, | ||
| "queue.pendingExecutionService", | ||
| pendingExecutionService, | ||
| "monitor.activeExecutions.redis", | ||
| "false"); | ||
| ObjectMapper mapper = new ObjectMapper(); | ||
| return mapper.writeValueAsString(properties); | ||
| } | ||
|
|
||
| @AfterAll | ||
| void cleanupOnce() { | ||
| if (orcaContainer != null) { | ||
| orcaContainer.stop(); | ||
| } | ||
|
|
||
| if (postgres != null) { | ||
| postgres.stop(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testHealthCheckWithPostgres() throws Exception { | ||
| super.testHealthCheck(); | ||
| } | ||
| } |
Oops, something went wrong.