Skip to content

Commit 9690edc

Browse files
committed
rds: add engineVersion attr
1 parent 371aede commit 9690edc

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

nixops_aws/nix/ec2-rds-dbinstance.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ with import ./lib.nix lib;
7070
for valid engines.'';
7171
};
7272

73+
engineVersion = mkOption {
74+
type = types.str;
75+
description = ''Database engine version. The version number of the database engine to use.'';
76+
};
77+
7378
dbName = mkOption {
7479
type = types.str;
7580
description = "Optional database name to be created when instance is first created.";

nixops_aws/resources/ec2_rds_dbinstance.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def __init__(self, name: str, config: nixops.resources.ResourceEval):
5050
self.rds_dbinstance_master_password: str = self.config.masterPassword
5151
self.rds_dbinstance_port: int = self.config.port
5252
self.rds_dbinstance_engine: str = self.config.engine
53+
self.rds_dbinstance_engine_version: str = self.config.engine_version
5354
self.rds_dbinstance_db_name: str = self.config.dbName
5455
self.rds_dbinstance_multi_az: bool = self.config.multiAZ
5556
self.subnet_group: Optional[str] = self.config.subnetGroup
@@ -106,6 +107,7 @@ class EC2RDSDbInstanceState(nixops.resources.ResourceState[EC2RDSDbInstanceDefin
106107
)
107108
rds_dbinstance_port = nixops.util.attr_property("ec2.rdsPort", None, int)
108109
rds_dbinstance_engine = nixops.util.attr_property("ec2.rdsEngine", None)
110+
rds_dbinstance_engine_version = nixops.util.attr_property("ec2.rdsEngineVersion", None)
109111
rds_dbinstance_db_name = nixops.util.attr_property("ec2.rdsDbName", None)
110112
rds_dbinstance_endpoint = nixops.util.attr_property("ec2.rdsEndpoint", None)
111113
rds_dbinstance_multi_az = nixops.util.attr_property("ec2.multiAZ", False)
@@ -288,6 +290,7 @@ def _copy_dbinstance_attrs(
288290
self.rds_dbinstance_instance_class = dbinstance.instance_class
289291
self.rds_dbinstance_master_username = dbinstance.master_username
290292
self.rds_dbinstance_engine = dbinstance.engine
293+
self.rds_dbinstance_engine_version = dbinstance.engine_version
291294
self.rds_dbinstance_multi_az = dbinstance.multi_az
292295
if dbinstance.subnet_group:
293296
self.subnet_group = dbinstance.subnet_group.name
@@ -446,6 +449,7 @@ def create(
446449
defn.rds_dbinstance_master_password,
447450
port=defn.rds_dbinstance_port,
448451
engine=defn.rds_dbinstance_engine,
452+
engine_version=defn.rds_dbinstance_engine_version,
449453
db_name=defn.rds_dbinstance_db_name,
450454
multi_az=defn.rds_dbinstance_multi_az,
451455
**self.get_vpc_options(defn),

0 commit comments

Comments
 (0)