Skip to content
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

Jump to bottom

Dd/test if pr number is available in code #4697

Draft
wants to merge 2 commits into
base: dd/remove-aks-from-rails-environments
Choose a base branch
from
+9 −1
Draft

Dd/test if pr number is available in code #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a2b62
Attempt to read PR_NUMBER
Nitemaeric Nov 18, 2024
817fb05
Attempt to set and read APP_NAME_SUFFIX
Nitemaeric Nov 18, 2024
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: 8 additions & 0 deletions app/views/sign_in/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">
<p class="govuk-body">
<%= ENV.fetch("PR_NUMBER", "Can't read PR_NUMBER") %>
</p>

<p class="govuk-body">
<%= ENV.fetch("APP_NAME_SUFFIX", "Can't read APP_NAME_SUFFIX") %>
</p>

<%= render partial: "default_signin_content" %>
</div>
</div>
2 changes: 1 addition & 1 deletion terraform/aks/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ locals {
REDIS_CACHE_URL = module.redis_cache.url
REDIS_WORKER_URL = module.redis_worker.url
}
app_env_values = yamldecode(file(var.app_config_file))[var.app_environment]
app_env_values = merge(yamldecode(file(var.app_config_file))[var.app_environment], { APP_NAME_SUFFIX = local.app_name_suffix })
infra_secrets = yamldecode(module.secrets.map[var.key_vault_infra_secret_name])

statuscake_additional_hostnames = var.additional_hostnames != null ? tolist([for hostname in var.additional_hostnames : format("https://%s/ping", hostname)]) : null
Expand Down
Loading