Merge pull request #786 from amuntean-godaddy/fix_781

Fix #781: when target is removed, also remove it from config

Author: karimra

pkg/app/loaders.go

@@ -140,9 +140,6 @@ START:
 		// do deletes first since target change is delete+add
 		for _, del := range targetOp.Del {
 			// clustered, delete target in all instances of the cluster
-			a.configLock.Lock()
-			delete(a.Config.Targets, del)
-			a.configLock.Unlock()
 			a.operLock.Lock()
 			t, ok := a.Targets[del]
 			if ok {

pkg/app/target.go

@@ -72,12 +72,10 @@ func (a *App) DeleteTarget(ctx context.Context, name string) error {
 	if !a.targetConfigExists(name) {
 		return fmt.Errorf("target %q does not exist", name)
 	}
-	if !a.isLeader {
-		a.configLock.Lock()
-		delete(a.Config.Targets, name)
-		a.configLock.Unlock()
-		a.Logger.Printf("target %q deleted from config", name)
-	}
+	a.configLock.Lock()
+	delete(a.Config.Targets, name)
+	a.configLock.Unlock()
+	a.Logger.Printf("target %q deleted from config", name)
 	// delete from oper map
 	a.operLock.Lock()
 	defer a.operLock.Unlock()

pkg/app/tunnel.go

@@ -174,9 +174,9 @@ func (a *App) tunServerDeleteTargetHandler(tt tunnel.Target) error {
 		cfn()
 		delete(a.tunTargetCfn, tt)
 		delete(a.tunTargets, tt)
-		a.configLock.Lock()
-		delete(a.Config.Targets, tt.ID)
-		a.configLock.Unlock()
+		if err := a.DeleteTarget(a.ctx, tt.ID); err != nil {
+			a.Logger.Printf("failed deleting tunnel target %q: %v", tt.ID, err)
+		}
 	}
 	return nil
 }