Skip to content

Commit aedbbe3

Browse files
authored
Merge pull request #84 from jonschoning/83_json_mime_types
re-include mimetypes for json patch
2 parents 7fc7143 + 8d64efc commit aedbbe3

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

kubernetes-client/kubernetes-client.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cabal-version: 1.12
77
-- hash: 114671d4f1b4c78c3a32487c9b8589f61d433f2a32488b3ed9e4372614f3972b
88

99
name: kubernetes-client
10-
version: 0.3.2.0
10+
version: 0.3.2.1
1111
synopsis: Client library for Kubernetes
1212
description: Client library for interacting with a Kubernetes cluster.
1313
.
@@ -62,7 +62,7 @@ library
6262
, http-client-tls >=0.3
6363
, jose-jwt >=0.8
6464
, jsonpath >=0.1 && <0.3
65-
, kubernetes-client-core ==0.3.1.0
65+
, kubernetes-client-core ==0.3.2.1
6666
, microlens >=0.4 && <0.5
6767
, mtl >=2.2
6868
, oidc-client >=0.4
@@ -107,7 +107,7 @@ test-suite example
107107
, jose-jwt >=0.8
108108
, jsonpath >=0.1 && <0.3
109109
, kubernetes-client
110-
, kubernetes-client-core ==0.3.1.0
110+
, kubernetes-client-core ==0.3.2.1
111111
, microlens >=0.4 && <0.5
112112
, mtl >=2.2
113113
, oidc-client >=0.4
@@ -160,7 +160,7 @@ test-suite spec
160160
, jose-jwt >=0.8
161161
, jsonpath >=0.1 && <0.3
162162
, kubernetes-client
163-
, kubernetes-client-core ==0.3.1.0
163+
, kubernetes-client-core ==0.3.2.1
164164
, microlens >=0.4 && <0.5
165165
, mtl >=2.2
166166
, oidc-client >=0.4

kubernetes/.openapi-generator/COMMIT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Requested Commit: 44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
2-
Actual Commit: 44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
1+
Requested Commit: 4526ca2610e4c3812521ea226f421664435c9053
2+
Actual Commit: 4526ca2610e4c3812521ea226f421664435c9053

kubernetes/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0-SNAPSHOT
1+
5.0.1-SNAPSHOT

kubernetes/kubernetes-client-core.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: kubernetes-client-core
2-
version: 0.3.1.0
2+
version: 0.3.2.1
33
synopsis: Auto-generated kubernetes-client-core API Client
44
description: .
55
Client library for calling the Kubernetes API based on http-client.

kubernetes/lib/Kubernetes/OpenAPI/MimeTypes.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ data MimeJsonPatchjson = MimeJsonPatchjson deriving (P.Typeable)
220220
-- | @application/json-patch+json@
221221
instance MimeType MimeJsonPatchjson where
222222
mimeType _ = Just $ P.fromString "application/json-patch+json"
223+
instance A.ToJSON a => MimeRender MimeJsonPatchjson a where mimeRender _ = A.encode
224+
instance A.FromJSON a => MimeUnrender MimeJsonPatchjson a where mimeUnrender _ = A.eitherDecode
223225
-- instance MimeRender MimeJsonPatchjson T.Text where mimeRender _ = undefined
224226
-- instance MimeUnrender MimeJsonPatchjson T.Text where mimeUnrender _ = undefined
225227

@@ -242,6 +244,8 @@ data MimeMergePatchjson = MimeMergePatchjson deriving (P.Typeable)
242244
-- | @application/merge-patch+json@
243245
instance MimeType MimeMergePatchjson where
244246
mimeType _ = Just $ P.fromString "application/merge-patch+json"
247+
instance A.ToJSON a => MimeRender MimeMergePatchjson a where mimeRender _ = A.encode
248+
instance A.FromJSON a => MimeUnrender MimeMergePatchjson a where mimeUnrender _ = A.eitherDecode
245249
-- instance MimeRender MimeMergePatchjson T.Text where mimeRender _ = undefined
246250
-- instance MimeUnrender MimeMergePatchjson T.Text where mimeUnrender _ = undefined
247251

@@ -252,6 +256,8 @@ data MimeStrategicMergePatchjson = MimeStrategicMergePatchjson deriving (P.Typea
252256
-- | @application/strategic-merge-patch+json@
253257
instance MimeType MimeStrategicMergePatchjson where
254258
mimeType _ = Just $ P.fromString "application/strategic-merge-patch+json"
259+
instance A.ToJSON a => MimeRender MimeStrategicMergePatchjson a where mimeRender _ = A.encode
260+
instance A.FromJSON a => MimeUnrender MimeStrategicMergePatchjson a where mimeUnrender _ = A.eitherDecode
255261
-- instance MimeRender MimeStrategicMergePatchjson T.Text where mimeRender _ = undefined
256262
-- instance MimeUnrender MimeStrategicMergePatchjson T.Text where mimeUnrender _ = undefined
257263

kubernetes/openapi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324402,3 +324402,4 @@ components:
324402324402
in: header
324403324403
name: authorization
324404324404
type: apiKey
324405+
x-original-swagger-version: "2.0"

settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ export PACKAGE_NAME="kubernetes"
2626

2727
export USERNAME="kubernetes"
2828

29-
OPENAPI_GENERATOR_COMMIT=44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
29+
OPENAPI_GENERATOR_COMMIT=4526ca2610e4c3812521ea226f421664435c9053

0 commit comments

Comments
 (0)