re-gen kubernetes with updated generator commit

jonschoning · thomasjm · commit c04d857e8828 · 2022-05-29T14:09:38.000-07:00
diff --git a/kubernetes-client/kubernetes-client.cabal b/kubernetes-client/kubernetes-client.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           kubernetes-client
-version:        0.4.2.0
+version:        0.4.3.0
 synopsis:       Client library for Kubernetes
 description:    Client library for interacting with a Kubernetes cluster.
                 .
@@ -60,7 +60,7 @@ library
     , http-client-tls >=0.3
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
-    , kubernetes-client-core ==0.4.2.0
+    , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
     , mtl >=2.2
     , oidc-client >=0.4
@@ -105,7 +105,7 @@ test-suite example
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
     , kubernetes-client
-    , kubernetes-client-core ==0.4.2.0
+    , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
     , mtl >=2.2
     , oidc-client >=0.4
@@ -158,7 +158,7 @@ test-suite spec
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
     , kubernetes-client
-    , kubernetes-client-core ==0.4.2.0
+    , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
     , mtl >=2.2
     , oidc-client >=0.4
diff --git a/kubernetes-client/package.yaml b/kubernetes-client/package.yaml
@@ -1,5 +1,5 @@
 name: kubernetes-client
-version: 0.4.2.0
+version: 0.4.3.0
 description: |
   Client library for interacting with a Kubernetes cluster.
 
@@ -49,7 +49,7 @@ dependencies:
   - http-client >=0.5 && <0.8
   - http-client-tls >=0.3
   - jose-jwt >=0.8
-  - kubernetes-client-core ==0.4.2.0
+  - kubernetes-client-core ==0.4.3.0
   - microlens >=0.4
   - mtl >=2.2
   - oidc-client >=0.4
diff --git a/kubernetes/.openapi-generator/COMMIT b/kubernetes/.openapi-generator/COMMIT
@@ -1,2 +1,2 @@
-Requested Commit: 1247e774530b715fb54f719a3b10000d5dd2137b
-Actual Commit: 1247e774530b715fb54f719a3b10000d5dd2137b
+Requested Commit: 078232acb56b0a8cdceded6508cec4999bf547d6
+Actual Commit: 078232acb56b0a8cdceded6508cec4999bf547d6
diff --git a/kubernetes/.openapi-generator/VERSION b/kubernetes/.openapi-generator/VERSION
@@ -1 +1 @@
-5.3.0-SNAPSHOT
+6.0.1-SNAPSHOT
diff --git a/kubernetes/.openapi-generator/swagger.json-default.sha256 b/kubernetes/.openapi-generator/swagger.json-default.sha256
@@ -0,0 +1 @@
+681bfc7f139bd481224e485f53d0136ceb9699008bd99749547236a2122b45f0
diff --git a/kubernetes/kubernetes-client-core.cabal b/kubernetes/kubernetes-client-core.cabal
@@ -1,5 +1,5 @@
 name:           kubernetes-client-core
-version:        0.4.2.0
+version:        0.4.3.0
 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
@@ -80,7 +80,7 @@ data KubernetesClientConfig = KubernetesClientConfig
   , configLogContext :: LogContext -- ^ Configures the logger
   , configAuthMethods :: [AnyAuthMethod] -- ^ List of configured auth methods
   , configValidateAuthMethods :: Bool -- ^ throw exceptions if auth methods are not configured
-  , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':' 
+  , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'
   }
 
 -- | display the config
diff --git a/kubernetes/lib/Kubernetes/OpenAPI/LoggingKatip.hs b/kubernetes/lib/Kubernetes/OpenAPI/LoggingKatip.hs
@@ -54,7 +54,7 @@ initLogContext = LG.initLogEnv "Kubernetes.OpenAPI" "dev"
 
 -- | Runs a Katip logging block with the Log environment
 runDefaultLogExecWithContext :: LogExecWithContext
-runDefaultLogExecWithContext x = LG.runKatipT x
+runDefaultLogExecWithContext = LG.runKatipT
 
 -- * stdout logger
 
diff --git a/kubernetes/openapi.yaml b/kubernetes/openapi.yaml
diff --git a/kubernetes/stack.yaml b/kubernetes/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-18.6
+resolver: lts-19.6
 build:
   haddock-arguments:
     haddock-args:
diff --git a/kubernetes/swagger.json b/kubernetes/swagger.json
diff --git a/kubernetes/tests/Instances.hs b/kubernetes/tests/Instances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-unused-matches #-}
 
 module Instances where
@@ -13,6 +14,7 @@ import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Time as TI
 import qualified Data.Vector as V
+import Data.String (fromString)
 
 import Control.Monad
 import Data.Char (isSpace)
@@ -52,9 +54,16 @@ instance Arbitrary Date where
     arbitrary = Date <$> arbitrary
     shrink (Date xs) = Date <$> shrink xs
 
+#if MIN_VERSION_aeson(2,0,0)
+#else
 -- | A naive Arbitrary instance for A.Value:
 instance Arbitrary A.Value where
-  arbitrary = frequency [(3, simpleTypes), (1, arrayTypes), (1, objectTypes)]
+  arbitrary = arbitraryValue
+#endif
+
+arbitraryValue :: Gen A.Value
+arbitraryValue =
+  frequency [(3, simpleTypes), (1, arrayTypes), (1, objectTypes)]
     where
       simpleTypes :: Gen A.Value
       simpleTypes =
@@ -64,7 +73,7 @@ instance Arbitrary A.Value where
           , (2, liftM (A.Number . fromIntegral) (arbitrary :: Gen Int))
           , (2, liftM (A.String . T.pack) (arbitrary :: Gen String))
           ]
-      mapF (k, v) = (T.pack k, v)
+      mapF (k, v) = (fromString k, v)
       simpleAndArrays = frequency [(1, sized sizedArray), (4, simpleTypes)]
       arrayTypes = sized sizedArray
       objectTypes = sized sizedObject
diff --git a/settings b/settings
@@ -26,4 +26,4 @@ export PACKAGE_NAME="kubernetes"
 
 export USERNAME="kubernetes"
 
-OPENAPI_GENERATOR_COMMIT=1247e774530b715fb54f719a3b10000d5dd2137b
+OPENAPI_GENERATOR_COMMIT=078232acb56b0a8cdceded6508cec4999bf547d6

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+681bfc7f139bd481224e485f53d0136ceb9699008bd99749547236a2122b45f0`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ data KubernetesClientConfig = KubernetesClientConfig`
`80`	`80`	`, configLogContext :: LogContext -- ^ Configures the logger`
`81`	`81`	`, configAuthMethods :: [AnyAuthMethod] -- ^ List of configured auth methods`
`82`	`82`	`, configValidateAuthMethods :: Bool -- ^ throw exceptions if auth methods are not configured`
`83`		`- , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'`
	`83`	`+ , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`-- \| display the config`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-18.6`
	`1`	`+resolver: lts-19.6`
`2`	`2`	`build:`
`3`	`3`	`haddock-arguments:`
`4`	`4`	`haddock-args:`