feat: Fix serverless v2 engine and add missing resource arguments #317

bryantbiggs · 2022-08-30T18:57:25Z

Description

Add support for RDS multi-AZ clusters that do not utilize the Aurora engine
- Added support for availability_zones, db_cluster_instance_class, iops, storage_type, and allocated_storage to support RDS multi-AZ
- Add example to demonstrate RDS multi-AZ usage
Add support for using cluster_identifier_prefix by adding cluster_use_name_prefix variable
Add cluster_members argument/variable
Fix serverless v2 scaling which is only valid when engine_mode == "provisioned" for v2 mode
Remove restriction for engine_version when using serverless v1 (currently forces null but now can be configured by users)
Update serverless example to shorten names used and be more consistent with using just v1 and v2 for which serverless mode is used
Order cluster arguments to match order of provider schema definition - this makes it easy to see what arguments are supported vs what is not (and needs to be added)
Ensure required version specified for examples is consistent with root module
Update example tags, name, VPC settings to be consistent with other modules and avoid NAT creation where possible
- Fix example directories to use hyphens instead of underscores in their names

Motivation and Context

Closes Multi-AZ ServerlessV2 Cluster #298
Closes Cannot create serverless v1 postgres #305
Closes aurora-postgresql in serverless mode does not allow to set engine version and do upgrades #313
Closes Availibility Zones #314
Closes Allow defining rds instance multi_az #315
Closes feat: Non-Aurora multi az cluster support #316

Breaking Changes

No

How Has This Been Tested?

