diff --git a/bindata/bindata.go b/bindata/bindata.go index dd3461c..436b813 100644 --- a/bindata/bindata.go +++ b/bindata/bindata.go @@ -12,7 +12,6 @@ // templates/dynamo-db-tf/main.tf // templates/elastic-cache-tf/deploy.sh // templates/elastic-cache-tf/main.tf -// templates/elastic-cache-tf/manifest.json // templates/rds-tf/deploy.sh // templates/rds-tf/main.tf // templates/rds-tf/scripts/post-terraform-apply/modify-version/11__to__13.sh @@ -207,7 +206,7 @@ func bindataTemplatesAwsrolestfMainTf() (*asset, error) { size: 1499, md5checksum: "", mode: os.FileMode(420), - modTime: time.Unix(1719397351, 0), + modTime: time.Unix(1719563356, 0), } a := &asset{bytes: bytes, info: info} @@ -245,7 +244,7 @@ func bindataTemplatesAwss3buckettfDeploySh() (*asset, error) { return a, nil } -var _bindataTemplatesAwss3buckettfMainTf = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x8f\x9b\x30\x10\xbd\xe7\x57\x8c\xb8\x1b\x54\xed\x2d\xd2\x4a\x6d\xd4\x1c\x52\xa9\x6d\x54\x56\xed\x11\x39\x30\x10\x0b\xb0\xb3\xf6\x38\xd9\x88\xe5\xbf\x57\xb6\xa1\x82\x90\x7e\xa9\xe5\x14\x0f\xef\x3d\xbf\x37\x33\x84\x50\x6b\x5e\x2a\xdd\x42\xb7\x02\x38\xf0\xbc\x46\x59\x40\x64\x1e\x22\x5f\x00\x38\xd8\xbc\x46\x82\xf9\xf3\x08\x51\xd7\x41\x9c\x12\x27\x4c\x49\x69\xdc\x04\x62\xbc\xf1\xe8\x4f\xbc\x45\xe8\xfb\xc8\x0b\x68\xac\x84\x92\x4b\x01\x7e\x62\x46\x59\x3a\xb2\x37\x01\x57\xe3\x15\x16\xcf\xa3\xb3\xc2\x82\x07\x13\x70\x5d\xc7\x40\x94\x80\xcf\x10\xef\x64\xa9\xf9\x57\xd4\x24\x72\xde\x40\xd4\xa0\x2c\x84\xac\x22\xe8\x7b\x8f\xbc\x28\x5d\x9b\x13\xcf\x31\xab\xf1\x9a\x9d\x34\x96\xe2\x65\xae\x98\xb8\x14\xdb\x17\xd2\xfc\x0b\x1a\x65\x75\x8e\x26\xde\xca\xb3\xd0\x4a\xb6\x28\x09\xfa\xde\x23\x86\x3c\x6c\xfc\x9d\xda\xd2\x49\x8d\x09\x9d\x23\x6c\x0c\xfe\xdd\xb5\x73\xf3\xc3\x4d\xff\xc7\x8b\x2c\x06\x2b\x27\xad\x4a\xd1\xe0\x1f\x0e\xef\xdd\xb7\x74\x3f\x10\x46\x39\x9e\x37\x77\x87\x12\x82\x30\x75\x91\xa8\x59\x69\x9b\x86\xe5\x4a\x92\x56\x8d\xa3\xf5\xab\x7e\xb5\x6a\x55\x61\x1b\x9c\x8d\xcf\x6f\x54\x88\x36\x91\xaa\x04\xad\xd7\xc6\x1c\xd7\x49\x52\x09\x7a\x5b\x09\x3a\xda\x43\x9c\xab\x36\x91\xfc\x2c\x98\x70\x6d\x4a\xf8\xc5\xb0\x1f\x4a\x71\x25\xc8\xdd\x63\x1e\xb2\x41\xda\x09\xdd\x69\x5f\xfa\xb0\x19\xde\xbf\x42\x6b\x0d\x3d\xa9\x0f\x46\xc9\xb0\x1e\x38\x69\xed\x4f\xe8\xd3\xee\xbf\xc2\xb3\x55\x84\x81\xeb\x3d\x65\xe7\x71\x76\x81\x3c\x9f\xe7\x0c\x1f\x5c\x66\xc4\x2b\xe3\xc0\xbe\xb3\x4f\xc8\xdb\x69\x4b\x9d\x84\xab\x85\x01\xcf\xe8\x00\x9f\x5d\x9f\xa7\xa0\x50\xb8\x41\x0d\x5f\x46\xfc\x11\x89\x17\x9c\x78\xbc\xd7\xaa\xb0\x39\x8d\xef\xc7\x63\xd0\x59\xa0\xee\xa8\xb9\xad\xbe\xcf\xf6\x2e\x7e\xc5\x94\xc5\x78\xf4\x81\x86\xa5\x9b\xfd\x33\x6c\xff\x61\x04\xcb\xb4\xd3\xfa\x45\xd0\x71\x92\xf0\x3d\x27\x9e\xa2\x34\x82\xc4\x59\xd0\x75\x44\xde\x96\x83\x83\xdf\xf5\x61\xc9\x8a\xf6\xbb\x5d\x96\xee\x77\xd1\x6d\xfa\xc5\xd9\x7d\x19\xdf\x03\x00\x00\xff\xff\xfe\x67\xc3\x57\x72\x05\x00\x00") +var _bindataTemplatesAwss3buckettfMainTf = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x5d\xab\x9b\x40\x10\x7d\xf7\x57\x0c\x3e\xb5\x50\x0d\xe5\xbe\x05\x02\x6d\x68\x28\x29\xb4\x0d\x35\xb4\x8f\x32\xd1\xd1\x2c\x59\x77\x73\x77\xc7\xe4\x86\x5c\xff\x7b\x59\x57\x8b\x26\xf6\x8b\xd6\xa7\xec\x78\xce\xd9\x73\x66\xc6\x30\x19\x83\x85\x36\x15\x5c\x03\x80\x1d\x66\x07\x52\x39\x84\xf6\x21\x6c\x0b\x00\xbb\x3a\x3b\x10\xc3\xf8\x59\x40\x78\xbd\x42\x9c\x30\x32\x25\xac\x0d\x2d\x3d\x31\x5e\xb6\xe8\x4f\x58\x11\x34\x4d\xd8\x0a\x18\x2a\x85\x56\xf7\x02\x78\x8c\xac\xae\x79\x1f\xbd\xf6\xb8\x03\x5d\xe0\xee\x59\x38\x2b\x91\xf7\x60\x3d\xee\x7a\x8d\x40\x14\x40\x8f\x10\xaf\x55\x61\xf0\x2b\x19\x16\x19\x4a\x08\x25\xa9\x5c\xa8\x32\x84\xa6\x69\x91\x67\x6d\x0e\xf6\x88\x19\xa5\x07\xba\xa4\x47\x43\x85\x78\x1a\x2b\xce\x5c\x8a\xd5\x13\x1b\xfc\x42\x56\xd7\x26\x23\x1b\xaf\xd4\x49\x18\xad\x2a\x52\x0c\x4d\xd3\x22\xba\x3c\x51\xff\x3b\xa9\x0b\x27\xd5\x27\x74\x8e\x48\x5a\xfa\xbb\x6b\xc7\xe6\xbb\x9b\xfe\x8f\x17\x95\x77\x56\x8e\x46\x17\x42\xd2\x1f\x0e\xef\xed\xb7\x64\xd3\x11\x7a\x39\xcc\xe4\xe4\x50\x7c\x90\x48\x9f\x15\x99\xa8\xa8\xa5\x8c\x32\xad\xd8\x68\xe9\x68\x4d\xd0\x04\x41\xa5\xf3\x5a\xd2\x68\x7c\xed\x46\xf9\x68\x03\xa9\x52\xf0\x7c\x6e\xed\x7e\x3e\x9b\x95\x82\xdf\x94\x82\xf7\xf5\x2e\xce\x74\x35\x53\x78\x12\x91\x70\x6d\x9a\xe1\xd9\x46\x3f\x94\xe2\x52\xb0\xbb\xc7\x3e\xa4\x9d\xb4\x13\x9a\x68\x5f\xf2\xb0\xec\xde\x3f\x43\x55\x5b\xde\xea\x0f\x56\x2b\xbf\x1e\x34\x68\xed\x4f\xe8\xc3\xee\x3f\xc3\x63\xad\x99\x3c\xb7\xf5\x94\x9e\xfa\xd9\x79\xf2\x78\x9e\x23\xbc\x77\x99\x32\x96\x16\x16\x50\x91\x29\xe9\x85\xff\xba\xb6\x84\xd5\xb0\xb1\x4e\xc8\xd5\xfc\x98\x47\x22\x00\x9f\x5d\xb7\x87\x20\x5f\xb8\x41\x75\xdf\x47\xfc\x91\x18\x73\x64\x8c\x37\x46\xe7\x75\xc6\xfd\xfb\xfe\xe8\x75\xee\x50\x13\x6a\x6e\xb7\xa7\xd9\xad\x8b\x5f\x31\x55\xde\x1f\xdb\x40\xdd\xea\x8d\xfe\x1f\x56\xff\x30\x88\xfb\xb4\xc3\xfa\x59\xf0\x7e\x90\xf0\x1d\x32\x26\xa4\xac\x60\x71\x12\x7c\xe9\x91\xb7\x65\xef\xe0\x77\x7d\xb8\x67\x85\x9b\xf5\x3a\x4d\x36\xeb\xf0\x36\xfd\xed\xb9\x79\x35\x95\xf1\xbd\xd4\x3b\x94\x5b\xb7\x22\x37\xcb\xfa\x32\x68\x82\xef\x01\x00\x00\xff\xff\x81\x4a\x34\xad\xa7\x05\x00\x00") func bindataTemplatesAwss3buckettfMainTfBytes() ([]byte, error) { return bindataRead( @@ -264,10 +263,10 @@ func bindataTemplatesAwss3buckettfMainTf() (*asset, error) { info := bindataFileInfo{ name: "templates/aws-s3-bucket-tf/main.tf", - size: 1394, + size: 1447, md5checksum: "", mode: os.FileMode(420), - modTime: time.Unix(1718871201, 0), + modTime: time.Unix(1719563436, 0), } a := &asset{bytes: bytes, info: info} @@ -327,7 +326,7 @@ func bindataTemplatesDocumentdbtfMainTf() (*asset, error) { size: 4953, md5checksum: "", mode: os.FileMode(420), - modTime: time.Unix(1719397743, 0), + modTime: time.Unix(1719563356, 0), } a := &asset{bytes: bytes, info: info} @@ -387,7 +386,7 @@ func bindataTemplatesDynamodbtfMainTf() (*asset, error) { size: 4527, md5checksum: "", mode: os.FileMode(420), - modTime: time.Unix(1719397774, 0), + modTime: time.Unix(1719563356, 0), } a := &asset{bytes: bytes, info: info} @@ -447,37 +446,7 @@ func bindataTemplatesElasticcachetfMainTf() (*asset, error) { size: 6319, md5checksum: "", mode: os.FileMode(420), - modTime: time.Unix(1719397791, 0), - } - - a := &asset{bytes: bytes, info: info} - - return a, nil -} - -var _bindataTemplatesElasticcachetfManifestJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") - -func bindataTemplatesElasticcachetfManifestJsonBytes() ([]byte, error) { - return bindataRead( - _bindataTemplatesElasticcachetfManifestJson, - "templates/elastic-cache-tf/manifest.json", - ) -} - - - -func bindataTemplatesElasticcachetfManifestJson() (*asset, error) { - bytes, err := bindataTemplatesElasticcachetfManifestJsonBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{ - name: "templates/elastic-cache-tf/manifest.json", - size: 0, - md5checksum: "", - mode: os.FileMode(420), - modTime: time.Unix(1711705783, 0), + modTime: time.Unix(1719563356, 0), } a := &asset{bytes: bytes, info: info} @@ -711,7 +680,6 @@ var _bindata = map[string]func() (*asset, error){ "templates/dynamo-db-tf/main.tf": bindataTemplatesDynamodbtfMainTf, "templates/elastic-cache-tf/deploy.sh": bindataTemplatesElasticcachetfDeploySh, "templates/elastic-cache-tf/main.tf": bindataTemplatesElasticcachetfMainTf, - "templates/elastic-cache-tf/manifest.json": bindataTemplatesElasticcachetfManifestJson, "templates/rds-tf/deploy.sh": bindataTemplatesRdstfDeploySh, "templates/rds-tf/main.tf": bindataTemplatesRdstfMainTf, "templates/rds-tf/scripts/post-terraform-apply/modify-version/11__to__13.sh": bindataTemplatesRdstfScriptsPostterraformapplyModifyversion11to13Sh, @@ -795,7 +763,6 @@ var _bintree = &bintree{Func: nil, Children: map[string]*bintree{ "elastic-cache-tf": {Func: nil, Children: map[string]*bintree{ "deploy.sh": {Func: bindataTemplatesElasticcachetfDeploySh, Children: map[string]*bintree{}}, "main.tf": {Func: bindataTemplatesElasticcachetfMainTf, Children: map[string]*bintree{}}, - "manifest.json": {Func: bindataTemplatesElasticcachetfManifestJson, Children: map[string]*bintree{}}, }}, "rds-tf": {Func: nil, Children: map[string]*bintree{ "deploy.sh": {Func: bindataTemplatesRdstfDeploySh, Children: map[string]*bintree{}}, diff --git a/config/prod/default.yml b/config/prod/default.yml index f5ab2a2..f5579f1 100644 --- a/config/prod/default.yml +++ b/config/prod/default.yml @@ -1,2 +1,2 @@ app_name: infra-provisioner-v2 -version: v2.48.8 +version: v2.48.9 diff --git a/templates/aws-s3-bucket-tf/main.tf b/templates/aws-s3-bucket-tf/main.tf index 334a6b0..d2de31b 100644 --- a/templates/aws-s3-bucket-tf/main.tf +++ b/templates/aws-s3-bucket-tf/main.tf @@ -18,7 +18,7 @@ module "s3-buckets" { s3_buckets = {{ .ExtraResources.S3Buckets | mustToJson }} environment = {{ .ExtraResources.Environment | quote }} infra_vertical = {{ .InfraVertical | quote }} - bucket_tags = { + bucket_tags = merge({ Team = {{ .Team.Name | quote }} Owner = {{ .Team.Owner | quote }} {{- if .Metadata.Product }} @@ -36,6 +36,5 @@ module "s3-buckets" { {{- end }} {{- end }} - -} +}, {{ .ExtraResources.GlobalTags | mustToJson }}) } diff --git a/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/main.tf b/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/main.tf index f5f7622..2fe6678 100755 --- a/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/main.tf +++ b/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/main.tf @@ -14,13 +14,12 @@ module "s3-buckets" { s3_buckets = [{"anonymizedBucketName":"navi-bucket-test-1","bucketTag":"customer-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["*"]}],"bucketPolicy":"{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::594542361424:role/databricks-ec2-role\"},\"Action\":[\"s3:GetObject\",\"s3:PutObject\",\"s3:PutObjectAcl\",\"s3:ListBucket\"],\"Resource\":[\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1\",\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1/*\"]}]}"},{"anonymizedBucketName":"navi-bucket-test-2","bucketTag":"document-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["https://go-nlc.com"]}]}] environment = "dev" infra_vertical = "lending" - bucket_tags = { + bucket_tags = merge({ Team = "Infra" Owner = "lending" Product = "lending" Name = "foo" Environment = "dev" DataSensitivity = "PII_SPI" - -} +}, null) } diff --git a/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/main.tf b/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/main.tf index de630a5..313c10e 100755 --- a/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/main.tf +++ b/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/main.tf @@ -14,13 +14,12 @@ module "s3-buckets" { s3_buckets = [{"anonymizedBucketName":"navi-bucket-test-1","bucketTag":"customer-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["*"]}],"bucketPolicy":"{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::594542361424:role/databricks-ec2-role\"},\"Action\":[\"s3:GetObject\",\"s3:PutObject\",\"s3:PutObjectAcl\",\"s3:ListBucket\"],\"Resource\":[\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1\",\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1/*\"]}]}"},{"anonymizedBucketName":"navi-bucket-test-2","bucketTag":"document-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["https://go-nlc.com"]}]}] environment = "dev" infra_vertical = "insurance" - bucket_tags = { + bucket_tags = merge({ Team = "Infra" Owner = "gi" Product = "gi" Name = "foo" Environment = "dev" DataSensitivity = "PII_SPI" - -} +}, null) } diff --git a/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/main.tf b/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/main.tf index de630a5..313c10e 100755 --- a/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/main.tf +++ b/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/main.tf @@ -14,13 +14,12 @@ module "s3-buckets" { s3_buckets = [{"anonymizedBucketName":"navi-bucket-test-1","bucketTag":"customer-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["*"]}],"bucketPolicy":"{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::594542361424:role/databricks-ec2-role\"},\"Action\":[\"s3:GetObject\",\"s3:PutObject\",\"s3:PutObjectAcl\",\"s3:ListBucket\"],\"Resource\":[\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1\",\"arn:aws:s3:::navi-dd80e5524820496dbacd4e84d05d95f1/*\"]}]}"},{"anonymizedBucketName":"navi-bucket-test-2","bucketTag":"document-uploads","lifecycleRules":[{"expiration":{"days":1}}],"enableAccessLog":false,"enablePublicBucket":false,"corsPolicy":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT","GET"],"AllowedOrigins":["https://go-nlc.com"]}]}] environment = "dev" infra_vertical = "insurance" - bucket_tags = { + bucket_tags = merge({ Team = "Infra" Owner = "gi" Product = "gi" Name = "foo" Environment = "dev" DataSensitivity = "PII_SPI" - -} +}, null) }