Merge branch 'master' into refactor/remove-symlinks

Conflicts:
	openapi/openapiutils/openapi_utils.go

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ## Proposed changes
 
-Please add as many details as possible about the change here. Does this Pull Request resolve any open issue? If so, please 
-make sure to link to that issue:
+Please add as many details as possible about the change here. Does this Pull Request resolve any open issue? 
+If so, please make sure to link to that issue:
 
 Fixes: # 
 

Gopkg.toml

@@ -72,3 +72,7 @@
 [[constraint]]
   branch = "master"
   name = "github.com/iancoleman/strcase"
+
+[[constraint]]
+  name = "github.com/hashicorp/logutils"
+  version = "1.0.0"

Makefile

@@ -26,10 +26,7 @@ fmt:
 # make vet
 vet:
 	@echo "[INFO] Running go vet on the current directory"
-	@go vet $(TEST_PACKAGES) ; if [ $$? -eq 1 ]; then \
-		echo "[ERROR] Vet found suspicious constructs. Please fix the reported constructs before submitting code for review"; \
-		exit 1; \
-	fi
+	@go vet $(TEST_PACKAGES)
 
 # make lint
 lint:
@@ -40,10 +37,7 @@ lint:
 # make test
 test: fmt vet lint
 	@echo "[INFO] Testing $(TF_OPENAPI_PROVIDER_PLUGIN_NAME)"
-	@go test -v -cover $(TEST_PACKAGES) ; if [ $$? -eq 1 ]; then \
-		echo "[ERROR] Test returned with failures. Please go through the different scenarios and fix the tests that are failing"; \
-		exit 1; \
-	fi
+	@go test -v -cover $(TEST_PACKAGES)
 
 pre-requirements:
 	@echo "[INFO] Creating $(TF_INSTALLED_PLUGINS_PATH) if it does not exist"

examples/swaggercodegen/api/api/cdn.go

@@ -9,23 +9,25 @@ import (
 	"log"
 )
 
-var db = map[string]*ContentDeliveryNetwork{}
+var db = map[string]*ContentDeliveryNetworkV1{}
 
 func ContentDeliveryNetworkCreateV1(w http.ResponseWriter, r *http.Request) {
 	if AuthenticateRequest(r, w) != nil {
 		return
 	}
 	xRequestID := r.Header.Get("X-Request-ID")
 	log.Printf("Header [X-Request-ID]: %s", xRequestID)
-	cdn := &ContentDeliveryNetwork{}
+	cdn := &ContentDeliveryNetworkV1{}
 	err := readRequest(r, cdn)
 	if err != nil {
 		sendErrorResponse(http.StatusBadRequest, err.Error(), w)
 		return
 	}
 	cdn.Id = uuid.New()
+	cdn.ObjectNestedSchemeProperty = &ContentDeliveryNetworkV1ObjectNestedSchemeProperty{
+		Name: "autogenerated name",
+	}
 	db[cdn.Id] = cdn
-	log.Printf("POST [%+v\n]", cdn)
 	sendResponse(http.StatusCreated, w, cdn)
 }
 
