From 1b62bda60a8702d7dd67717739acdb52bd2b6584 Mon Sep 17 00:00:00 2001
From: David McCanney <38220805+mccanney@users.noreply.github.com>
Date: Sun, 21 Oct 2018 16:02:07 +0100
Subject: [PATCH] Update for GitHub account change

- Update URIs for documentation.
- Update URIs for badges.
- Change tenant_name to be an environment variable.
- Small additional code comments.
---
 README.md                        | 10 +++++-----
 examples/dkim-dmarc/README.md    |  4 ++--
 examples/existing-zone/README.md |  2 +-
 examples/new-zone/README.md      |  2 +-
 test/integration/main.tf         |  4 ++--
 test/integration/variables.tf    |  6 ++++++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 52c06f7..d497f66 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # AWS Office 365 Route53 Terraform Module
 
-[![CircleCI](https://circleci.com/gh/tiguard/terraform-aws-route53-o365.svg?style=shield)](https://circleci.com/gh/tiguard/terraform-aws-route53-o365)
-[![GitHub release](https://img.shields.io/github/release/tiguard/terraform-aws-route53-o365.svg?style=flat-square)](https://github.com/tiguard/terraform-aws-route53-o365/releases)
-[![license](https://img.shields.io/github/license/tiguard/terraform-aws-route53-o365.svg?style=flat-square)](https://github.com/tiguard/terraform-aws-route53-o365/blob/master/LICENSE.md)
+[![CircleCI](https://circleci.com/gh/mccanney/terraform-aws-route53-o365.svg?style=shield)](https://circleci.com/gh/mccanney/terraform-aws-route53-o365)
+[![GitHub release](https://img.shields.io/github/release/mccanney/terraform-aws-route53-o365.svg?style=flat-square)](https://github.com/mccanney/terraform-aws-route53-o365/releases)
+[![license](https://img.shields.io/github/license/mccanney/terraform-aws-route53-o365.svg?style=flat-square)](https://github.com/mccanney/terraform-aws-route53-o365/blob/master/LICENSE.md)
 
 A terraform module which creates, in AWS Route53, the [DNS records](https://support.office.com/article/External-Domain-Name-System-records-for-Office-365-c0531a6f-9e25-4f2d-ad0e-a70bfef09ac0) required by Office 365.
 
@@ -10,7 +10,7 @@ A terraform module which creates, in AWS Route53, the [DNS records](https://supp
 
 ```hcl
 module "route53_o365" {
-    source = "tiguard/route53-o365/aws"
+    source = "mccanney/route53-o365/aws"
 
     domain           = "example.com"
     zone_id          = "${data.aws_route53_zone.zone_name.zone_id}"
@@ -41,7 +41,7 @@ module "route53_o365" {
 
 ## Contributing
 
-Please use the [issue tracker](https://github.com/tiguard/terraform-aws-route53-o365/issues) to file any bug reports or make feature requests.
+Please use the [issue tracker](https://github.com/mccanney/terraform-aws-route53-o365/issues) to file any bug reports or make feature requests.
 
 ## License
 
diff --git a/examples/dkim-dmarc/README.md b/examples/dkim-dmarc/README.md
index cd9654c..bc48890 100644
--- a/examples/dkim-dmarc/README.md
+++ b/examples/dkim-dmarc/README.md
@@ -10,7 +10,7 @@ data "aws_route53_zone" "zone" {
 }
 
 module "route53_o365" {
-    source = "tiguard/route53-o365/aws"
+    source = "mccanney/route53-o365/aws"
 
     domain          = "example.com"
     zone_id         = "${data.aws_route53_zone.zone.zone_id}"
@@ -33,7 +33,7 @@ data "aws_route53_zone" "zone" {
 }
 
 module "route53_o365" {
-    source = "tiguard/route53-o365/aws"
+    source = "mccanney/route53-o365/aws"
 
     domain          = "example.com"
     zone_id         = "${data.aws_route53_zone.zone.zone_id}"
diff --git a/examples/existing-zone/README.md b/examples/existing-zone/README.md
index 568c75d..feb1b85 100644
--- a/examples/existing-zone/README.md
+++ b/examples/existing-zone/README.md
@@ -8,7 +8,7 @@ data "aws_route53_zone" "zone" {
 }
 
 module "route53_o365" {
-    source = "tiguard/route53-o365/aws"
+    source = "mccanney/route53-o365/aws"
 
     domain     = "example.com"
     zone_id    = "${data.aws_route53_zone.zone.zone_id}"
diff --git a/examples/new-zone/README.md b/examples/new-zone/README.md
index 21b2dca..636f636 100644
--- a/examples/new-zone/README.md
+++ b/examples/new-zone/README.md
@@ -8,7 +8,7 @@ resource "aws_route53_zone" "zone" {
 }
 
 module "route53_o365" {
-    source = "tiguard/route53-o365/aws"
+    source = "mccanney/route53-o365/aws"
 
     domain  = "example.com"
     zone_id = "${aws_route53_zone.zone.zone_id}"
diff --git a/test/integration/main.tf b/test/integration/main.tf
index 73b4914..b08b6d0 100644
--- a/test/integration/main.tf
+++ b/test/integration/main.tf
@@ -26,6 +26,6 @@ module "route53-o365" {
     ms_txt       = "ms12345678"
     enable_dkim  = true
     enable_dmarc = true
-    dmarc_record = "v=DMARC1; p=none; rua=mailto:dmarc@tiguard.technology; ruf=mailto:dmarc@tiguard.technology"
-    tenant_name  = "tiguard"
+    dmarc_record = "v=DMARC1; p=reject; rua=mailto:dmarc@tiguard.technology; ruf=mailto:dmarc@tiguard.technology; adkim=s; aspf=s;"
+    tenant_name  = "${var.tenant_name}"
 }
diff --git a/test/integration/variables.tf b/test/integration/variables.tf
index e83c33a..65e888a 100644
--- a/test/integration/variables.tf
+++ b/test/integration/variables.tf
@@ -6,6 +6,12 @@ variable "domain" {
     default = "tiguard.technology"
 }
 
+# Delegation ID is set via an environment variable.
 variable "delegation_id" {
     default = ""
 }
+
+# Tenant name is set via an environment variable.
+variable "tenant_name" {
+    default = ""
+}