From 3431a701830d451530635c77b6269aebe7fdaf52 Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Sun, 29 Sep 2019 18:15:36 +0800 Subject: [PATCH 1/7] Fix datetime problem with kubernetes. Pass microseconds instead of milliseconds --- kubernetes/kubernetes-client-core.cabal | 2 +- kubernetes/lib/Kubernetes/OpenAPI/Core.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/kubernetes-client-core.cabal b/kubernetes/kubernetes-client-core.cabal index d741eeb..3f7fb80 100644 --- a/kubernetes/kubernetes-client-core.cabal +++ b/kubernetes/kubernetes-client-core.cabal @@ -1,5 +1,5 @@ name: kubernetes-client-core -version: 0.1.0.1 +version: 0.1.0.2 synopsis: Auto-generated kubernetes-client-core API Client description: . Client library for calling the Kubernetes API based on http-client. diff --git a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs index 485501f..8bdb8cd 100644 --- a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs +++ b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs @@ -440,10 +440,10 @@ _readDateTime = _parseISO8601 {-# INLINE _readDateTime #-} --- | @TI.formatISO8601Millis@ +-- | @TI.formatISO8601Micros@ _showDateTime :: (t ~ TI.UTCTime, TI.FormatTime t) => t -> String _showDateTime = - TI.formatISO8601Millis + TI.formatISO8601Micros {-# INLINE _showDateTime #-} -- | parse an ISO8601 date-time string From 611b8e6297c417efc5d5292ac44968efb6dc4cbd Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Sun, 29 Sep 2019 22:37:24 +0800 Subject: [PATCH 2/7] Bump version of kubernetes-client --- kubernetes-client/package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes-client/package.yaml b/kubernetes-client/package.yaml index af579c1..b026029 100644 --- a/kubernetes-client/package.yaml +++ b/kubernetes-client/package.yaml @@ -1,5 +1,5 @@ name: kubernetes-client -version: 0.1.0.1 +version: 0.1.0.2 description: | Client library for interacting with a Kubernetes cluster. @@ -38,7 +38,7 @@ dependencies: - data-default-class >=0.1.2.0 - http-client >=0.5 && <0.7 - http-client-tls >=0.3.5.3 - - kubernetes-client-core ==0.1.0.1 + - kubernetes-client-core ==0.1.0.2 - microlens >=0.4.3 && <0.5 - mtl >=2.2.1 - pem >=0.2.4 From 3aaceece57c3b08a307662a941b42353b7c31036 Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Tue, 1 Oct 2019 21:13:28 +0800 Subject: [PATCH 3/7] Generated code using date format --- kubernetes/lib/Kubernetes/OpenAPI/Core.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs index 8bdb8cd..9b0a147 100644 --- a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs +++ b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs @@ -434,16 +434,16 @@ instance P.Show DateTime where instance MimeRender MimeMultipartFormData DateTime where mimeRender _ = mimeRenderDefaultMultipartFormData --- | @_parseISO8601@ -_readDateTime :: (TI.ParseTime t, Monad m, Alternative m) => String -> m t +-- | @TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ"@ +_readDateTime :: (TI.ParseTime t, Monad m, ) => String -> m t _readDateTime = - _parseISO8601 + TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ" {-# INLINE _readDateTime #-} --- | @TI.formatISO8601Micros@ -_showDateTime :: (t ~ TI.UTCTime, TI.FormatTime t) => t -> String +-- | @TI.formatTime TI.defaultTimeLocale "%FT%T%6QZ"@ +_showDateTime :: (TI.FormatTime t) => t -> String _showDateTime = - TI.formatISO8601Micros + TI.formatTime TI.defaultTimeLocale "%FT%T%6QZ" {-# INLINE _showDateTime #-} -- | parse an ISO8601 date-time string From f179218e85a47dd0e348abff076b1e95747a894f Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Tue, 1 Oct 2019 21:34:55 +0800 Subject: [PATCH 4/7] Fixing problem with a trailing comma generated wrongly by the openapi generator --- kubernetes/lib/Kubernetes/OpenAPI/Core.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs index 9b0a147..78a955d 100644 --- a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs +++ b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs @@ -435,7 +435,7 @@ instance MimeRender MimeMultipartFormData DateTime where mimeRender _ = mimeRenderDefaultMultipartFormData -- | @TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ"@ -_readDateTime :: (TI.ParseTime t, Monad m, ) => String -> m t +_readDateTime :: (TI.ParseTime t, Monad m) => String -> m t _readDateTime = TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ" {-# INLINE _readDateTime #-} From a224f7070d6649fd5ac9e69e04a9dab9259350ae Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Tue, 1 Oct 2019 22:29:06 +0800 Subject: [PATCH 5/7] Revert "Fixing problem with a trailing comma generated wrongly by the openapi generator" This reverts commit f179218e85a47dd0e348abff076b1e95747a894f. --- kubernetes/lib/Kubernetes/OpenAPI/Core.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs index 78a955d..9b0a147 100644 --- a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs +++ b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs @@ -435,7 +435,7 @@ instance MimeRender MimeMultipartFormData DateTime where mimeRender _ = mimeRenderDefaultMultipartFormData -- | @TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ"@ -_readDateTime :: (TI.ParseTime t, Monad m) => String -> m t +_readDateTime :: (TI.ParseTime t, Monad m, ) => String -> m t _readDateTime = TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ" {-# INLINE _readDateTime #-} From d1919b64cc47f70cf2278e09fc6deeb94df29e5d Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Tue, 1 Oct 2019 22:29:38 +0800 Subject: [PATCH 6/7] Revert "Generated code using date format" This reverts commit 3aaceece57c3b08a307662a941b42353b7c31036. --- kubernetes/lib/Kubernetes/OpenAPI/Core.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs index 9b0a147..8bdb8cd 100644 --- a/kubernetes/lib/Kubernetes/OpenAPI/Core.hs +++ b/kubernetes/lib/Kubernetes/OpenAPI/Core.hs @@ -434,16 +434,16 @@ instance P.Show DateTime where instance MimeRender MimeMultipartFormData DateTime where mimeRender _ = mimeRenderDefaultMultipartFormData --- | @TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ"@ -_readDateTime :: (TI.ParseTime t, Monad m, ) => String -> m t +-- | @_parseISO8601@ +_readDateTime :: (TI.ParseTime t, Monad m, Alternative m) => String -> m t _readDateTime = - TI.parseTimeM True TI.defaultTimeLocale "%FT%T%6QZ" + _parseISO8601 {-# INLINE _readDateTime #-} --- | @TI.formatTime TI.defaultTimeLocale "%FT%T%6QZ"@ -_showDateTime :: (TI.FormatTime t) => t -> String +-- | @TI.formatISO8601Micros@ +_showDateTime :: (t ~ TI.UTCTime, TI.FormatTime t) => t -> String _showDateTime = - TI.formatTime TI.defaultTimeLocale "%FT%T%6QZ" + TI.formatISO8601Micros {-# INLINE _showDateTime #-} -- | parse an ISO8601 date-time string From c4d73c2f1fa47e8ff068fe4487c73e0fd222a385 Mon Sep 17 00:00:00 2001 From: Fernando Rincon Date: Wed, 2 Oct 2019 21:00:48 +0800 Subject: [PATCH 7/7] Update dependency to the new version --- kubernetes-client/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes-client/package.yaml b/kubernetes-client/package.yaml index 202d3f8..cb51555 100644 --- a/kubernetes-client/package.yaml +++ b/kubernetes-client/package.yaml @@ -49,7 +49,7 @@ dependencies: - http-client >=0.5 && <0.7 - http-client-tls >=0.3 - jose-jwt >=0.8 - - kubernetes-client-core ==0.1.0.1 + - kubernetes-client-core ==0.1.0.2 - microlens >=0.4 && <0.5 - mtl >=2.2 - oidc-client >=0.4