Skip to content

Commit d2d4481

Browse files
authored
upgrade engine versions to match defaults from aws console (#1709)
OpenSearch is following semver (contrary to ES) and AWS console does not list < 1.3 any longer
1 parent be0bbe4 commit d2d4481

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

test_infra/stacks/databases_stack.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def _setup_postgresql(self) -> None:
355355
self,
356356
"aws-sdk-pandas-postgresql-params",
357357
engine=rds.DatabaseClusterEngine.aurora_postgres(
358-
version=rds.AuroraPostgresEngineVersion.VER_11_13,
358+
version=rds.AuroraPostgresEngineVersion.VER_13_7,
359359
),
360360
parameters={
361361
"apg_plan_mgmt.capture_plan_baselines": "off",
@@ -366,7 +366,7 @@ def _setup_postgresql(self) -> None:
366366
"aws-sdk-pandas-aurora-cluster-postgresql",
367367
removal_policy=RemovalPolicy.DESTROY,
368368
engine=rds.DatabaseClusterEngine.aurora_postgres(
369-
version=rds.AuroraPostgresEngineVersion.VER_11_13,
369+
version=rds.AuroraPostgresEngineVersion.VER_13_7,
370370
),
371371
cluster_identifier="postgresql-cluster-sdk-pandas",
372372
instances=1,
@@ -518,7 +518,7 @@ def _setup_mysql_serverless(self) -> None:
518518
"aws-sdk-pandas-aurora-cluster-mysql-serverless",
519519
removal_policy=RemovalPolicy.DESTROY,
520520
engine=rds.DatabaseClusterEngine.aurora_mysql(
521-
version=rds.AuroraMysqlEngineVersion.VER_5_7_12,
521+
version=rds.AuroraMysqlEngineVersion.VER_2_10_2,
522522
),
523523
cluster_identifier="mysql-serverless-cluster-sdk-pandas",
524524
default_database_name=database,
@@ -635,7 +635,7 @@ def _setup_oracle(self) -> None:
635635
"aws-sdk-pandas-oracle-instance",
636636
removal_policy=RemovalPolicy.DESTROY,
637637
instance_identifier="oracle-instance-sdk-pandas",
638-
engine=rds.DatabaseInstanceEngine.oracle_ee(version=rds.OracleEngineVersion.VER_19_0_0_0_2021_04_R1),
638+
engine=rds.DatabaseInstanceEngine.oracle_ee(version=rds.OracleEngineVersion.VER_19),
639639
instance_type=ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
640640
credentials=rds.Credentials.from_password(
641641
username=self.db_username,

test_infra/stacks/opensearch_stack.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(
3737
self.bucket = bucket
3838

3939
self._set_opensearch_infra()
40-
self._setup_opensearch_1_0()
40+
self._setup_opensearch_1()
4141
self._setup_elasticsearch_7_10_fgac()
4242

4343
def _set_opensearch_infra(self) -> None:
@@ -56,15 +56,15 @@ def _set_opensearch_infra(self) -> None:
5656
else:
5757
self.connectivity = {"vpc": self.vpc, "vpc_subnets": [{"subnets": [self.vpc.private_subnets[0]]}]}
5858

59-
def _setup_opensearch_1_0(self) -> None:
60-
domain_name = "sdk-pandas-os-1-0"
59+
def _setup_opensearch_1(self) -> None:
60+
domain_name = "sdk-pandas-os-1"
6161
validate_domain_name(domain_name)
6262
domain_arn = f"arn:aws:es:{self.region}:{self.account}:domain/{domain_name}"
6363
domain = opensearch.Domain(
6464
self,
6565
domain_name,
6666
domain_name=domain_name,
67-
version=opensearch.EngineVersion.OPENSEARCH_1_0,
67+
version=opensearch.EngineVersion.OPENSEARCH_1_3,
6868
capacity=opensearch.CapacityConfig(data_node_instance_type="t3.medium.search", data_nodes=1),
6969
**self.connectivity,
7070
access_policies=[

0 commit comments

Comments
 (0)