*string PrincipalID needs to be nil-guarded (#4258)

jackfrancis · jackfrancis · commit 0449af5faf0f · 2018-11-15T17:16:04.000-08:00
diff --git a/pkg/operations/deletevm.go b/pkg/operations/deletevm.go
@@ -90,7 +90,7 @@ func CleanDeleteVirtualMachine(az armhelpers.ACSEngineClient, logger *log.Entry,
 		}
 	}
 
-	if vm.Identity != nil {
+	if vm.Identity != nil && vm.Identity.PrincipalID != nil {
 		// Role assignments are not deleted if the VM is destroyed, so we must cleanup ourselves!
 		// The role assignments should only be relevant if managed identities are used,
 		// but always cleaning them up is easier than adding rule based logic here and there.

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func CleanDeleteVirtualMachine(az armhelpers.ACSEngineClient, logger *log.Entry,`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- if vm.Identity != nil {`
	`93`	`+ if vm.Identity != nil && vm.Identity.PrincipalID != nil {`
`94`	`94`	`// Role assignments are not deleted if the VM is destroyed, so we must cleanup ourselves!`
`95`	`95`	`// The role assignments should only be relevant if managed identities are used,`
`96`	`96`	`// but always cleaning them up is easier than adding rule based logic here and there.`