From b50d8dd14141f712ffedf6ac71b4eef9ffd18586 Mon Sep 17 00:00:00 2001 From: vinayak-dapi Date: Thu, 16 Mar 2023 19:01:52 +0530 Subject: [PATCH 1/3] CS-2243: Added slack notification support --- constants/extraHeaders.go | 11 +++++++++++ example/main.go | 5 +++-- request/request.go | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 constants/extraHeaders.go diff --git a/constants/extraHeaders.go b/constants/extraHeaders.go new file mode 100644 index 0000000..e0497e5 --- /dev/null +++ b/constants/extraHeaders.go @@ -0,0 +1,11 @@ +package constants + +type goExtraHeadersType struct { + LibraryVersion string + LibraryPlatform string +} + +var GoExtraHeaders = goExtraHeadersType{ + LibraryVersion: "1.4.0", + LibraryPlatform: "dapi-go", +} diff --git a/example/main.go b/example/main.go index 20623b6..6b45cf6 100644 --- a/example/main.go +++ b/example/main.go @@ -1,10 +1,11 @@ package main import ( - "github.com/dapi-co/dapi-go/app" - "github.com/dapi-co/dapi-go/config" "log" "net/http" + + "github.com/dapi-co/dapi-go/app" + "github.com/dapi-co/dapi-go/config" ) func main() { diff --git a/request/request.go b/request/request.go index 71c36f9..7f552d2 100644 --- a/request/request.go +++ b/request/request.go @@ -98,6 +98,7 @@ func DapiRequest(body []byte, action string, header http.Header) ([]byte, error) } request.Header.Set("Content-Type", "application/json") + request.Header = AddExtraHeaders(request.Header) resp, err := client.Do(request) if err != nil { @@ -131,6 +132,7 @@ func DapiSDKRequest(body []byte, header http.Header) ([]byte, error) { request.Header.Set("Content-Type", "application/json") request.Header.Set("Host", "dd.dapi.com") + request.Header = AddExtraHeaders(request.Header) resp, err := client.Do(request) if err != nil { @@ -157,3 +159,9 @@ func GetHTTPHeader(header *BaseHeader) http.Header { return httpHeader } + +func AddExtraHeaders(header http.Header) http.Header { + header.Add("LibraryVersion", constants.GoExtraHeaders.LibraryVersion) + header.Add("LibraryPlatform", constants.GoExtraHeaders.LibraryPlatform) + return header +} From 562ba8f9aa1f1d67b8faee8f7dd336a867e69e25 Mon Sep 17 00:00:00 2001 From: vinayak-dapi Date: Mon, 20 Mar 2023 18:33:01 +0530 Subject: [PATCH 2/3] CS-2243: Make new headers private and change their names --- {constants => request}/extraHeaders.go | 4 ++-- request/request.go | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) rename {constants => request}/extraHeaders.go (70%) diff --git a/constants/extraHeaders.go b/request/extraHeaders.go similarity index 70% rename from constants/extraHeaders.go rename to request/extraHeaders.go index e0497e5..465c8d9 100644 --- a/constants/extraHeaders.go +++ b/request/extraHeaders.go @@ -1,11 +1,11 @@ -package constants +package request type goExtraHeadersType struct { LibraryVersion string LibraryPlatform string } -var GoExtraHeaders = goExtraHeadersType{ +var goExtraHeaders = goExtraHeadersType{ LibraryVersion: "1.4.0", LibraryPlatform: "dapi-go", } diff --git a/request/request.go b/request/request.go index 7f552d2..86e0dc8 100644 --- a/request/request.go +++ b/request/request.go @@ -98,7 +98,8 @@ func DapiRequest(body []byte, action string, header http.Header) ([]byte, error) } request.Header.Set("Content-Type", "application/json") - request.Header = AddExtraHeaders(request.Header) + request.Header.Add("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) + request.Header.Add("X-Dapi-Library", goExtraHeaders.LibraryPlatform) resp, err := client.Do(request) if err != nil { @@ -132,7 +133,8 @@ func DapiSDKRequest(body []byte, header http.Header) ([]byte, error) { request.Header.Set("Content-Type", "application/json") request.Header.Set("Host", "dd.dapi.com") - request.Header = AddExtraHeaders(request.Header) + request.Header.Add("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) + request.Header.Add("X-Dapi-Library", goExtraHeaders.LibraryPlatform) resp, err := client.Do(request) if err != nil { @@ -159,9 +161,3 @@ func GetHTTPHeader(header *BaseHeader) http.Header { return httpHeader } - -func AddExtraHeaders(header http.Header) http.Header { - header.Add("LibraryVersion", constants.GoExtraHeaders.LibraryVersion) - header.Add("LibraryPlatform", constants.GoExtraHeaders.LibraryPlatform) - return header -} From dc28b61f8a32736443c4e747ec97084136d7d111 Mon Sep 17 00:00:00 2001 From: vinayak-dapi Date: Wed, 22 Mar 2023 13:03:03 +0530 Subject: [PATCH 3/3] CS-2243: Changed add to set for new headers --- request/request.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/request/request.go b/request/request.go index 86e0dc8..96d5297 100644 --- a/request/request.go +++ b/request/request.go @@ -98,8 +98,8 @@ func DapiRequest(body []byte, action string, header http.Header) ([]byte, error) } request.Header.Set("Content-Type", "application/json") - request.Header.Add("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) - request.Header.Add("X-Dapi-Library", goExtraHeaders.LibraryPlatform) + request.Header.Set("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) + request.Header.Set("X-Dapi-Library", goExtraHeaders.LibraryPlatform) resp, err := client.Do(request) if err != nil { @@ -133,8 +133,8 @@ func DapiSDKRequest(body []byte, header http.Header) ([]byte, error) { request.Header.Set("Content-Type", "application/json") request.Header.Set("Host", "dd.dapi.com") - request.Header.Add("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) - request.Header.Add("X-Dapi-Library", goExtraHeaders.LibraryPlatform) + request.Header.Set("X-Dapi-Library-Version", goExtraHeaders.LibraryVersion) + request.Header.Set("X-Dapi-Library", goExtraHeaders.LibraryPlatform) resp, err := client.Do(request) if err != nil {