Merge pull request #35 from kform-dev/delete

updated delete handling

Author: henderiw

docs/rn/0.0.19.md

@@ -0,0 +1,7 @@
+# Release 0.0.18
+
+[ChangeLog](https://github.com/kform-dev/choreo/releases)
+
+## delete handling
+
+Fixed delete existing resource via cli

pkg/controller/reconciler/DESIGN.md

@@ -97,6 +97,10 @@ func (r *storage) Delete(ctx context.Context, name string, opts ...rest.DeleteOp
 		return old, nil
 	}
 
+	if len(o.DryRun) > 0 {
+		return old, nil
+	}
+
 	if err := r.storage.Delete(store.ToKey(name)); err != nil {
 		return nil, status.Errorf(codes.Internal, "cannot delete object err: %s", err.Error())
 	}

pkg/server/apiserver/registry/delete.go

@@ -121,6 +121,10 @@ func (r *storage) update(ctx context.Context, new, old runtime.Unstructured, o *
 		UpdateGeneration(newObjectMeta, object.GetGeneration(old))
 	}
 
+	if len(o.DryRun) > 0 {
+		return new, nil
+	}
+
 	if err = r.storage.Update(store.ToKey(newObjectMeta.GetName()), new); err != nil {
 		return nil, status.Errorf(codes.Internal, "cannot update object in store, err: %s", err.Error())
 	}

pkg/server/apiserver/registry/update.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/henderiw/logger/log"
+	"github.com/kform-dev/choreo/pkg/proto/grpcerrors"
 	"github.com/kform-dev/choreo/pkg/proto/resourcepb"
 	"github.com/kform-dev/choreo/pkg/server/api"
 	"github.com/kform-dev/choreo/pkg/server/apiserver/rest"
@@ -320,7 +321,9 @@ func (r *srv) Delete(ctx context.Context, req *resourcepb.Delete_Request) (*reso
 		Trace:  req.Options.Trace,
 		Origin: req.Options.Origin,
 	}); err != nil {
-		return &resourcepb.Delete_Response{}, err
+		if !grpcerrors.IsNotFound(err) {
+			return &resourcepb.Delete_Response{}, err
+		}
 	}
 
 	if req.Options.Origin == "choreoctl" {