varnitgoyal95/infra-provisioner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "INFRA-3115 | Ankit Bhardwaj | add snapshot_identifier rds tf""

Browse Source
This commit is contained in:
Ankit Bhardwaj Bhardwaj
2024-05-07 16:44:52 +05:30
committed by GitHub
parent acf3b5ae7d
commit fb0f8a8fb3
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

6
templates/rds-tf/deploy.sh
View File

@@ -13,6 +13,10 @@ function state_migration() {
done
}
function postgres_db_state_migration() {
terraform state list | grep 'module.rds.module.postgres_db.postgresql_database.this' && terraform state rm 'module.rds.module.postgres_db.postgresql_database.this'
}
additional_terraform_options=""
{{- if and .Actions.Plan .Actions.Destroy }}
@@ -38,7 +42,7 @@ for provider in $providers; do
terraform state replace-provider -auto-approve "$provider" "$correct_provider"
done
printf '\n'
postgres_db_state_migration
{{- if .Actions.Plan }}
terraform_action=plan
terraform $terraform_action -target=module.rds.module.rds_instance -target=module.rds.module.rds_instance_replica -target=module.rds.data.aws_subnet_ids.command_private_subnets -target=module.rds.data.aws_subnets.command_private_subnets $additional_terraform_options

3
templates/rds-tf/main.tf
View File

@@ -270,6 +270,9 @@ module "rds" {
{{- else }}
storage_encrypted = false
{{- end }}
{{- if .ExtraResources.Database.SnapshotIdentifier }}
snapshot_identifier = {{ .ExtraResources.Database.SnapshotIdentifier | quote }}
{{- end}}
}

5
testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh vendored
View File

@@ -13,6 +13,10 @@ function state_migration() {
done
}
function postgres_db_state_migration() {
terraform state list | grep 'module.rds.module.postgres_db.postgresql_database.this' && terraform state rm 'module.rds.module.postgres_db.postgresql_database.this'
}
additional_terraform_options=""
additional_terraform_options="${additional_terraform_options} -auto-approve"
@@ -33,6 +37,7 @@ for provider in $providers; do
terraform state replace-provider -auto-approve "$provider" "$correct_provider"
done
printf '\n'
postgres_db_state_migration
state_migration
terraform_action=apply
terraform $terraform_action -target=module.rds.data.aws_subnet_ids.command_private_subnets -target=module.rds.data.aws_subnets.command_private_subnets $additional_terraform_options

5
testdata/expected_output/sample_infra_manifest_2/rds-tf/deploy.sh vendored
View File

@@ -13,6 +13,10 @@ function state_migration() {
done
}
function postgres_db_state_migration() {
terraform state list | grep 'module.rds.module.postgres_db.postgresql_database.this' && terraform state rm 'module.rds.module.postgres_db.postgresql_database.this'
}
additional_terraform_options=""
additional_terraform_options="${additional_terraform_options} -auto-approve"
@@ -33,6 +37,7 @@ for provider in $providers; do
terraform state replace-provider -auto-approve "$provider" "$correct_provider"
done
printf '\n'
postgres_db_state_migration
state_migration
terraform_action=apply
terraform $terraform_action -target=module.rds.data.aws_subnet_ids.command_private_subnets -target=module.rds.data.aws_subnets.command_private_subnets $additional_terraform_options

5
testdata/expected_output/sample_infra_manifest_flink/rds-tf/deploy.sh vendored
View File

@@ -13,6 +13,10 @@ function state_migration() {
done
}
function postgres_db_state_migration() {
terraform state list | grep 'module.rds.module.postgres_db.postgresql_database.this' && terraform state rm 'module.rds.module.postgres_db.postgresql_database.this'
}
additional_terraform_options=""
additional_terraform_options="${additional_terraform_options} -auto-approve"
@@ -33,6 +37,7 @@ for provider in $providers; do
terraform state replace-provider -auto-approve "$provider" "$correct_provider"
done
printf '\n'
postgres_db_state_migration
state_migration
terraform_action=apply
terraform $terraform_action -target=module.rds.data.aws_subnet_ids.command_private_subnets -target=module.rds.data.aws_subnets.command_private_subnets $additional_terraform_options

1
types.go
View File

@@ -165,6 +165,7 @@ type Database struct {
KmsKeyId string `json:"kmsKeyId"`
StatementTimeout int `json:"statementTimeout"`
TeleportUserStatementTimeout int `json:"teleportUserStatementTimeout"`
SnapshotIdentifier string `json:"snapshotIdentifier"`
}
type ElasticCache struct {