Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
80a3cb3
build(.tool-versions): bump tool versions for terraform-docs and pre-…
nhs-oliverslater May 6, 2026
c416895
docs(infrastructure/modules): correct formatting and refresh tf-docs …
nhs-oliverslater May 6, 2026
c006be7
docs(docs/developer-guides): Update GitHub links to use permalinks (v…
nhs-oliverslater May 6, 2026
a0640e1
feat(infrastructure/modules/tags): add new tags module and implement …
nhs-oliverslater May 6, 2026
a3c0a47
docs(infrastructure/modules): correct formatting and refresh tf-docs …
nhs-oliverslater May 6, 2026
89ad801
fix(infrastructure/modules/tags/variables.tf): set default value for …
nhs-oliverslater May 6, 2026
1a2b741
test(infrastructure/modules/tags/region.tf): add tflint exclusions fo…
nhs-oliverslater May 6, 2026
31a6dee
style(infrastructure/modules/tags): lint fix and formatting
nhs-oliverslater May 6, 2026
19e26b9
fix(infrastructure/modules/tags/exports/context.tf): add context.tf f…
nhs-oliverslater May 6, 2026
9200d06
feat(infrastructure/modules/kms): add new kms module
nhs-oliverslater May 7, 2026
e6fd278
docs(infrastructure/modules/tags): correct description for var.label_…
nhs-oliverslater May 7, 2026
1192ff9
fix(infrastructure/modules/tags/main.tf): update deprecated data sour…
nhs-oliverslater May 7, 2026
cdb8e2d
fix(infrastructure/modules/tags/main.tf): covert incompatible generat…
nhs-oliverslater May 7, 2026
fdf21ab
fix(infrastructure/modules/kms/outputs.tf): add outputs to kms module
nhs-oliverslater May 11, 2026
4a35b25
intro IAM module
Pira-nhs May 13, 2026
c3ebff9
fmt check english
Pira-nhs May 13, 2026
a11fc6c
consume upstream module
Pira-nhs May 19, 2026
8b6d12f
Merge remote-tracking branch 'origin/feature/BCSS-23189-add-new-modul…
Pira-nhs May 19, 2026
7789fed
update based of boostrap stack changes
Pira-nhs May 21, 2026
58900d3
Merge branch 'main' into feature/BCSS-23301-add-new-iam-module
nhs-oliverslater May 27, 2026
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
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ nodejs 24.16.0
# docker/koalaman/shellcheck latest@sha256:e40388688bae0fcffdddb7e4dea49b900c18933b452add0930654b2dea3e7d5c # SEE: https://hub.docker.com/r/koalaman/shellcheck/tags
# docker/mstruebing/editorconfig-checker 2.7.1@sha256:dd3ca9ea50ef4518efe9be018d669ef9cf937f6bb5cfe2ef84ff2a620b5ddc24 # SEE: https://hub.docker.com/r/mstruebing/editorconfig-checker/tags
# docker/sonarsource/sonar-scanner-cli 5.0.1@sha256:494ecc3b5b1ee1625bd377b3905c4284e4f0cc155cff397805a244dee1c7d575 # SEE: https://hub.docker.com/r/sonarsource/sonar-scanner-cli/tags
<!-- markdownlint-enable -->
<!-- markdownlint-restore -->
366 changes: 366 additions & 0 deletions infrastructure/modules/iam/context.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,366 @@
#
# ONLY EDIT THIS FILE IN github.com/NHSDigital/screening-terraform-modules-aws/infrastructure/modules/tags
# All other instances of this file should be a copy of that one
#
#
# Copy this file from https://github.com/NHSDigital/screening-terraform-modules-aws/blob/master/infrastructure/modules/tags/exports/context.tf
# and then place it in your Terraform module to automatically get
# tag module standard configuration inputs suitable for passing
# to other modules.
#
# curl -sL https://raw.githubusercontent.com/NHSDigital/screening-terraform-modules-aws/master/infrastructure/modules/tags/exports/context.tf -o context.tf
#
# Modules should access the whole context as `module.this.context`
# to get the input variables with nulls for defaults,
# for example `context = module.this.context`,
# and access individual variables as `module.this.<var>`,
# with final values filled in.
#
# For example, when using defaults, `module.this.context.delimiter`
# will be null, and `module.this.delimiter` will be `-` (hyphen).
#

module "this" {
source = "git::https://github.com/NHSDigital/screening-terraform-modules-aws.git//infrastructure/modules/tags?ref=feature/BCSS-23189-add-new-modules-to-suppport-bcss"

service = var.service
project = var.project
region = var.region
environment = var.environment
stack = var.stack
workspace = var.workspace
name = var.name
delimiter = var.delimiter
attributes = var.attributes
tags = var.tags
additional_tag_map = var.additional_tag_map
label_order = var.label_order
regex_replace_chars = var.regex_replace_chars
id_length_limit = var.id_length_limit
label_key_case = var.label_key_case
label_value_case = var.label_value_case
descriptor_formats = var.descriptor_formats
labels_as_tags = var.labels_as_tags

context = var.context
}

# Copy contents of screening-terraform-modules-aws/tags/variables.tf here
# tflint-ignore: terraform_unused_declarations
variable "aws_region" {
type = string
description = "The AWS region"
default = "eu-west-2"
validation {
condition = contains(["eu-west-1", "eu-west-2", "us-east-1"], var.aws_region)
error_message = "AWS Region must be one of eu-west-1, eu-west-2, us-east-1"
}
}

variable "context" {
type = any
default = {
enabled = true
service = null
project = null
region = null
environment = null
stack = null
workspace = null
name = null
delimiter = null
attributes = []
tags = {}
additional_tag_map = {}
regex_replace_chars = null
label_order = []
id_length_limit = null
label_key_case = null
label_value_case = null
descriptor_formats = {}
# Note: we have to use [] instead of null for unset lists due to
# https://github.com/hashicorp/terraform/issues/28137
# which was not fixed until Terraform 1.0.0,
# but we want the default to be all the labels in `label_order`
# and we want users to be able to prevent all tag generation
# by setting `labels_as_tags` to `[]`, so we need
# a different sentinel to indicate "default"
labels_as_tags = ["unset"]
}
description = <<-EOT
Single object for setting entire context at once.
See description of individual variables for details.
Leave string and numeric variables as `null` to use default value.
Individual variable settings (non-null) override settings in context object,
except for attributes, tags, and additional_tag_map, which are merged.
EOT

validation {
condition = lookup(var.context, "label_key_case", null) == null ? true : contains(["lower", "title", "upper"], var.context["label_key_case"])
error_message = "Allowed values: `lower`, `title`, `upper`."
}

validation {
condition = lookup(var.context, "label_value_case", null) == null ? true : contains(["lower", "title", "upper", "none"], var.context["label_value_case"])
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
}
}

variable "enabled" {
type = bool
default = null
description = "Set to false to prevent the module from creating any resources"
}

variable "service" {
type = string
default = null
description = "ID element. Usually an abbreviation of your service directorate name, e.g. 'bcss' or 'csms', to help ensure generated IDs are globally unique"
}

variable "region" {
type = string
default = null
description = "ID element _(Rarely used, not included by default)_. Usually an abbreviation of the selected AWS region e.g. 'uw2', 'ew2' or 'gbl' for resources like IAM roles that have no region"
}

variable "project" {
type = string
default = null
description = "ID element. A project identifier, indicating the name or role of the project the resource is for, such as `website` or `api`"
}
variable "stack" {
type = string
default = null
description = "ID element. The name of the stack/component, e.g. `database`, `web`, `waf`, `eks`"
}
variable "workspace" {
type = string
default = null
description = "ID element. The Terraform workspace, to help ensure generated IDs are unique across workspaces"
}
variable "environment" {
type = string
default = null
description = "ID element. Usually used to indicate role, e.g. 'prd', 'dev', 'test', 'preprod', 'prod', 'uat'"
}

variable "name" {
type = string
default = null
description = <<-EOT
ID element. Usually the component or solution name, e.g. 'app' or 'jenkins'.
This is the only ID element not also included as a `tag`.
The "name" tag is set to the full `id` string. There is no tag with the value of the `name` input.
EOT
}

variable "delimiter" {
type = string
default = null
description = <<-EOT
Delimiter to be used between ID elements.
Defaults to `-` (hyphen). Set to `""` to use no delimiter at all.
EOT
}

variable "attributes" {
type = list(string)
default = []
description = <<-EOT
ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,
in the order they appear in the list. New attributes are appended to the
end of the list. The elements of the list are joined by the `delimiter`
and treated as a single ID element.
EOT
}

variable "labels_as_tags" {
type = set(string)
default = ["default"]
description = <<-EOT
Set of labels (ID elements) to include as tags in the `tags` output.
Default is to include all labels.
Tags with empty values will not be included in the `tags` output.
Set to `[]` to suppress all generated tags.
**Notes:**
The value of the `name` tag, if included, will be the `id`, not the `name`.
Unlike other `null-label` inputs, the initial setting of `labels_as_tags` cannot be
changed in later chained modules. Attempts to change it will be silently ignored.
EOT
}

variable "tags" {
type = map(string)
default = {}
description = <<-EOT
Additional tags (e.g. `{'BusinessUnit': 'XYZ'}`).
Neither the tag keys nor the tag values will be modified by this module.
EOT
}

variable "additional_tag_map" {
type = map(string)
default = {}
description = <<-EOT
Additional key-value pairs to add to each map in `tags_as_list_of_maps`. Not added to `tags` or `id`.
This is for some rare cases where resources want additional configuration of tags
and therefore take a list of maps with tag key, value, and additional configuration.
EOT
}

variable "label_order" {
type = list(string)
default = null
description = <<-EOT
The order in which the labels (ID elements) appear in the `id`.
Defaults to ["namespace", "environment", "stage", "name", "attributes"].
You can omit any of the 6 labels ("tenant" is the 6th), but at least one must be present.
EOT
}

variable "regex_replace_chars" {
type = string
default = null
description = <<-EOT
Terraform regular expression (regex) string.
Characters matching the regex will be removed from the ID elements.
If not set, `"/[^a-zA-Z0-9-]/"` is used to remove all characters other than hyphens, letters and digits.
EOT
}

variable "id_length_limit" {
type = number
default = null
description = <<-EOT
Limit `id` to this many characters (minimum 6).
Set to `0` for unlimited length.
Set to `null` for keep the existing setting, which defaults to `0`.
Does not affect `id_full`.
EOT
validation {
condition = var.id_length_limit == null ? true : var.id_length_limit >= 6 || var.id_length_limit == 0
error_message = "The id_length_limit must be >= 6 if supplied (not null), or 0 for unlimited length."
}
}

variable "label_key_case" {
type = string
default = null
description = <<-EOT
Controls the letter case of the `tags` keys (label names) for tags generated by this module.
Does not affect keys of tags passed in via the `tags` input.
Possible values: `lower`, `title`, `upper`.
Default value: `title`.
EOT

validation {
condition = var.label_key_case == null ? true : contains(["lower", "title", "upper"], var.label_key_case)
error_message = "Allowed values: `lower`, `title`, `upper`."
}
}

variable "label_value_case" {
type = string
default = null
description = <<-EOT
Controls the letter case of ID elements (labels) as included in `id`,
set as tag values, and output by this module individually.
Does not affect values of tags passed in via the `tags` input.
Possible values: `lower`, `title`, `upper` and `none` (no transformation).
Set this to `title` and set `delimiter` to `""` to yield Pascal Case IDs.
Default value: `lower`.
EOT

validation {
condition = var.label_value_case == null ? true : contains(["lower", "title", "upper", "none"], var.label_value_case)
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
}
}

variable "descriptor_formats" {
type = any
default = {}
description = <<-EOT
Describe additional descriptors to be output in the `descriptors` output map.
Map of maps. Keys are names of descriptors. Values are maps of the form
`{
format = string
labels = list(string)
}`
(Type is `any` so the map values can later be enhanced to provide additional options.)
`format` is a Terraform format string to be passed to the `format()` function.
`labels` is a list of labels, in order, to pass to `format()` function.
Label values will be normalized before being passed to `format()` so they will be
identical to how they appear in `id`.
Default is `{}` (`descriptors` output will be empty).
EOT
}

variable "owner" {
type = string
description = "The name and or NHS.net email address of the service owner"
default = "None"
}

variable "tag_version" {
type = string
description = "Used to identify the tagging version in use"
default = "1.0"
}

variable "data_classification" {
type = string
description = "Used to identify the data classification of the resource, e.g 1-5"
default = "n/a"
validation {
condition = contains(["n/a", "1", "2", "3", "4", "5"], var.data_classification)
error_message = "Data Classification must be \"n/a\" or between 1-5"
}
}

variable "data_type" {
type = string
description = "The tag data_type"
default = "None"
validation {
condition = contains(["None", "PCD", "PID", "Anonymised", "UserAccount", "Audit"], var.data_type)
error_message = "Data Type must be one of None, PCD, PID, Anonymised, UserAccount, Audit"
}
}


variable "public_facing" {
type = bool
description = "Whether this resource is public facing"
default = false
}

variable "service_category" {
type = string
description = "The tag service_category"
default = "n/a"
validation {
condition = contains(["n/a", "Bronze", "Silver", "Gold", "Platinum"], var.service_category)
error_message = "The Service Category must be one of n/a, Bronze, Silver, Gold, Platinum"
}
}
variable "on_off_pattern" {
type = string
description = "Used to turn resources on and off based on a time pattern"
default = "n/a"
}

variable "application_role" {
type = string
description = "The role the application is performing"
default = "General"
}

variable "tool" {
type = string
description = "The tool used to deploy the resource"
default = "Terraform"
}

#### End of copy of screening-terraform-modules-aws/tags/variables.tf
Loading
Loading