From 9171be4442bda24c51ee8f7e212d8d4f5e66f746 Mon Sep 17 00:00:00 2001 From: Brett Curtis Date: Thu, 14 Nov 2024 19:56:55 -0500 Subject: [PATCH] Use `terraform-core-helpers` child module (#50) --- .github/release.yml | 4 +- .pre-commit-config.yaml | 8 +- deployments/regional/README.md | 17 ++-- deployments/regional/helpers.tf | 11 +++ deployments/regional/locals.tf | 26 ++---- deployments/regional/main.tf | 87 +++--------------- deployments/regional/providers.tf | 89 +++++++++++++++++++ .../tfvars/us-east1-b-non-production.tfvars | 3 - .../tfvars/us-east1-b-production.tfvars | 3 - .../regional/tfvars/us-east1-b-sandbox.tfvars | 2 - .../tfvars/us-east1-c-non-production.tfvars | 3 - .../tfvars/us-east1-c-production.tfvars | 3 - .../regional/tfvars/us-east1-c-sandbox.tfvars | 2 - .../tfvars/us-east1-d-non-production.tfvars | 3 - .../tfvars/us-east1-d-production.tfvars | 3 - .../regional/tfvars/us-east1-d-sandbox.tfvars | 2 - .../tfvars/us-east4-a-non-production.tfvars | 3 - .../tfvars/us-east4-a-production.tfvars | 3 - .../regional/tfvars/us-east4-a-sandbox.tfvars | 2 - .../tfvars/us-east4-b-non-production.tfvars | 3 - .../tfvars/us-east4-b-production.tfvars | 3 - .../regional/tfvars/us-east4-b-sandbox.tfvars | 2 - .../tfvars/us-east4-c-non-production.tfvars | 3 - .../tfvars/us-east4-c-production.tfvars | 3 - .../regional/tfvars/us-east4-c-sandbox.tfvars | 2 - deployments/regional/variables.tf | 16 ---- go.mod | 34 +++---- go.sum | 64 ++++++------- 28 files changed, 185 insertions(+), 219 deletions(-) create mode 100755 deployments/regional/helpers.tf create mode 100644 deployments/regional/providers.tf diff --git a/.github/release.yml b/.github/release.yml index c6d9cb1..421c43d 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -10,8 +10,8 @@ changelog: labels: - dependencies - - title: 🔩 Dependencies + - title: 🔩 Dependencies labels: - dependencies -# This file is managed by the osinfra-io/github-organization-management repository and should not be edited directly. \ No newline at end of file +# This file is managed by the osinfra-io/github-organization-management repository and should not be edited directly. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b9cdd63..4cfb27e 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-yaml - id: end-of-file-fixer @@ -9,7 +9,7 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.95.0 + rev: v1.96.2 hooks: - id: terraform_fmt @@ -30,10 +30,12 @@ repos: - --hook-config=--create-file-if-not-exist=false - repo: https://github.com/bridgecrewio/checkov.git - rev: 3.2.253 + rev: 3.2.276 hooks: - id: checkov files: Dockerfile verbose: true args: + - --skip-check + - "CKV_TF_1,CKV_TF_2" - --quiet diff --git a/deployments/regional/README.md b/deployments/regional/README.md index 4db8856..d353199 100755 --- a/deployments/regional/README.md +++ b/deployments/regional/README.md @@ -9,13 +9,15 @@ No requirements. | Name | Version | |------|---------| -| [datadog](#provider\_datadog) | 3.44.1 | -| [google](#provider\_google) | 6.2.0 | -| [kubernetes](#provider\_kubernetes) | 2.32.0 | +| [datadog](#provider\_datadog) | 3.48.1 | +| [google](#provider\_google) | 6.11.1 | +| [kubernetes](#provider\_kubernetes) | 2.33.0 | ## Modules -No modules. +| Name | Source | Version | +|------|--------|---------| +| [helpers](#module\_helpers) | github.com/osinfra-io/terraform-core-helpers//root | v0.1.2 | ## Resources @@ -26,8 +28,10 @@ No modules. | [kubernetes_manifest.gke_info_go](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/manifest) | resource | | [kubernetes_service_v1.gke_info_go](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service_v1) | resource | | [kubernetes_service_v1.gke_info_go_regional](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service_v1) | resource | -| [google_client_config.current](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config) | data source | +| [google_client_config.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config) | data source | | [google_container_cluster.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_cluster) | data source | +| [google_project.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/project) | data source | +| [google_projects.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/projects) | data source | ## Inputs @@ -35,11 +39,8 @@ No modules. |------|-------------|------|---------|:--------:| | [datadog\_api\_key](#input\_datadog\_api\_key) | Datadog API key | `string` | n/a | yes | | [datadog\_app\_key](#input\_datadog\_app\_key) | Datadog APP key | `string` | n/a | yes | -| [environment](#input\_environment) | The full environment name for example: `sandbox`, `non-production`, `production` | `string` | `"sandbox"` | no | | [gke\_info\_go\_replicas](#input\_gke\_info\_go\_replicas) | The number of replicas for the gke-info deployment | `number` | `1` | no | | [gke\_info\_go\_version](#input\_gke\_info\_go\_version) | The version of the gke-info deployment | `string` | n/a | yes | -| [region](#input\_region) | The region to deploy the resources into | `string` | n/a | yes | -| [zone](#input\_zone) | The zone to deploy the resources to | `string` | n/a | yes | ## Outputs diff --git a/deployments/regional/helpers.tf b/deployments/regional/helpers.tf new file mode 100755 index 0000000..932941a --- /dev/null +++ b/deployments/regional/helpers.tf @@ -0,0 +1,11 @@ +# Terraform Core Helpers Module (osinfra.io) +# https://github.com/osinfra-io/terraform-core-helpers + +module "helpers" { + source = "github.com/osinfra-io/terraform-core-helpers//root?ref=v0.1.2" + + cost_center = "x001" + data_classification = "public" + repository = "google-cloud-kubernetes" + team = "platform-google-cloud-kubernetes" +} diff --git a/deployments/regional/locals.tf b/deployments/regional/locals.tf index 8a8f79a..f17b95a 100755 --- a/deployments/regional/locals.tf +++ b/deployments/regional/locals.tf @@ -2,13 +2,13 @@ # https://www.terraform.io/docs/language/values/locals.html locals { - datadog_mci_synthetic_url = var.environment == "production" ? "https://gcp.osinfra.io/${local.datadog_synthetic_service}/metadata/cluster-name" : "https://${local.env}.gcp.osinfra.io/${local.datadog_synthetic_service}/metadata/cluster-name" - datadog_synthetic_message_critical = var.environment == "production" ? "@hangouts-Platform-CriticalHighPriority" : "" - datadog_synthetic_message_medium = var.environment == "production" ? "@hangouts-Platform-MediumLowInfoPriority" : "" + datadog_mci_synthetic_url = module.helpers.environment == "production" ? "https://gcp.osinfra.io/${local.datadog_synthetic_service}/metadata/cluster-name" : "https://${module.helpers.env}.gcp.osinfra.io/${local.datadog_synthetic_service}/metadata/cluster-name" + datadog_synthetic_message_critical = module.helpers.environment == "production" ? "@hangouts-Platform-CriticalHighPriority" : "" + datadog_synthetic_message_medium = module.helpers.environment == "production" ? "@hangouts-Platform-MediumLowInfoPriority" : "" datadog_synthetic_name = "GKE Info" datadog_synthetic_service = "gke-info-go" - datadog_synthetic_tests = var.region == "us-east1" || var.zone == "b" ? { + datadog_synthetic_tests = module.helpers.region == "us-east1" || module.helpers.zone == "b" ? { "mci" = { locations = [ "aws:ca-central-1", @@ -43,7 +43,7 @@ locals { message = local.datadog_synthetic_message_medium message_priority = "3" name = "Istio MCI ${local.datadog_synthetic_name}" - region = "us-east1" + region = module.helpers.region service = local.datadog_synthetic_service status = "paused" @@ -61,21 +61,13 @@ locals { message = local.datadog_synthetic_message_medium message_priority = "3" name = "Istio Ingress ${local.datadog_synthetic_name}" - region = "us-east1" + region = module.helpers.region service = local.datadog_synthetic_service status = "paused" - url = var.environment == "production" ? "https://us-east1.gcp.osinfra.io/${local.datadog_synthetic_service}" : "https://us-east1.${local.env}.gcp.osinfra.io/${local.datadog_synthetic_service}" + url = module.helpers.environment == "production" ? "https://us-east1.gcp.osinfra.io/${local.datadog_synthetic_service}" : "https://us-east1.${module.helpers.env}.gcp.osinfra.io/${local.datadog_synthetic_service}" } } : {} - env_map = { - "sandbox" = "sb" - "non-production" = "nonprod" - "production" = "prod" - } - - env = lookup(local.env_map, var.environment, "none") - - registry = var.environment == "sandbox" ? "us-docker.pkg.dev/plt-lz-services-tf7f-sb/plt-docker-virtual" : "us-docker.pkg.dev/plt-lz-services-tf79-prod/plt-docker-virtual" - kubernetes_project = var.environment == "sandbox" ? "plt-k8s-tf39-sb" : var.environment == "production" ? "plt-k8s-tf10-prod" : "plt-k8s-tf33-nonprod" + registry = module.helpers.environment == "sandbox" ? "us-docker.pkg.dev/plt-lz-services-tf7f-sb/plt-docker-virtual" : "us-docker.pkg.dev/plt-lz-services-tf79-prod/plt-docker-virtual" + kubernetes_project = module.helpers.environment == "sandbox" ? "plt-k8s-tf39-sb" : module.helpers.environment == "production" ? "plt-k8s-tf10-prod" : "plt-k8s-tf33-nonprod" } diff --git a/deployments/regional/main.tf b/deployments/regional/main.tf index 404fbbe..8200be2 100755 --- a/deployments/regional/main.tf +++ b/deployments/regional/main.tf @@ -1,67 +1,3 @@ -# Required Providers -# https://www.terraform.io/docs/language/providers/requirements.html#requiring-providers - -terraform { - required_providers { - # Datadog Provider - # https://registry.terraform.io/providers/DataDog/datadog/latest/docs - - datadog = { - source = "datadog/datadog" - } - - # Google Cloud Provider - # https://www.terraform.io/docs/providers/google/index.html - - google = { - source = "hashicorp/google" - } - - # Kubernetes Provider - # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs - - kubernetes = { - source = "hashicorp/kubernetes" - } - } -} - -# Datadog Provider -# https://registry.terraform.io/providers/DataDog/datadog/latest/docs - -provider "datadog" { - api_key = var.datadog_api_key - app_key = var.datadog_app_key -} - -# Kubernetes Provider -# https://registry.terraform.io/providers/hashicorp/kubernetes/latest - -provider "kubernetes" { - - cluster_ca_certificate = base64decode( - data.google_container_cluster.this.master_auth[0].cluster_ca_certificate - ) - - host = "https://${data.google_container_cluster.this.endpoint}" - token = data.google_client_config.current.access_token -} - -# Google Container Cluster Data Source -# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_cluster - -data "google_container_cluster" "this" { - location = var.region - name = "plt-${var.region}-${var.zone}" - project = local.kubernetes_project -} - -# Google Client Config Data Source -# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config - -data "google_client_config" "current" { -} - # Datadog Synthetics Test Resource # https://registry.terraform.io/providers/DataDog/datadog/latest/docs/resources/synthetics_test @@ -82,7 +18,7 @@ resource "datadog_synthetics_test" "this" { locations = each.value.locations message = each.value.message - name = "${each.value.name} ${each.value.region} ${var.environment}" + name = "${each.value.name} ${each.value.region} ${module.helpers.environment}" options_list { tick_every = 300 @@ -108,10 +44,10 @@ resource "datadog_synthetics_test" "this" { subtype = "http" tags = [ - "env:${var.environment}", + "env:${module.helpers.environment}", "service:${each.value.service}", "region:${each.value.region}", - "team:platform-google-cloud-kubernetes" + "team:${module.helpers.team}" ] type = "api" @@ -140,7 +76,7 @@ resource "kubernetes_deployment_v1" "gke_info_go" { metadata { labels = { - "tags.datadoghq.com/env" = var.environment + "tags.datadoghq.com/env" = module.helpers.environment "tags.datadoghq.com/service" = "gke-info-go" "tags.datadoghq.com/version" = var.gke_info_go_version } @@ -162,18 +98,17 @@ resource "kubernetes_deployment_v1" "gke_info_go" { metadata { annotations = { "apm.datadoghq.com/env" = jsonencode({ - "DD_ENV" = var.environment + "DD_ENV" = module.helpers.environment "DD_SERVICE" = "gke-info-go" "DD_VERSION" = var.gke_info_go_version }) - "proxy.istio.io/config" = "tracing: {}" } labels = { # Enable Admission Controller to mutate new pods part of this deployment "admission.datadoghq.com/enabled" = "true" "app" = "gke-info-go" - "tags.datadoghq.com/env" = var.environment + "tags.datadoghq.com/env" = module.helpers.environment "tags.datadoghq.com/service" = "gke-info-go" "tags.datadoghq.com/version" = var.gke_info_go_version } @@ -216,12 +151,12 @@ resource "kubernetes_deployment_v1" "gke_info_go" { resources { requests = { - cpu = "100m" - memory = "64Mi" + cpu = "10m" + memory = "32Mi" } limits = { - cpu = "200m" - memory = "128Mi" + cpu = "20m" + memory = "64Mi" } } @@ -348,7 +283,7 @@ resource "kubernetes_service_v1" "gke_info_go" { resource "kubernetes_service_v1" "gke_info_go_regional" { metadata { - name = "gke-info-go-${var.region}-${var.zone}" + name = "gke-info-go-${module.helpers.region}-${module.helpers.zone}" namespace = "gke-info" } diff --git a/deployments/regional/providers.tf b/deployments/regional/providers.tf new file mode 100644 index 0000000..8c1f7a7 --- /dev/null +++ b/deployments/regional/providers.tf @@ -0,0 +1,89 @@ +# Required Providers +# https://www.terraform.io/docs/language/providers/requirements.html#requiring-providers + +terraform { + required_providers { + + datadog = { + source = "datadog/datadog" + } + + # Google Cloud Provider + # https://www.terraform.io/docs/providers/google/index.html + + google = { + source = "hashicorp/google" + } + + helm = { + source = "hashicorp/helm" + } + + kubernetes = { + source = "hashicorp/kubernetes" + } + } +} + +# Datadog Provider +# https://registry.terraform.io/providers/DataDog/datadog/latest/docs + +provider "datadog" { + api_key = var.datadog_api_key + app_key = var.datadog_app_key +} + +# Helm Provider +# https://registry.terraform.io/providers/hashicorp/helm/latest + +provider "helm" { + kubernetes { + + cluster_ca_certificate = base64decode( + data.google_container_cluster.this.master_auth.0.cluster_ca_certificate + ) + + host = data.google_container_cluster.this.endpoint + token = data.google_client_config.this.access_token + } +} + +# Kubernetes Provider +# https://registry.terraform.io/providers/hashicorp/kubernetes/latest + +provider "kubernetes" { + cluster_ca_certificate = base64decode( + data.google_container_cluster.this.master_auth.0.cluster_ca_certificate + ) + host = "https://${data.google_container_cluster.this.endpoint}" + token = data.google_client_config.this.access_token +} + +# Google Client Config Data Source +# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config + +data "google_client_config" "this" { +} + +# Google Container Cluster Data Source +# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_cluster + +data "google_container_cluster" "this" { + name = "plt-${module.helpers.region}-${module.helpers.zone}" + location = module.helpers.region + project = data.google_project.this.project_id +} + +# Google Projects Data Source +# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/projects + +data "google_projects" "this" { + filter = "name:plt-k8s-* labels.env:${module.helpers.environment}" +} + +# Google Project Data Source +# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/project + +data "google_project" "this" { + project_id = data.google_projects.this.projects.0.project_id +} diff --git a/deployments/regional/tfvars/us-east1-b-non-production.tfvars b/deployments/regional/tfvars/us-east1-b-non-production.tfvars index dcfbce5..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-b-non-production.tfvars +++ b/deployments/regional/tfvars/us-east1-b-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east1" -zone = "b" diff --git a/deployments/regional/tfvars/us-east1-b-production.tfvars b/deployments/regional/tfvars/us-east1-b-production.tfvars index 1e48c96..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-b-production.tfvars +++ b/deployments/regional/tfvars/us-east1-b-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east1" -zone = "b" diff --git a/deployments/regional/tfvars/us-east1-b-sandbox.tfvars b/deployments/regional/tfvars/us-east1-b-sandbox.tfvars index 5d7f577..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-b-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east1-b-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east1" -zone = "b" diff --git a/deployments/regional/tfvars/us-east1-c-non-production.tfvars b/deployments/regional/tfvars/us-east1-c-non-production.tfvars index f3e564c..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-c-non-production.tfvars +++ b/deployments/regional/tfvars/us-east1-c-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east1" -zone = "c" diff --git a/deployments/regional/tfvars/us-east1-c-production.tfvars b/deployments/regional/tfvars/us-east1-c-production.tfvars index 77077d2..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-c-production.tfvars +++ b/deployments/regional/tfvars/us-east1-c-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east1" -zone = "c" diff --git a/deployments/regional/tfvars/us-east1-c-sandbox.tfvars b/deployments/regional/tfvars/us-east1-c-sandbox.tfvars index 4fd8cd3..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-c-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east1-c-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east1" -zone = "c" diff --git a/deployments/regional/tfvars/us-east1-d-non-production.tfvars b/deployments/regional/tfvars/us-east1-d-non-production.tfvars index fb92a3f..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-d-non-production.tfvars +++ b/deployments/regional/tfvars/us-east1-d-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east1" -zone = "d" diff --git a/deployments/regional/tfvars/us-east1-d-production.tfvars b/deployments/regional/tfvars/us-east1-d-production.tfvars index 3c76623..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-d-production.tfvars +++ b/deployments/regional/tfvars/us-east1-d-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east1" -zone = "d" diff --git a/deployments/regional/tfvars/us-east1-d-sandbox.tfvars b/deployments/regional/tfvars/us-east1-d-sandbox.tfvars index a87f472..e69de29 100755 --- a/deployments/regional/tfvars/us-east1-d-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east1-d-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east1" -zone = "d" diff --git a/deployments/regional/tfvars/us-east4-a-non-production.tfvars b/deployments/regional/tfvars/us-east4-a-non-production.tfvars index 08dd87a..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-a-non-production.tfvars +++ b/deployments/regional/tfvars/us-east4-a-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east4" -zone = "a" diff --git a/deployments/regional/tfvars/us-east4-a-production.tfvars b/deployments/regional/tfvars/us-east4-a-production.tfvars index a0f9313..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-a-production.tfvars +++ b/deployments/regional/tfvars/us-east4-a-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east4" -zone = "a" diff --git a/deployments/regional/tfvars/us-east4-a-sandbox.tfvars b/deployments/regional/tfvars/us-east4-a-sandbox.tfvars index c0b5ca9..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-a-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east4-a-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east4" -zone = "a" diff --git a/deployments/regional/tfvars/us-east4-b-non-production.tfvars b/deployments/regional/tfvars/us-east4-b-non-production.tfvars index 5252acf..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-b-non-production.tfvars +++ b/deployments/regional/tfvars/us-east4-b-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east4" -zone = "b" diff --git a/deployments/regional/tfvars/us-east4-b-production.tfvars b/deployments/regional/tfvars/us-east4-b-production.tfvars index be509b3..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-b-production.tfvars +++ b/deployments/regional/tfvars/us-east4-b-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east4" -zone = "b" diff --git a/deployments/regional/tfvars/us-east4-b-sandbox.tfvars b/deployments/regional/tfvars/us-east4-b-sandbox.tfvars index ca576c6..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-b-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east4-b-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east4" -zone = "b" diff --git a/deployments/regional/tfvars/us-east4-c-non-production.tfvars b/deployments/regional/tfvars/us-east4-c-non-production.tfvars index c890afb..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-c-non-production.tfvars +++ b/deployments/regional/tfvars/us-east4-c-non-production.tfvars @@ -1,3 +0,0 @@ -environment = "non-production" -region = "us-east4" -zone = "c" diff --git a/deployments/regional/tfvars/us-east4-c-production.tfvars b/deployments/regional/tfvars/us-east4-c-production.tfvars index 0881a2e..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-c-production.tfvars +++ b/deployments/regional/tfvars/us-east4-c-production.tfvars @@ -1,3 +0,0 @@ -environment = "production" -region = "us-east4" -zone = "c" diff --git a/deployments/regional/tfvars/us-east4-c-sandbox.tfvars b/deployments/regional/tfvars/us-east4-c-sandbox.tfvars index 7a8f4a1..e69de29 100755 --- a/deployments/regional/tfvars/us-east4-c-sandbox.tfvars +++ b/deployments/regional/tfvars/us-east4-c-sandbox.tfvars @@ -1,2 +0,0 @@ -region = "us-east4" -zone = "c" diff --git a/deployments/regional/variables.tf b/deployments/regional/variables.tf index f33e7d7..041d69a 100755 --- a/deployments/regional/variables.tf +++ b/deployments/regional/variables.tf @@ -1,9 +1,3 @@ -variable "environment" { - description = "The full environment name for example: `sandbox`, `non-production`, `production`" - type = string - default = "sandbox" -} - variable "datadog_api_key" { description = "Datadog API key" type = string @@ -24,13 +18,3 @@ variable "gke_info_go_version" { description = "The version of the gke-info deployment" type = string } - -variable "region" { - description = "The region to deploy the resources into" - type = string -} - -variable "zone" { - description = "The zone to deploy the resources to" - type = string -} diff --git a/go.mod b/go.mod index 29fda5f..921d5f1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gke-info -go 1.23.1 +go 1.23.3 require ( github.com/sirupsen/logrus v1.9.3 @@ -8,12 +8,12 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.8.0 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.2 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.57.0 // indirect + github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect - github.com/DataDog/go-libddwaf/v3 v3.4.0 // indirect - github.com/DataDog/go-sqllexer v0.0.14 // indirect + github.com/DataDog/go-libddwaf/v3 v3.5.1 // indirect + github.com/DataDog/go-sqllexer v0.0.17 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect github.com/DataDog/gostackparse v0.7.0 // indirect github.com/DataDog/sketches-go v1.4.6 // indirect @@ -21,29 +21,29 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect - github.com/ebitengine/purego v0.7.1 // indirect - github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9 // indirect + github.com/ebitengine/purego v0.8.1 // indirect + github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.6 // indirect + github.com/hashicorp/go-sockaddr v1.0.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/outcaste-io/ristretto v0.2.3 // indirect - github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect + github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect github.com/pkg/errors v0.9.1 // indirect github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/tinylib/msgp v1.2.1 // indirect + github.com/tinylib/msgp v1.2.4 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/time v0.6.0 // indirect + golang.org/x/crypto v0.29.0 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.31.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/time v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.2 // indirect ) require ( diff --git a/go.sum b/go.sum index b16510d..960225d 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ -github.com/DataDog/appsec-internal-go v1.8.0 h1:1Tfn3LEogntRqZtf88twSApOCAAO3V+NILYhuQIo4J4= -github.com/DataDog/appsec-internal-go v1.8.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.2 h1:DufHgwm9sFbZMWw+KAwO2obP+0BcyEVR1harOoUy3JA= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.2/go.mod h1:NHgTieB5DpTc4AZrzx1xE+tPCWTJ7Hw3TVRiWuK505U= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.57.0 h1:LplNAmMgZvGU7kKA0+4c1xWOjz828xweW5TCi8Mw9Q0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.57.0/go.mod h1:4Vo3SJ24uzfKHUHLoFa8t8o+LH+7TCQ7sPcZDtOpSP4= +github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= +github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0 h1:uX6/XoKMS7KYXe+R+vwgw+eRdmn16xfa9PDF5dxgumE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0/go.mod h1:ATVw8kr3U1Eqz3qBz9kS6WFDKji9XyoAsHKSlj3hPTM= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0 h1:9C8TVNz0IiNoD6tuEKPY/vMIUjB7kN0OaLyImhatWjg= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0/go.mod h1:c4th0IFaP0Q1ofRa0GcPB9hJWN+cmUoEfOI1Ub0O50A= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= -github.com/DataDog/go-libddwaf/v3 v3.4.0 h1:NJ2W2vhYaOm1OWr1LJCbdgp7ezG/XLJcQKBmjFwhSuM= -github.com/DataDog/go-libddwaf/v3 v3.4.0/go.mod h1:n98d9nZ1gzenRSk53wz8l6d34ikxS+hs62A31Fqmyi4= -github.com/DataDog/go-sqllexer v0.0.14 h1:xUQh2tLr/95LGxDzLmttLgTo/1gzFeOyuwrQa/Iig4Q= -github.com/DataDog/go-sqllexer v0.0.14/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= +github.com/DataDog/go-libddwaf/v3 v3.5.1 h1:GWA4ln4DlLxiXm+X7HA/oj0ZLcdCwOS81KQitegRTyY= +github.com/DataDog/go-libddwaf/v3 v3.5.1/go.mod h1:n98d9nZ1gzenRSk53wz8l6d34ikxS+hs62A31Fqmyi4= +github.com/DataDog/go-sqllexer v0.0.17 h1:u47fJAVg/+5DA74ZW3w0Qu+3qXHd3GtnA8ZBYixdPrM= +github.com/DataDog/go-sqllexer v0.0.17/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4= github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4= @@ -33,8 +33,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 h1:8EXxF+tCLqaVk8AOC29zl2mnhQjwyLxxOTuhUazWRsg= github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4/go.mod h1:I5sHm0Y0T1u5YjlyqC5GVArM7aNZRUYtTjmJ8mPJFds= -github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA= -github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= +github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= +github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -43,16 +43,16 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9 h1:q5g0N9eal4bmJwXHC5z0QCKs8qhS35hFfq0BAYsIwZI= -github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs= +github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0= github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= -github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEyqO4u9I= -github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= +github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw= +github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= @@ -67,8 +67,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0= github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= +github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY= +github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -101,8 +101,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tinylib/msgp v1.2.1 h1:6ypy2qcCznxpP4hpORzhtXyTqrBs7cfM9MCCWY8zsmU= -github.com/tinylib/msgp v1.2.1/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= +github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU= +github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -111,16 +111,16 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= @@ -134,13 +134,13 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -156,8 +156,8 @@ google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/DataDog/dd-trace-go.v1 v1.69.1 h1:grTElrPaCfxUsrJjyPLHlVPbmlKVzWMxVdcBrGZSzEk= gopkg.in/DataDog/dd-trace-go.v1 v1.69.1/go.mod h1:U9AOeBHNAL95JXcd/SPf4a7O5GNeF/yD13sJtli/yaU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=