Add DeleteQueueV1 for JSON support

app/gosqs/delete_queue.go

@@ -0,0 +1,38 @@
+package gosqs
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/Admiral-Piett/goaws/app/interfaces"
+
+	"github.com/Admiral-Piett/goaws/app/models"
+	"github.com/Admiral-Piett/goaws/app/utils"
+
+	"github.com/Admiral-Piett/goaws/app"
+	log "github.com/sirupsen/logrus"
+)
+
+func DeleteQueueV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
+	requestBody := models.NewDeleteQueueRequest()
+	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
+	if !ok {
+		log.Error("Invalid Request - DeleteQueueV1")
+		return createErrorResponseV1(ErrInvalidParameterValue.Type)
+	}
+
+	uriSegments := strings.Split(requestBody.QueueUrl, "/")
+	queueName := uriSegments[len(uriSegments)-1]
+
+	log.Infof("Deleting Queue: %s", queueName)
+
+	app.SyncQueues.Lock()
+	delete(app.SyncQueues.Queues, queueName)
+	app.SyncQueues.Unlock()
+
+	respStruct := models.DeleteQueueResponse{
+		Xmlns:    models.BASE_XMLNS,
+		Metadata: models.BASE_RESPONSE_METADATA,
+	}
+	return http.StatusOK, respStruct
+}

app/gosqs/delete_queue_test.go

@@ -0,0 +1,91 @@
+package gosqs
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/Admiral-Piett/goaws/app"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/Admiral-Piett/goaws/app/conf"
+	"github.com/Admiral-Piett/goaws/app/fixtures"
+	"github.com/Admiral-Piett/goaws/app/interfaces"
+	"github.com/Admiral-Piett/goaws/app/models"
+	"github.com/Admiral-Piett/goaws/app/utils"
+)
+
+func TestDeleteQueueV1_success(t *testing.T) {
+	conf.LoadYamlConfig("../conf/mock-data/mock-config.yaml", "BaseUnitTests")
+	defer func() {
+		utils.ResetApp()
+		utils.REQUEST_TRANSFORMER = utils.TransformRequest
+	}()
+
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
+		v := resultingStruct.(*models.DeleteQueueRequest)
+		*v = models.DeleteQueueRequest{
+			QueueUrl: fmt.Sprintf("%s/%s", fixtures.BASE_URL, "unit-queue1"),
+		}
+		return true
+	}
+
+	expectedResponse := models.DeleteQueueResponse{
+		Xmlns:    models.BASE_XMLNS,
+		Metadata: models.BASE_RESPONSE_METADATA,
+	}
+
+	_, r := utils.GenerateRequestInfo("POST", "/", nil, true)
+	code, response := DeleteQueueV1(r)
+
+	assert.Equal(t, http.StatusOK, code)
+	assert.Equal(t, expectedResponse, response)
+
+	_, ok := app.SyncQueues.Queues["unit-queue1"]
+	assert.False(t, ok)
+}
+
+func TestDeleteQueueV1_success_unknown_queue(t *testing.T) {
+	conf.LoadYamlConfig("../conf/mock-data/mock-config.yaml", "BaseUnitTests")
+	defer func() {
+		utils.ResetApp()
+		utils.REQUEST_TRANSFORMER = utils.TransformRequest
+	}()
+
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
+		v := resultingStruct.(*models.DeleteQueueRequest)
+		*v = models.DeleteQueueRequest{
+			QueueUrl: fmt.Sprintf("%s/%s", fixtures.BASE_URL, "unknown-queue1"),
+		}
+		return true
+	}
+
+	expectedResponse := models.DeleteQueueResponse{
+		Xmlns:    models.BASE_XMLNS,
+		Metadata: models.BASE_RESPONSE_METADATA,
+	}
+
+	_, r := utils.GenerateRequestInfo("POST", "/", nil, true)
+	code, response := DeleteQueueV1(r)
+
+	assert.Equal(t, http.StatusOK, code)
+	assert.Equal(t, expectedResponse, response)
+}
+
+func TestDeleteQueueV1_success_invalid_request(t *testing.T) {
+	conf.LoadYamlConfig("../conf/mock-data/mock-config.yaml", "BaseUnitTests")
+	defer func() {
+		utils.ResetApp()
+		utils.REQUEST_TRANSFORMER = utils.TransformRequest
+	}()
+
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
+		return false
+	}
+
+	_, r := utils.GenerateRequestInfo("POST", "/", nil, true)
+	code, _ := DeleteQueueV1(r)
+
+	assert.Equal(t, http.StatusBadRequest, code)
+}

