Alignment across repositories

.github/workflows/kitchen.yml

@@ -20,8 +20,8 @@ permissions:
 
 jobs:
   kitchen_terraform:
-    name: "Tests"
-    uses: osinfra-io/github-terraform-gcp-called-workflows/.github/workflows/kitchen-terraform.yml@v0.2.0
+    name: Tests
+    uses: osinfra-io/github-terraform-gcp-called-workflows/.github/workflows/kitchen-terraform.yml@v0.2.1
     if: github.actor != 'dependabot[bot]' && github.actor != 'osinfra-sa'
 
     with:

regional/README.md

@@ -11,7 +11,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | 5.8.0 |
+| <a name="provider_google"></a> [google](#provider\_google) | 5.22.0 |
 | <a name="provider_random"></a> [random](#provider\_random) | 3.6.0 |
 
 ## Modules
@@ -33,7 +33,6 @@ No modules.
 | <a name="input_availability_type"></a> [availability\_type](#input\_availability\_type) | The availability type of the Cloud SQL instance | `string` | `"REGIONAL"` | no |
 | <a name="input_backup_start_time"></a> [backup\_start\_time](#input\_backup\_start\_time) | Time indicating when backup configuration starts | `string` | `"04:00"` | no |
 | <a name="input_client_certs"></a> [client\_certs](#input\_client\_certs) | A set of client cert names, note: 10 max per instance | `set(string)` | `[]` | no |
-| <a name="input_cost_center"></a> [cost\_center](#input\_cost\_center) | The cost center to use for resource labels | `string` | n/a | yes |
 | <a name="input_database_version"></a> [database\_version](#input\_database\_version) | The MySQL, PostgreSQL or SQL Server version to use. | `string` | `"POSTGRES_15"` | no |
 | <a name="input_deletion_protection"></a> [deletion\_protection](#input\_deletion\_protection) | Whether or not to allow Terraform to destroy the instance | `bool` | `true` | no |
 | <a name="input_host_project_id"></a> [host\_project\_id](#input\_host\_project\_id) | Host project ID for the shared VPC | `string` | `""` | no |

regional/locals.tf

@@ -2,13 +2,6 @@
 # https://www.terraform.io/docs/language/values/locals.html
 
 locals {
-  labels = merge(
-    {
-      cost-center = var.cost_center
-    },
-    var.labels
-  )
-
   network = "projects/${var.host_project_id}/global/networks/${var.network}"
 
   # These flags are required for CIS GCP v1.3.0 compliance

regional/main.tf

@@ -46,7 +46,7 @@ resource "google_sql_database_instance" "this" {
       update_track = var.update_track
     }
 
-    user_labels = local.labels
+    user_labels = var.labels
   }
 
 

regional/variables.tf

@@ -16,11 +16,6 @@ variable "client_certs" {
   default     = []
 }
 
-variable "cost_center" {
-  description = "The cost center to use for resource labels"
-  type        = string
-}
-
 variable "postgres_database_flags" {
   description = "The database flags for Cloud SQL. See [PostgreSQL Flags](https://cloud.google.com/sql/docs/postgres/flags)"
   type = list(object({

test/fixtures/default_cloud_sql/main.tf

@@ -2,7 +2,6 @@ module "test" {
   source = "../../../regional"
 
   client_certs = var.client_certs
-  cost_center  = "x000"
 
   postgres_database_flags = [
     {
@@ -20,9 +19,10 @@ module "test" {
   instance_name       = var.instance_name
 
   labels = {
-    env        = "sb"
-    repository = "terraform-google-cloud-sql"
-    team       = "testing"
+    cost-center = "x000"
+    env         = "sb"
+    repository  = "terraform-google-cloud-sql"
+    team        = "testing"
   }
 
   network                        = "kitchen-vpc"

test/integration/default_cloud_sql/controls/inspec.yml

@@ -8,6 +8,8 @@ name: InSpec GCP (Google Cloud Platform) Resource Pack
 
 # Before a profile can use controls from another profile, the to-be-included profile needs to be specified:
 
+# InSpec GCP (Google Cloud Platform) Resource Pack
+# https://github.com/inspec/inspec-gcp
 depends:
   - name: inspec_gcp
-    url: https://github.com/inspec/inspec-gcp/archive/v1.11.93.tar.gz
+    url: https://github.com/inspec/inspec-gcp/archive/v1.11.98.tar.gz