Skip to content

Commit f3c3068

Browse files
authored
add support for _ in apiary_managed_schemas (#105)
1 parent 52e40fc commit f3c3068

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
88
### Added
99
- Support for docker private registry.
1010
- A new variable to specify TABLE_PARAM_FILTER regex for Hive Metastore listener.
11-
11+
- Support for `_` in `apiary_managed_schemas` variable. Fixes [#5] (https://github.com/ExpediaGroup/apiary/issues/5). Requires version greater than `v1.1.0` of https://github.com/ExpediaGroup/apiary-metastore-docker
1212

1313
## [1.0.5] - 2019-03-12
1414

common.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
locals {
88
instance_alias = "${ var.instance_name == "" ? "apiary" : format("apiary-%s",var.instance_name) }"
99
enable_route53_records = "${ var.apiary_domain_name == "" ? "0" : "1" }"
10-
apiary_data_buckets = "${ formatlist("%s-%s-%s-%s",local.instance_alias,data.aws_caller_identity.current.account_id,var.aws_region,var.apiary_managed_schemas) }"
10+
apiary_managed_schemas = "${ split(",",replace(join(",",var.apiary_managed_schemas),"_","-")) }"
11+
apiary_data_buckets = "${ formatlist("%s-%s-%s-%s",local.instance_alias,data.aws_caller_identity.current.account_id,var.aws_region,local.apiary_managed_schemas) }"
1112
gluedb_prefix = "${ var.instance_name == "" ? "" : "${var.instance_name}_" }"
1213
}
1314

sns.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ POLICY
2929

3030
resource "aws_sns_topic" "apiary_data_events" {
3131
count = "${ var.enable_data_events == "" ? 0 : length(var.apiary_managed_schemas) }"
32-
name = "${local.instance_alias}-${var.apiary_managed_schemas[count.index]}-data-events"
32+
name = "${local.instance_alias}-${local.apiary_managed_schemas[count.index]}-data-events"
3333

3434
policy = <<POLICY
3535
{
@@ -38,7 +38,7 @@ resource "aws_sns_topic" "apiary_data_events" {
3838
"Effect": "Allow",
3939
"Principal": {"AWS":"*"},
4040
"Action": "SNS:Publish",
41-
"Resource": "arn:aws:sns:*:*:${local.instance_alias}-${var.apiary_managed_schemas[count.index]}-data-events",
41+
"Resource": "arn:aws:sns:*:*:${local.instance_alias}-${local.apiary_managed_schemas[count.index]}-data-events",
4242
"Condition":{
4343
"ArnLike":{"aws:SourceArn":"${aws_s3_bucket.apiary_data_bucket.*.arn[count.index]}"}
4444
}

0 commit comments

Comments
 (0)