Merge pull request #7 from spectrocloud/deepan/applying-upstream-changes-MTV-1929

PEM-8573: adding upstream changes

Author: deepen168

pkg/controller/plan/migration.go

@@ -376,6 +376,11 @@ func (r *Migration) begin() (err error) {
 // Archive the plan.
 // Best effort to remove any retained migration resources.
 func (r *Migration) Archive() {
+	defer func() {
+		if r.provider != nil {
+			r.provider.Close()
+		}
+	}()
 	if err := r.init(); err != nil {
 		r.Log.Error(err, "Archive initialization failed.")
 		return
@@ -407,6 +412,11 @@ func (r *Migration) Archive() {
 }
 
 func (r *Migration) SetPopulatorDataSourceLabels() {
+	defer func() {
+		if r.provider != nil {
+			r.provider.Close()
+		}
+	}()
 	err := r.init()
 	if err != nil {
 		r.Log.Error(err, "Setting Populator Data Source labels failed.")
@@ -434,6 +444,11 @@ func (r *Migration) SetPopulatorDataSourceLabels() {
 // Cancel the migration.
 // Delete resources associated with VMs that have been marked canceled.
 func (r *Migration) Cancel() error {
+	defer func() {
+		if r.provider != nil {
+			r.provider.Close()
+		}
+	}()
 	if err := r.init(); err != nil {
 		return liberr.Wrap(err)
 	}