Skip to content

Commit

Permalink
Bugfix support old postgres versions and allow upgrade (#46)
Browse files Browse the repository at this point in the history
* Added support for postgres versions below 10 and fixed issues with upgrade

* Accepted code review suggestion

Co-Authored-By: Andriy Knysh <aknysh@users.noreply.github.com>

* Accepted code review suggestion

Co-Authored-By: Andriy Knysh <aknysh@users.noreply.github.com>

* Updated to handle the situation when the random_string resource does not exist

Co-Authored-By: Andriy Knysh <aknysh@users.noreply.github.com>

* Updated to handle the situation when the random_string resource does not exist

Co-Authored-By: Andriy Knysh <aknysh@users.noreply.github.com>

* Addressed code review comment
  • Loading branch information
jyotsnar authored and aknysh committed Nov 8, 2019
1 parent dee017f commit bb5216e
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ module "final_snapshot_label" {
}

locals {
computed_major_engine_version = "${var.engine == "postgres" ? join(".", slice(split(".", var.engine_version), 0, 1)) : join(".", slice(split(".", var.engine_version), 0, 2))}"
versions = "${split(".", var.engine_version)}"
major_version = "${element(local.versions,0)}"
minor_version = "${length(local.versions) > 1 ? format(".%s", element(local.versions,1)) : ""}"
computed_major_engine_version = "${local.major_version}${(var.engine != "postgres" || local.major_version < 10) ? local.minor_version : ""}"
major_engine_version = "${var.major_engine_version == "" ? local.computed_major_engine_version : var.major_engine_version}"
}

Expand Down Expand Up @@ -59,17 +62,32 @@ resource "aws_db_instance" "default" {
final_snapshot_identifier = "${length(var.final_snapshot_identifier) > 0 ? var.final_snapshot_identifier : module.final_snapshot_label.id}"
}

resource "random_string" "default" {
count = "${var.enabled == "true" ? 1 : 0}"
length = 20
special = false
upper = false

keepers {
engine_version = "${var.engine_version}"
}
}

resource "aws_db_parameter_group" "default" {
count = "${(length(var.parameter_group_name) == 0 && var.enabled == "true") ? 1 : 0}"
name = "${module.label.id}"
name = "${module.label.id}${var.delimiter}${join("", random_string.default.*.result)}"
family = "${var.db_parameter_group}"
tags = "${module.label.tags}"
parameter = "${var.db_parameter}"

lifecycle {
create_before_destroy = true
}
}

resource "aws_db_option_group" "default" {
count = "${(length(var.option_group_name) == 0 && var.enabled == "true") ? 1 : 0}"
name = "${module.label.id}"
name = "${module.label.id}${var.delimiter}${join("", random_string.default.*.result)}"
engine_name = "${var.engine}"
major_engine_version = "${local.major_engine_version}"
tags = "${module.label.tags}"
Expand Down

0 comments on commit bb5216e

Please sign in to comment.