Skip to content

upgrade engine versions to match defaults from aws console #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2022
Merged

upgrade engine versions to match defaults from aws console #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test_infra/stacks/databases_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def _setup_postgresql(self) -> None:
self,
"aws-sdk-pandas-postgresql-params",
engine=rds.DatabaseClusterEngine.aurora_postgres(
version=rds.AuroraPostgresEngineVersion.VER_11_13,
version=rds.AuroraPostgresEngineVersion.VER_13_7,
),
parameters={
"apg_plan_mgmt.capture_plan_baselines": "off",
Expand All @@ -366,7 +366,7 @@ def _setup_postgresql(self) -> None:
"aws-sdk-pandas-aurora-cluster-postgresql",
removal_policy=RemovalPolicy.DESTROY,
engine=rds.DatabaseClusterEngine.aurora_postgres(
version=rds.AuroraPostgresEngineVersion.VER_11_13,
version=rds.AuroraPostgresEngineVersion.VER_13_7,
),
cluster_identifier="postgresql-cluster-sdk-pandas",
instances=1,
Expand Down Expand Up @@ -518,7 +518,7 @@ def _setup_mysql_serverless(self) -> None:
"aws-sdk-pandas-aurora-cluster-mysql-serverless",
removal_policy=RemovalPolicy.DESTROY,
engine=rds.DatabaseClusterEngine.aurora_mysql(
version=rds.AuroraMysqlEngineVersion.VER_5_7_12,
version=rds.AuroraMysqlEngineVersion.VER_2_10_2,
),
cluster_identifier="mysql-serverless-cluster-sdk-pandas",
default_database_name=database,
Expand Down Expand Up @@ -635,7 +635,7 @@ def _setup_oracle(self) -> None:
"aws-sdk-pandas-oracle-instance",
removal_policy=RemovalPolicy.DESTROY,
instance_identifier="oracle-instance-sdk-pandas",
engine=rds.DatabaseInstanceEngine.oracle_ee(version=rds.OracleEngineVersion.VER_19_0_0_0_2021_04_R1),
engine=rds.DatabaseInstanceEngine.oracle_ee(version=rds.OracleEngineVersion.VER_19),
instance_type=ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
credentials=rds.Credentials.from_password(
username=self.db_username,
Expand Down
8 changes: 4 additions & 4 deletions test_infra/stacks/opensearch_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(
self.bucket = bucket

self._set_opensearch_infra()
self._setup_opensearch_1_0()
self._setup_opensearch_1()
self._setup_elasticsearch_7_10_fgac()

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

def _setup_opensearch_1_0(self) -> None:
domain_name = "sdk-pandas-os-1-0"
def _setup_opensearch_1(self) -> None:
domain_name = "sdk-pandas-os-1"
validate_domain_name(domain_name)
domain_arn = f"arn:aws:es:{self.region}:{self.account}:domain/{domain_name}"
domain = opensearch.Domain(
self,
domain_name,
domain_name=domain_name,
version=opensearch.EngineVersion.OPENSEARCH_1_0,
version=opensearch.EngineVersion.OPENSEARCH_1_3,
capacity=opensearch.CapacityConfig(data_node_instance_type="t3.medium.search", data_nodes=1),
**self.connectivity,
access_policies=[
Expand Down