Add whitehall govuk_basic_auth_credentials to link checker api for integration & staging #7092
Conversation
SebAshton
force-pushed
the
add-govuk-basic-auth-credentials
branch
from
d98546e
to
bc81117
Compare
SebAshton
changed the title
SebAshton
force-pushed
the
add-govuk-basic-auth-credentials
branch
from
bc81117
to
a2376b1
Compare
| @@ -25,6 +25,7 @@ govuk::apps::email_alert_api::govuk_notify_base_url: 'https://api.staging-notify | |||
| govuk::apps::email_alert_api::govuk_notify_template_id: '76d21ce7-54c3-4fb7-8830-ba3b79287985' | |||
| govuk::apps::hmrc_manuals_api::publish_topics: false | |||
| govuk::apps::kibana::logit_environment: d414187a-2796-4ea7-9b9a-d40c341646d6 | |||
| govuk::apps::link_checker_api::govuk_basic_auth_credentials: "%{hiera('http_username')}:%{hiera('http_password')}" | |||
There was a problem hiding this comment.
I think this will need the Basic at the beginning of the string.
There was a problem hiding this comment.
Any reason we haven't split these up as per previous use cases:
govuk-puppet/hieradata/common.yaml
Line 815 in a2376b1
There was a problem hiding this comment.
Actually... since we called the variable govuk_basic_auth_credentials, I think we should update https://github.com/alphagov/link-checker-api/pull/120/files#diff-4e80c9e759124f64feef221083d041dbR294 to put in the Basic for us.
There was a problem hiding this comment.
@dwhenry No real reason except it fits what Whitehall used to do and it works better with how the Link Checker API is configured.
SebAshton
force-pushed
the
add-govuk-basic-auth-credentials
branch
2 times, most recently
from
09d5ea9
to
4c4379d
Compare
hieradata/staging.yaml
Outdated
| @@ -25,6 +25,7 @@ govuk::apps::email_alert_api::govuk_notify_base_url: 'https://api.staging-notify | |||
| govuk::apps::email_alert_api::govuk_notify_template_id: '76d21ce7-54c3-4fb7-8830-ba3b79287985' | |||
| govuk::apps::hmrc_manuals_api::publish_topics: false | |||
| govuk::apps::kibana::logit_environment: d414187a-2796-4ea7-9b9a-d40c341646d6 | |||
| govuk::apps::link_checker_api::govuk_basic_auth_credentials: "Basic %{hiera('http_username')}:%{hiera('http_password')}" | |||
There was a problem hiding this comment.
Sorry I've changed my mind... I think we shouldn't include the Basic in the string here as the variable has basic in the name.
SebAshton
force-pushed
the
add-govuk-basic-auth-credentials
branch
from
4c4379d
to
accd0c8
Compare
This PR adds a new env var to set the basic auth credentials for the link checker API to pass the basic auth challenge on integration.