Add put and delete for variants

pkg/handler/crud.go

@@ -41,6 +41,8 @@ type CRUD interface {
 	// Variants
 	CreateVariant(variant.CreateVariantParams) middleware.Responder
 	FindVariants(variant.FindVariantsParams) middleware.Responder
+	PutVariant(variant.PutVariantParams) middleware.Responder
+	DeleteVariant(variant.DeleteVariantParams) middleware.Responder
 }
 
 // NewCRUD creates a new CRUD instance
@@ -351,3 +353,43 @@ func (c *crud) FindVariants(params variant.FindVariantsParams) middleware.Respon
 	resp.SetPayload(e2r.MapVariants(vs))
 	return resp
 }
+
+func (c *crud) PutVariant(params variant.PutVariantParams) middleware.Responder {
+	v := entity.Variant{}
+
+	q := entity.NewVariantQuerySet(repo.GetDB())
+	err := q.IDEq(uint(params.VariantID)).One(&v)
+	if err != nil {
+		return variant.NewPutVariantDefault(500).WithPayload(ErrorMessage("%s", err))
+	}
+
+	v.Key = util.SafeString(params.Body.Key)
+	if params.Body.Attachment != nil {
+		a, err := r2e.MapAttachment(params.Body.Attachment)
+		if err != nil {
+			return variant.NewPutVariantDefault(400).WithPayload(ErrorMessage("%s", err))
+		}
+		v.Attachment = a
+	}
+
+	if err := repo.GetDB().Save(&v).Error; err != nil {
+		return variant.NewPutVariantDefault(500).WithPayload(ErrorMessage("%s", err))
+	}
+
+	resp := variant.NewPutVariantOK()
+	resp.SetPayload(e2r.MapVariant(&v))
+	return resp
+}
+
+func (c *crud) DeleteVariant(params variant.DeleteVariantParams) middleware.Responder {
+	if err := validateDeleteVariant(params); err != nil {
+		return variant.NewDeleteVariantDefault(err.StatusCode).WithPayload(ErrorMessage("%s", err))
+	}
+
+	q := entity.NewVariantQuerySet(repo.GetDB())
+	if err := q.IDEq(uint(params.VariantID)).Delete(); err != nil {
+		return variant.NewDeleteVariantDefault(500).WithPayload(ErrorMessage("%s", err))
+	}
+
+	return variant.NewDeleteVariantOK()
+}

pkg/handler/handler.go

@@ -61,6 +61,8 @@ func setupCRUD(api *operations.FlagrAPI) {
 	// variants
 	api.VariantCreateVariantHandler = variant.CreateVariantHandlerFunc(c.CreateVariant)
 	api.VariantFindVariantsHandler = variant.FindVariantsHandlerFunc(c.FindVariants)
+	api.VariantPutVariantHandler = variant.PutVariantHandlerFunc(c.PutVariant)
+	api.VariantDeleteVariantHandler = variant.DeleteVariantHandlerFunc(c.DeleteVariant)
 }
 
 func setupEvaluation(api *operations.FlagrAPI) {

pkg/handler/validate.go

@@ -5,6 +5,7 @@ import (
 	"github.com/checkr/flagr/pkg/repo"
 	"github.com/checkr/flagr/pkg/util"
 	"github.com/checkr/flagr/swagger_gen/restapi/operations/distribution"
+	"github.com/checkr/flagr/swagger_gen/restapi/operations/variant"
 )
 
 func validatePutDistributions(params distribution.PutDistributionsParams) *Error {
@@ -41,7 +42,32 @@ func validatePutDistributions(params distribution.PutDistributionsParams) *Error
 			return NewError(400, "error finding variantID %v under this flag. expecting %v", vID, vIDs)
 		}
 		if k != util.SafeString(v.VariantKey) {
-			return NewError(400, "error matching variantID %v with variantKey %s. expecting %s.", vID, util.SafeString(v.VariantKey), k)
+			return NewError(400, "error matching variantID %v with variantKey %s. expecting %s", vID, util.SafeString(v.VariantKey), k)
+		}
+	}
+
+	return nil
+}
+
+func validateDeleteVariant(params variant.DeleteVariantParams) *Error {
+	f := &entity.Flag{}
+	err := entity.NewFlagQuerySet(repo.GetDB()).IDEq(uint(params.FlagID)).One(f)
+	if err != nil {
+		return NewError(400, "error finding flagID %v. reason %s", params.FlagID, err)
+	}
+	f.Preload(repo.GetDB())
+
+	q := entity.NewDistributionQuerySet(repo.GetDB())
+	for _, s := range f.Segments {
+		for _, d := range s.Distributions {
+			if d.VariantID == util.SafeUint(params.VariantID) {
+				if d.Percent != uint(0) {
+					return NewError(400, "error deleting variant %v. distribution %v still has non-zero distribution %v", params.VariantID, d.ID, d.Percent)
+				}
+				if err := q.IDEq(d.ID).Delete(); err != nil {
+					return NewError(500, "error deleting distribution %v. reason: %s", d.ID, err)
+				}
+			}
 		}
 	}
 

swagger/flag_variant.yaml

@@ -0,0 +1,60 @@
+put:
+  tags:
+    - variant
+  operationId: putVariant
+  parameters:
+    - in: path
+      name: flagID
+      description: numeric ID of the flag
+      required: true
+      type: integer
+      format: int64
+      minimum: 1
+    - in: path
+      name: variantID
+      description: numeric ID of the variant
+      required: true
+      type: integer
+      format: int64
+      minimum: 1
+    - in: body
+      name: body
+      description: update a variant
+      required: true
+      schema:
+        $ref: "#/definitions/putVariantRequest"
+  responses:
+    200:
+      description: variant just updated
+      schema:
+        $ref: "#/definitions/variant"
+    default:
+      description: generic error response
+      schema:
+        $ref: "#/definitions/error"
+delete:
+  tags:
+    - variant
+  operationId: deleteVariant
+  parameters:
+    - in: path
+      name: flagID
+      description: numeric ID of the flag
+      required: true
+      type: integer
+      format: int64
+      minimum: 1
+    - in: path
+      name: variantID
+      description: numeric ID of the variant
+      required: true
+      type: integer
+      format: int64
+      minimum: 1
+  responses:
+    200:
+      description: deleted
+    default:
+      description: generic error response
+      schema:
+        $ref: "#/definitions/error"

swagger/index.yaml

@@ -20,6 +20,8 @@ paths:
     $ref: ./flag_enabled.yaml
   /flags/{flagID}/variants:
     $ref: ./flag_variants.yaml
+  /flags/{flagID}/variants/{variantID}:
+    $ref: ./flag_variant.yaml
   /flags/{flagID}/segments:
     $ref: ./flag_segments.yaml
   /flags/{flagID}/segments/{segmentID}/constraints:
@@ -154,6 +156,17 @@ definitions:
         minLength: 1
       attachment:
         type: object
+  putVariantRequest:
+    type: object
+    required:
+      - key
+      - attachment
+    properties:
+      key:
+        type: string
+        minLength: 1
+      attachment:
+        type: object
 
   # Constraint
   constraint: