From 975c383b759b34806d4b0a03be067ab3af3c75d7 Mon Sep 17 00:00:00 2001
From: Houssem Dellai <hodellai@microsoft.com>
Date: Fri, 5 Jan 2024 10:51:42 +0100
Subject: [PATCH] edited 121

---
 .infracost/pricing.gob                     | Bin 6002 -> 6001 bytes
 121_appservice_domain/Readme.md            |  14 ++++++-------
 121_appservice_domain/appservice_domain.tf |  23 +--------------------
 121_appservice_domain/dns_zone.tf          |  14 +++++++++++++
 121_appservice_domain/providers.tf         |   4 ++--
 121_appservice_domain/rg.tf                |   5 +++++
 6 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 121_appservice_domain/dns_zone.tf
 create mode 100644 121_appservice_domain/rg.tf

diff --git a/.infracost/pricing.gob b/.infracost/pricing.gob
index a6c14b813f1206178f4baea6e70dcbdde68874c8..2921e6df8f732b0d05f35a3781620348f93da3ae 100644
GIT binary patch
delta 911
zcmeyQ_fgNC|9?9RBh&v521Yi<{|yWbYW2)OZUX}&6C+ztYH?{!3FH4J21ZWTih|6d
z)M7^<w~c{;!RLP?Gb56Ui5`{)EkJSM|IJK{jI7bInR!5!Eewn-3=9JQTUi+ySwb>%
zQz4rFi5&%6s5&{1XCBvGty+G4t33(~Hj`zzrwB7KF!D13&EW%z3ou^TZU7XYEi^-f
zkqe824a+oHWDWeRv(~jR*f9K<73s5W#f{+QlRvVUOb+3Vn0%Up3v3fa!Q|6ob3j}^
z^HgOCpas)Krirj<VX@!<?*b8!L%3g5hk(p=JRN%N=fR8}U~>cb!%>{eFTlgs05ok6
zzahwQ0huM?8-U#T0`tLKh#8YT1i^mh(|4Nu0VpfYIbDR22gz!fDer|LVIwuGALymY
z$2b>)Jpkp_h|UFbp&?huwGiY^Xh1Ujc=>ACiDg?R2ZG(1C>AdIk4XZ_4p_kUv(MoM
zxm4sp>m8u?CT=u9cKCe`BV_Ie!RaC>rodck!?pnI7B#=d1wfZRW1A|%tc1n3@BCmN
zK?8I0bCzi$%qmFgVCK0)eGV~i;%gMsr!YedfjD`x1JiU=%b-bM@@uAP^8Z-$kd22W
zj)M26au|}IOaTWDGY>FuP}M=BaUv^9h&zfJf|CLyRvCUUmgv0uQnXlo@&!(l$(I?E
n!9fL$<1D^;V6~hVu7Q(HeMs<zY9AXnu#LqW5u%KISR4ib-XIr(

delta 921
zcmeyU_esx#|9>Y7Bh&vb21Yi<|4j@G>i-*=f&3;0MkYqKpw!~hoD#<WEewpDt`!BD
zMXAM(KyC*E1B1{1W@bht6%*Yp4cdU>!v9;D7#UfkV>9!BD%%(sSr`}u{<pI-GO~nZ
z=B7e4{}Ve3v{7~PSsnwfJLeV)$+>KQz)&&ST5th~E1>LC<pJati!KCl1$9p@Jp<(S
z3QZSb(P3cZX9QZq2U5q~=kNq5VIe$CmI+y$?cu8v3>6GNYG*Y)_p3kZH`##4WU{hQ
z0@yAtt5Trk<kd{mME^1JAZvpf_mY2_2#W!-1jM|_y&_=u2#5>X{Q#Qqju*wXGx(;8
zpqMAf`{J?$P@Njj91)Nwxh%P4K(49}3EoicW8*gYA&1Fi7V(J5ub8>O-iF%G&T9mA
zC^S%XIHto@Kpj%giQ<rpToA4m-_;(VeG!aP<o_|tA$b7m5{4fI?@#40BtMw~wpvjn
zTm&W9Aoep%+%OO1UIB=43_oT?`fOWqBX~Jj(<J5y5oRSMvtg0o#|jP&SY*kG%|nj6
zAFNY>q0NV^59*f%Y=+3bb>v6UcbjcK$SqJ)8GhWEYPH$8W6c+^TMn^<W0YU}_k;qV
zznyufi!iHTvEo1D3^^7xBnfzU$VU}Re^FBt1RHlz0BjsA^<C$H1Op_t8Gh_(S^m?a
zNB=um?IV^55hf8#BPUykqIgG(Yc4oyp;1%AJyjSv$YDw3AM+e;pf~x=J?`WHlL!C=
C`%NwY

diff --git a/121_appservice_domain/Readme.md b/121_appservice_domain/Readme.md
index a27db25..e53aa07 100644
--- a/121_appservice_domain/Readme.md
+++ b/121_appservice_domain/Readme.md
@@ -1,5 +1,9 @@
 # Azure App Service Domain in Terraform
 
+## News
+
+This is now available as Terraform module on Terraform Registry: https://registry.terraform.io/modules/HoussemDellai/appservice-domain/azapi/
+
 ## Problem
 
 You can create a custom domain name in Azure using App Service Domain service.
@@ -13,7 +17,7 @@ However for labs, workshops and demonstrations, this is very useful to make the
 
 ## Solution
 
-We'll provide a Terraform implemntation for creating a custom domain name using Azure App Service Domain.
+We'll provide a Terraform implementation for creating a custom domain name using Azure App Service Domain.
 We'll use `AzApi` provider to create the resource. More info about AzApi here: https://registry.terraform.io/providers/Azure/azapi/latest/docs/resources/azapi_resource.
 
 The AzApi will call the REST API and pass the required JSON file containing the needed attributes.
@@ -23,7 +27,7 @@ We also create an Azure DNS Zone to manage and configure the domain name.
 
 And we create an A record "test" to make sure the configuration works.
 
-The complete Terraform implemntation is in this current folder.
+The complete Terraform implementation is in this current folder.
 But here is a
 
 ```terraform
@@ -106,16 +110,12 @@ az appservice domain create `
 
 ## Important notes
 
-You should use a Pay-As-You-Go azure subcription to be able to create Azure App Service Domain.
+You should use a Pay-As-You-Go azure subscription to be able to create Azure App Service Domain.
 MSDN/VisualStudio and Free Azure subscriptions doesn't work.
 
 Within the terraform config file, you can change the contact info for the contactAdmin, contactRegistrant, contactBilling and contactTech.
 It worked for me when reusing the same contact !
 
-We didn't create any link between DNS Zone and App Service Domain. 
-How the DNS Zone was linked/bound to the custom domain name ?
-I suppose it is a default Azure configuration, as the two resources are in the same resource group and/or the use the same domain name.
-
 ## What is next ?
 
 You can explore App Service Domain with Azure Container Apps (ACA) in this lab: https://github.com/HoussemDellai/aca-course/tree/main/14_aca_custom_domain.
\ No newline at end of file
diff --git a/121_appservice_domain/appservice_domain.tf b/121_appservice_domain/appservice_domain.tf
index 25ce821..511538d 100644
--- a/121_appservice_domain/appservice_domain.tf
+++ b/121_appservice_domain/appservice_domain.tf
@@ -1,29 +1,8 @@
-# Resource Group
-resource "azurerm_resource_group" "rg" {
-  name     = var.rg_name
-  location = var.location
-}
-
-# DNS Zone to configure the domain name
-resource "azurerm_dns_zone" "dns_zone" {
-  name                = var.domain_name
-  resource_group_name = azurerm_resource_group.rg.name
-}
-
-# DNS Zone A record
-resource "azurerm_dns_a_record" "dns_a_record" {
-  name                = "test"
-  zone_name           = azurerm_dns_zone.dns_zone.name
-  resource_group_name = azurerm_resource_group.rg.name
-  ttl                 = 300
-  records             = ["1.2.3.4"] # just example IP address
-}
-
 # App Service Domain
 # REST API reference: https://docs.microsoft.com/en-us/rest/api/appservice/domains/createorupdate
 resource "azapi_resource" "appservice_domain" {
   type                      = "Microsoft.DomainRegistration/domains@2022-09-01"
-  name                      = "mycompany.com"
+  name                      = var.domain_name
   parent_id                 = azurerm_resource_group.rg.id
   location                  = "global"
   schema_validation_enabled = true
diff --git a/121_appservice_domain/dns_zone.tf b/121_appservice_domain/dns_zone.tf
new file mode 100644
index 0000000..b82d056
--- /dev/null
+++ b/121_appservice_domain/dns_zone.tf
@@ -0,0 +1,14 @@
+# DNS Zone to configure the domain name
+resource "azurerm_dns_zone" "dns_zone" {
+  name                = var.domain_name
+  resource_group_name = azurerm_resource_group.rg.name
+}
+
+# DNS Zone A record
+resource "azurerm_dns_a_record" "dns_a_record" {
+  name                = "test"
+  zone_name           = azurerm_dns_zone.dns_zone.name
+  resource_group_name = azurerm_resource_group.rg.name
+  ttl                 = 300
+  records             = ["1.2.3.4"] # just example IP address
+}
diff --git a/121_appservice_domain/providers.tf b/121_appservice_domain/providers.tf
index ecd3d64..27a6e95 100644
--- a/121_appservice_domain/providers.tf
+++ b/121_appservice_domain/providers.tf
@@ -6,12 +6,12 @@ terraform {
 
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "= 3.68.0"
+      version = "= 3.85.0"
     }
 
     azapi = {
       source  = "Azure/azapi"
-      version = "1.8.0"
+      version = "1.11.0"
     }
   }
 }
diff --git a/121_appservice_domain/rg.tf b/121_appservice_domain/rg.tf
new file mode 100644
index 0000000..073ef9e
--- /dev/null
+++ b/121_appservice_domain/rg.tf
@@ -0,0 +1,5 @@
+# Resource Group
+resource "azurerm_resource_group" "rg" {
+  name     = var.rg_name
+  location = var.location
+}
\ No newline at end of file