FLI Issue 3222: Import issue when --address and --drop is used

cmd/flipt/import.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -10,6 +11,8 @@ import (
 	"github.com/spf13/cobra"
 	"go.flipt.io/flipt/internal/ext"
 	"go.flipt.io/flipt/internal/storage/sql"
+	"go.flipt.io/flipt/rpc/flipt"
+	sdk "go.flipt.io/flipt/sdk/go"
 )
 
 type importCommand struct {
@@ -107,6 +110,11 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
+		if c.dropBeforeImport {
+			if err := dropNamespaces(ctx, client); err != nil {
+				return fmt.Errorf("dropping namespaces: %w", err)
+			}
+		}
 		return ext.NewImporter(client).Import(ctx, enc, in, c.skipExisting)
 	}
 
@@ -161,3 +169,27 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 		server,
 	).Import(ctx, enc, in, c.skipExisting)
 }
+
+func dropNamespaces(ctx context.Context, client *sdk.Flipt) error {
+	namespaces, err := client.ListNamespaces(ctx, &flipt.ListNamespaceRequest{})
+	if err != nil {
+		return err
+	}
+
+	for _, ns := range namespaces.Namespaces {
+		if err := client.DeleteNamespace(ctx, &flipt.DeleteNamespaceRequest{
+			Key:   ns.Key,
+			Force: true,
+		}); err != nil {
+			return err
+		}
+	}
+
+	_, err = client.CreateNamespace(ctx, &flipt.CreateNamespaceRequest{
+		Key:         "default",
+		Name:        "Default",
+		Description: "Default namespace",
+	})
+
+	return err
+}

internal/server/namespace.go

@@ -73,18 +73,20 @@ func (s *Server) DeleteNamespace(ctx context.Context, r *flipt.DeleteNamespaceRe
 		return &empty.Empty{}, nil
 	}
 
-	if namespace.Protected {
+	if !r.GetForce() && namespace.Protected {
 		return nil, errors.ErrInvalidf("namespace %q is protected", r.Key)
 	}
 
-	// if any flags exist under the namespace then it cannot be deleted
-	count, err := s.store.CountFlags(ctx, storage.NewNamespace(r.Key))
-	if err != nil {
-		return nil, err
-	}
+	if !r.GetForce() {
+		// if any flags exist under the namespace then it cannot be deleted
+		count, err := s.store.CountFlags(ctx, storage.NewNamespace(r.Key))
+		if err != nil {
+			return nil, err
+		}
 
-	if count > 0 {
-		return nil, errors.ErrInvalidf("namespace %q cannot be deleted; flags must be deleted first", r.Key)
+		if count > 0 {
+			return nil, errors.ErrInvalidf("namespace %q cannot be deleted; flags must be deleted first", r.Key)
+		}
 	}
 
 	if err := s.store.DeleteNamespace(ctx, r); err != nil {

internal/server/namespace_test.go

@@ -275,3 +275,61 @@ func TestDeleteNamespace_HasFlags(t *testing.T) {
 	require.EqualError(t, err, "namespace \"foo\" cannot be deleted; flags must be deleted first")
 	assert.Nil(t, got)
 }
+
+
+func TestDeleteNamespace_ProtectedWithForce(t *testing.T) {
+	var (
+		store  = &common.StoreMock{}
+		logger = zaptest.NewLogger(t)
+		s      = &Server{
+			logger: logger,
+			store:  store,
+		}
+		req = &flipt.DeleteNamespaceRequest{
+			Key: "foo",
+			Force: true,
+		}
+	)
+
+	store.On("GetNamespace", mock.Anything, storage.NewNamespace("foo")).Return(&flipt.Namespace{
+		Key:       req.Key,
+		Protected: true,
+	}, nil)
+
+	store.AssertNotCalled(t, "CountFlags")
+
+	store.On("DeleteNamespace", mock.Anything, req).Return(nil)
+
+	got, err := s.DeleteNamespace(context.TODO(), req)
+	require.NoError(t, err)
+
+	assert.NotNil(t, got)
+}
+
+func TestDeleteNamespace_HasFlagsWithForce(t *testing.T) {
+	var (
+		store  = &common.StoreMock{}
+		logger = zaptest.NewLogger(t)
+		s      = &Server{
+			logger: logger,
+			store:  store,
+		}
+		req = &flipt.DeleteNamespaceRequest{
+			Key: "foo",
+			Force: true,
+		}
+	)
+
+	store.On("GetNamespace", mock.Anything, storage.NewNamespace("foo")).Return(&flipt.Namespace{
+		Key: req.Key,
+	}, nil)
+
+	store.AssertNotCalled(t, "CountFlags")
+
+	store.On("DeleteNamespace", mock.Anything, req).Return(nil)
+
+	got, err := s.DeleteNamespace(context.TODO(), req)
+	require.NoError(t, err)
+
+	assert.NotNil(t, got)
+}

openapi.yaml

@@ -116,6 +116,10 @@ paths:
                   required: true
                   schema:
                     type: string
+                - name: force
+                  in: query
+                  schema:
+                    type: boolean
             responses:
                 "200":
                     description: OK