Merge pull request #31 from guoshimin/newpackagename

new package name and module base for generated code

kubernetes-client-helper/package.yaml

@@ -4,7 +4,7 @@ library:
   source-dirs: src
 dependencies:
   - base >=4.7 && <5.0
-  - kubernetes == 0.1.0.0
+  - kubernetes-openapi-client-gen == 0.1.0.0
   - pem
   - x509
   - tls
@@ -19,6 +19,3 @@ dependencies:
   - bytestring >=0.10.0 && <0.11
   - text >=0.11 && <1.3
   - safe-exceptions <0.2
-
-
-

kubernetes-client-helper/src/Kubernetes/ClientHelper.hs

@@ -2,8 +2,8 @@
 
 module Kubernetes.ClientHelper where
 
-import qualified Kubernetes.Core            as K
-import qualified Kubernetes.Model           as K
+import qualified Kubernetes.OpenAPI.Core            as K
+import qualified Kubernetes.OpenAPI.Model           as K
 
 import           Control.Exception.Safe     (Exception, MonadThrow, throwM)
 import           Control.Monad.IO.Class     (MonadIO, liftIO)
@@ -32,23 +32,23 @@ import qualified Network.TLS.Extra          as TLS
 import           System.Environment         (getEnv)
 import           System.X509                (getSystemCertificateStore)
 
--- |Sets the master URI in the 'K.KubernetesConfig'.
+-- |Sets the master URI in the 'K.KubernetesClientConfig'.
 setMasterURI
     :: T.Text                -- ^ Master URI
-    -> K.KubernetesConfig
-    -> K.KubernetesConfig
+    -> K.KubernetesClientConfig
+    -> K.KubernetesClientConfig
 setMasterURI server kcfg =
     kcfg { K.configHost = (LazyB.fromStrict . T.encodeUtf8) server }
 
 -- |Disables the client-side auth methods validation. This is necessary if you are using client cert authentication.
-disableValidateAuthMethods :: K.KubernetesConfig -> K.KubernetesConfig
+disableValidateAuthMethods :: K.KubernetesClientConfig -> K.KubernetesClientConfig
 disableValidateAuthMethods kcfg = kcfg { K.configValidateAuthMethods = False }
 
--- |Configures the 'K.KubernetesConfig' to use token authentication.
+-- |Configures the 'K.KubernetesClientConfig' to use token authentication.
 setTokenAuth
     :: T.Text             -- ^Authentication token
-    -> K.KubernetesConfig
-    -> K.KubernetesConfig
+    -> K.KubernetesClientConfig
+    -> K.KubernetesClientConfig
 setTokenAuth token kcfg = kcfg
     { K.configAuthMethods = [K.AnyAuthMethod (K.AuthApiKeyBearerToken $ "Bearer " <> token)]
     }
@@ -124,7 +124,7 @@ loadPEMCerts p = do
 serviceAccountDir :: FilePath
 serviceAccountDir = "/var/run/secrets/kubernetes.io/serviceaccount"
 
-cluster :: (MonadIO m, MonadThrow m) => m (NH.Manager, K.KubernetesConfig)
+cluster :: (MonadIO m, MonadThrow m) => m (NH.Manager, K.KubernetesClientConfig)
 cluster = do
   caStore <- loadPEMCerts $ serviceAccountDir ++ "/ca.crt"
   defTlsParams <- liftIO defaultTLSClientParams

kubernetes-watch/package.yaml

@@ -10,6 +10,6 @@ dependencies:
   - mtl >=2.2.1
   - streaming-bytestring >= 0.1.5 && < 0.2.0
   - text >=0.11 && <1.3
-  - kubernetes == 0.1.0.0
+  - kubernetes-openapi-client-gen == 0.1.0.0
 
 

kubernetes-watch/src/Kubernetes/Watch/Client.hs

@@ -13,10 +13,10 @@ import Data.Aeson
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Streaming.Char8 as Q
 import qualified Data.Text as T
-import Kubernetes.Core
-import Kubernetes.Client
-import Kubernetes.MimeTypes
-import Kubernetes.Model (Watch(..))
+import Kubernetes.OpenAPI.Core
+import Kubernetes.OpenAPI.Client
+import Kubernetes.OpenAPI.MimeTypes
+import Kubernetes.OpenAPI.Model (Watch(..))
 import Network.HTTP.Client
 
 data WatchEvent a = WatchEvent
@@ -66,7 +66,7 @@ Launching 'dispatchWatch' with the above we get a stream of endpoints data:
 dispatchWatch ::
   (HasOptionalParam req Watch, MimeType accept, MimeType contentType) =>
     Manager
-    -> KubernetesConfig
+    -> KubernetesClientConfig
     -> KubernetesRequest req contentType resp accept
     -> (Q.ByteString IO () -> IO a)
     -> IO a

kubernetes/.swagger-codegen/COMMIT

@@ -1,2 +1,2 @@
-Requested Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035
-Actual Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035
+Requested Commit: d0e2d7684dd3258233c3e4d838dcd7bf44055869
+Actual Commit: d0e2d7684dd3258233c3e4d838dcd7bf44055869

kubernetes/kubernetes-openapi-client-gen.cabal

@@ -0,0 +1,149 @@
+name:           kubernetes-openapi-client-gen
+version:        0.1.0.0
+synopsis:       Auto-generated kubernetes-openapi-client-gen API Client
+description:    .
+                Client library for calling the Kubernetes API based on http-client.
+                .
+                host: 
+                .
+                base path: https://localhost
+                .
+                Kubernetes API version: v1.9.12
+                .
+                OpenAPI spec version: 2.0
+                .
+                OpenAPI-Specification: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
+                .
+category:       Web
+homepage:       https://github.com/kubernetes-client/haskell
+author:         Auto Generated
+maintainer:     Shimin Guo <smguo2001@gmail.com>
+license:        Apache-2.0
+build-type:     Simple
+cabal-version:  >= 1.10
+
+extra-source-files:
+    README.md
+    swagger.yaml
+
+library
+  hs-source-dirs:
+      lib
+  ghc-options: -Wall -funbox-strict-fields
+  build-depends:
+      aeson >=1.0 && <2.0
+    , base >=4.7 && <5.0
+    , base64-bytestring >1.0 && <2.0
+    , bytestring >=0.10.0 && <0.11
+    , case-insensitive
+    , containers >=0.5.0.0 && <0.6
+    , deepseq >= 1.4 && <1.6
+    , exceptions >= 0.4
+    , http-api-data >= 0.3.4 && <0.4
+    , http-client >=0.5 && <0.6
+    , http-client-tls
+    , http-media >= 0.4 && < 0.8
+    , http-types >=0.8 && <0.13
+    , iso8601-time >=0.1.3 && <0.2.0
+    , microlens >= 0.4.3 && <0.5
+    , mtl >=2.2.1
+    , network >=2.6.2 && <2.7
+    , random >=1.1
+    , safe-exceptions <0.2
+    , text >=0.11 && <1.3
+    , time >=1.5 && <1.10
+    , transformers >=0.4.0.0
+    , unordered-containers
+    , vector >=0.10.9 && <0.13
+    , katip >=0.4 && < 0.6
+  other-modules:
+      Paths_kubernetes_openapi_client_gen
+  exposed-modules:
+      Kubernetes.OpenAPI
+      Kubernetes.OpenAPI.API.Admissionregistration
+      Kubernetes.OpenAPI.API.AdmissionregistrationV1alpha1
+      Kubernetes.OpenAPI.API.AdmissionregistrationV1beta1
+      Kubernetes.OpenAPI.API.Apiextensions
+      Kubernetes.OpenAPI.API.ApiextensionsV1beta1
+      Kubernetes.OpenAPI.API.Apiregistration
+      Kubernetes.OpenAPI.API.ApiregistrationV1beta1
+      Kubernetes.OpenAPI.API.Apis
+      Kubernetes.OpenAPI.API.Apps
+      Kubernetes.OpenAPI.API.AppsV1
+      Kubernetes.OpenAPI.API.AppsV1beta1
+      Kubernetes.OpenAPI.API.AppsV1beta2
+      Kubernetes.OpenAPI.API.Authentication
+      Kubernetes.OpenAPI.API.AuthenticationV1
+      Kubernetes.OpenAPI.API.AuthenticationV1beta1
+      Kubernetes.OpenAPI.API.Authorization
+      Kubernetes.OpenAPI.API.AuthorizationV1
+      Kubernetes.OpenAPI.API.AuthorizationV1beta1
+      Kubernetes.OpenAPI.API.Autoscaling
+      Kubernetes.OpenAPI.API.AutoscalingV1
+      Kubernetes.OpenAPI.API.AutoscalingV2beta1
+      Kubernetes.OpenAPI.API.Batch
+      Kubernetes.OpenAPI.API.BatchV1
+      Kubernetes.OpenAPI.API.BatchV1beta1
+      Kubernetes.OpenAPI.API.BatchV2alpha1
+      Kubernetes.OpenAPI.API.Certificates
+      Kubernetes.OpenAPI.API.CertificatesV1beta1
+      Kubernetes.OpenAPI.API.Core
+      Kubernetes.OpenAPI.API.CoreV1
+      Kubernetes.OpenAPI.API.CustomObjects
+      Kubernetes.OpenAPI.API.Events
+      Kubernetes.OpenAPI.API.EventsV1beta1
+      Kubernetes.OpenAPI.API.Extensions
+      Kubernetes.OpenAPI.API.ExtensionsV1beta1
+      Kubernetes.OpenAPI.API.Logs
+      Kubernetes.OpenAPI.API.Networking
+      Kubernetes.OpenAPI.API.NetworkingV1
+      Kubernetes.OpenAPI.API.Policy
+      Kubernetes.OpenAPI.API.PolicyV1beta1
+      Kubernetes.OpenAPI.API.RbacAuthorization
+      Kubernetes.OpenAPI.API.RbacAuthorizationV1
+      Kubernetes.OpenAPI.API.RbacAuthorizationV1alpha1
+      Kubernetes.OpenAPI.API.RbacAuthorizationV1beta1
+      Kubernetes.OpenAPI.API.Scheduling
+      Kubernetes.OpenAPI.API.SchedulingV1alpha1
+      Kubernetes.OpenAPI.API.Settings
+      Kubernetes.OpenAPI.API.SettingsV1alpha1
+      Kubernetes.OpenAPI.API.Storage
+      Kubernetes.OpenAPI.API.StorageV1
+      Kubernetes.OpenAPI.API.StorageV1alpha1
+      Kubernetes.OpenAPI.API.StorageV1beta1
+      Kubernetes.OpenAPI.API.Version
+      Kubernetes.OpenAPI.Client
+      Kubernetes.OpenAPI.Core
+      Kubernetes.OpenAPI.Logging
+      Kubernetes.OpenAPI.MimeTypes
+      Kubernetes.OpenAPI.Model
+      Kubernetes.OpenAPI.ModelLens
+  default-language: Haskell2010
+
+test-suite tests
+  type: exitcode-stdio-1.0
+  main-is: Test.hs
+  hs-source-dirs:
+      tests
+  ghc-options: -Wall -fno-warn-orphans
+  build-depends:
+      kubernetes-openapi-client-gen
+    , QuickCheck
+    , aeson
+    , base >=4.7 && <5.0
+    , bytestring >=0.10.0 && <0.11
+    , containers
+    , hspec >=1.8
+    , iso8601-time
+    , mtl >=2.2.1
+    , semigroups
+    , text
+    , time
+    , transformers >=0.4.0.0
+    , unordered-containers
+    , vector
+  other-modules:
+      ApproxEq
+      Instances
+      PropMime
+  default-language: Haskell2010