Update variables (#4)

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: check-symlinks
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.96.1
+    rev: v1.96.2
     hooks:
       - id: terraform_fmt
 
@@ -29,7 +29,7 @@ repos:
       - id: terraform_docs
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: 3.2.269
+    rev: 3.2.276
     hooks:
       - id: checkov
         verbose: true

README.md

@@ -77,18 +77,21 @@ No resources.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cost_center"></a> [cost\_center](#input\_cost\_center) | The cost center the resources will be billed to, must start with 'x' followed by three or four digits | `string` | n/a | yes |
 | <a name="input_data_classification"></a> [data\_classification](#input\_data\_classification) | The data classification of the resources can be public, internal, or confidential | `string` | n/a | yes |
-| <a name="input_email"></a> [email](#input\_email) | The email address of the team responsible for the resources | `string` | n/a | yes |
-| <a name="input_repository"></a> [repository](#input\_repository) | The repository name (should be in the format 'owner/repo') containing only lowercase alphanumeric characters or hyphens | `string` | n/a | yes |
+| <a name="input_repository"></a> [repository](#input\_repository) | The repository name containing only lowercase alphanumeric characters or hyphens | `string` | n/a | yes |
 | <a name="input_team"></a> [team](#input\_team) | The team name (should contain only lowercase alphanumeric characters and hyphens) | `string` | n/a | yes |
 | <a name="input_workspace"></a> [workspace](#input\_workspace) | This is used for tests to set the workspace name. Do not set this variable in any other context | `string` | `null` | no |
 
 ### Outputs
 
 | Name | Description |
 |------|-------------|
+| <a name="output_cost_center"></a> [cost\_center](#output\_cost\_center) | The cost center the resources will be billed to |
+| <a name="output_data_classification"></a> [data\_classification](#output\_data\_classification) | The data classification of the resources |
 | <a name="output_env"></a> [env](#output\_env) | The short name for the environment for example prod, nonprod, sb |
 | <a name="output_environment"></a> [environment](#output\_environment) | The environment name for example production, non-production, sandbox |
 | <a name="output_labels"></a> [labels](#output\_labels) | A map of labels to apply to resources |
 | <a name="output_region"></a> [region](#output\_region) | The region where resources will be deployed |
+| <a name="output_repository"></a> [repository](#output\_repository) | The repository name |
+| <a name="output_team"></a> [team](#output\_team) | The team name |
 | <a name="output_zone"></a> [zone](#output\_zone) | The zone where resources will be deployed |
 <!-- END_TF_DOCS -->

locals.tf

@@ -33,7 +33,6 @@ locals {
     env                 = local.environment
     cost-center         = var.cost_center
     data-classification = var.data_classification
-    email               = var.email
     region              = local.region
     repository          = var.repository
     team                = var.team

outputs.tf

@@ -1,6 +1,16 @@
 # Terraform Output Values
 # https://www.terraform.io/language/values/outputs
 
+output "cost_center" {
+  description = "The cost center the resources will be billed to"
+  value       = var.cost_center
+}
+
+output "data_classification" {
+  description = "The data classification of the resources"
+  value       = var.data_classification
+}
+
 output "env" {
   description = "The short name for the environment for example prod, nonprod, sb"
   value       = local.env
@@ -21,6 +31,16 @@ output "region" {
   value       = local.region
 }
 
+output "repository" {
+  description = "The repository name"
+  value       = var.repository
+}
+
+output "team" {
+  description = "The team name"
+  value       = var.team
+}
+
 output "zone" {
   description = "The zone where resources will be deployed"
   value       = local.zone

tests/default.tftest.hcl

@@ -384,6 +384,6 @@ variables {
   cost_center         = "mock-cost-center"
   data_classification = "mock-data-classification"
   email               = "[email protected]"
-  repository          = "mock-owner/mock-repository"
+  repository          = "mock-repository"
   team                = "mock-team"
 }

tests/fixtures/default/main.tf

@@ -3,7 +3,6 @@ module "core_workspace" {
 
   cost_center         = var.cost_center
   data_classification = var.data_classification
-  email               = var.email
   repository          = var.repository
   team                = var.team
   workspace           = var.workspace

variables.tf

@@ -21,23 +21,13 @@ variable "data_classification" {
   }
 }
 
-variable "email" {
-  description = "The email address of the team responsible for the resources"
-  type        = string
-
-  validation {
-    condition     = can(regex("^[a-zA-Z0-9._%+-]+@osinfra\\.io$", var.email))
-    error_message = "The email address must be a valid osinfra.io email address"
-  }
-}
-
 variable "repository" {
-  description = "The repository name (should be in the format 'owner/repo') containing only lowercase alphanumeric characters or hyphens"
+  description = "The repository name containing only lowercase alphanumeric characters or hyphens"
   type        = string
 
   validation {
-    condition     = can(regex("^[a-z0-9-]+/[a-z0-9-]+$", var.repository))
-    error_message = "The repository name should be in the format 'owner/repo' and contain only lowercase alphanumeric characters or hyphens"
+    condition     = can(regex("^[a-z0-9-]+$", var.repository))
+    error_message = "The repository name must consist entirely of lowercase alphanumeric characters or hyphens"
   }
 }