Bump flamingo.me/graphql to v1.5.0 (#335)

* Bump flamingo.me/graphql to v1.5.0 * Force go 1.17
i-love-flamingo · Aug 26, 2021 · 8c11239 · 8c11239
1 parent a78d5da
commit 8c11239
Show file tree

Hide file tree

Showing 28 changed files with 4,168 additions and 2,927 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.16', '1.*' ]
+        go: [ '1.16', '1.17' ]
     name: With Go ${{ matrix.go }}
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.*' ]
+        go: [ '1.17' ]
     name: Static checks
     steps:
       - uses: actions/checkout@v2
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.*' ]
+        go: [ '1.17' ]
     name: Integration
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor
 .vscode
 .idea
+dump.rdb
diff --git a/docs/openapi/docs.go b/docs/openapi/docs.go
@@ -1,22 +1,21 @@
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Package openapi GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag
-
 package openapi
 
 import (
 	"bytes"
 	"encoding/json"
 	"strings"
+	"text/template"
 
-	"github.com/alecthomas/template"
 	"github.com/swaggo/swag"
 )
 
 var doc = `{
     "schemes": {{ marshal .Schemes }},
     "swagger": "2.0",
     "info": {
-        "description": "{{.Description}}",
+        "description": "{{escape .Description}}",
         "title": "{{.Title}}",
         "contact": {
             "name": "Flamingo",
@@ -1031,7 +1030,7 @@ var doc = `{
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
-                            "$ref": "#/definitions/paymentResultError"
+                            "$ref": "#/definitions/productResultError"
                         }
                     }
                 }
@@ -1091,57 +1090,6 @@ var doc = `{
         }
     },
     "definitions": {
-        "ProductAttribute": {
-            "type": "object",
-            "properties": {
-                "Code": {
-                    "description": "Code is the internal attribute identifier",
-                    "type": "string"
-                },
-                "CodeLabel": {
-                    "description": "CodeLabel is the human readable (perhaps localized) attribute name",
-                    "type": "string"
-                },
-                "Label": {
-                    "description": "Label is the human readable (perhaps localized) attribute value",
-                    "type": "string"
-                },
-                "RawValue": {
-                    "description": "RawValue is the untouched original value of the attribute",
-                    "type": "object"
-                },
-                "UnitCode": {
-                    "description": "UnitCode is the internal code of the attribute values measuring unit",
-                    "type": "string"
-                }
-            }
-        },
-        "ProductAttributes": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#/definitions/ProductAttribute"
-            }
-        },
-        "ProductMedia": {
-            "type": "object",
-            "properties": {
-                "MimeType": {
-                    "type": "string"
-                },
-                "Reference": {
-                    "type": "string"
-                },
-                "Title": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                },
-                "Usage": {
-                    "type": "string"
-                }
-            }
-        },
         "application.PlaceOrderPaymentInfo": {
             "type": "object",
             "properties": {
@@ -1636,17 +1584,6 @@ var doc = `{
                 }
             }
         },
-        "cartResultError": {
-            "type": "object",
-            "properties": {
-                "Code": {
-                    "type": "string"
-                },
-                "Message": {
-                    "type": "string"
-                }
-            }
-        },
         "checkoutError": {
             "type": "object",
             "properties": {
@@ -1689,7 +1626,7 @@ var doc = `{
                 },
                 "Error": {
                     "description": "Contains details if success is false",
-                    "$ref": "#/definitions/cartResultError"
+                    "$ref": "#/definitions/productResultError"
                 },
                 "Success": {
                     "type": "boolean"
@@ -1803,6 +1740,15 @@ var doc = `{
                 }
             }
         },
+        "domain.Attribute": {
+            "type": "object"
+        },
+        "domain.Attributes": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/domain.Attribute"
+            }
+        },
         "domain.Badge": {
             "type": "object",
             "properties": {
@@ -1943,6 +1889,26 @@ var doc = `{
                 }
             }
         },
+        "domain.Media": {
+            "type": "object",
+            "properties": {
+                "MimeType": {
+                    "type": "string"
+                },
+                "Reference": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Usage": {
+                    "type": "string"
+                }
+            }
+        },
         "domain.PaymentRequestAPI": {
             "type": "object",
             "properties": {
@@ -2031,7 +1997,7 @@ var doc = `{
                     "$ref": "#/definitions/domain.PriceInfo"
                 },
                 "Attributes": {
-                    "$ref": "#/definitions/ProductAttributes"
+                    "$ref": "#/definitions/domain.Attributes"
                 },
                 "AvailablePrices": {
                     "type": "array",
@@ -2101,7 +2067,7 @@ var doc = `{
                 "Media": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/ProductMedia"
+                        "$ref": "#/definitions/domain.Media"
                     }
                 },
                 "RetailerCode": {
@@ -2160,7 +2126,7 @@ var doc = `{
                     "description": "Media",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/ProductMedia"
+                        "$ref": "#/definitions/domain.Media"
                     }
                 },
                 "PreSelectedVariantSku": {
@@ -2211,17 +2177,6 @@ var doc = `{
                 }
             }
         },
-        "paymentResultError": {
-            "type": "object",
-            "properties": {
-                "Code": {
-                    "type": "string"
-                },
-                "Message": {
-                    "type": "string"
-                }
-            }
-        },
         "placeorder.CreditCardInfo": {
             "type": "object",
             "properties": {
@@ -2343,6 +2298,13 @@ func (s *s) ReadDoc() string {
 			a, _ := json.Marshal(v)
 			return string(a)
 		},
+		"escape": func(v interface{}) string {
+			// escape tabs
+			str := strings.Replace(v.(string), "\t", "\\t", -1)
+			// replace " with \", and if that results in \\", replace that with \\\"
+			str = strings.Replace(str, "\"", "\\\"", -1)
+			return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1)
+		},
 	}).Parse(doc)
 	if err != nil {
 		return doc