Skip to content

Commit

Permalink
Fix CloudFormation parameters (#5)
Browse files Browse the repository at this point in the history
* Remove NoEcho to prevent constant changes

* Remove unused `capabilities`
  • Loading branch information
snovikov authored Sep 6, 2021
1 parent 65bb3d2 commit 0fa8974
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ output "newrelic_log_ingestion_lambda_arn" {
resource "aws_cloudformation_stack" "newrelic_lambda_integration" {
name = "${local.name}-lambda-integration"
template_body = file("${path.module}/nr-lambda-integration-role.yaml")
capabilities = ["CAPABILITY_AUTO_EXPAND", "CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
capabilities = ["CAPABILITY_NAMED_IAM"]
parameters = {
NewRelicAccountNumber = data.aws_ssm_parameter.newrelic_account_number.value
PolicyName = ""
Expand Down
4 changes: 4 additions & 0 deletions newrelic-log-ingestion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Parameters:
Type: String
Description: Your NewRelic license key. You may omit it when deploying the function.
Default: "YOUR_LICENSE_KEY"
# Removed because of issue mentioned here:
# https://github.com/hashicorp/terraform-provider-aws/issues/55
# TODO: resolve it after issue is solved
# NoEcho: true
Bucket:
Type: String
Description: The bucket where the newrelic-log-ingestion.zip is placed
Expand Down
5 changes: 4 additions & 1 deletion nr-license-key-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ Parameters:
Type: String
Description: The New Relic account license key
AllowedPattern: '(?:eu-)?[0-9a-f]+(?:[A-Z]{4})?'
NoEcho: true
# Removed because of issue mentioned here:
# https://github.com/hashicorp/terraform-provider-aws/issues/55
# TODO: resolve it after issue is solved
# NoEcho: true
SecretName:
Type: String
Description: The friendly name for the license key secret
Expand Down

0 comments on commit 0fa8974

Please sign in to comment.