From 8c7fa19ade71081bcd27f8fc124e34048801d34d Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Wed, 10 Jul 2024 17:00:03 +0100 Subject: [PATCH] CCM-5100: Update repo description for nhs-notify-iam-webauth --- docs/Gemfile.lock | 9 +++++++-- docs/_includes/notify-repo-list.html | 2 +- docs/_includes/page-info-header.html | 9 ++++----- docs/_layouts/notify-repo.md | 16 ++++++---------- .../_repos/nhs-notify-iam-webauth.md | 17 +++++++++++++++++ docs/collections/_repos/nhs-notify-iam.md | 13 ------------- .../config/vale/styles/Vocab/words/accept.txt | 1 + scripts/terraform/terraform.mk | 8 ++++---- 8 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 docs/collections/_repos/nhs-notify-iam-webauth.md delete mode 100644 docs/collections/_repos/nhs-notify-iam.md diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 3fbe054..35cffce 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -29,6 +29,7 @@ GEM ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) + google-protobuf (3.25.3-arm64-darwin) google-protobuf (3.25.3-x86_64-linux) html-pipeline (2.14.3) activesupport (>= 2) @@ -90,6 +91,8 @@ GEM jekyll-seo-tag (~> 2.1) minitest (5.23.1) mutex_m (0.2.0) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) pathutil (0.16.2) @@ -104,9 +107,10 @@ GEM strscan (>= 3.0.9) rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.69.5) + sass-embedded (1.69.5-arm64-darwin) + google-protobuf (~> 3.23) + sass-embedded (1.69.5-x86_64-linux-gnu) google-protobuf (~> 3.23) - rake (>= 13.0.0) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -116,6 +120,7 @@ GEM webrick (1.8.1) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES diff --git a/docs/_includes/notify-repo-list.html b/docs/_includes/notify-repo-list.html index 1e6acb1..6d7f2c4 100644 --- a/docs/_includes/notify-repo-list.html +++ b/docs/_includes/notify-repo-list.html @@ -4,7 +4,7 @@

Repository List

{% for repo in site.repos %} {% if repo.order > 0 %}
  • - {{ repo.name }} - {{ repo.description }} + {{ repo.repo-name }} - {{ repo.name }}
    • {% endif %} {% endfor %} diff --git a/docs/_includes/page-info-header.html b/docs/_includes/page-info-header.html index fe6f752..03402a9 100644 --- a/docs/_includes/page-info-header.html +++ b/docs/_includes/page-info-header.html @@ -2,10 +2,10 @@ assign wordWarning = 200 %} {% assign wordCount = content | number_of_words%} {% assign readTime = wordCount | divided_by: 100.0 | ceil %} {% if page.sub_title %} -

    {{ page.title }}

    +

    {{ page.name }}

    {{ page.summary }}

    {% else %} -

    {{ page.title }}

    +

    {{ page.name }}

    {% endif %}
    @@ -21,9 +21,8 @@

    {{ page.title }}

    >๐Ÿงพ History - {% endif %} | {% if page.author %} โœ {{page.author}} {% else %} โœ Ross - Buggins {% endif %} | {% if page.owner %} ๐Ÿ”‘ {{page.owner}} {% else %} ๐Ÿ”‘ - Ross Buggins {% endif %} + {% endif %} | {% if page.author %} โœ {{page.author}} {% else %} โœ NHS Notify {% endif %} | {% if page.owner %} ๐Ÿ”‘ {{page.owner}} {% else %} ๐Ÿ”‘ + NHS Notify {% endif %}

    {% for tag in page.tags %} -

    -https://github.com/NHSDigital/{{page.repo-name}} -

    +
    +
    Repository
    +
    https://github.com/NHSDigital/{{page.repo-name}}
    -

    Authors

    - - - -

    Content

    +
    {{ content }} diff --git a/docs/collections/_repos/nhs-notify-iam-webauth.md b/docs/collections/_repos/nhs-notify-iam-webauth.md new file mode 100644 index 0000000..df1330f --- /dev/null +++ b/docs/collections/_repos/nhs-notify-iam-webauth.md @@ -0,0 +1,17 @@ +--- +repo-name: nhs-notify-iam-webauth +owners: [ "rossbugginsnhs", "m-houston" ] +title: nhs-notify-iam-webauth +name: Notify IAM Web Authentication +description: OIDC Authentication Micro-Frontend for Web UI +author: "Mike Houston" +order: 3 +parent: Repositories +--- + +### Purpose + +This repository contains a Micro-Frontend (MFE) web application which handles user login using a Cognito User Pool + +Other MFEs composed into a single web application can access the authenticated user credentials via a cookie set for the +shared domain. diff --git a/docs/collections/_repos/nhs-notify-iam.md b/docs/collections/_repos/nhs-notify-iam.md deleted file mode 100644 index 60537a7..0000000 --- a/docs/collections/_repos/nhs-notify-iam.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -repo-name: nhs-notify-iam -owners: ["rossbugginsnhs"] -name: Notify IAM -description: Notify Identity and Access Management -author: "Ross Buggins" -order: 3 -parent: Repositories ---- - -# Something - -Core repos. diff --git a/scripts/config/vale/styles/Vocab/words/accept.txt b/scripts/config/vale/styles/Vocab/words/accept.txt index 8962b32..cd379d6 100644 --- a/scripts/config/vale/styles/Vocab/words/accept.txt +++ b/scripts/config/vale/styles/Vocab/words/accept.txt @@ -24,3 +24,4 @@ drawio endraw [Oo]nboarding relative_url +Cognito diff --git a/scripts/terraform/terraform.mk b/scripts/terraform/terraform.mk index 120a059..8b7a59f 100644 --- a/scripts/terraform/terraform.mk +++ b/scripts/terraform/terraform.mk @@ -44,8 +44,8 @@ _terraform: # Terraform command wrapper - mandatory: cmd=[command to execute]; o # 'TERRAFORM_STACK' is passed to the functions as environment variable TERRAFORM_STACK=$(or ${TERRAFORM_STACK}, $(or ${terraform_stack}, $(or ${STACK}, $(or ${stack}, scripts/terraform/examples/terraform-state-aws-s3)))) dir=$(or ${dir}, ${TERRAFORM_STACK}) - source scripts/terraform/terraform.lib.sh - terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set + . scripts/terraform/terraform.lib.sh && \ + terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set # ============================================================================== # Quality checks - please DO NOT edit this section! @@ -68,8 +68,8 @@ terraform-example-destroy-aws-infrastructure: # Destroy example of AWS infrastru terraform-example-clean: # Remove Terraform example files @ExamplesAndTests dir=$(or ${dir}, ${TERRAFORM_STACK}) - source scripts/terraform/terraform.lib.sh - terraform-clean + . scripts/terraform/terraform.lib.sh && \ + terraform-clean rm -f ${TERRAFORM_STACK}/.terraform.lock.hcl # ==============================================================================