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.

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

First pass at a full terraform example #151

Merged
merged 7 commits into from
Apr 15, 2024
Merged

Conversation

regularfry
Copy link
Contributor

Description

As a general rule, the repository template should provide functionality that works out of the box. The terraform example is problematic because the options default to running the example, and the example doesn't give any guidance as to how people should set up their own code.

This patch removes the example, and replaces it with a more fully explained quick start example in Scripting_Terraform.md.

It also adds the TF_ENV environment variable, as a shorthand for selecting the terraform environment directory under infrastructure/environments.

Type of changes

  • Refactoring (non-breaking change)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • I am familiar with the contributing guidelines
  • I have followed the code style of the project
  • I have added tests to cover my changes
  • I have updated the documentation accordingly
  • This PR is a result of pair or mob programming

Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others privacy, we kindly ask you to NOT including PII (Personal Identifiable Information) / PID (Personal Identifiable Data) or any other sensitive data in this PR (Pull Request) and the codebase changes. We will remove any PR that do contain any sensitive information. We really appreciate your cooperation in this matter.

  • I confirm that neither PII/PID nor sensitive data are included in this PR and the codebase changes.

@regularfry regularfry changed the title WIP First pass at a full terraform example First pass at a full terraform example Mar 4, 2024
@regularfry regularfry requested a review from stefaniuk March 4, 2024 10:31
Copy link
Contributor

@stefaniuk stefaniuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR looks good to me. A guide reads better than a dry example.

Just one small additional change would be nice to make to clean up.

scripts/terraform/terraform.mk Show resolved Hide resolved
Copy link
Contributor

