Delete resources in error state

- Allow errored event drivers to be deleted
- Do not default event driver types to expose=true
- Put images in to CREATING state when picked up by controller
- Be more resilient about deleting service bindings accidentally
- Fix powercli list vms

Signed-off-by: Berndt Jung <[email protected]>

Author: berndtj

examples/powershell/powercli-list-vms.ps1

@@ -3,14 +3,14 @@
 ## SPDX-License-Identifier: Apache-2.0
 #######################################################################
 
-Import-Module PowerCLI.ViCore
+# Import-Module PowerCLI.ViCore
 
 function handle($context, $payload) {
     [void](Set-PowerCLIConfiguration -InvalidCertificateAction ignore -Confirm:$false)
 
     $username = $context.secrets.username
     $password = $context.secrets.password
-    $hostname = $payload.host
+    $hostname = $context.secrets.host
 
     $server = connect-viserver -server $hostname -User $username -Password $password
 

examples/powershell/requirements.psd1

@@ -1,3 +1,4 @@
 @{
   PSSlack = 'latest'
+  'VMware.PowerCLI' = 'latest'
 }

pkg/dispatchcli/cmd/create_eventdrivertype.go

@@ -41,7 +41,7 @@ func NewCmdCreateEventDriverType(out io.Writer, errOut io.Writer) *cobra.Command
 		},
 	}
 	cmd.Flags().StringVarP(&cmdFlagApplication, "application", "a", "", "associate with an application")
-	cmd.Flags().BoolVar(&exposeEventDriverType, "expose", true, "expose the driver externally")
+	cmd.Flags().BoolVar(&exposeEventDriverType, "expose", false, "expose the driver externally")
 	return cmd
 }
 

pkg/entity-store/postgres.go

@@ -297,8 +297,7 @@ func (p *postgresEntityStore) Update(ctx context.Context, lastRevision uint64, e
 		return 0, errors.Wrap(err, "error updating entity")
 	}
 	if rowsAffected != 1 {
-		log.Errorf("rowsAffected != 1: intead %v", rowsAffected)
-		return 0, errors.Errorf("error updating entity: no such entity or there's intermidate update")
+		return 0, errors.Errorf("error updating entity %s/%s: no such entity or there is an intermidate update - %v", entity.GetOrganizationID(), entity.GetName(), lastRevision)
 	}
 	entity.setRevision(lastRevision + 1)
 	return int64(entity.GetRevision()), nil

pkg/event-manager/drivers/entity_handler.go