app/gosqs/get_queue_url.go

@@ -11,7 +11,6 @@ import (
 )
 
 func GetQueueUrlV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
-
 	requestBody := models.NewGetQueueUrlRequest()
 	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
 	if !ok {

app/gosqs/gosqs.go

@@ -333,35 +333,6 @@ func DeleteMessageBatch(w http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func DeleteQueue(w http.ResponseWriter, req *http.Request) {
-	// Sent response type
-	w.Header().Set("Content-Type", "application/xml")
-
-	// Retrieve FormValues required
-	queueUrl := getQueueFromPath(req.FormValue("QueueUrl"), req.URL.String())
-	queueName := ""
-	if queueUrl == "" {
-		vars := mux.Vars(req)
-		queueName = vars["queueName"]
-	} else {
-		uriSegments := strings.Split(queueUrl, "/")
-		queueName = uriSegments[len(uriSegments)-1]
-	}
-
-	log.Println("Deleting Queue:", queueName)
-	app.SyncQueues.Lock()
-	delete(app.SyncQueues.Queues, queueName)
-	app.SyncQueues.Unlock()
-
-	// Create, encode/xml and send response
-	respStruct := app.DeleteQueueResponse{"http://queue.amazonaws.com/doc/2012-11-05/", app.ResponseMetadata{RequestId: "00000000-0000-0000-0000-000000000000"}}
-	enc := xml.NewEncoder(w)
-	enc.Indent("  ", "    ")
-	if err := enc.Encode(respStruct); err != nil {
-		log.Printf("error: %v\n", err)
-	}
-}
-
 func getQueueFromPath(formVal string, theUrl string) string {
 	if formVal != "" {
 		return formVal

app/gosqs/receive_message.go

@@ -15,6 +15,9 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// TODO - Admiral-Piett - could we refactor the way we hide messages?  Change data structure to a queue
+// organized by "reveal time" or a map with the key being a timestamp of when it could be shown?
+// Ordered Map - https://github.com/elliotchance/orderedmap
 func ReceiveMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
 	requestBody := models.NewReceiveMessageRequest()
 	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)

app/gosqs/receive_message_test.go

@@ -3,8 +3,6 @@ package gosqs
 import (
 	"context"
 	"net/http"
-	"net/http/httptest"
-	"net/url"
 	"sync"
 	"testing"
 	"time"
@@ -136,64 +134,6 @@ func TestReceiveMessage_CanceledByClientV1(t *testing.T) {
 	}
 }
 
-func TestReceiveMessage_WithConcurrentDeleteQueueV1(t *testing.T) {
-	// create a queue
-	app.CurrentEnvironment = fixtures.LOCAL_ENVIRONMENT
-	defer func() {
-		utils.ResetApp()
-	}()
-
-	app.SyncQueues.Queues["waiting-queue"] = &app.Queue{
-		Name:                          "waiting-queue",
-		ReceiveMessageWaitTimeSeconds: 1,
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		// receive message
-		_, r := utils.GenerateRequestInfo("POST", "/", models.ReceiveMessageRequest{
-			QueueUrl: "http://localhost:4100/queue/waiting-queue",
-		}, true)
-		status, resp := ReceiveMessageV1(r)
-		assert.Equal(t, http.StatusBadRequest, status)
-
-		// Check the response body is what we expect.
-		expected := "QueueNotFound"
-		result := resp.GetResult().(models.ErrorResult)
-		if result.Type != "Not Found" {
-			t.Errorf("handler returned unexpected body: got %v want %v",
-				result.Message, expected)
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		time.Sleep(10 * time.Millisecond) // 10ms to let the ReceiveMessage() block
-
-		// delete queue message
-		form := url.Values{}
-		form.Add("Action", "DeleteQueue")
-		form.Add("QueueUrl", "http://localhost:4100/queue/waiting-queue")
-		form.Add("Version", "2012-11-05")
-		_, r := utils.GenerateRequestInfo("POST", "/", form, false)
-
-		rr := httptest.NewRecorder()
-		http.HandlerFunc(DeleteQueue).ServeHTTP(rr, r)
-
-		if status := rr.Code; status != http.StatusOK {
-			t.Errorf("handler returned wrong status code: got \n%v want %v",
-				status, http.StatusOK)
-		}
-	}()
-
-	if timedout := waitTimeout(&wg, 2*time.Second); timedout {
-		t.Errorf("concurrent handlers timeout, expecting both to return within timeout")
-	}
-}
-
 func TestReceiveMessageDelaySecondsV1(t *testing.T) {
 	// create a queue
 	app.CurrentEnvironment = fixtures.LOCAL_ENVIRONMENT

app/models/models.go

@@ -467,3 +467,13 @@ type PurgeQueueRequest struct {
 }
 
 func (r *PurgeQueueRequest) SetAttributesFromForm(values url.Values) {}
+
+func NewDeleteQueueRequest() *DeleteQueueRequest {
+	return &DeleteQueueRequest{}
+}
+
+type DeleteQueueRequest struct {
+	QueueUrl string `json:"QueueUrl" schema:"QueueUrl"`
+}
+
+func (r *DeleteQueueRequest) SetAttributesFromForm(values url.Values) {}

app/models/responses.go

@@ -269,3 +269,17 @@ func (r PurgeQueueResponse) GetResult() interface{} {
 func (r PurgeQueueResponse) GetRequestId() string {
 	return r.Metadata.RequestId
 }
+
+/*** Delete Queue Response */
+type DeleteQueueResponse struct {
+	Xmlns    string               `xml:"xmlns,attr,omitempty"`
+	Metadata app.ResponseMetadata `xml:"ResponseMetadata,omitempty"`
+}
+
+func (r DeleteQueueResponse) GetResult() interface{} {
+	return nil
+}
+
+func (r DeleteQueueResponse) GetRequestId() string {
+	return r.Metadata.RequestId
+}

app/router/router.go

@@ -73,13 +73,13 @@ var routingTableV1 = map[string]func(r *http.Request) (int, interfaces.AbstractR
 	"DeleteMessage":           sqs.DeleteMessageV1,
 	"GetQueueUrl":             sqs.GetQueueUrlV1,
 	"PurgeQueue":              sqs.PurgeQueueV1,
+	"DeleteQueue":             sqs.DeleteQueueV1,
 }
 
 var routingTable = map[string]http.HandlerFunc{
 	// SQS
 	"SendMessageBatch":   sqs.SendMessageBatch,
 	"DeleteMessageBatch": sqs.DeleteMessageBatch,
-	"DeleteQueue":        sqs.DeleteQueue,
 
 	// SNS
 	"ListTopics":                sns.ListTopics,

app/router/router_test.go

@@ -270,12 +270,12 @@ func TestActionHandler_v0_xml(t *testing.T) {
 			"ChangeMessageVisibility": sqs.ChangeMessageVisibilityV1,
 			"GetQueueUrl":             sqs.GetQueueUrlV1,
 			"PurgeQueue":              sqs.PurgeQueueV1,
+			"DeleteQueue":             sqs.DeleteQueueV1,
 		}
 		routingTable = map[string]http.HandlerFunc{
 			// SQS
 			"SendMessageBatch":   sqs.SendMessageBatch,
 			"DeleteMessageBatch": sqs.DeleteMessageBatch,
-			"DeleteQueue":        sqs.DeleteQueue,
 
 			// SNS
 			"ListTopics":                sns.ListTopics,

app/sqs_messages.go

@@ -1,21 +1,5 @@
 package app
 
-/*** List Queues Response */
-type ListQueuesResult struct {
-	QueueUrl []string `xml:"QueueUrl"`
-}
-
-type ListQueuesResponse struct {
-	Xmlns    string           `xml:"xmlns,attr"`
-	Result   ListQueuesResult `xml:"ListQueuesResult"`
-	Metadata ResponseMetadata `xml:"ResponseMetadata"`
-}
-
-type DeleteQueueResponse struct {
-	Xmlns    string           `xml:"xmlns,attr,omitempty"`
-	Metadata ResponseMetadata `xml:"ResponseMetadata,omitempty"`
-}
-
 type DeleteMessageBatchResultEntry struct {
 	Id string `xml:"Id"`
 }
@@ -58,8 +42,3 @@ type SendMessageBatchResponse struct {
 	Result   SendMessageBatchResult `xml:"SendMessageBatchResult"`
 	Metadata ResponseMetadata       `xml:"ResponseMetadata,omitempty"`
 }
-
-type SetQueueAttributesResponse struct {
-	Xmlns    string           `xml:"xmlns,attr,omitempty"`
-	Metadata ResponseMetadata `xml:"ResponseMetadata,omitempty"`
-}