@@ -34,7 +36,6 @@ func ContentDeliveryNetworkGetV1(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	cdn, err := retrieveCdn(r)
-	log.Printf("GET [%+v\n]", cdn)
 	if err != nil {
 		sendErrorResponse(http.StatusNotFound, err.Error(), w)
 		return
@@ -51,16 +52,22 @@ func ContentDeliveryNetworkUpdateV1(w http.ResponseWriter, r *http.Request) {
 		sendErrorResponse(http.StatusNotFound, err.Error(), w)
 		return
 	}
-	newCDN := &ContentDeliveryNetwork{}
+	newCDN := &ContentDeliveryNetworkV1{}
 	err = readRequest(r, newCDN)
 	if err != nil {
 		sendErrorResponse(http.StatusBadRequest, err.Error(), w)
 		return
 	}
-	log.Printf("UPDATE [%+v\n]", newCDN)
-	cdn.Id = cdn.Id
-	db[cdn.Id] = newCDN
-	sendResponse(http.StatusOK, w, newCDN)
+
+	cdn.Ips = newCDN.Ips
+	cdn.Hostnames = newCDN.Hostnames
+	cdn.ExampleInt = newCDN.ExampleInt
+	cdn.ExampleNumber = newCDN.ExampleNumber
+	cdn.ExampleBoolean = newCDN.ExampleBoolean
+	cdn.ObjectProperty = newCDN.ObjectProperty
+
+	db[cdn.Id] = cdn
+	sendResponse(http.StatusOK, w, cdn)
 }
 
 func ContentDeliveryNetworkDeleteV1(w http.ResponseWriter, r *http.Request) {
@@ -73,11 +80,10 @@ func ContentDeliveryNetworkDeleteV1(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	delete(db, cdn.Id)
-	log.Printf("DELETE [%s]", cdn.Id)
-	updateResponseHeaders(http.StatusNoContent, w)
+	sendResponse(http.StatusNoContent, w, nil)
 }
 
-func retrieveCdn(r *http.Request) (*ContentDeliveryNetwork, error) {
+func retrieveCdn(r *http.Request) (*ContentDeliveryNetworkV1, error) {
 	id := strings.TrimPrefix(r.URL.Path, "/v1/cdns/")
 	if id == "" {
 		return nil, fmt.Errorf("cdn id path param not provided")

examples/swaggercodegen/api/api/content_delivery_network.go

@@ -10,7 +10,7 @@
 
 package api
 
-type ContentDeliveryNetwork struct {
+type ContentDeliveryNetworkV1 struct {
 
 	Id string `json:"id,omitempty"`
 
@@ -25,4 +25,8 @@ type ContentDeliveryNetwork struct {
 	ExampleNumber float32 `json:"exampleNumber,omitempty"`
 
 	ExampleBoolean bool `json:"example_boolean,omitempty"`
-}
+
+	ObjectProperty *ObjectProperty `json:"object_property"`
+
+	ObjectNestedSchemeProperty *ContentDeliveryNetworkV1ObjectNestedSchemeProperty `json:"object_nested_scheme_property,omitempty"`
+}

examples/swaggercodegen/api/api/content_delivery_network_v1_object_nested_scheme_property.go

@@ -0,0 +1,16 @@
+/*
+ * Dummy Service Provider generated using 'swaggercodegen' that has two resources 'cdns' and 'lbs' which are terraform compliant
+ *
+ * This service provider allows the creation of fake 'cdns' and 'lbs' resources
+ *
+ * API version: 1.0.0
+ * Contact: [email protected]
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+
+package api
+
+type ContentDeliveryNetworkV1ObjectNestedSchemeProperty struct {
+
+	Name string `json:"name"`
+}

examples/swaggercodegen/api/api/http_utils.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 )
 
 func readRequest(r *http.Request, in interface{}) error {
@@ -21,17 +22,24 @@ func readRequest(r *http.Request, in interface{}) error {
 func sendResponse(httpResponseStatusCode int, w http.ResponseWriter, out interface{}) {
 	var resBody []byte
 	var err error
-	if resBody, err = json.Marshal(out); err != nil {
-		msg := fmt.Sprintf("internal server error - %s", err)
-		sendErrorResponse(http.StatusInternalServerError, msg, w)
+	if out != nil {
+		if resBody, err = json.Marshal(out); err != nil {
+			msg := fmt.Sprintf("internal server error - %s", err)
+			sendErrorResponse(http.StatusInternalServerError, msg, w)
+		}
 	}
-	w.WriteHeader(httpResponseStatusCode)
-	w.Write(resBody)
+	updateResponseHeaders(httpResponseStatusCode, w)
+	if len(resBody) > 0 {
+		w.Write(resBody)
+	}
+	log.Printf("Response sent '%+v'", out)
 }
 
 func sendErrorResponse(httpStatusCode int, message string, w http.ResponseWriter) {
 	updateResponseHeaders(httpStatusCode, w)
-	w.Write([]byte(fmt.Sprintf(`{"code":"%d", "message": "%s"}`, httpStatusCode, message)))
+	err := fmt.Sprintf(`{"code":"%d", "message": "%s"}`, httpStatusCode, message)
+	w.Write([]byte(err))
+	log.Printf("Error Response sent '%s'", err)
 }
 
 func updateResponseHeaders(httpStatusCode int, w http.ResponseWriter) {