Merge branch 'tf_small_fix' into 'master'

DmitryFomin1 · DmitryFomin1 · commit 4717a89cc600 · 2021-09-09T19:17:53.000Z
DLE AMI search criteria fix

See merge request postgres-ai/terraform-postgres-ai-database-lab!37
diff --git a/role.tf b/role.tf
@@ -27,7 +27,7 @@ resource "aws_iam_role" "db_lab_engine_role" {
           Resource = "arn:aws:s3:::${var.source_pgdump_s3_bucket}"
         },
         {
-          Action   = ["s3:GetObject"]
+          Action   = ["s3:GetObject","s3:GetObjectAcl"]
           Effect   = "Allow"
           Resource = "arn:aws:s3:::${var.source_pgdump_s3_bucket}/*" # Grant read access to entire bucket
         }
diff --git a/variables.tf b/variables.tf
@@ -20,7 +20,7 @@ variable "aws_deploy_region" {
 
 variable "aws_ami_owner" {
     description = "Filter for the AMI owner"
-    default = "self"
+    default = "005923036815" # Postgres.ai account publishes public AMI for DLE 
 }
 variable "aws_deploy_ec2_instance_type" {
     description = "Type of EC2 instance"

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ resource "aws_iam_role" "db_lab_engine_role" {`
`27`	`27`	`Resource = "arn:aws:s3:::${var.source_pgdump_s3_bucket}"`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- Action = ["s3:GetObject"]`
	`30`	`+ Action = ["s3:GetObject","s3:GetObjectAcl"]`
`31`	`31`	`Effect = "Allow"`
`32`	`32`	`Resource = "arn:aws:s3:::${var.source_pgdump_s3_bucket}/*" # Grant read access to entire bucket`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ variable "aws_deploy_region" {`
`20`	`20`
`21`	`21`	`variable "aws_ami_owner" {`
`22`	`22`	`description = "Filter for the AMI owner"`
`23`		`- default = "self"`
	`23`	`+ default = "005923036815" # Postgres.ai account publishes public AMI for DLE`
`24`	`24`	`}`
`25`	`25`	`variable "aws_deploy_ec2_instance_type" {`
`26`	`26`	`description = "Type of EC2 instance"`