From 896197110fa63c217abe56e5bb8b0a6876ed8fec Mon Sep 17 00:00:00 2001
From: Rick <1450685+LinuxSuRen@users.noreply.github.com>
Date: Fri, 28 Jun 2024 12:21:05 +0800
Subject: [PATCH] chore: add more content-type headers (#500)

Co-authored-by: rick <LinuxSuRen@users.noreply.github.com>
---
 .github/workflows/release.yaml   | 1 +
 pkg/server/data/headers.yaml     | 6 ++++++
 pkg/server/remote_server.go      | 4 ++--
 pkg/server/remote_server_test.go | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8125d89..0254508 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -17,6 +17,7 @@ env:
 jobs:
   goreleaser:
     runs-on: ubuntu-22.04
+    if: github.ref != 'refs/heads/master'
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
       - uses: ./tools/github-actions/setup-deps
diff --git a/pkg/server/data/headers.yaml b/pkg/server/data/headers.yaml
index c93b0ec..f74a65e 100644
--- a/pkg/server/data/headers.yaml
+++ b/pkg/server/data/headers.yaml
@@ -2,6 +2,12 @@
   value: ""
 - key: Content-Type
   value: application/json
+- key: Content-Type
+  value: application/json-patch+json
+- key: Content-Type
+  value: application/merge-patch+json
+- key: Content-Type
+  value: application/apply-patch+yaml
 - key: Content-Type
   value: application/x-www-form-urlencoded
 - key: Accept-Language
diff --git a/pkg/server/remote_server.go b/pkg/server/remote_server.go
index 8deb5da..f3adaf1 100644
--- a/pkg/server/remote_server.go
+++ b/pkg/server/remote_server.go
@@ -771,7 +771,7 @@ func (s *server) PopularHeaders(ctx context.Context, in *Empty) (pairs *Pairs, e
 		Data: []*Pair{},
 	}
 
-	err = yaml.Unmarshal([]byte(popularHeaders), &pairs.Data)
+	err = yaml.Unmarshal(popularHeaders, &pairs.Data)
 	return
 }
 
@@ -1009,7 +1009,7 @@ func (s *server) getLoaderByStoreName(storeName string) (loader testing.Writer,
 }
 
 //go:embed data/headers.yaml
-var popularHeaders string
+var popularHeaders []byte
 
 func findParentTestCases(testcase *testing.TestCase, suite *testing.TestSuite) (testcases []testing.TestCase) {
 	reg, matchErr := regexp.Compile(`(.*?\{\{.*\.\w*.*?\}\})`)
diff --git a/pkg/server/remote_server_test.go b/pkg/server/remote_server_test.go
index 354ead7..b8963bf 100644
--- a/pkg/server/remote_server_test.go
+++ b/pkg/server/remote_server_test.go
@@ -599,7 +599,7 @@ func TestPopularHeaders(t *testing.T) {
 
 	pairs, err := server.PopularHeaders(ctx, &Empty{})
 	if assert.NoError(t, err) {
-		assert.Equal(t, 6, len(pairs.Data))
+		assert.Equal(t, 9, len(pairs.Data))
 	}
 }