fix example and e2e test

This commit is contained in:
hezijie 2023-11-21 16:31:26 +08:00
parent 5895b4f1c4
commit 99037bb0e5
4 changed files with 61 additions and 4 deletions

View File

@ -47,6 +47,7 @@ data "azurerm_subscription" "current" {
resource "random_pet" "management_group_name" { resource "random_pet" "management_group_name" {
prefix = "AVNM-management-group" prefix = "AVNM-management-group"
} }
resource "azurerm_management_group" "mg" { resource "azurerm_management_group" "mg" {
display_name = random_pet.management_group_name.id display_name = random_pet.management_group_name.id
@ -55,14 +56,21 @@ resource "azurerm_management_group" "mg" {
] ]
} }
data "azurerm_client_config" "this" {}
resource "azurerm_role_assignment" "management_group_owner" {
principal_id = coalesce(var.msi_id, data.azurerm_client_config.this.object_id)
scope = azurerm_management_group.mg.id
role_definition_name = "Contributor"
}
# register Microsoft.Network to the Management Group # register Microsoft.Network to the Management Group
resource "null_resource" "register_rp_to_mg" { resource "null_resource" "register_rp_to_mg" {
provisioner "local-exec" { provisioner "local-exec" {
command = <<CMD command = "az provider register --namespace Microsoft.Network -m ${azurerm_management_group.mg.name}"
az provider register --namespace 'Microsoft.Network' -m ${azurerm_management_group.mg.name}
CMD
} }
depends_on = [azurerm_role_assignment.management_group_owner]
} }
resource "time_sleep" "wait_5_seconds" { resource "time_sleep" "wait_5_seconds" {

View File

@ -8,4 +8,10 @@ variable "resource_group_name_prefix" {
type = string type = string
description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription." description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
default = "rg" default = "rg"
}
variable "msi_id" {
type = string
description = "(Optional) Manage identity id that be used as authentication method. Defaults to `null`."
default = null
} }

View File

@ -0,0 +1,11 @@
package e2e
import "io"
var discardWriter io.Writer = discard{}
type discard struct{}
func (d discard) Write(p []byte) (n int, err error) {
return len(p), nil
}

View File

@ -3,6 +3,7 @@ package e2e
import ( import (
"fmt" "fmt"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
@ -17,7 +18,8 @@ import (
) )
var speicalTests = map[string]func(*testing.T){ var speicalTests = map[string]func(*testing.T){
"quickstart/201-vmss-packer-jumpbox": test201VmssPackerJumpbox, "quickstart/201-vmss-packer-jumpbox": test201VmssPackerJumpbox,
"quickstart/101-virtual-network-manager-create-management-group-scope": test101VirtualNetworkManagerCreateManagementGroupScope,
} }
func Test_Quickstarts(t *testing.T) { func Test_Quickstarts(t *testing.T) {
@ -141,6 +143,36 @@ func test201VmssPackerJumpbox(t *testing.T) {
}, nil) }, nil)
} }
func test101VirtualNetworkManagerCreateManagementGroupScope(t *testing.T) {
rootPath := filepath.Join("..", "..")
f := filepath.Join("quickstart", "101-virtual-network-manager-create-management-group-scope")
tenantId := os.Getenv("ARM_TENANT_ID")
clientId := os.Getenv("ARM_CLIENT_ID")
clientSecret := os.Getenv("ARM_CLIENT_SECRET")
msiId := os.Getenv("MSI_ID")
var cmd *exec.Cmd
if tenantId != "" && clientId != "" && clientSecret != "" {
cmd = exec.Command("az", "login", "--service-principal", "-u", clientId, "-p", clientSecret, "--tenant", tenantId)
err := cmd.Run()
require.NoError(t, err, "cannot login via service principal: %+v", err)
} else if msiId != "" {
cmd = exec.Command("az", "login", "--identity", "--username", msiId)
err := cmd.Run()
require.NoError(t, err, "cannot login via identity: %+v", err)
} else {
t.Fatalf("To test `quickstart/101-virtual-network-manager-create-management-group-scope` you must set `ARM_TENANT_ID`, `ARM_CLIENT_ID`, `ARM_CLIENT_SECRET`, or set `MSI_ID` so we can run `az login`.")
}
cmd.Stdout = discardWriter
defer func() {
cmd := exec.Command("az", "logout")
cmd.Stdout = discardWriter
_ = cmd.Run()
}()
helper.RunE2ETest(t, rootPath, f, terraform.Options{
Upgrade: true,
}, nil)
}
func removeDuplicates(s []string) []string { func removeDuplicates(s []string) []string {
m := make(map[string]struct{}) m := make(map[string]struct{})
result := []string{} result := []string{}