[haskell] update openapi-generator commit to 4.1.3

kubernetes-client · Oct 3, 2019 · cd40828 · cd40828
1 parent a4d67bd
commit cd40828
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/openapi/haskell-http-client.xml b/openapi/haskell-http-client.xml
@@ -20,7 +20,9 @@
                             <inputSpec>${generator.spec.path}</inputSpec>
                             <generatorName>haskell-http-client</generatorName>
                             <output>${generator.output.path}</output>
-                            <validateSpec>false</validateSpec>
+                            <skipValidateSpec>true</skipValidateSpec>
+                            <typeMappings>intstr.IntOrString=IntOrString,resource.Quantity=Quantity</typeMappings>
+                            <importMappings>IntOrString=Kubernetes.OpenAPI.CustomTypes,Quantity=Kubernetes.OpenAPI.CustomTypes</importMappings>
                             <configOptions>
                                 <packageName>${generator.package.name}</packageName>
                                 <packageVersion>${generator.client.version}</packageVersion>
@@ -29,9 +31,9 @@
                                 <baseModule>Kubernetes.OpenAPI</baseModule>
                                 <requestType>KubernetesRequest</requestType>
                                 <configType>KubernetesClientConfig</configType>
-                                <type-mappings>intstr.IntOrString=IntOrString,resource.Quantity=Quantity</type-mappings>
-                                <import-mappings>IntOrString=Kubernetes.OpenAPI.CustomTypes,Quantity=Kubernetes.OpenAPI.CustomTypes</import-mappings>
                                 <customTestInstanceModule>CustomInstances</customTestInstanceModule>
+                                <dateTimeFormat>%FT%T%6QZ</dateTimeFormat>
+                                <dateTimeParseFormat>%FT%T%QZ</dateTimeParseFormat>
                             </configOptions>
                         </configuration>
                     </execution>

diff --git a/openapi/haskell.sh b/openapi/haskell.sh
@@ -47,14 +47,14 @@ source "${SCRIPT_ROOT}/openapi-generator/client-generator.sh"
 source "${SETTING_FILE}"
 
 # Latest version as of Mar 15, 2019
-OPENAPI_GENERATOR_COMMIT="${OPENAPI_GENERATOR_COMMIT:-c9737cf97d5e31936639842d389118e980ee85a9}"; \
+OPENAPI_GENERATOR_COMMIT="${OPENAPI_GENERATOR_COMMIT:-cc1bfe5fef4087be4310168972cc7bcfe1da7461}"; \
 CLIENT_LANGUAGE=haskell-http-client; \
 CLEANUP_DIRS=(lib/Kubernetes/OpenAPI/API); \
 kubeclient::generator::generate_client "${OUTPUT_DIR}"
 
 CABAL_OVERRIDES=(homepage https://github.com/kubernetes-client/haskell
            author "Auto Generated"
-           maintainer "Shimin Guo <smguo2001@gmail.com>"
+           maintainer "Shimin Guo <smguo2001@gmail.com>, Akshay Mankar <itsakshaymankar@gmail.com>"
            license Apache-2.0)
 
 patch_cabal_file() {
@@ -64,9 +64,6 @@ patch_cabal_file() {
     done
 }
 
-# Solve bug with date time format
-sed -i 's/formatISO8601Millis/formatISO8601Micros/g' ${OUTPUT_DIR}/lib/Kubernetes/OpenAPI/Core.hs
-
 patch_cabal_file "${CABAL_OVERRIDES[@]}"
 
 # Add license-file after license