From 3cf91ab32b0a9f40beb72052e34451240cd3c671 Mon Sep 17 00:00:00 2001
From: Arvind Iyengar <arvind.iyengar@rancher.com>
Date: Fri, 5 Jun 2020 15:02:58 -0700
Subject: [PATCH] Relocate resolveNSGReference

Related Issue: https://github.com/rancher/rancher/issues/27468
---
 drivers/azure/azure.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/azure/azure.go b/drivers/azure/azure.go
index cb8442c5ed..ce2d24ffd8 100644
--- a/drivers/azure/azure.go
+++ b/drivers/azure/azure.go
@@ -324,11 +324,6 @@ func (d *Driver) SetConfigFromFlags(fl drivers.DriverOptions) error {
 	d.UpdateCount = fl.Int(flAzureUpdateDomainCount)
 	d.DiskSize = fl.Int(flAzureDiskSize)
 	d.NSG = fl.String(flAzureNSG)
-	var err error
-	d.nsgUsedInPool = len(d.NSG) > 0
-	if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
-		return err
-	}
 
 	d.ClientID = fl.String(flAzureClientID)
 	d.ClientSecret = fl.String(flAzureClientSecret)
@@ -414,6 +409,10 @@ func (d *Driver) Create() error {
 		}
 		customData = base64.StdEncoding.EncodeToString(buf)
 	}
+	d.nsgUsedInPool = len(d.NSG) > 0
+	if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
+		return err
+	}
 
 	if err := c.CreateResourceGroup(ctx, d.ResourceGroup, d.Location); err != nil {
 		return err
@@ -483,6 +482,10 @@ func (d *Driver) Remove() error {
 	if err != nil {
 		return err
 	}
+	d.nsgUsedInPool = len(d.NSG) > 0
+	if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
+		return err
+	}
 
 	if err := c.DeleteVirtualMachineIfExists(ctx, d.ResourceGroup, d.naming().VM()); err != nil {
 		return err