Merge branch 'release/0.5.0'

zerowastesgp · Aug 22, 2020 · f9fa677 · f9fa677
2 parents 2fa8e92 + 17badfd
commit f9fa677
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 15 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/antonbabenko/pre-commit-terraform
-  rev: b45a728a922c5916d37060aaa1fdad9b8b702d79  # frozen: v1.25.0
+  rev: dafe42560ace053a00e5902931972ba9f28b7d5c  # frozen: v1.32.0
   hooks:
     - id: terraform_fmt
     - id: terraform_validate

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## v0.5.0 - Aug 22, 2020
+
+### Changes
+
+* Upgrade Terraform to v0.13
+* Upgrade Terraform pre-commit hooks to v1.32.0
+* Upgrade OVH provider to v0.8
+* Make apex `A` record point to Netlify
+* Make `www` point to Netlify (`zerowaste-sgp-www.netlify.app`)
+
 ## v0.4.0 - Feb 7, 2020
 
 ### Changes

diff --git a/README.md b/README.md
@@ -5,17 +5,23 @@ Terraform module for managing the `zerowastesgp.fr` DNS zone.
 This module follows the [standard structure][standard-module-structure] described in the [Terraform documentation][terraform-docs].
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+| Name | Version |
+|------|---------|
+| terraform | >= 0.13.0 |
+
 ## Providers
 
 No provider.
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:-----:|
-| ovh\_application\_key | The OVH API application key | `string` | n/a | yes |
-| ovh\_application\_secret | The OVH API application secret | `string` | n/a | yes |
-| ovh\_consumer\_key | The OVH API consumer key | `string` | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| ovh\_application\_key | The OVH API application key | `string` | `null` | no |
+| ovh\_application\_secret | The OVH API application secret | `string` | `null` | no |
+| ovh\_consumer\_key | The OVH API consumer key | `string` | `null` | no |
 | ovh\_endpoint | Specify which API endpoint to use | `string` | n/a | yes |
 
 ## Outputs

diff --git a/dns-records.tf b/dns-records.tf
@@ -14,25 +14,22 @@ locals {
         "ns100.ovh.net.",
       ]
     },
-    # See https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-an-apex-domain.
+    # See https://docs.netlify.com/domains-https/custom-domains/configure-external-dns/#configure-an-apex-domain.
     {
       name = ""
       type = "A"
       ttl  = 0,
       targets = [
-        "185.199.108.153",
-        "185.199.109.153",
-        "185.199.110.153",
-        "185.199.111.153",
+        "104.198.14.52",
       ]
     },
-    # https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-a-subdomain.
+    # See https://docs.netlify.com/domains-https/custom-domains/configure-external-dns/#configure-a-subdomain.
     {
       name = "www"
       type = "CNAME"
       ttl  = 0,
       targets = [
-        "zerowastesgp.github.io.",
+        "zerowaste-sgp-www.netlify.app.",
       ]
     },
     # -------------------------------------------------- #

diff --git a/main.tf b/main.tf
@@ -1,6 +1,6 @@
 # https://www.terraform.io/docs/configuration/terraform.html#terraform-block-syntax.
 terraform {
-  required_version = ">= 0.12.0"
+  required_version = ">= 0.13.0"
 
   required_providers {
   }

diff --git a/modules/ovh-dns/main.tf b/modules/ovh-dns/main.tf
@@ -1,9 +1,12 @@
 # https://www.terraform.io/docs/configuration/terraform.html#terraform-block-syntax.
 terraform {
-  required_version = ">= 0.12.0"
+  required_version = ">= 0.13.0"
 
   required_providers {
     # https://www.terraform.io/docs/providers/ovh/.
-    ovh = "~> 0.6"
+    ovh = {
+      source  = "terraform-providers/ovh"
+      version = "~> 0.8"
+    }
   }
 }