Skip to content

WIP: RDS: add engineVersion attribute #150

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: RDS: add engineVersion attribute #150

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
5 changes: 5 additions & 0 deletions nixops_aws/nix/ec2-rds-dbinstance.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ with import ./lib.nix lib;
for valid engines.'';
};

engineVersion = mkOption {
type = types.str;
description = ''Database engine version. The version number of the database engine to use.'';
};

dbName = mkOption {
type = types.str;
description = "Optional database name to be created when instance is first created.";
Expand Down
4 changes: 4 additions & 0 deletions nixops_aws/resources/ec2_rds_dbinstance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def __init__(self, name: str, config: nixops.resources.ResourceEval):
self.rds_dbinstance_master_password: str = self.config.masterPassword
self.rds_dbinstance_port: int = self.config.port
self.rds_dbinstance_engine: str = self.config.engine
self.rds_dbinstance_engine_version: str = self.config.engine_version
self.rds_dbinstance_db_name: str = self.config.dbName
self.rds_dbinstance_multi_az: bool = self.config.multiAZ
self.subnet_group: Optional[str] = self.config.subnetGroup
Expand Down Expand Up @@ -106,6 +107,7 @@ class EC2RDSDbInstanceState(nixops.resources.ResourceState[EC2RDSDbInstanceDefin
)
rds_dbinstance_port = nixops.util.attr_property("ec2.rdsPort", None, int)
rds_dbinstance_engine = nixops.util.attr_property("ec2.rdsEngine", None)
rds_dbinstance_engine_version = nixops.util.attr_property("ec2.rdsEngineVersion", None)
rds_dbinstance_db_name = nixops.util.attr_property("ec2.rdsDbName", None)
rds_dbinstance_endpoint = nixops.util.attr_property("ec2.rdsEndpoint", None)
rds_dbinstance_multi_az = nixops.util.attr_property("ec2.multiAZ", False)
Expand Down Expand Up @@ -288,6 +290,7 @@ def _copy_dbinstance_attrs(
self.rds_dbinstance_instance_class = dbinstance.instance_class
self.rds_dbinstance_master_username = dbinstance.master_username
self.rds_dbinstance_engine = dbinstance.engine
self.rds_dbinstance_engine_version = dbinstance.engine_version
self.rds_dbinstance_multi_az = dbinstance.multi_az
if dbinstance.subnet_group:
self.subnet_group = dbinstance.subnet_group.name
Expand Down Expand Up @@ -446,6 +449,7 @@ def create(
defn.rds_dbinstance_master_password,
port=defn.rds_dbinstance_port,
engine=defn.rds_dbinstance_engine,
engine_version=defn.rds_dbinstance_engine_version,
db_name=defn.rds_dbinstance_db_name,
multi_az=defn.rds_dbinstance_multi_az,
**self.get_vpc_options(defn),
Expand Down