I have updated at least one of the examples/* to demonstrate and validate my change(s)
I have tested and validated these changes using one or more of the provided examples/* projects
- Validated serverless example
- Validated multi-az example
- Validated postgresql example
I have executed pre-commit run -a on my pull request

egeland · 2022-09-04T23:08:22Z

Would there be a rough estimate on when this (esp the fix for #313 ) would be merged? 🙏 😅

bryantbiggs · 2022-09-06T23:50:53Z

main.tf

 resource "aws_rds_cluster" "this" {
  count = local.create_cluster ? 1 : 0

-  # Notes:


lots of noise due to the re-ordering to match the AWS provider (makes it easier to compare what we support vs what we need to add), apologies for that. However, nothing was deleted - only re-order or the addition of new arguments that we did not previously support (mostly for RDS multi-AZ plus a few others)

bryantbiggs · 2022-09-06T23:51:24Z

main.tf

-
-  engine                              = var.engine
-  engine_mode                         = var.engine_mode
-  engine_version                      = local.is_serverless ? null : var.engine_version


this was fixed for the serverless v1 upgrade so users can now set the engine version - not sure when this changed but now its configurable for #313 (i.e. - the conditional check was removed and now its just engine_version = var.engine_version)

bryantbiggs · 2022-09-06T23:54:20Z

main.tf

  }

  dynamic "scaling_configuration" {
-    for_each = length(keys(var.scaling_configuration)) == 0 || !local.is_serverless ? [] : [var.scaling_configuration]


a lot of these for_each conditionals were cleaned up and simplified

bryantbiggs · 2022-09-06T23:56:36Z

main.tf

 resource "aws_rds_cluster_endpoint" "this" {
-  for_each = local.create_cluster && !local.is_serverless ? var.endpoints : tomap({})


fixed the looping comprehension

bryantbiggs · 2022-09-06T23:56:54Z

main.tf

 }

-resource "aws_rds_cluster_instance" "this" {
-  for_each = local.create_cluster && !local.is_serverless ? var.instances : {}


fixed looping comprehension

bryantbiggs · 2022-09-06T23:57:17Z

main.tf

 resource "aws_rds_cluster_role_association" "this" {
-  for_each = local.create_cluster ? var.iam_roles : {}


fixed looping comprehension

bryantbiggs · 2022-09-06T23:57:46Z

main.tf


-  db_cluster_identifier = try(aws_rds_cluster.this[0].id, "")


a lot of these wrapped try()s are not doing anything

antonbabenko

Just a small comment. LGTM.

examples/multi-az/README.md

examples/multi-az/main.tf

Co-authored-by: Anton Babenko <anton@antonbabenko.com>

## [7.4.0](v7.3.0...v7.4.0) (2022-09-07) ### Features * Fix serverless v2 engine and add missing resource arguments ([#317](#317)) ([2d87320](2d87320))

antonbabenko · 2022-09-07T11:21:54Z

This PR is included in version 7.4.0 🎉

github-actions · 2023-04-13T02:11:16Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

bryantbiggs added the wip label Aug 30, 2022

bryantbiggs force-pushed the fix/serverless branch 4 times, most recently from 12b28b5 to a1f4b57 Compare September 6, 2022 23:20

feat: Fix serverless v2 engine and add missing resource arguments

90578b2

bryantbiggs force-pushed the fix/serverless branch from a1f4b57 to 90578b2 Compare September 6, 2022 23:46

bryantbiggs marked this pull request as ready for review September 6, 2022 23:46

bryantbiggs commented Sep 6, 2022

View reviewed changes

fix: Merging of tags works now

de5305c

bryantbiggs requested a review from antonbabenko September 7, 2022 00:06

fix: Correct spelling mistakes

99804b7

antonbabenko approved these changes Sep 7, 2022

View reviewed changes

examples/multi-az/README.md Outdated Show resolved Hide resolved

examples/multi-az/main.tf Outdated Show resolved Hide resolved

bryantbiggs and others added 2 commits September 7, 2022 07:03

Update examples/multi-az/main.tf

d980d87

Co-authored-by: Anton Babenko <anton@antonbabenko.com>

Update examples/multi-az/README.md

4b9b6af

Co-authored-by: Anton Babenko <anton@antonbabenko.com>

bryantbiggs merged commit 2d87320 into terraform-aws-modules:master Sep 7, 2022

bryantbiggs deleted the fix/serverless branch September 7, 2022 11:21

antonbabenko pushed a commit that referenced this pull request Sep 7, 2022

chore(release): version 7.4.0 [skip ci]

7774eb8

## [7.4.0](v7.3.0...v7.4.0) (2022-09-07) ### Features * Fix serverless v2 engine and add missing resource arguments ([#317](#317)) ([2d87320](2d87320))

antonbabenko mentioned this pull request Sep 8, 2022

Multi-AZ ServerlessV2 Cluster #298

Closed

1 task

github-actions bot locked as resolved and limited conversation to collaborators Apr 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Fix serverless v2 engine and add missing resource arguments #317

feat: Fix serverless v2 engine and add missing resource arguments #317

bryantbiggs commented Aug 30, 2022 •

edited

Loading

egeland commented Sep 4, 2022

bryantbiggs Sep 6, 2022

bryantbiggs Sep 6, 2022 •

edited

Loading

bryantbiggs Sep 6, 2022

bryantbiggs Sep 6, 2022

bryantbiggs Sep 6, 2022

bryantbiggs Sep 6, 2022

bryantbiggs Sep 6, 2022

antonbabenko left a comment

antonbabenko commented Sep 7, 2022

github-actions bot commented Apr 13, 2023

		resource "aws_rds_cluster_endpoint" "this" {
		for_each = local.create_cluster && !local.is_serverless ? var.endpoints : tomap({})

		resource "aws_rds_cluster_role_association" "this" {
		for_each = local.create_cluster ? var.iam_roles : {}

feat: Fix serverless v2 engine and add missing resource arguments #317

feat: Fix serverless v2 engine and add missing resource arguments #317

Conversation

bryantbiggs commented Aug 30, 2022 • edited Loading

Description

Motivation and Context

Breaking Changes

How Has This Been Tested?

egeland commented Sep 4, 2022

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022 • edited Loading

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

bryantbiggs Sep 6, 2022

Choose a reason for hiding this comment

antonbabenko left a comment

Choose a reason for hiding this comment

antonbabenko commented Sep 7, 2022

github-actions bot commented Apr 13, 2023

bryantbiggs commented Aug 30, 2022 •

edited

Loading

bryantbiggs Sep 6, 2022 •

edited

Loading