Refactor gandi configuration in a TF module

terraform/main.tf

@@ -18,24 +18,10 @@ variable "project" {
 variable "domain" {
   default = "androidmakers.fr"
 }
-//
 variable "gandi_access_token" {
   type = string
 }
 
-# Also create "androidmakers-tfstate" as it can sadly not be a variable
-# Typically use the same resource as for tfstate-bucket above (but doest have to)
-variable "region" {
-  default = "europe-west9"
-}
-
-terraform {
-  backend "gcs" {
-    bucket = "androidmakers-tfstate"
-    prefix = "terraform/state"
-  }
-}
-
 terraform {
   required_providers {
     gandi = {
@@ -49,63 +35,25 @@ provider "gandi" {
   personal_access_token = var.gandi_access_token
 }
 
-import {
-  id = "androidmakers.fr"
-  to = gandi_domain.androidmakers_fr
-}
-
-resource "gandi_domain" "androidmakers_fr" {
-  name = "androidmakers.fr"
-
-  # The owner block is required even though sadly it's not supported by the current provider
-  owner {
-    email = "placeholder"
-    type = "company"
-    street_addr = "placeholder"
-    zip = "placeholder"
-    phone = "placeholder"
-    given_name = "placeholder"
-    family_name = "placeholder"
-    country = "FR"
-    city = "placeholder"
-    state = "placeholder"
-    mail_obfuscated = true
-    organisation = "placeholder"
-    data_obfuscated = true
-  }
-  lifecycle {
-    ignore_changes = [
-      # "Error: domain owner contact update is currently not supported"
-      owner,
-    ]
-  }
-}
-
-import {
-  id = "androidmakers.fr"
-  to = gandi_livedns_domain.androidmakers_fr
-}
+module "gandi" {
+  source = "./modules/gandi"
 
-resource "gandi_livedns_domain" "androidmakers_fr" {
-  name = "androidmakers.fr"
+  loadbalancer_ip = google_compute_global_address.default.address
 }
 
-import {
-  id = "androidmakers.fr/@/A"
-  to = gandi_livedns_record.androidmakers_fr
+# Also create "androidmakers-tfstate" as it can sadly not be a variable
+# Typically use the same resource as for tfstate-bucket above (but doest have to)
+variable "region" {
+  default = "europe-west9"
 }
 
-resource "gandi_livedns_record" "androidmakers_fr" {
-  zone = gandi_livedns_domain.androidmakers_fr.id
-  name = "@"
-  type = "A"
-  ttl = 3600
-  values = [
-    google_compute_global_address.default.address
-  ]
+terraform {
+  backend "gcs" {
+    bucket = "androidmakers-tfstate"
+    prefix = "terraform/state"
+  }
 }
 
-
 provider google-beta {
   project = var.project
   region  = var.region

terraform/modules/gandi/main.tf

@@ -0,0 +1,49 @@
+terraform {
+  required_providers {
+    gandi = {
+      version = "2.3.0"
+      source   = "go-gandi/gandi"
+    }
+  }
+}
+
+resource "gandi_domain" "androidmakers_fr" {
+  name = "androidmakers.fr"
+
+  # The owner block is required even though sadly it's not supported by the current provider
+  owner {
+    email = "placeholder"
+    type = "company"
+    street_addr = "placeholder"
+    zip = "placeholder"
+    phone = "placeholder"
+    given_name = "placeholder"
+    family_name = "placeholder"
+    country = "FR"
+    city = "placeholder"
+    state = "placeholder"
+    mail_obfuscated = true
+    organisation = "placeholder"
+    data_obfuscated = true
+  }
+  lifecycle {
+    ignore_changes = [
+      # "Error: domain owner contact update is currently not supported"
+      owner,
+    ]
+  }
+}
+
+resource "gandi_livedns_domain" "androidmakers_fr" {
+  name = "androidmakers.fr"
+}
+
+resource "gandi_livedns_record" "androidmakers_fr" {
+  zone = gandi_livedns_domain.androidmakers_fr.id
+  name = "@"
+  type = "A"
+  ttl = 3600
+  values = [
+    var.loadbalancer_ip
+  ]
+}

terraform/modules/gandi/variables.tf

@@ -0,0 +1,4 @@
+
+variable "loadbalancer_ip" {
+  type = string
+}