jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-03-10 08:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(DEV-1005): add postgres v13 & v14 support (#434)" (#468)

Browse Source 
This reverts commit 78577600cc.
This commit is contained in:
Benjamin
2021-10-26 16:58:55 +02:00
committed by GitHub
parent c4db2a2bb2
commit dc4a87b4e9
5 changed files with 2 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cloud_provider/aws/databases/postgresql.rs
View File

@@ -399,10 +399,6 @@ fn get_managed_postgres_version(requested_version: String) -> Result<String, Str
let v12 = generate_supported_version(12, 2, 8, None, None, None);
supported_postgres_versions.extend(v12);
// v13
let v13 = generate_supported_version(13, 1, 4, None, None, None);
supported_postgres_versions.extend(v13);
get_supported_version_to_use("Postgresql", supported_postgres_versions, requested_version)
}

4
src/cloud_provider/utilities.rs
View File

@@ -34,10 +34,6 @@ pub fn get_self_hosted_postgres_version(requested_version: String) -> Result<Str
let v12 = generate_supported_version(12, 2, 8, Some(0), Some(0), None);
supported_postgres_versions.extend(v12);
// v13
let v13 = generate_supported_version(13, 1, 4, Some(0), Some(0), None);
supported_postgres_versions.extend(v13);
get_supported_version_to_use("Postgresql", supported_postgres_versions, requested_version)
}

37
tests/aws/aws_databases.rs
View File

@@ -563,24 +563,6 @@ fn postgresql_v12_deploy_a_working_dev_environment() {
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), CONTAINER);
}
#[cfg(feature = "test-aws-self-hosted")]
#[named]
#[test]
fn postgresql_v13_deploy_a_working_dev_environment() {
let context = context();
let secrets = FuncTestsSecrets::new();
let environment = test_utilities::common::working_minimal_environment(
&context,
AWS_QOVERY_ORGANIZATION_ID,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), CONTAINER);
}
// Postgres production environment
#[cfg(feature = "test-aws-managed-services")]
#[named]
@@ -636,29 +618,12 @@ fn postgresql_v12_deploy_a_working_prod_environment() {
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), MANAGED);
}
#[cfg(feature = "test-aws-managed-services")]
#[named]
#[test]
fn postgresql_v13_deploy_a_working_prod_environment() {
let context = context();
let secrets = FuncTestsSecrets::new();
let environment = test_utilities::common::working_minimal_environment(
&context,
AWS_QOVERY_ORGANIZATION_ID,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), MANAGED);
}
/**
**
** MongoDB tests
**
**/
fn test_mongodb_configuration(
context: Context,
mut environment: Environment,

20
tests/digitalocean/do_databases.rs
View File

@@ -470,6 +470,7 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
** PostgreSQL tests
**
**/
fn test_postgresql_configuration(
context: Context,
mut environment: Environment,
@@ -633,25 +634,6 @@ fn postgresql_v12_deploy_a_working_dev_environment() {
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), CONTAINER);
}
#[cfg(feature = "test-do-self-hosted")]
#[ignore]
#[named]
#[test]
fn postgresql_v13_deploy_a_working_dev_environment() {
let context = context();
let secrets = FuncTestsSecrets::new();
let environment = working_minimal_environment(
&context,
DO_QOVERY_ORGANIZATION_ID,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), CONTAINER);
}
/**
**
** MongoDB tests

37
tests/scaleway/scw_databases.rs
View File

@@ -620,24 +620,6 @@ fn postgresql_v12_deploy_a_working_dev_environment() {
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), CONTAINER);
}
#[cfg(feature = "test-scw-self-hosted")]
#[named]
#[test]
fn postgresql_v13_deploy_a_working_dev_environment() {
let context = context();
let secrets = FuncTestsSecrets::new();
let environment = working_minimal_environment(
&context,
SCW_QOVERY_ORGANIZATION_ID,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), CONTAINER);
}
// Postgres production environment
#[cfg(feature = "test-scw-managed-services")]
#[named]
@@ -696,25 +678,6 @@ fn postgresql_v12_deploy_a_working_prod_environment() {
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), MANAGED);
}
#[cfg(feature = "test-scw-managed-services")]
#[named]
#[test]
#[ignore]
fn postgresql_v13_deploy_a_working_prod_environment() {
let context = context();
let secrets = FuncTestsSecrets::new();
let environment = working_minimal_environment(
&context,
SCW_QOVERY_ORGANIZATION_ID,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), MANAGED);
}
/**
**
** MongoDB tests