@stefaniuk stefaniuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stefaniuk stefaniuk added this pull request to the merge queue Apr 15, 2024
Merged via the queue into main with commit 5be34c4 Apr 15, 2024
23 checks passed
@stefaniuk stefaniuk deleted the alyo12-terraform-docs branch April 15, 2024 20:23
RossBugginsNHS added a commit to NHSDigital/nhs-notify-repository-template that referenced this pull request Jun 18, 2024
commit bf69df4
Author: fstewart-nhs <[email protected]>
Date:   Thu Jun 6 12:00:44 2024 +0100

    Update diagrams section and add Mermaids example (nhs-england-tools#165)

    <!-- markdownlint-disable-next-line first-line-heading -->

    Small update to the README with suggestions for diagram options that
    keep the source under version control. I.e. `drawio` which is already
    used in the examples, but also `mermaids`. Also provide a basic
    `mermaids` example.

    Updates guidance on diagram tooling.

    <!-- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply. -->

    - [ ] Refactoring (non-breaking change)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would change existing
    functionality)
    - [ ] Bug fix (non-breaking change which fixes an issue)

    <!-- Go over all the following points, and put an `x` in all the boxes
    that apply. -->

    - [ ] I am familiar with the [contributing
    guidelines](../docs/CONTRIBUTING.md)
    - [ ] I have followed the code style of the project
    - [ ] I have added tests to cover my changes
    - [ ] I have updated the documentation accordingly
    - [ ] This PR is a result of pair or mob programming

    ---

    To ensure the utmost confidentiality and protect your and others
    privacy, we kindly ask you to NOT including [PII (Personal Identifiable
    Information) / PID (Personal Identifiable
    Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
    or any other sensitive data in this PR (Pull Request) and the codebase
    changes. We will remove any PR that do contain any sensitive
    information. We really appreciate your cooperation in this matter.

    - [ ] I confirm that neither PII/PID nor sensitive data are included in
    this PR and the codebase changes.

commit 0ed3c55
Author: Alex Young <[email protected]>
Date:   Wed May 1 11:48:52 2024 +0100

    Check markdown in files known to git, not all files (nhs-england-tools#158)

    <!-- markdownlint-disable-next-line first-line-heading -->

    As currently written, `check=all scripts/githooks/check-markdown-format`
    will not only check files intentionally checked in, it will also check
    anything under, for instance, `.venv/` or `node_modules/` which are out
    of our control.

    This change makes it only pay attention to checked-in files. I don't
    think it was intentional that we lint markdown in dependencies.

    <!-- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply. -->

    - [ ] Refactoring (non-breaking change)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would change existing
    functionality)
    - [x] Bug fix (non-breaking change which fixes an issue)

    <!-- Go over all the following points, and put an `x` in all the boxes
    that apply. -->

    - [x] I am familiar with the [contributing
    guidelines](../docs/CONTRIBUTING.md)
    - [x] I have followed the code style of the project
    - [ ] I have added tests to cover my changes
    - [ ] I have updated the documentation accordingly
    - [ ] This PR is a result of pair or mob programming

    ---

    To ensure the utmost confidentiality and protect your and others
    privacy, we kindly ask you to NOT including [PII (Personal Identifiable
    Information) / PID (Personal Identifiable
    Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
    or any other sensitive data in this PR (Pull Request) and the codebase
    changes. We will remove any PR that do contain any sensitive
    information. We really appreciate your cooperation in this matter.

    - [x] I confirm that neither PII/PID nor sensitive data are included in
    this PR and the codebase changes.

    Signed-off-by: Alex Young <[email protected]>

commit 9d88dae
Author: Dan Stefaniuk <[email protected]>
Date:   Wed Apr 17 13:39:43 2024 +0100

    Add sed and grep to the list of prerequisites (nhs-england-tools#150)

    Add `sed` and `grep` GNU toolchain commands to the list of
    prerequisites.

    While setting up workstations with a new team, some scripts failed and
    it wasn't immediately apparent that the version of the `sed` command had
    to be GNU compliant.

    - [x] Refactoring (non-breaking change)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would change existing
    functionality)
    - [ ] Bug fix (non-breaking change which fixes an issue)

    - [x] I am familiar with the [contributing
    guidelines](../docs/CONTRIBUTING.md)
    - [x] I have followed the code style of the project
    - [ ] I have added tests to cover my changes
    - [x] I have updated the documentation accordingly
    - [ ] This PR is a result of pair or mob programming

    ---

    To ensure the utmost confidentiality and protect your and others
    privacy, we kindly ask you to NOT including [PII (Personal Identifiable
    Information) / PID (Personal Identifiable
    Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
    or any other sensitive data in this PR (Pull Request) and the codebase
    changes. We will remove any PR that do contain any sensitive
    information. We really appreciate your cooperation in this matter.

    - [x] I confirm that neither PII/PID nor sensitive data are included in
    this PR and the codebase changes.

commit 5be34c4
Author: Alex Young <[email protected]>
Date:   Mon Apr 15 21:23:11 2024 +0100

    First pass at a full terraform example (nhs-england-tools#151)

    <!-- markdownlint-disable-next-line first-line-heading -->

    As a general rule, the repository template should provide functionality
    that works out of the box. The terraform example is problematic because
    the options default to running the example, and the example doesn't give
    any guidance as to how people should set up their own code.

    This patch removes the example, and replaces it with a more fully
    explained quick start example in `Scripting_Terraform.md`.

    It also adds the `TF_ENV` environment variable, as a shorthand for
    selecting the terraform environment directory under
    `infrastructure/environments`.

    <!-- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply. -->

    - [ ] Refactoring (non-breaking change)
    - [x] New feature (non-breaking change which adds functionality)
    - [x] Breaking change (fix or feature that would change existing
    functionality)
    - [ ] Bug fix (non-breaking change which fixes an issue)

    <!-- Go over all the following points, and put an `x` in all the boxes
    that apply. -->

    - [ ] I am familiar with the [contributing
    guidelines](../docs/CONTRIBUTING.md)
    - [ ] I have followed the code style of the project
    - [ ] I have added tests to cover my changes
    - [ ] I have updated the documentation accordingly
    - [ ] This PR is a result of pair or mob programming

    ---

    To ensure the utmost confidentiality and protect your and others
    privacy, we kindly ask you to NOT including [PII (Personal Identifiable
    Information) / PID (Personal Identifiable
    Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
    or any other sensitive data in this PR (Pull Request) and the codebase
    changes. We will remove any PR that do contain any sensitive
    information. We really appreciate your cooperation in this matter.

    - [x] I confirm that neither PII/PID nor sensitive data are included in
    this PR and the codebase changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants