not allowed, thanks terraform

Blockstream · Nov 26, 2019 · 876ca2e · 876ca2e
1 parent be1bf30
commit 876ca2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 60 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -108,10 +108,6 @@ plan:
         -var "ssl_certs=$SSL_CERTS"
         -var "opsgenie_api_key=$OPSGENIE_API_KEY"
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false)
 
 plan_main:
@@ -137,10 +133,6 @@ plan_main:
         -var "ssl_certs=$SSL_CERTS"
         -var "opsgenie_api_key=$OPSGENIE_API_KEY"
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false)
 
 deploy_main:
@@ -167,10 +159,6 @@ deploy_main:
         -var "ssl_certs=$SSL_CERTS"
         -var "opsgenie_api_key=$OPSGENIE_API_KEY"
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false -auto-approve)
 
 plan_bitcoin_mainnet:
@@ -192,10 +180,6 @@ plan_bitcoin_mainnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false)
 
 deploy_bitcoin_mainnet:
@@ -224,10 +208,6 @@ deploy_bitcoin_mainnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false -auto-approve)
 
 plan_bitcoin_testnet:
@@ -249,10 +229,6 @@ plan_bitcoin_testnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/testnet/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false)
 
 deploy_bitcoin_testnet:
@@ -281,10 +257,6 @@ deploy_bitcoin_testnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/testnet/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false -auto-approve)
 
 plan_liquid_mainnet:
@@ -306,10 +278,6 @@ plan_liquid_mainnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/liquid/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false)
 
 deploy_liquid_mainnet:
@@ -338,8 +306,4 @@ deploy_liquid_mainnet:
         -var "image_source_project=$IMAGE_SOURCE_PROJECT"
         -var "mempooldat=$MEMPOOLDAT"
         -var "fullurl=https://blockstream.info/liquid/_sync/mempool"
-        -var "provider_google_version=$PROVIDER_GOOGLE_VERSION"
-        -var "provider_google_beta_version=$PROVIDER_GOOGLE_BETA_VERSION"
-        -var "provider_null_version=$PROVIDER_NULL_VERSION"
-        -var "provider_template_version=$PROVIDER_TEMPLATE_VERSION"
         -input=false -auto-approve)
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -2,10 +2,10 @@ terraform {
   required_version = "> 0.12.0"
 
   required_providers {
-    google      = "= ${var.provider_google_version}"
-    google-beta = "= ${var.provider_google_beta_version}"
-    null        = "= ${var.provider_null_version}"
-    template    = "= ${var.provider_template_version}"
+    google      = "= 2.20"
+    google-beta = "= 2.20"
+    null        = "= 2.1"
+    template    = "= 2.1"
   }
 
   backend "gcs" {

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -162,23 +162,3 @@ variable "fullurl" {
   type    = string
   default = ""
 }
-
-variable "provider_google_version" {
-  type    = string
-  default = "2.20"
-}
-
-variable "provider_google_beta_version" {
-  type    = string
-  default = "2.20"
-}
-
-variable "provider_null_version" {
-  type    = string
-  default = "2.1"
-}
-
-variable "provider_template_version" {
-  type    = string
-  default = "2.1"
-}