Fix condition for enabling GCP API gateway service

api3dao · Apr 27, 2022 · dd34f2f · dd34f2f
1 parent bb9b811
commit dd34f2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/rude-clouds-draw.md b/.changeset/rude-clouds-draw.md
@@ -0,0 +1,5 @@
+---
+'@api3/airnode-deployer': patch
+---
+
+Fix condition for enabling GCP API gateway service
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "dev:invoke": "(cd packages/airnode-node && yarn run dev:invoke)",
     "dev:list": "(cd packages/airnode-operation && yarn run dev:list)",
     "dev:stop": "(cd packages/airnode-operation && yarn run dev:stop)",
-    "docker": "yarn docker:build:artifacts && yarn docker:build:deployer && yarn docker:build:client && yarn docker:build:admin",
+    "docker:build": "yarn docker:build:artifacts && yarn docker:build:deployer && yarn docker:build:client && yarn docker:build:admin",
     "docker:build:admin": "docker build --tag api3/airnode-admin:latest --file packages/airnode-admin/docker/Dockerfile .",
     "docker:build:artifacts": "docker rmi --force api3/airnode-artifacts && docker build --tag api3/airnode-artifacts:latest --file docker/Dockerfile .",
     "docker:build:deployer": "docker build --tag api3/airnode-deployer:latest --file packages/airnode-deployer/docker/Dockerfile .",

diff --git a/packages/airnode-deployer/terraform/airnode/gcp/main.tf b/packages/airnode-deployer/terraform/airnode/gcp/main.tf
@@ -71,7 +71,7 @@ module "startCoordinator" {
 }
 
 resource "google_project_service" "apigateway_api" {
-  count = var.http_api_key == null || var.http_signed_data_api_key == null ? 0 : 1
+  count = var.http_api_key == null && var.http_signed_data_api_key == null ? 0 : 1
 
   service = "apigateway.googleapis.com"
 
@@ -84,7 +84,7 @@ resource "google_project_service" "apigateway_api" {
 }
 
 resource "google_project_service" "servicecontrol_api" {
-  count = var.http_api_key == null || var.http_signed_data_api_key == null ? 0 : 1
+  count = var.http_api_key == null && var.http_signed_data_api_key == null ? 0 : 1
 
   service = "servicecontrol.googleapis.com"