D12751.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12751.diff
View Options

	diff --git a/services/terraform/remote/service_tunnelbroker.tf b/services/terraform/remote/service_tunnelbroker.tf
	--- a/services/terraform/remote/service_tunnelbroker.tf
	+++ b/services/terraform/remote/service_tunnelbroker.tf
	@@ -20,12 +20,17 @@
	rabbitmq_password = local.secrets.amqpPassword[local.environment]

	apns_config_secret_name = "tunnelbroker/APNsConfig"
	+ fcm_config_secret_name = "tunnelbroker/FCMConfig"
	}

	data "aws_secretsmanager_secret" "tunnelbroker_apns" {
	name = local.apns_config_secret_name
	}

	+data "aws_secretsmanager_secret" "tunnelbroker_fcm" {
	+ name = local.fcm_config_secret_name
	+}
	+
	# RabbitMQ
	resource "aws_mq_broker" "tunnelbroker_rabbitmq" {
	broker_name = "tunnelbroker-rabbitmq"
	@@ -97,6 +102,10 @@
	{
	name = "APNS_CONFIG"
	valueFrom = data.aws_secretsmanager_secret.tunnelbroker_apns.arn
	+ },
	+ {
	+ name = "FCM_CONFIG"
	+ valueFrom = data.aws_secretsmanager_secret.tunnelbroker_fcm.arn
	}
	]
	logConfiguration = {
	diff --git a/services/tunnelbroker/src/constants.rs b/services/tunnelbroker/src/constants.rs
	--- a/services/tunnelbroker/src/constants.rs
	+++ b/services/tunnelbroker/src/constants.rs
	@@ -12,6 +12,7 @@
	pub const CLIENT_RMQ_MSG_PRIORITY: u8 = 1;
	pub const RMQ_CONSUMER_TAG: &str = "tunnelbroker";
	pub const ENV_APNS_CONFIG: &str = "APNS_CONFIG";
	+pub const ENV_FCM_CONFIG: &str = "FCM_CONFIG";
	pub const LOG_LEVEL_ENV_VAR: &str =
	tracing_subscriber::filter::EnvFilter::DEFAULT_ENV;