From 71afd4165896063cde9fd4ccf02ab091c86794ef Mon Sep 17 00:00:00 2001
From: Max Ostapenko <1611259+max-ostapenko@users.noreply.github.com>
Date: Mon, 14 Oct 2024 23:48:00 +0200
Subject: [PATCH] format

---
 .gitignore             |  2 +-
 package.json           |  1 -
 tf/.terraform.lock.hcl | 56 +++++++++++++++++++++---------------------
 tf/dataform.tf         |  4 +--
 tf/functions.tf        | 12 ++++-----
 tf/locals.tf           |  8 +++---
 tf/main.tf             |  5 +++-
 tf/variables.tf        |  5 ----
 8 files changed, 45 insertions(+), 48 deletions(-)
 delete mode 100644 tf/variables.tf

diff --git a/.gitignore b/.gitignore
index ffb22ef..5c4fc78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ node_modules/
 
 # Terraform
 tf/.terraform/
-tf/temp
\ No newline at end of file
+tf/temp
diff --git a/package.json b/package.json
index 5c30908..51c6646 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-
   "name": "crawl-data",
   "dependencies": {
     "@dataform/core": "3.0.6"
diff --git a/tf/.terraform.lock.hcl b/tf/.terraform.lock.hcl
index a31a0dd..cca38c2 100644
--- a/tf/.terraform.lock.hcl
+++ b/tf/.terraform.lock.hcl
@@ -21,41 +21,41 @@ provider "registry.terraform.io/hashicorp/archive" {
 }
 
 provider "registry.terraform.io/hashicorp/google" {
-  version     = "6.6.0"
-  constraints = ">= 3.43.0, >= 4.77.0, < 7.0.0"
+  version     = "6.7.0"
+  constraints = ">= 6.7.0"
   hashes = [
-    "h1:BOwY9eXbFeMU+DC1L8RW1CfcGPIiF1rMxNAxjssqNgk=",
-    "zh:0c181f9b9f0ab81731e5c4c2d20b6d342244506687437dad94e279ef2a588f68",
-    "zh:12a4c333fc0ba670e87f09eb574e4b7da90381f9929ef7c866048b6841cc8a6a",
-    "zh:15c277c2052df89429051350df4bccabe4cf46068433d4d8c673820d9756fc00",
-    "zh:35d1663c81b81cd98d768fa7b80874b48c51b27c036a3c598a597f653374d3c8",
-    "zh:56b268389758d544722a342da4174c486a40ffa2a49b45a06111fe31c6c9c867",
-    "zh:abd3ea8c3a62928ba09ba7eb42b52f53e682bd65e92d573f1739596b5a9a67b1",
-    "zh:be55a328d61d9db58690db74ed43614111e1105e5e52cee15acaa062df4e233e",
-    "zh:ce2317ce9fd02cf14323f9e061c43a415b4ae9b3f96046460d0e6b6529a5aa6c",
-    "zh:d54a6d8e031c824f1de21b93c3e01ed7fec134b4ae55223d08868c6168c98e47",
-    "zh:d8c6e33b5467c6eb5a970adb251c4c8194af12db5388cff9d4b250294eae4daa",
-    "zh:f49e4cc9c0b55b3bec7da64dd698298345634a5df372228ee12aa45e57982f64",
+    "h1:2R/lqkaJ6+JzXLvMjV9RpS800/D+JBVJdUr5cMTCtqA=",
+    "zh:16ac63e56986916015637bdc26a93e375aa84f22381d37dea51b227bc8fd58e3",
+    "zh:3d27c11cfd55394e247b01dc5d8bf4b892940ac0b66785cf565fbbabe8b8363b",
+    "zh:40011688dd3d5294f92bc0d85f30f26c427adc9a0e5c5053ca71a66f322e6edd",
+    "zh:84f2b94480c0979fbef001bc040dcaa5ac7b7d3cb47edc24ef612f6ede8ecb84",
+    "zh:9350b88bfeedf91176ed8447e368a980b0f5c9ad5f6bc0eff62e8889888a60df",
+    "zh:a0aba100e12c1a4e45ed9c66a95edb6c1f51d4f88ac4a38e0f64ee057128b23d",
+    "zh:cc5b520ea5806b967559f6f7fa07e7f0e9fe380bfb68d2f8b5afc1c94e99cd70",
+    "zh:d1eaea3ed952dff0337930938ae031841175725a6da1a512d8dfd649b1e2a83f",
+    "zh:d9deed8a673ce1d1f9ebcb6186ee4068933720d0d97ef7b627d7d0f819b67eed",
+    "zh:df342d4ab9cd3d1e26bd338bc4a2f0fd136c96f8861ce0ab63a7e6e41f62254b",
+    "zh:f0438dbdacdcfc2727b09752f682c96f5f575fdb3282b6fb1721756d83b390c7",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/google-beta" {
-  version     = "6.6.0"
-  constraints = ">= 3.43.0, < 7.0.0"
+  version     = "6.7.0"
+  constraints = ">= 6.7.0"
   hashes = [
-    "h1:vAJoyd0seXZtiALZVcKicKT7RnmHKxs7DfhjYu6LMcs=",
-    "zh:1bf8f840a9a4ac1e120a6155225a0defbfa7f07b19c9bb37b45f95006b020ccf",
-    "zh:39077f037e611bdbd6af42e51b2881ea03d62ad55f21b42f90dc09e2cf812753",
-    "zh:64313dd2158749e3a4f2759edb896a9efa2c2afc59feb38d3af57e31eaa64480",
-    "zh:6bec8b21a20f50d81ca2e633cdaf1144bb8615a1dedf50e87c86f4eda3467b05",
-    "zh:74566c568410997fe966ef44130d19d640dbb427ffec3de93f0fd2affeb6fd8f",
-    "zh:8fe1c42d3229d0fe64961b7fa480689408eff3e5be62eb108d6aa9d36a10a769",
-    "zh:9593b59efd271623f45d133164eae16676130439727a625c10d3b929d2f28671",
-    "zh:a72c71431523d1f0d0d8baf7141ff16aa5938c0edf27e05dc4d1dc3455a50d01",
-    "zh:cbc96a215575d94601ec315a2db8802b521e904aaecf2602bce0110786cfa81f",
-    "zh:e71c3e06e861d5c9d1782b0bbaef93b5b9defa926304f90ddd22bc9b69ee14bd",
-    "zh:f559eefcc67d771ce0157e7ec021c1025b8af2a8c7ca89e1f5ac812e16bf9760",
+    "h1:Qz5ElnCFH7sz/k+oITUjP1zHbLFi2lsOtBP8vLXRQ/w=",
+    "zh:0def181a8781c13f002bf77afb83ce600bd5c08e4324f5d2c2e4d60a8b41dd5c",
+    "zh:323453165fa8c69a4400c0c14750bce9ac9729f2313966e983a13aa8a0d68f9e",
+    "zh:5507893e7115d0702de0a87f583d09639e082c825ec1e5bd1e4317061d5c7b04",
+    "zh:74505c85aaa9ef70491bdb708e0aee459fb1b85848d170217a6bf0c4cd2edf5c",
+    "zh:81d7f41eda8547e140304320fa0d188be26982234831c8405db5a91aef20e478",
+    "zh:95cd1322406f7cd97e6e4c0ddedf60060fa70481c9134871148ef6dd71d2254d",
+    "zh:a4ba2b745d35a7e09d318f30f0057c3b06d4443b5e08abd20041e17be3981c7d",
+    "zh:a5a49279474ddb12c8902f33ee9a714800cf0860c10599984a5145e63aec3e8c",
+    "zh:abbcc76e8ea53a92f701ddb15eb5771306ae19273e5b199b2cb1370723b16d1d",
+    "zh:ac942c462a313861146df88d0d1223e5b59d7c9acd83066dc0b8f2565067e558",
+    "zh:c9b00cc290736b956fb2d7f1c478671c8ef25d8a07526c791c9cf218580de1b9",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
   ]
 }
diff --git a/tf/dataform.tf b/tf/dataform.tf
index 46383ea..bc81abf 100644
--- a/tf/dataform.tf
+++ b/tf/dataform.tf
@@ -4,8 +4,8 @@ locals {
 
 import {
   provider = google-beta
-  id = "projects/${local.project}/locations/${local.region}/repositories/crawl-data"
-  to = google_dataform_repository.production
+  id       = "projects/${local.project}/locations/${local.region}/repositories/crawl-data"
+  to       = google_dataform_repository.production
 }
 
 resource "google_dataform_repository" "production" {
diff --git a/tf/functions.tf b/tf/functions.tf
index 0c83f6a..48b9f38 100644
--- a/tf/functions.tf
+++ b/tf/functions.tf
@@ -15,8 +15,8 @@ resource "google_storage_bucket_object" "object" {
 # Cloud Function to trigger Dataform workflow
 import {
   provider = google-beta
-  id = "projects/${local.project}/locations/${local.region}/functions/dataformTrigger"
-  to = google_cloudfunctions2_function.dataformTrigger
+  id       = "projects/${local.project}/locations/${local.region}/functions/dataformTrigger"
+  to       = google_cloudfunctions2_function.dataformTrigger
 }
 
 resource "google_cloudfunctions2_function" "dataformTrigger" {
@@ -38,8 +38,8 @@ resource "google_cloudfunctions2_function" "dataformTrigger" {
     }
     source {
       storage_source {
-        bucket     = "gcf-v2-sources-226352634162-us-central1"
-        object     = "dataformTrigger/function-source.zip"
+        bucket = "gcf-v2-sources-226352634162-us-central1"
+        object = "dataformTrigger/function-source.zip"
       }
     }
   }
@@ -116,8 +116,8 @@ EOF
 
 import {
   provider = google-beta
-  id = "projects/${local.project}/locations/us-east4/jobs/bq-poller-cwv-tech-report"
-  to = google_cloud_scheduler_job.bq-poller-cwv-tech-report
+  id       = "projects/${local.project}/locations/us-east4/jobs/bq-poller-cwv-tech-report"
+  to       = google_cloud_scheduler_job.bq-poller-cwv-tech-report
 }
 
 resource "google_cloud_scheduler_job" "bq-poller-cwv-tech-report" {
diff --git a/tf/locals.tf b/tf/locals.tf
index 0366745..f1c16a8 100644
--- a/tf/locals.tf
+++ b/tf/locals.tf
@@ -1,6 +1,6 @@
 locals {
-  project               = "httparchive"
-  project_number        = "226352634162"
-  region                = "us-central1"
-  location              = "us"
+  project        = "httparchive"
+  project_number = "226352634162"
+  region         = "us-central1"
+  location       = "us"
 }
diff --git a/tf/main.tf b/tf/main.tf
index 8279fef..6ca0a56 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -1,7 +1,10 @@
 terraform {
   required_version = ">= 1.9.7"
   required_providers {
-    google = ">= 6.6.0"
+    google = ">= 6.7.0"
+    google-beta = ">= 6.7.0"
+    archive = ">= 2.6.0"
+
   }
 
   backend "gcs" {
diff --git a/tf/variables.tf b/tf/variables.tf
deleted file mode 100644
index 2553161..0000000
--- a/tf/variables.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-variable "environment" {
-  type        = string
-  description = "Environment name"
-  default     = "dev"
-}