docker builds

Author: max-ostapenko

src/.dockerignore

@@ -0,0 +1,12 @@
+node_modules
+npm-debug.log
+.git
+.gitignore
+.env
+.nyc_output
+coverage
+*.md
+.DS_Store
+cloudbuild.yaml
+__tests__
+coverage

src/Dockerfile

@@ -0,0 +1,17 @@
+FROM node:22-slim
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package files first for better layer caching
+COPY package*.json ./
+
+# Install dependencies (this layer will be cached unless package files change)
+RUN npm ci --only=production --quiet --no-fund --no-audit && npm cache clean --force
+
+ENV DATABASE=tech-report-api-prod
+
+# Copy source code
+COPY . .
+
+CMD ["node", "index.js"]

src/package.json

@@ -10,7 +10,9 @@
   "scripts": {
     "start": "export DATABASE=tech-report-api-prod && node index.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "test:live": "bash ../test-api.sh"
+    "test:live": "bash ../test-api.sh",
+    "build": "docker build -t tech-report-api .",
+    "run": "docker run -p 8080:8080 tech-report-api"
   },
   "dependencies": {
     "@google-cloud/firestore": "7.11.2",

terraform/dev/local.auto.tfvars.template

@@ -3,6 +3,13 @@ terraform {
     bucket = "tfstate-httparchive"
     prefix = "tech-report-apis/dev"
   }
+
+  required_providers {
+    docker = {
+      source  = "kreuzwerker/docker"
+      version = ">= 3.6.2"
+    }
+  }
 }
 
 provider "google" {
@@ -11,23 +18,30 @@ provider "google" {
   request_timeout = "60m"
 }
 
-resource "google_api_gateway_api" "api" {
-  provider     = google-beta
-  api_id       = "reports-api-dev"
-  display_name = "Reports API Gateway DEV"
-  project      = var.project
+provider "google-beta" {
+  project         = var.project
+  region          = var.region
+}
+
+# Get current Google Cloud access token
+data "google_client_config" "default" {}
+
+# Configure Docker provider with Artifact Registry authentication
+provider "docker" {
+  registry_auth {
+    address  = "${var.region}-docker.pkg.dev"
+    username = "oauth2accesstoken"
+    password = data.google_client_config.default.access_token
+  }
 }
 
-resource "google_api_gateway_api_config" "api_config" {
-  provider             = google-beta
-  api                  = google_api_gateway_api.api.api_id
-  api_config_id_prefix = "reports-api-config-dev"
-  project              = var.project
-  display_name         = "Reports API Config DEV"
-  openapi_documents {
-    document {
-      path = "spec.yaml"
-      contents = base64encode(<<-EOF
+module "gateway" {
+  source                      = "./../modules/api-gateway"
+  project                     = var.project
+  environment                 = var.environment
+  region                      = var.region
+  service_account_email       = var.google_service_account_api_gateway
+  spec_yaml                   = <<EOF
 swagger: "2.0"
 info:
   title: reports_api_config_dev
@@ -113,48 +127,36 @@ paths:
         200:
           description: String
 EOF
-      )
-    }
-  }
-  gateway_config {
-    backend_config {
-      google_service_account = var.google_service_account_api_gateway
-    }
-  }
-}
-
-resource "google_api_gateway_gateway" "gateway" {
-  provider     = google-beta
-  project      = var.project
-  region       = var.region
-  api_config   = google_api_gateway_api_config.api_config.id
-  gateway_id   = "reports-dev"
-  display_name = "Reports API Gateway DEV"
-  labels = {
-    owner       = "tech_report_api"
-    environment = var.environment
-  }
-  depends_on = [google_api_gateway_api_config.api_config]
-  lifecycle {
-    replace_triggered_by = [
-      google_api_gateway_api_config.api_config
-    ]
-  }
 }
 
 module "endpoints" {
-  source                           = "./../modules/run-service"
-  entry_point                      = "app"
-  project                          = var.project
-  environment                      = var.environment
-  source_directory                 = "../../src"
-  function_name                    = "tech-report-api"
-  region                           = var.region
-  service_account_email            = var.google_service_account_cloud_functions
-  service_account_api_gateway      = var.google_service_account_api_gateway
-  min_instances                    = var.min_instances
+  source                      = "./../modules/run-service"
+  entry_point                 = "app"
+  project                     = var.project
+  environment                 = var.environment
+  source_directory            = "../../src"
+  function_name               = "tech-report-api"
+  region                      = var.region
+  service_account_email       = var.google_service_account_cloud_functions
+  service_account_api_gateway = var.google_service_account_api_gateway
+  min_instances               = var.min_instances
   environment_variables = {
     "PROJECT"  = var.project
     "DATABASE" = var.project_database
   }
 }
+
+moved {
+  from = google_api_gateway_api.api
+  to = module.gateway.google_api_gateway_api.api
+}
+
+moved {
+  from = google_api_gateway_api_config.api_config
+  to = module.gateway.google_api_gateway_api_config.api_config
+}
+
+moved {
+  from = google_api_gateway_gateway.gateway
+  to = module.gateway.google_api_gateway_gateway.gateway
+}

terraform/dev/main.tf

@@ -1,26 +1,34 @@
-######################################
-# API Gateway
-######################################
 # Used to expose Internal resources to external sources, such as web applications
 # See https://cloud.google.com/api-gateway/docs for more information
+
+terraform {
+  required_providers {
+    docker = {
+      source  = "hashicorp/google-beta"
+      version = ">= 6.38.0"
+    }
+  }
+}
+
 # The API used by the Gateway
 resource "google_api_gateway_api" "api" {
-  provider     = google-beta # API Gateway is still in beta
-  api_id       = "api-gw-${var.environment}"
-  display_name = "The ${var.environment} API Gateway"
+  provider     = google-beta
+  api_id       = "reports-api-${var.environment}"
+  display_name = "Reports API Gateway ${var.environment}"
   project      = var.project
 }
+
 # A Configuration, consisting of an OpenAPI specification
 resource "google_api_gateway_api_config" "api_config" {
-  provider             = google-beta # API Gateway is still in beta
+  provider             = google-beta
   api                  = google_api_gateway_api.api.api_id
-  api_config_id_prefix = "api"
+  api_config_id_prefix = "reports-api-config-${var.environment}"
   project              = var.project
-  display_name         = "The ${var.environment} Config"
+  display_name         = "Reports API Config ${var.environment}"
   openapi_documents {
     document {
-      path     = "spec.yaml"             # File name is simply sugar to show on GCP
-      contents = filebase64("spec.yaml") # This is based on *who* is call the module! 
+      path     = "spec.yaml"
+      contents = base64encode(var.spec_yaml)
     }
   }
   gateway_config {
@@ -35,13 +43,13 @@ resource "google_api_gateway_gateway" "gateway" {
   project      = var.project
   region       = var.region
   api_config   = google_api_gateway_api_config.api_config.id
-  gateway_id   = "${var.environment}-gw"
-  display_name = "${var.environment} Api Gateway"
+  gateway_id   = "reports-${var.environment}"
+  display_name = "Reports API Gateway ${var.environment}"
   labels = {
     owner       = "tech_report_api"
     environment = var.environment
   }
-  depends_on = [google_api_gateway_api_config.api_config]
+
   lifecycle {
     replace_triggered_by = [
       google_api_gateway_api_config.api_config

terraform/modules/api-gateway/main.tf

@@ -1,6 +1,7 @@
 variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
+  default = "dev"
 }
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
@@ -14,3 +15,7 @@ variable "service_account_email" {
   description = "Email of the service account associated with and to run the API Gateway"
   type        = string
 }
+variable "spec_yaml" {
+  description = "The OpenAPI specification for the API Gateway"
+  type        = string
+}

terraform/modules/api-gateway/variables.tf

@@ -0,0 +1,20 @@
+# Calculate hash of source files to determine if rebuild is needed
+locals {
+  source_files = fileset(path.root, "../${var.function_name}/*")
+  source_hash  = substr(sha1(join("", [for f in local.source_files : filesha1(f)])), 0, 8)
+}
+
+# Build Docker image
+resource "docker_image" "function_image" {
+  name = "${var.region}-docker.pkg.dev/${var.project}/dataform/${var.function_name}:${local.source_hash}"
+
+  build {
+    context    = "../${var.function_name}/"
+    dockerfile = "Dockerfile"
+    platform   = "linux/amd64"
+  }
+}
+
+resource "docker_registry_image" "registry_image" {
+  name = docker_image.function_image.name
+}