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

refactor: added additional prefix validation #776

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
+155 −3
Open

refactor: added additional prefix validation #776

Changes from 6 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3583b31
refactor: added additional prefix validation
kierramarie Nov 14, 2024
20f0c18
fix: added or null
kierramarie Nov 14, 2024
c6d061e
fix: added coalesce
kierramarie Nov 14, 2024
fa4db13
fix: updated coalesce
kierramarie Nov 14, 2024
e7f7460
fix: updated coalesce
kierramarie Nov 14, 2024
fd54957
fix: updated coalesce again
kierramarie Nov 15, 2024
3ef8d23
Merge branch 'main' into ks-add-prefix-val
shemau Nov 29, 2024
4085847
Merge branch 'main' into ks-add-prefix-val
kierramarie Dec 9, 2024
3ac25ad
refactor: update condition
kierramarie Jan 6, 2025
92c1c37
Merge branch 'main' into ks-add-prefix-val
kierramarie Jan 6, 2025
b0e81f6
Merge branch 'ks-add-prefix-val' of https://github.com/terraform-ibm-…
kierramarie Jan 6, 2025
8267b05
refactor: update condition
kierramarie Jan 6, 2025
9ad9202
fix: prefix validation update
kierramarie Jan 6, 2025
717ab4a
chore: merge with main
kierramarie Jan 21, 2025
bc9b8b3
fix: prefix validation condition change
kierramarie Jan 21, 2025
c9b13cb
fix: working prefix validation and allows empty string
kierramarie Jan 21, 2025
ee89a8f
fix: return prefix default
kierramarie Jan 21, 2025
ab8a6a2
Merge branch 'main' into ks-add-prefix-val
kierramarie Feb 5, 2025
804e420
fix: better regex
kierramarie Feb 10, 2025
9ce6be5
Merge branch 'main' into ks-add-prefix-val
kierramarie Feb 10, 2025
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
4 changes: 4 additions & 0 deletions solutions/instance/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ variable "prefix" {
type = string
description = "(Optional) Prefix to append to all resources created by this solution."
default = null
validation {
error_message = "Prefix must begin with a lowercase letter and contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters."
condition = can(regex("^([a-z]|[a-z][-a-z0-9]*[a-z0-9])$", coalesce(var.prefix, "cos"))) && length(coalesce(var.prefix, "cos")) <= 16
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be neater

    condition = anytrue([
      var.prefix == null,
      can(regex("^([a-z]|[a-z][-a-z0-9]{0,14}[a-z0-9])$", var.prefix))
    ])

Either
null

the regex is
a single lower letter,
or,
a single lower letter, ending in letter or number with 0 to 14 characters (making 16 total) in the middle.

This avoids the coalesce commands with an arbitrary string and the need for a specific length validation

Copy link
Contributor

Choose a reason for hiding this comment

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

Two adjacent '-'s are also not permitted.

  validation {
  condition = anytrue([
      var.prefix == null,
      alltrue([
        can(regex("^([a-z]|[a-z][-a-z0-9]{0,14}[a-z0-9])$", var.prefix)),
        length(regexall("^.*--.*", var.prefix)) == 0
      ])
    ])
    error_message = "Prefix must begin with a lowercase letter, contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters."
  }

Copy link
Contributor

Choose a reason for hiding this comment

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

Very brief discussion in the standup today. Decided this should be a request changes response.

}
}

variable "existing_resource_group" {
Expand Down