Skip to content

Commit

Permalink
Merge branch 'main' into dockerize-snapshot-upload
Browse files Browse the repository at this point in the history
  • Loading branch information
LesnyRumcajs authored Feb 6, 2024
2 parents 4b5d7ca + c2d6322 commit 5ec9e42
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 34 deletions.
65 changes: 37 additions & 28 deletions scripts/mirror-actors/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tf-managed/modules/sync-check/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ locals {
FOREST_TARGET_RUBY_COMMON = "/volumes/ruby_common",
slack_token = var.slack_token,
slack_channel = var.slack_channel,
NEW_RELIC_API_KEY = var.NEW_RELIC_API_KEY,
NEW_RELIC_ACCOUNT_ID = var.NEW_RELIC_ACCOUNT_ID,
NEW_RELIC_REGION = var.NEW_RELIC_REGION,
NEW_RELIC_API_KEY = var.new_relic_api_key,
NEW_RELIC_ACCOUNT_ID = var.new_relic_account_id,
NEW_RELIC_REGION = var.new_relic_region,
forest_tag = "edge-fat"
})
}
Expand Down
6 changes: 3 additions & 3 deletions tf-managed/modules/sync-check/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ variable "project" {
default = "Forest-DEV" # Alternative: "Default"
}

variable "NEW_RELIC_REGION" {
variable "new_relic_region" {
description = "The New Relic Platform Region"
type = string
default = "EU"
}

variable "NEW_RELIC_API_KEY" {
variable "new_relic_api_key" {
description = "New Relic API KEY"
default = ""
type = string
sensitive = true
}

variable "NEW_RELIC_ACCOUNT_ID" {
variable "new_relic_account_id" {
description = "The New Relic Account ID"
default = ""
type = string
Expand Down

0 comments on commit 5ec9e42

Please sign in to comment.