Update NMI resource id query key (#1401)

Co-authored-by: Feng Zhang <fenzhan@microsoft.com>

Author: fenzhanG2

pkg/nmi/server/server.go

@@ -549,6 +549,9 @@ func parseTokenRequest(r *http.Request) (request TokenRequest) {
 		// These are mutually exclusive values (client_id, msi_resource_id)
 		request.ClientID = vals.Get("client_id")
 		request.ResourceID = vals.Get("msi_res_id")
+		if len(request.ResourceID) == 0 {
+			request.ResourceID = vals.Get("mi_res_id")
+		}
 
 		request.Resource = vals.Get("resource")
 	}

pkg/nmi/server/server_test.go

@@ -115,6 +115,20 @@ func TestParseTokenRequest(t *testing.T) {
 		}
 	})
 
+	t.Run("query present with latest resource id", func(t *testing.T) {
+		const resource = "https://vault.azure.net"
+		const resourceID = "/subscriptions/9f2be85c-f8ae-4569-9353-38e5e8b459ef/resourcegroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test"
+
+		var r http.Request
+		r.URL, _ = url.Parse(fmt.Sprintf("%s?mi_res_id=%s&resource=%s", endpoint, resourceID, resource))
+
+		result := parseTokenRequest(&r)
+
+		if result.ResourceID != resourceID {
+			t.Errorf("invalid ResourceID - expected: %q, actual: %q", resourceID, result.ResourceID)
+		}
+	})
+
 	t.Run("bare endpoint", func(t *testing.T) {
 		var r http.Request
 		r.URL, _ = url.Parse(endpoint)