Skip to content

Commit

Permalink
fix: added datadog provider source to avoid conflicts (#254)
Browse files Browse the repository at this point in the history
* fix: set datadog provider source

* fix: update change log

---------

Co-authored-by: janli <[email protected]>
  • Loading branch information
githubjianli and JianLi-Expedia authored Apr 3, 2024
1 parent 90939aa commit 68ce35d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [7.1.2] - 2024-04-03
### Fixed
- Added provider source for `datadog`.

## [7.1.1] - 2024-04-03
### Fixed
- Renamed variable from `common_producer_iamroles` to `apiary_common_producer_iamroles` to make the name consistent.
Expand Down
2 changes: 1 addition & 1 deletion s3-other.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
resource "aws_s3_bucket" "apiary_inventory_bucket" {
count = var.s3_enable_inventory == true ? 1 : 0
bucket = local.s3_inventory_bucket
tags = merge(tomap({"Name"="${local.s3_inventory_bucket}"}), "${var.apiary_tags}")
tags = merge(tomap({"Name"="${local.s3_inventory_bucket}"}), var.apiary_tags)
policy = <<EOF
{
"Version":"2012-10-17",
Expand Down
4 changes: 4 additions & 0 deletions version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,9 @@ terraform {
source = "hashicorp/aws"
version = "~> 4.0"
}
datadog = {
source = "DataDog/datadog"
version = "3.25.0"
}
}
}
4 changes: 2 additions & 2 deletions vpc-endpoint-service.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "aws_vpc_endpoint_service" "hms_readonly" {
network_load_balancer_arns = compact(concat(aws_lb.apiary_hms_ro_lb.*.arn, data.aws_lb.k8s_hms_ro_lb.*.arn))
acceptance_required = false
allowed_principals = formatlist("arn:aws:iam::%s:root", var.apiary_customer_accounts)
tags = merge(tomap({"Name"="${local.instance_alias}-hms-readonly"}), "${var.apiary_tags}")
tags = merge(tomap({"Name"="${local.instance_alias}-hms-readonly"}), var.apiary_tags)
}

resource "aws_vpc_endpoint_connection_notification" "hms_readonly" {
Expand All @@ -24,7 +24,7 @@ resource "aws_vpc_endpoint_service" "hms_readwrite" {
network_load_balancer_arns = compact(concat(aws_lb.apiary_hms_rw_lb.*.arn, data.aws_lb.k8s_hms_rw_lb.*.arn))
acceptance_required = false
allowed_principals = distinct(compact(concat(local.assume_allowed_principals, local.producer_allowed_principals)))
tags = merge(tomap({"Name"="${local.instance_alias}-hms-readwrite"}), "${var.apiary_tags}")
tags = merge(tomap({"Name"="${local.instance_alias}-hms-readwrite"}), var.apiary_tags)
}

resource "aws_vpc_endpoint_connection_notification" "hms_readwrite" {
Expand Down

0 comments on commit 68ce35d

Please sign in to comment.