Clean the dependencies.

Ensure library works with publicly available endpoints.

.gitignore

@@ -1,3 +1,4 @@
 *.out
 *.test
-coverage.txt
+coverage.txt
+*.DS_Store

Makefile

@@ -11,11 +11,22 @@ help:  ## display this help
 
 .PHONY: test
 test: ## run tests on library
-	@go test $(ADDITIONAL_BUILD_FLAGS) -v -cover ./...
+	@LOG_LEVEL=debug go test $(ADDITIONAL_BUILD_FLAGS) -v -cover ./...
 
 .PHONY: test-packages
 test-packages: ## run tests on packages
 	@go test -v -cover ./pkg/...
 
 .PHONY: all
-all: test-packages test
+all: test-packages test
+
+.PHONY: update
+update: ## update dependencies
+	@go get -u -v ./...
+
+sonar:
+	sonar-scanner \
+  -Dsonar.projectKey=golang-simple-graphql \
+  -Dsonar.sources=. \
+  -Dsonar.host.url=http://localhost:9000 \
+  -Dsonar.login=555ba78b315faa07b3231a3be0f3cbb24ab33814

README.md

@@ -9,13 +9,15 @@ Ps. It's Hasura friendly.
   - [Features](#features)
   - [Usage example](#usage-example)
     - [Environment variables](#environment-variables)
+    - [Cache](#cache)
     - [Example reader code](#example-reader-code)
+    - [Tips](#tips)
   - [Working with results](#working-with-results)
 
 ## Reasoning
 
-I've tried to run few graphQL clients with hasura, all of them required conversion of the data into
+I've tried to run a few GraphQL clients with Hasura, all of them required conversion of the data into
-the appropriate structures, causing issues with non-existing types ( thanks to Hasura ), for example `bigint` which was difficult to export.
+the appropriate structures, causing issues with non-existing types ( thanks to Hasura ), for example, `bigint` which was difficult to export.
 Therefore, I present you the simple client to which you can copy & paste your graphQL query, variables and you are good to go.
 
 ## Features
@@ -23,13 +25,35 @@ Therefore, I present you the simple client to which you can copy & paste your gr
 * Executing GraphQL queries as they are, without types declaration
 * HTTP2 support!
 * Support for additional headers
+* Query cache
 
 ## Usage example
 
 ### Environment variables
 
 * `GRAPHQL_ENDPOINT` - Your GraphQL endpoint. Default: `http://127.0.0.1:9090/v1/graphql`
+* `GRAPHQL_CACHE` -  Should the query cache be enabled? Default: `false`
+* `GRAPHQL_CACHE_TTL` -  Cache TTL in seconds for SELECT type of queries. Default: `5`
 * `LOG_LEVEL` - Logging level. Default: `info`
+* `RETRIES_ENABLE` - Should retries be enabled? Default: `false`
+* `RETRIES_NUMBER` - Number of retries: Default: `1`
+* `RETRIES_DELAY` - Delay in retries in milliseconds. Default: `250`
+
+### Cache
+
+You have two options to enable the cache:
+
+* Use `GRAPHQL_CACHE` environment variable which will enable the cache globally. It may be desired if you want to use the cache for all queries.
+* Add `gqlcache: true` header for your query which will enable the cache for this query only with `GRAPHQL_CACHE_TTL` TTL.
+
+Example:
+
+```go
+headers := map[string]interface{}{
+  ...
+  "gqlcache": true,
+}
+```
 
 ### Example reader code
 
@@ -37,35 +61,42 @@ Therefore, I present you the simple client to which you can copy & paste your gr
 ```go
 import (
   fmt
-  gql "github.com/lukaszraczylo/simple-gql-client"
+  graphql "github.com/lukaszraczylo/go-simple-graphql"
 )
 
-headers := map[string]interface{}{
+func main() {
-  "x-hasura-user-id":   37,
+  headers := map[string]interface{}{
-  "x-hasura-user-uuid": "bde3262e-b42e-4151-ac10-d43f0bef44a5",
+    "x-hasura-user-id":   37,
-}
+    "x-hasura-user-uuid": "bde1962e-b42e-1212-ac10-d43fa27f44a5",
-
-variables := map[string]interface{}{
-"fileHash": "123deadc0w321",
-}
-var query = `query searchFileKnown($fileHash: String) {
-  tbl_file_scans(where: {file_hash: {_eq: $fileHash}}) {
-  	porn
-  	racy
-  	violence
-  	virus
   }
-}
 
-graphql := NewConnection()
+  variables := map[string]interface{}{
-result, err := graphql.Query(query, variables, nil)
+    "fileHash": "123deadc0w321",
-if err != nil {
+  }
-  fmt.Println("Query error", err)
+
-  return
+  query := `query searchFileKnown($fileHash: String) {
+    tbl_file_scans(where: {file_hash: {_eq: $fileHash}}) {
+    	racy
+    	violence
+    	virus
+    }
+  }`
+
+  gql := graphql.NewConnection()
+  result, err := gql.Query(query, variables, headers)
+  if err != nil {
+    fmt.Println("Query error", err)
+    return
+  }
+  fmt.Println(result)
 }
-fmt.Println(result)
 ```
 
+### Tips
+
+* Connection handler ( `gql := graphql.NewConnection()` ) should be created once and reused in the application especially if you run dozens of queries per second. It will allow you also to use cache and http2 to its full potential.
+
+
 **Result**
 
 ```json
@@ -74,10 +105,10 @@ fmt.Println(result)
 
 ## Working with results
 
-I'm using an amazing library [tidwall/gjson](https://github.com/tidwall/gjson) to parse the results and extract information required in further steps and I strongly recommend this approach as the easiest and close to painless.
+I'm using an amazing library [tidwall/gjson](https://github.com/tidwall/gjson) to parse the results and extract the information required in further steps and I strongly recommend this approach as the easiest and close to painless, for example:
 
 ```go
-result = gjson.Get(result, "tbl_user_group_admins.0.is_admin").Bool()
+result := gjson.Get(result, "tbl_user_group_admins.0.is_admin").Bool()
 if result {
   fmt.Println("User is an admin")
 }

go.mod

@@ -1,22 +1,32 @@
 module github.com/lukaszraczylo/go-simple-graphql
 
-go 1.17
+go 1.18
 
 require (
+	github.com/allegro/bigcache/v3 v3.1.0
+	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/buger/jsonparser v1.1.1
 	github.com/json-iterator/go v1.1.12
-	github.com/lukaszraczylo/pandati v0.0.10
+	github.com/lukaszraczylo/pandati v0.0.18
-	github.com/rs/zerolog v1.25.0
+	github.com/rs/zerolog v1.29.0
-	github.com/stretchr/testify v1.7.0
+	github.com/sethvargo/go-retry v0.2.4
-	golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
+	github.com/stretchr/testify v1.7.1
+	golang.org/x/net v0.7.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/text v0.3.6 // indirect
+	github.com/tidwall/gjson v1.14.4 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/wI2L/jsondiff v0.3.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0 // indirect
 )

go.sum

@@ -1,62 +1,65 @@
+github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk=
+github.com/allegro/bigcache/v3 v3.1.0/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I=
+github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
+github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/lukaszraczylo/pandati v0.0.10 h1:ZXmLjxb/UYRBVyAKwXmUcJgZ2FYNwGY4YDJsQQMYAXI=
+github.com/lukaszraczylo/pandati v0.0.18 h1:6khtDY6QXkiyh4a3dzHtIzx/9UqUGfHjzKBCA0SIurI=
-github.com/lukaszraczylo/pandati v0.0.10/go.mod h1:1lE/x4X4LfO1yerAQoiR7AVb/wIabH/zITDGnqTdyH8=
+github.com/lukaszraczylo/pandati v0.0.18/go.mod h1:Aqlc0KH+ssvrscYYbEKMv7n5cFwe+0MjsJbikNz1h60=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.25.0 h1:Rj7XygbUHKUlDPcVdoLyR91fJBsduXj5fRxyqIQj/II=
+github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
-github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI=
+github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec=
+github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 h1:Z04ewVs7JhXaYkmDhBERPi41gnltfQpMWDnTnQbaCqk=
+github.com/wI2L/jsondiff v0.3.0 h1:iTzQ9u/d86GE9RsBzVHX88f2EA1vQUboHwLhSQFc1s4=
-golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+github.com/wI2L/jsondiff v0.3.0/go.mod h1:y1IMzNNjlSsk3IUoJdRJO7VRBtzMvRgyo4Vu0LdHpTc=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

gql.go

@@ -18,10 +18,14 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"strconv"
+	"strings"
 	"time"
 
+	bigcache "github.com/allegro/bigcache/v3"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/lukaszraczylo/go-simple-graphql/pkg/logging"
+	retry "github.com/sethvargo/go-retry"
 	"golang.org/x/net/http2"
 )
 
@@ -30,9 +34,15 @@ var (
 )
 
 type GraphQL struct {
-	Endpoint   string
+	Endpoint      string
-	HttpClient *http.Client
+	HttpClient    *http.Client
-	Log        *logging.LogConfig
+	Log           *logging.LogConfig
+	Cache         bool // Enable caching for read queries
+	CacheStore    *bigcache.BigCache
+	RetriesEnable bool
+	RetriesNumber int
+	RetriesDelay  time.Duration
+	BackoffSetup  retry.Backoff
 }
 
 func pickGraphqlEndpoint() (graphqlEndpoint string) {
@@ -46,19 +56,93 @@ func pickGraphqlEndpoint() (graphqlEndpoint string) {
 	return graphqlEndpoint
 }
 
+func setCacheTTL() int {
+	value, present := os.LookupEnv("GRAPHQL_CACHE_TTL")
+	if present && value != "" {
+		i, err := strconv.Atoi(value)
+		if err != nil {
+			panic("Invalid value for query cache ttl")
+		}
+		return int(i)
+	} else {
+		return 5
+	}
+}
+
+func setCacheEnabled() bool {
+	value, present := os.LookupEnv("GRAPHQL_CACHE")
+	if present && value != "" {
+		b, err := strconv.ParseBool(value)
+		if err != nil {
+			panic("Invalid value for query cache")
+		}
+		return b
+	} else {
+		return false
+	}
+}
+
 func NewConnection() *GraphQL {
-	return &GraphQL{
+	g := GraphQL{
 		Endpoint: pickGraphqlEndpoint(),
 		HttpClient: &http.Client{
 			Transport: &http2.Transport{
+				DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+					if strings.HasPrefix(network, "http") {
+						return net.Dial(network, addr)
+					}
+					return tls.Dial(network, addr, cfg)
+				},
+				ReadIdleTimeout:    30 * time.Second,
 				DisableCompression: false,
 				AllowHTTP:          true,
 				PingTimeout:        5 * time.Second,
-				DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+				TLSClientConfig: &tls.Config{
-					return net.Dial(network, addr)
+					InsecureSkipVerify: true,
 				},
 			},
 		},
-		Log: logging.NewLogger(),
+		Log:           logging.NewLogger(),
+		Cache:         setCacheEnabled(),
+		CacheStore:    setupCache(),
+		RetriesEnable: false,
+		RetriesNumber: 1,
+		RetriesDelay:  250,
+		BackoffSetup:  nil,
 	}
+	var err error
+	retriesEnable, retriesEnableExists := os.LookupEnv("RETRIES_ENABLE")
+	if retriesEnableExists {
+		g.RetriesEnable, err = strconv.ParseBool(retriesEnable)
+		if err != nil {
+			panic("Invalid value for RETRIES_ENABLE")
+		}
+		retriesNumber, retriesNumberExists := os.LookupEnv("RETRIES_NUMBER")
+		if retriesNumberExists {
+			g.RetriesNumber, err = strconv.Atoi(retriesNumber)
+			if err != nil {
+				panic("Invalid value for RETRIES_NUMBER")
+			}
+		}
+		retriesDelay, retriesDelayExists := os.LookupEnv("RETRIES_DELAY")
+		if retriesDelayExists {
+			retDel, err := strconv.Atoi(retriesDelay)
+			if err != nil {
+				panic("Invalid value for RETRIES_DELAY")
+			}
+			g.RetriesDelay = time.Duration(retDel) * time.Millisecond
+		}
+	}
+	g.BackoffSetup = retry.NewExponential(g.RetriesDelay)
+	g.BackoffSetup = retry.WithMaxRetries(uint64(g.RetriesNumber), g.BackoffSetup)
+
+	return &g
+}
+
+func setupCache() *bigcache.BigCache {
+	cache, err := bigcache.NewBigCache(bigcache.DefaultConfig(time.Duration(setCacheTTL()) * time.Second))
+	if err != nil {
+		panic("Error creating cache: " + err.Error())
+	}
+	return cache
 }

query.go

@@ -2,12 +2,13 @@ package gql
 
 import (
 	"bytes"
+	"crypto/md5"
 	"errors"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"net/http"
 
+	retry "github.com/avast/retry-go"
 	"github.com/lukaszraczylo/pandati"
 )
 
@@ -29,16 +30,11 @@ func (g *GraphQL) queryBuilder(queryContent string, queryVariables interface{})
 		Variables: queryVariables,
 	}
 
-	// j := new(bytes.Buffer)
 	j2, err := json.Marshal(qb)
 	if err != nil {
 		g.Log.Critical("Unable to marshal the query", map[string]interface{}{"_error": err.Error(), "_query": queryContent, "_variables": queryVariables})
 		return []byte{}, err
 	}
-	// if err = json.Compact(j, j2); err != nil {
-	// 	g.Log.Critical("Unable to compact the query", map[string]interface{}{"error": err.Error()})
-	// 	return []byte{}, err
-	// }
 	return j2, err
 }
 
@@ -49,47 +45,96 @@ func (g *GraphQL) Query(queryContent string, queryVariables interface{}, queryHe
 		g.Log.Error("Unable to build the query", map[string]interface{}{"_error": err.Error()})
 		return "", err
 	}
+
+	var body []byte
+	var queryResult *queryResults
+	queryHash := fmt.Sprintf("%x", md5.Sum(query))
+
+	// If header 'gqlcache' is set to true, we will enforce the cache for the query
+	if !pandati.IsZero(queryHeaders) && !pandati.IsZero(queryHeaders["gqlcache"]) && queryHeaders["gqlcache"].(bool) {
+		g.Log.Debug("Forced cache for query", map[string]interface{}{"_query": queryContent, "_headers": queryHeaders})
+		g.Cache = true
+	}
+
+	if g.Cache {
+		g.Log.Debug("Checking the cache for the query", map[string]interface{}{"_query": queryHash})
+		if entry, entryInfo, err := g.CacheStore.GetWithInfo(queryHash); err == nil {
+			g.Log.Debug("Found the query in the cache", map[string]interface{}{"_query": queryHash})
+			if pandati.IsZero(entryInfo.EntryStatus) {
+				return string(entry), nil
+			}
+		} else {
+			g.Log.Debug("Unable to find the query in the cache", map[string]interface{}{"_query": queryHash, "_error": err.Error()})
+		}
+	}
+
 	httpRequest, err := http.NewRequest("POST", g.Endpoint, bytes.NewBuffer(query))
-	httpRequest.Header.Add("Content-Type", "application/json")
+	// httpRequest.Header.Set("Content-Type", "application/json")
+	if err != nil {
+		g.Log.Error("Unable to create the request", map[string]interface{}{"_error": err.Error()})
+		return "", err
+	}
+
 	for header, value := range queryHeaders {
 		httpRequest.Header.Add(fmt.Sprintf("%v", header), fmt.Sprintf("%v", value))
 	}
 
-	httpResponse, err := g.HttpClient.Do(httpRequest)
+	var httpResponse *http.Response
-	if err != nil {
-		g.Log.Error("Unable to send the query", map[string]interface{}{"_error": err.Error()})
-		return "", err
-	}
-	defer io.Copy(ioutil.Discard, httpResponse.Body)
-	defer httpResponse.Body.Close()
 
-	body, err := ioutil.ReadAll(httpResponse.Body)
+	err = retry.Do(
-	if err != nil {
+		func() error {
-		g.Log.Critical("Unable to read the response", map[string]interface{}{"_error": err.Error()})
+			httpResponse, err = g.HttpClient.Do(httpRequest)
-		return "", err
+
-	}
+			if err != nil {
-	var queryResult *queryResults
+				g.Log.Debug("Unable to send the query RETRY", map[string]interface{}{"_error": err.Error()})
-	err = json.Unmarshal(body, &queryResult)
+				return err
-	if err != nil {
+			}
-		g.Log.Error("Unable to unmarshal the query", map[string]interface{}{"_error": err.Error()})
+			defer httpResponse.Body.Close()
-		return "", err
+
-	}
+			if httpResponse.StatusCode <= 200 && httpResponse.StatusCode >= 204 {
+				return err
+			}
+
+			body, err = ioutil.ReadAll(httpResponse.Body)
+			if err != nil {
+				g.Log.Debug("Unable to read the response", map[string]interface{}{"_error": err.Error()})
+				return err
+			}
+
+			err = json.Unmarshal(body, &queryResult)
+			if err != nil {
+				g.Log.Debug("Unable to unmarshal the query", map[string]interface{}{"_error": err.Error()})
+				return err
+			}
+			return nil
+		},
+	)
 
 	if !pandati.IsZero(queryResult.Errors) {
-		g.Log.Error("Query returned error", map[string]interface{}{"_query": queryContent, "_variables": queryVariables, "_error": fmt.Sprintf("%v", queryResult.Errors)})
+		g.Log.Error("Query returned error", map[string]interface{}{"_query": queryContent, "_variables": queryVariables, "_error": fmt.Sprintf("%v", queryResult.Errors), "_response_code": httpResponse.StatusCode})
-		return "", fmt.Errorf("%v", queryResult.Errors[0].Message)
+		return "", fmt.Errorf("%v", queryResult.Errors)
 	}
 
 	if pandati.IsZero(queryResult.Data) {
-		g.Log.Error("Query returned no data", map[string]interface{}{"_query": queryContent, "_variables": queryVariables})
+		g.Log.Error("Query returned no data", map[string]interface{}{"_query": queryContent, "_variables": queryVariables, "_response_code": httpResponse.StatusCode})
 		return "", errors.New("Query returned no data")
 	}
 
 	responseContent, err = json.MarshalToString(queryResult.Data)
 	if err != nil {
-		g.Log.Error("Invalid data result", map[string]interface{}{"_query": queryContent, "_variables": queryVariables, "_result": responseContent})
+		g.Log.Error("Invalid data result", map[string]interface{}{"_query": queryContent, "_variables": queryVariables, "_result": responseContent, "_response_code": httpResponse.StatusCode})
 		return "", err
 	}
 
+	if g.Cache {
+		g.Log.Debug("Caching the query", map[string]interface{}{"_query": queryHash})
+		if queryContent[0:5] == "query" {
+			err = g.CacheStore.Set(queryHash, []byte(responseContent))
+			if err != nil {
+				g.Log.Error("Unable to cache the query", map[string]interface{}{"_query": queryHash, "_error": err.Error()})
+			}
+		}
+	}
+
 	return
 }

query_bench_test.go

@@ -1,69 +1,69 @@
 package gql
 
-import (
+// import (
-	"testing"
+// 	"testing"
-)
+// )
 
-func Benchmark_GraphQL_Query(t *testing.B) {
+// func Benchmark_GraphQL_Query(t *testing.B) {
-	if testing.Short() {
+// 	if testing.Short() {
-		t.Skip("Skipping test in short / CI mode")
+// 		t.Skip("Skipping test in short / CI mode")
-	}
+// 	}
-	type args struct {
+// 	type args struct {
-		queryContent   string
+// 		queryContent   string
-		queryVariables interface{}
+// 		queryVariables interface{}
-	}
+// 	}
-	tests := []struct {
+// 	tests := []struct {
-		name        string
+// 		name        string
-		endpoint    string
+// 		endpoint    string
-		isLocal     bool
+// 		isLocal     bool
-		args        args
+// 		args        args
-		wantResult  string
+// 		wantResult  string
-		mockedReply string
+// 		mockedReply string
-		wantErr     bool
+// 		wantErr     bool
-	}{
+// 	}{
-		{
+// 		{
-			name:     "Valid query",
+// 			name:     "Valid query",
-			endpoint: "http://hasura.local/v1/graphql",
+// 			endpoint: "http://hasura.local/v1/graphql",
-			isLocal:  false,
+// 			isLocal:  false,
-			args: args{
+// 			args: args{
-				queryContent: `query listUserBots {
+// 				queryContent: `query listUserBots {
-					tbl_bots(limit: 1) {
+// 					tbl_bots(limit: 1) {
-						bot_name
+// 						bot_name
-					}
+// 					}
-				}`,
+// 				}`,
-				queryVariables: nil,
+// 				queryVariables: nil,
-			},
+// 			},
-			wantResult:  `{"tbl_bots":[{"bot_name":"littleMentionBot"}]}`,
+// 			wantResult:  `{"tbl_bots":[{"bot_name":"littleMentionBot"}]}`,
-			mockedReply: `{"data":{"tbl_bots":[{"bot_name":"littleMentionBot"}]}}`,
+// 			mockedReply: `{"data":{"tbl_bots":[{"bot_name":"littleMentionBot"}]}}`,
-			wantErr:     false,
+// 			wantErr:     false,
-		},
+// 		},
-		{
+// 		{
-			name:     "Invalid query",
+// 			name:     "Invalid query",
-			endpoint: "http://hasura.local/v1/graphql",
+// 			endpoint: "http://hasura.local/v1/graphql",
-			isLocal:  false,
+// 			isLocal:  false,
-			args: args{
+// 			args: args{
-				queryContent: `query listUserBots {
+// 				queryContent: `query listUserBots {
-					tbl_botz(limit: 1) {
+// 					tbl_botz(limit: 1) {
-						bot_name
+// 						bot_name
-					}
+// 					}
-				}`,
+// 				}`,
-				queryVariables: nil,
+// 				queryVariables: nil,
-			},
+// 			},
-			mockedReply: `{"errors":[{"message":"Unknown field \"tbl_botz\" on type \"Query\""}]}`,
+// 			mockedReply: `{"errors":[{"message":"Unknown field \"tbl_botz\" on type \"Query\""}]}`,
-			wantResult:  ``,
+// 			wantResult:  ``,
-			wantErr:     true,
+// 			wantErr:     true,
-		},
+// 		},
-	}
+// 	}
 
-	for _, tt := range tests {
+// 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.B) {
+// 		t.Run(tt.name, func(t *testing.B) {
-			g := NewConnection()
+// 			g := NewConnection()
-			server, serverURL := mockGraphQLServerResponses(tt.mockedReply)
+// 			server, serverURL := mockGraphQLServerResponses(tt.mockedReply)
-			g.Endpoint = serverURL
+// 			g.Endpoint = serverURL
-			for n := 0; n < t.N; n++ {
+// 			for n := 0; n < t.N; n++ {
-				g.Query(tt.args.queryContent, tt.args.queryVariables, nil)
+// 				g.Query(tt.args.queryContent, tt.args.queryVariables, nil)
-			}
+// 			}
-			server.Close()
+// 			server.Close()
-		})
+// 		})
-	}
+// 	}
-}
+// }

query_test.go

@@ -1,6 +1,7 @@
 package gql
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
@@ -54,41 +55,166 @@ func (suite *TestSuite) Test_GraphQL_Query() {
 	if testing.Short() {
 		suite.T().Skip("Skipping test in short / CI mode")
 	}
+	g := NewConnection()
+
 	type args struct {
 		queryContent   string
 		queryVariables interface{}
+		queryHeaders   map[string]interface{}
 	}
 	tests := []struct {
-		name       string
+		name          string
-		endpoint   string
+		endpoint      string
-		isLocal    bool
+		isLocal       bool
-		args       args
+		cache_enabled bool
-		wantResult string
+		args          args
-		wantErr    bool
+		wantResult    string
+		wantErr       bool
 	}{
 		{
-			name:     "Valid query",
+			name:          "Valid query, no cache",
-			endpoint: "http://hasura.local/v1/graphql",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
-			isLocal:  true,
+			isLocal:       true,
+			cache_enabled: false,
 			args: args{
-				queryContent: `query listUserBots {
+				queryContent: `query packages_prices {
-					tbl_bots(limit: 1) {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
-						bot_name
+						aggregate {
+							count
+						}
 					}
 				}`,
 				queryVariables: nil,
 			},
-			wantResult: `{"tbl_bots":[{"bot_name":"littleMentionBot"}]}`,
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, no cache #2",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: false,
+			args: args{
+				queryContent: `query packages_prices {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, with cache empty",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: true,
+			args: args{
+				queryContent: `query packages_prices {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, with cache per query empty",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: false,
+			args: args{
+				queryContent: `query packages_prices_no_inlinecache {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+				queryHeaders: map[string]interface{}{
+					"gqlcache": false,
+				},
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, with cache per query",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: false,
+			args: args{
+				queryContent: `query packages_prices_inlinecache {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+				queryHeaders: map[string]interface{}{
+					"gqlcache": true,
+				},
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, with cache per query [verify]",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: false,
+			args: args{
+				queryContent: `query packages_prices_inlinecache {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+				queryHeaders: map[string]interface{}{
+					"gqlcache": true,
+				},
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:          "Valid query, with cache filled",
+			endpoint:      "https://telegram-bot.app/v1/graphql",
+			isLocal:       true,
+			cache_enabled: true,
+			args: args{
+				queryContent: `query packages_prices {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
 			wantErr:    false,
 		},
 		{
 			name:     "Invalid query",
-			endpoint: "http://hasura.local/v1/graphql",
+			endpoint: "https://telegram-bot.app/v1/graphql",
 			isLocal:  true,
 			args: args{
-				queryContent: `query listUserBots {
+				queryContent: `query packages_pricez {
-					tbl_botz(limit: 1) {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
-						bot_name
+						aggregate {
+							count
 					}
 				}`,
 				queryVariables: nil,
@@ -96,18 +222,61 @@ func (suite *TestSuite) Test_GraphQL_Query() {
 			wantResult: ``,
 			wantErr:    true,
 		},
+		{
+			name:     "Valid query to https endpoint",
+			endpoint: "https://telegram-bot.app/v1/graphql",
+			isLocal:  false,
+			args: args{
+				queryContent: `query packages_prices {
+					sub_group_packages_aggregate(where: {enabled: {_eq: true}}) {
+						aggregate {
+							count
+						}
+					}
+				}`,
+				queryVariables: nil,
+			},
+			wantResult: `{"sub_group_packages_aggregate":{"aggregate":{"count":4}}}`,
+			wantErr:    false,
+		},
+		{
+			name:     "Valid query to github endpoint",
+			endpoint: "https://api.github.com/graphql",
+			isLocal:  false,
+			args: args{
+				queryContent: `query {
+					repository(name: "semver-generator", owner: "lukaszraczylo", followRenames: true) {
+						releases(last: 2) {
+							nodes {
+								tag {
+									name
+								}
+							}
+						}
+					}
+				}`,
+				queryVariables: nil,
+				queryHeaders: map[string]interface{}{
+					"Authorization": "Bearer " + os.Getenv("GITHUB_TOKEN"),
+				},
+			},
+			wantResult: `{"repository":{"releases":{"nodes":[`,
+			wantErr:    false,
+		},
 	}
 	for _, tt := range tests {
 		suite.T().Run(tt.name, func(t *testing.T) {
-			if tt.isLocal {
+			// if tt.isLocal {
-				os.Setenv("GRAPHQL_ENDPOINT", tt.endpoint)
+			// 	os.Setenv("GRAPHQL_ENDPOINT", tt.endpoint)
-			}
+			// }
-			g := NewConnection()
+			g.Endpoint = tt.endpoint
-			gotResult, gotErr := g.Query(tt.args.queryContent, tt.args.queryVariables, nil)
+			g.Cache = tt.cache_enabled
+			gotResult, gotErr := g.Query(tt.args.queryContent, tt.args.queryVariables, tt.args.queryHeaders)
 			if tt.wantErr {
 				assert.Error(t, gotErr)
 			}
-			assert.Equal(t, tt.wantResult, gotResult)
+			assert.Contains(t, gotResult, tt.wantResult)
 		})
 	}
+	fmt.Println(g.CacheStore.Capacity())
 }