Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions spire/templates/apps/augury.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Augury/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -539,7 +539,7 @@ Resources:
- Name: ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Augury/ar-encryption-key-derivation-salt
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -710,7 +710,7 @@ Resources:
- Name: ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Augury/ar-encryption-key-derivation-salt
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -1155,7 +1155,7 @@ Resources:
- Name: ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Augury/ar-encryption-key-derivation-salt
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
Cpu: "4096"
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
Memory: "16384"
Expand Down
4 changes: 2 additions & 2 deletions spire/templates/apps/castle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Castle/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -306,7 +306,7 @@ Resources:
- Name: PG_USER
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Castle/database-username
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/CMS/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -508,7 +508,7 @@ Resources:
- Name: RAILS_SECRET_KEY
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/CMS/rails-secret-key
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -625,7 +625,7 @@ Resources:
- Name: RAILS_SECRET_KEY
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/CMS/rails-secret-key
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
4 changes: 2 additions & 2 deletions spire/templates/apps/dovetail-insights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Insights/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -302,7 +302,7 @@ Resources:
- Name: SECRET_KEY_BASE
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Insights/secret-key-base
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 2 additions & 4 deletions spire/templates/apps/dovetail-router.yml
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,7 @@ Resources:
Sid: AllowAppParameterRead
- Action: ssm:GetParameters
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/*
Resource: !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/*
Sid: AllowGlobalParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -839,7 +837,7 @@ Resources:
- Name: MAXMIND_LICENSE_KEY
ValueFrom: /prx/global/Spire/maxmind/license-key
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
Ulimits:
- HardLimit: 8192
Name: nofile
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/dovetail-spots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Spots/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -349,7 +349,7 @@ Resources:
- Name: SECRET_KEY_BASE
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Spots/secret-key-base
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -479,7 +479,7 @@ Resources:
- Name: SECRET_KEY_BASE
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Spots/secret-key-base
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/exchange.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Exchange/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -590,7 +590,7 @@ Resources:
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Exchange/chef-validation-certificate
- !Ref AWS::NoValue
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -829,7 +829,7 @@ Resources:
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Exchange/chef-validation-certificate
- !Ref AWS::NoValue
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/feeder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Feeder/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
- Action: ssm:GetParameters
Effect: Allow
Expand Down Expand Up @@ -956,7 +956,7 @@ Resources:
- Name: ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Feeder/ar-encryption-key-derivation-salt
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -1149,7 +1149,7 @@ Resources:
- Name: ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Feeder/ar-encryption-key-derivation-salt
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
4 changes: 2 additions & 2 deletions spire/templates/apps/id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/ID/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -389,7 +389,7 @@ Resources:
- Name: LOCKBOX_MASTER_KEY
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/ID/lockbox-master-key
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
8 changes: 4 additions & 4 deletions spire/templates/apps/networks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Networks/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -444,7 +444,7 @@ Resources:
- Name: RAILS_SESSION_SECRET
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Networks/rails-session-secret
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt PublicWebExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -722,7 +722,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Networks/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -868,7 +868,7 @@ Resources:
- Name: RAILS_SESSION_SECRET
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Networks/rails-session-secret
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt SphinxServerExecutionRole.Arn
NetworkMode: awsvpc
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/remix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/Remix/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -374,7 +374,7 @@ Resources:
- Name: PORTER_CALLBACK_TOKEN
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Remix/porter-callback-token
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -491,7 +491,7 @@ Resources:
- Name: PORTER_CALLBACK_TOKEN
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Remix/porter-callback-token
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/the-castle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/The_Castle/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -332,7 +332,7 @@ Resources:
- Name: MEDIAJOINT_PASSWORD
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_Castle/mediajoint-password
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -438,7 +438,7 @@ Resources:
- Name: MEDIAJOINT_PASSWORD
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_Castle/mediajoint-password
- Name: NEW_RELIC_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down
6 changes: 3 additions & 3 deletions spire/templates/apps/wfmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ Resources:
Effect: Allow
Resource:
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/${EnvironmentTypeAbbreviation}/Spire/WFMT/*
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Terra/new-relic-lite-api-key
- !Sub arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/prx/global/Spire/new-relic-lite-api-key
Sid: AllowAppParameterRead
Version: "2012-10-17"
PolicyName: ContainerSecrets
Expand Down Expand Up @@ -572,7 +572,7 @@ Resources:
- Name: DEVISE_SECRET_KEY
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/WFMT/devise-secret
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down Expand Up @@ -728,7 +728,7 @@ Resources:
- Name: DEVISE_SECRET_KEY
ValueFrom: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/WFMT/devise-secret
- Name: NEW_RELIC_LICENSE_KEY
ValueFrom: /prx/global/Terra/new-relic-lite-api-key
ValueFrom: /prx/global/Spire/new-relic-lite-api-key
ExecutionRoleArn: !GetAtt ExecutionRole.Arn
NetworkMode: bridge
Tags:
Expand Down