ImporterWrapper: Allocate a new Importer object (#1481)

The wrapper function was updating the existing importer, but the replaced function ended up having the same pointer as the wrapper function, meaning that import would enter an infinite recursion loop. Tested by doing import, read, update, and delete for 1) nsxt_logical_tier1_router 2) nsxt_ip_pool Signed-off-by: Salvatore Orlando <[email protected]>
vmware · Dec 18, 2024 · b3f333f · b3f333f
1 parent 7a2c41a
commit b3f333f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/nsxt/removed_resource_wrapper.go b/nsxt/removed_resource_wrapper.go
@@ -66,15 +66,18 @@ func deleteWrapper(originalFunc schema.DeleteFunc, name string) schema.DeleteFun
 }
 
 func importerWrapper(originalImporter *schema.ResourceImporter, name string) *schema.ResourceImporter {
+	newImporter := new(schema.ResourceImporter)
 	wrappedFunc := func(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 		if commonVersionCheck(m) {
-			return originalImporter.State(d, m)
+			stateFunc := originalImporter.State
+			return stateFunc(d, m)
 		}
 		log.Printf("[INFO] Failing import for resource %s: removed from NSX 9.0.0", name)
 		return nil, mpResourceRemovedError(name)
 	}
-	originalImporter.State = wrappedFunc
-	return originalImporter
+	newImporter.State = wrappedFunc
+	newImporter.StateContext = originalImporter.StateContext
+	return newImporter
 }
 
 func removedResourceWrapper(realResourceFunc resourceFunc, name string) *schema.Resource {