@@ -49,6 +49,8 @@ func (h *EntityHandler) Add(ctx context.Context, obj entitystore.Entity) (err er
 
 	// deploy the deployment in k8s cluster
 
+	log.Infof("Adding driver %s - expose: %v", driver.Name, driver.Expose)
+
 	if err := h.backend.Deploy(ctx, driver); err != nil {
 		translateErrorToEntityState(driver, err)
 		return ewrapper.Wrap(err, "error deploying driver")
@@ -99,10 +101,11 @@ func (h *EntityHandler) Delete(ctx context.Context, obj entitystore.Entity) erro
 
 	// delete the deployment from k8s cluster
 	err := h.backend.Delete(ctx, driver)
+	driver.SetDelete(true)
 	if err != nil {
 		translateErrorToEntityState(driver, err)
 		h.store.Update(ctx, driver.GetRevision(), driver)
-		return ewrapper.Wrap(err, "error deleting driver")
+		return h.Error(ctx, driver)
 	}
 
 	if err := h.store.Delete(ctx, driver.OrganizationID, driver.Name, driver); err != nil {
@@ -153,7 +156,7 @@ func (h *EntityHandler) Error(ctx context.Context, obj entitystore.Entity) error
 	case errReasonDeploymentNotFound:
 		if driver.GetDelete() {
 			// in DELETE status, delete driver entity
-			log.Debugf("%s in delete state, deployment not found, delete entity")
+			log.Debugf("%s in delete state, deployment not found, delete entity", driver.GetName())
 			h.store.Delete(ctx, driver.OrganizationID, driver.Name, driver)
 			recover = true
 		}

pkg/event-manager/drivers/http_handlers.go

@@ -246,6 +246,7 @@ func (h *Handlers) deleteDriver(params driverapi.DeleteDriverParams, principal i
 			})
 	}
 	d.Status = entitystore.StatusDELETING
+	d.SetDelete(true)
 	if _, err = h.store.Update(ctx, d.Revision, d); err != nil {
 		log.Errorf("store error when deleting the event driver %s: %+v", d.Name, err)
 		return driverapi.NewDeleteDriverDefault(500).WithPayload(&v1.Error{

pkg/image-manager/controller.go

@@ -115,6 +115,14 @@ func (h *imageEntityHandler) Add(ctx context.Context, obj entitystore.Entity) (e
 		log.Error(err)
 	}
 
+	i.SetStatus(entitystore.StatusCREATING)
+	_, err = h.Store.Update(ctx, i.GetRevision(), i)
+	if err != nil {
+		span.LogKV("error", err)
+		log.Error(err)
+		return
+	}
+
 	defer func() { h.Store.UpdateWithError(ctx, i, err) }()
 
 	if i.Status == entitystore.StatusMISSING {
@@ -173,7 +181,6 @@ func (h *imageEntityHandler) Sync(ctx context.Context, resyncPeriod time.Duratio
 func (h *imageEntityHandler) Error(ctx context.Context, obj entitystore.Entity) error {
 	span, ctx := trace.Trace(ctx, "")
 	defer span.Finish()
-
 	_, err := h.Store.Update(ctx, obj.GetRevision(), obj)
 	return err
 }

pkg/service-manager/controller.go

@@ -403,7 +403,7 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
 	for _, binding := range existing {
 		log.Debugf("Processing service binding %s [%s]", binding.Name, binding.Status)
 		if _, ok := serviceMap[binding.ServiceInstance]; !ok {
-			log.Debugf("Service for binding %s missing, delete", binding.Name)
+			log.Infof("Service instance for binding %s [%s] missing, delete", binding.Name, binding.ServiceInstance)
 			// No matching service exists... delete
 			binding.SetDelete(true)
 			binding.SetStatus(entitystore.StatusDELETING)
@@ -424,11 +424,14 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
 			continue
 		}
 		actual, ok := actualMap[binding.BindingID]
-		// If binding isn't present... delete
-		// TODO (bjung): would it be better to set the status to INITIALIZED and recreate?
+		// If binding isn't present... recreate
 		if !ok {
-			binding.SetDelete(true)
-			binding.SetStatus(entitystore.StatusDELETING)
+			log.Infof("Binding %s [%s] missing from service catalog, recreate", binding.Name, binding.ServiceInstance)
+			if !binding.GetDelete() {
+				// Since we are recreating, it's not really orphaned.
+				delete(actualMap, binding.BindingID)
+				binding.SetStatus(entitystore.StatusINITIALIZED)
+			}
 			synced = append(synced, binding)
 			continue
 		} else {
@@ -448,6 +451,7 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
 	}
 	// Clean up any orphaned bindings
 	for _, b := range actualMap {
+		log.Infof("Binding %s [%s] orphaned from entity store, delete", b.Name, b.ServiceInstance)
 		b.SetDelete(true)
 		b.SetStatus(entitystore.StatusDELETING)
 		synced = append(synced, b)

pkg/service-manager/controller_test.go

@@ -462,12 +462,12 @@ func TestServiceBindingSyncReady(t *testing.T) {
 	assert.Len(t, bindings, 0)
 
 	client.On("ListServiceBindings").Return([]entitystore.Entity{}, nil).Once()
-	// Actual binding missing... delete binding entity (should we recreate?)
+	// Actual binding missing... recreate binding entity
 	bindings, err = handler.Sync(context.Background(), time.Duration(1))
 	assert.NoError(t, err)
 	assert.Len(t, bindings, 1)
-	assert.True(t, bindings[0].GetDelete())
-	assert.Equal(t, entitystore.StatusDELETING, bindings[0].GetStatus())
+	assert.False(t, bindings[0].GetDelete())
+	assert.Equal(t, entitystore.StatusINITIALIZED, bindings[0].GetStatus())
 
 	// Remove the entity, creating an orphan
 	err = es.Delete(context.Background(), readyBinding.OrganizationID, readyBinding.Name, &readyBinding)

pkg/service-manager/handlers.go

@@ -283,6 +283,7 @@ func (h *Handlers) deleteServiceInstanceByName(params serviceinstance.DeleteServ
 	span, ctx := trace.Trace(params.HTTPRequest.Context(), "")
 	defer span.Finish()
 
+	missingBinding := false
 	b := entities.ServiceBinding{}
 	i := entities.ServiceInstance{}
 
@@ -293,11 +294,7 @@ func (h *Handlers) deleteServiceInstanceByName(params serviceinstance.DeleteServ
 	// TODO (bjung): We always assume there is an assocated binding... this may not always be true
 	err = h.Store.Get(ctx, params.XDispatchOrg, params.ServiceInstanceName, opts, &b)
 	if err != nil {
-		return serviceinstance.NewDeleteServiceInstanceByNameNotFound().WithPayload(
-			&v1.Error{
-				Code:    http.StatusNotFound,
-				Message: utils.ErrorMsgNotFound("service binding", params.ServiceInstanceName),
-			})
+		missingBinding = true
 	}
 	err = h.Store.Get(ctx, params.XDispatchOrg, params.ServiceInstanceName, opts, &i)
 	if err != nil {
@@ -307,13 +304,15 @@ func (h *Handlers) deleteServiceInstanceByName(params serviceinstance.DeleteServ
 				Message: utils.ErrorMsgNotFound("service instance", params.ServiceInstanceName),
 			})
 	}
-	err = h.Store.SoftDelete(ctx, &b)
-	if err != nil {
-		return serviceinstance.NewDeleteServiceInstanceByNameNotFound().WithPayload(
-			&v1.Error{
-				Code:    http.StatusNotFound,
-				Message: utils.ErrorMsgNotFound("service binding", params.ServiceInstanceName),
-			})
+	if !missingBinding {
+		err = h.Store.SoftDelete(ctx, &b)
+		if err != nil {
+			return serviceinstance.NewDeleteServiceInstanceByNameNotFound().WithPayload(
+				&v1.Error{
+					Code:    http.StatusNotFound,
+					Message: utils.ErrorMsgNotFound("service binding", params.ServiceInstanceName),
+				})
+		}
 	}
 	err = h.Store.SoftDelete(ctx, &i)
 	if err != nil {