[Azure VNET Peering] changed the incorrect parameter used for role assignment and role definition (#438)

nikhil-mongo · Nikhil Singh · web-flow · commit 21e0a1c73cac · 2021-04-21T09:28:16.000-05:00
* changed the incorrect parameter used for role assignment and role definition

* update variables.tf to remove unnecessary variable

* use data rather than variable for subscription id

Co-authored-by: Nikhil Singh &lt;nikhil.singh@Nikhils-MacBook-Pro.local&gt;
diff --git a/examples/mongodbatlas-azure-vnet-peering/azure.tf b/examples/mongodbatlas-azure-vnet-peering/azure.tf
@@ -30,7 +30,7 @@ resource "azuread_service_principal" "sp" {
 }
 resource "azurerm_role_definition" "rd" {
   name  = "my-custom-role-definition"
-  scope = "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"
+  scope = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"
 
   permissions {
     actions = ["Microsoft.Network/virtualNetworks/virtualNetworkPeerings/read",
@@ -41,11 +41,11 @@ resource "azurerm_role_definition" "rd" {
   }
 
   assignable_scopes = [
-    "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}",
+    "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}",
   ]
 }
 resource "azurerm_role_assignment" "ra" {
-  scope              = "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"
+  scope              = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"
   role_definition_id = azurerm_role_definition.rd.role_definition_resource_id
   principal_id       = azuread_service_principal.sp.id
 }
diff --git a/examples/mongodbatlas-azure-vnet-peering/variables.tf b/examples/mongodbatlas-azure-vnet-peering/variables.tf
@@ -30,3 +30,4 @@ variable "address_space" {
 variable "application_id" {
   default = "e90a1407-55c3-432d-9cb1-3638900a9d22"
 }
+
diff --git a/examples/mongodbatlas-azure-vnet-peering/versions.tf b/examples/mongodbatlas-azure-vnet-peering/versions.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     mongodbatlas = {
-      source = "terraform-providers/mongodbatlas"
+      source = "mongodb/mongodbatlas"
     }
     azuread = {
       source = "hashicorp/azuread"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ resource "azuread_service_principal" "sp" {`
`30`	`30`	`}`
`31`	`31`	`resource "azurerm_role_definition" "rd" {`
`32`	`32`	`name = "my-custom-role-definition"`
`33`		`- scope = "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"`
	`33`	`+ scope = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"`
`34`	`34`
`35`	`35`	`permissions {`
`36`	`36`	`actions = ["Microsoft.Network/virtualNetworks/virtualNetworkPeerings/read",`
`@@ -41,11 +41,11 @@ resource "azurerm_role_definition" "rd" {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`assignable_scopes = [`
`44`		`- "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}",`
	`44`	`+ "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}",`
`45`	`45`	`]`
`46`	`46`	`}`
`47`	`47`	`resource "azurerm_role_assignment" "ra" {`
`48`		`- scope = "/subscriptions/${var.application_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"`
	`48`	`+ scope = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${var.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${var.vnet_name}"`
`49`	`49`	`role_definition_id = azurerm_role_definition.rd.role_definition_resource_id`
`50`	`50`	`principal_id = azuread_service_principal.sp.id`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ variable "address_space" {`
`30`	`30`	`variable "application_id" {`
`31`	`31`	`default = "e90a1407-55c3-432d-9cb1-3638900a9d22"`
`32`	`32`	`}`
	`33`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`mongodbatlas = {`
`4`		`- source = "terraform-providers/mongodbatlas"`
	`4`	`+ source = "mongodb/mongodbatlas"`
`5`	`5`	`}`
`6`	`6`	`azuread = {`
`7`	`7`	`source = "hashicorp/azuread"`