Skip to content

[NRL-1511] Enable reporting for prod. Final release fixups #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattdean3-nhs merged 1 commit into from
Jul 8, 2025
Merged

[NRL-1511] Enable reporting for prod. Final release fixups #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion terraform/account-wide-infrastructure/dev/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ resource "aws_secretsmanager_secret" "devsandbox_environment_configuration" {
}

resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
count = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
name = "${local.project}--dev-powerbi-gw-instance-admin-pwd"
description = "Admin password for the PowerBI Gateway EC2 instance"
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/account-wide-infrastructure/prod/ec2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module "vpc" {
module "powerbi_gw_instance" {
count = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
source = "../modules/powerbi-gw-ec2"
use_custom_ami = false
use_custom_ami = var.use_powerbi_gw_custom_ami
instance_type = var.powerbi_gw_instance_type
name_prefix = "nhsd-nrlf--prod-powerbi-gw"
target_bucket_arn = module.prod-glue.target_bucket_arn
Expand Down
1 change: 0 additions & 1 deletion terraform/account-wide-infrastructure/prod/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ resource "aws_secretsmanager_secret" "prod_environment_configuration" {
}

resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
count = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
name = "${local.project}--prod-powerbi-gw-instance-admin-pwd"
description = "Admin password for the PowerBI Gateway EC2 instance"
}
Expand Down
4 changes: 2 additions & 2 deletions terraform/account-wide-infrastructure/prod/vars.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ variable "instance_type" {
variable "enable_powerbi_auto_push" {
type = bool
description = "Enable automatic pushing of info into PowerBI"
default = false
default = true
}

variable "powerbi_gw_instance_type" {
Expand All @@ -66,5 +66,5 @@ variable "powerbi_gw_instance_type" {
variable "use_powerbi_gw_custom_ami" {
type = bool
description = "Use custom image for PowerBI GW instance"
default = false
default = true
}
1 change: 0 additions & 1 deletion terraform/account-wide-infrastructure/test/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ resource "aws_secretsmanager_secret" "ref_environment_configuration" {
# PowerBI secrets
#
resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
count = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
name = "${local.project}--test-powerbi-gw-instance-admin-pwd"
description = "Admin password for the PowerBI Gateway EC2 instance"
}
Expand Down
Loading