Use terraform-core-helpers child module
#7
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,28 +2,14 @@ | |
| # https://www.terraform.io/docs/language/values/locals.html | ||
|
|
||
| locals { | ||
| helm_values = { | ||
| "cainjector.podLabels.tags\\.datadoghq\\.com/service" = "cert-manager-cainjector" | ||
| "cainjector.resources.limits.cpu" = var.cain_injector_resources_limits_cpu | ||
| "cainjector.resources.limits.memory" = var.cain_injector_resources_limits_memory | ||
| "cainjector.resources.requests.cpu" = var.cain_injector_resources_requests_cpu | ||
| "cainjector.resources.requests.memory" = var.cain_injector_resources_requests_memory | ||
| "cainjector.replicaCount" = var.cain_injector_replicas | ||
| "global.commonLabels.tags\\.datadoghq\\.com/env" = module.helpers.environment | ||
| "global.commonLabels.tags\\.datadoghq\\.com/version" = var.cert_manager_version | ||
| "podLabels.tags\\.datadoghq\\.com/service" = "cert-manager" | ||
| "resources.limits.cpu" = var.resources_limits_cpu | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,16 @@ | ||
| # Terraform Core Helpers Module (osinfra.io) | ||
| # https://github.com/osinfra-io/terraform-core-helpers | ||
|
|
||
| module "helpers" { | ||
| source = "github.com/osinfra-io/terraform-core-helpers?ref=v0.1.0" | ||
|
|
||
| cost_center = var.helpers_cost_center | ||
| data_classification = var.helpers_data_classification | ||
| email = var.helpers_email | ||
| repository = var.helpers_repository | ||
| team = var.helpers_team | ||
| } | ||
|
|
||
| # Helm Release | ||
| # https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,6 +49,31 @@ variable "chart_repository" { | |
| default = "https://charts.jetstack.io" | ||
| } | ||
|
|
||
| variable "helpers_cost_center" { | ||
| description = "The cost center the resources will be billed to, must start with 'x' followed by three or four digits" | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_data_classification" { | ||
| description = "The data classification of the resources can be public, internal, or confidential" | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_email" { | ||
| description = "The email address of the team responsible for the resources" | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_repository" { | ||
| description = "The repository name (should be in the format 'owner/repo' containing only lowercase alphanumeric characters or hyphens)" | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_team" { | ||
| description = "The team name (should contain only lowercase alphanumeric characters and hyphens)" | ||
| type = string | ||
| } | ||
|
|
||
| variable "replicas" { | ||
| description = "The number of replicas to run" | ||
| type = number | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -24,3 +24,11 @@ run "default_regional_istio_csr" { | |||||||||||||||||||||
| source = "./tests/fixtures/default/regional/istio-csr" | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| variables { | ||||||||||||||||||||||
| helpers_cost_center = "mock-cost-center" | ||||||||||||||||||||||
| helpers_data_classification = "mock-data-classification" | ||||||||||||||||||||||
| helpers_email = "mock-team@osinfra.io" | ||||||||||||||||||||||
| helpers_repository = "mock-owner/mock-repository" | ||||||||||||||||||||||
| helpers_team = "mock-team" | ||||||||||||||||||||||
|
Comment on lines
+29
to
+33
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider using more distinctive mock values. To prevent any potential confusion or accidental use in production, consider using more obviously fake values. - helpers_cost_center = "mock-cost-center"
- helpers_data_classification = "mock-data-classification"
- helpers_email = "mock-team@osinfra.io"
- helpers_repository = "mock-owner/mock-repository"
- helpers_team = "mock-team"
+ helpers_cost_center = "TEST-MOCK-COST-CENTER-000"
+ helpers_data_classification = "TEST-MOCK-DATA-CLASS-000"
+ helpers_email = "test-mock-team@example.com"
+ helpers_repository = "test-mock-owner/test-mock-repo"
+ helpers_team = "TEST-MOCK-TEAM-000"📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||
| } | ||||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,11 @@ data "terraform_remote_state" "regional" { | |
| module "test" { | ||
| source = "../../../../../regional/istio-csr" | ||
|
|
||
| artifact_registry = "mock-docker.pkg.dev/mock-project/mock-virtual" | ||
| cluster_prefix = "mock-cluster" | ||
| helpers_cost_center = var.helpers_cost_center | ||
| helpers_data_classification = var.helpers_data_classification | ||
| helpers_email = var.helpers_email | ||
| helpers_repository = var.helpers_repository | ||
| helpers_team = var.helpers_team | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Input Variables | ||
| # https://www.terraform.io/language/values/variables | ||
|
|
||
| variable "helpers_cost_center" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_data_classification" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_email" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_repository" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_team" { | ||
| type = string | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,5 +63,10 @@ data "terraform_remote_state" "regional" { | |
| module "test" { | ||
| source = "../../../../regional" | ||
|
|
||
| artifact_registry = "mock-docker.pkg.dev/mock-project/mock-virtual" | ||
| helpers_cost_center = var.helpers_cost_center | ||
| helpers_data_classification = var.helpers_data_classification | ||
| helpers_email = var.helpers_email | ||
| helpers_repository = var.helpers_repository | ||
| helpers_team = var.helpers_team | ||
|
Comment on lines
+21
to
+26
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider adding variable validation for helper values. While the mock values are appropriate for testing, consider adding variable validation blocks in the actual module to ensure these helper values meet your organization's standards (e.g., specific email formats, repository naming conventions). Example validation block to add in the main module: variable "helpers_email" {
description = "Contact email for the resource owner"
type = string
validation {
condition = can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", var.helpers_email))
error_message = "The helpers_email value must be a valid email address."
}
} |
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Input Variables | ||
| # https://www.terraform.io/language/values/variables | ||
|
|
||
| variable "helpers_cost_center" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_data_classification" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_email" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_repository" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "helpers_team" { | ||
| type = string | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Missing validation rules for helper variables
The variables are defined in multiple
variables.tffiles but none of them implement the validation rules specified in the README. The variables are declared only with type definitions, missing crucial validation blocks to enforce:helpers_cost_center: pattern validation for 'x' followed by 3-4 digitshelpers_data_classification: allowed values validation for public/internal/confidentialhelpers_repository: format validation for owner/repo pattern and character restrictionshelpers_team: character set validation for lowercase alphanumeric and hyphens🔗 Analysis chain
Verify validation rules implementation.
The new helper variables have clear descriptions with specific validation rules. Let's verify that these rules are properly implemented in the variables.tf file.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 86
Script:
Length of output: 6220