Fix log return disposed obj (#705)

* generator not to dispose stream * new generated code * test to cover log stream
kubernetes-client · Sep 17, 2021 · 07ab21b · 07ab21b
1 parent 4e29dff
commit 07ab21b
Show file tree

Hide file tree

Showing 5 changed files with 308 additions and 221 deletions.
diff --git a/gen/KubernetesGenerator/Kubernetes.cs.template b/gen/KubernetesGenerator/Kubernetes.cs.template
@@ -466,7 +466,7 @@ namespace k8s
                     }
                     throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
-                {{/IfReturnType operation "stream"}}
+                {{/IfReturnType operation "obj"}}
             }
             {{/IfReturnType operation "any"}}
             if (_shouldTrace)

diff --git a/gen/KubernetesGenerator/KubernetesExtensions.cs.template b/gen/KubernetesGenerator/KubernetesExtensions.cs.template
@@ -64,6 +64,17 @@ namespace k8s
             {{/operation.parameters}}
             CancellationToken cancellationToken = default(CancellationToken))
         {
+            {{#IfReturnType operation "stream"}}
+            var _result = await operations.{{GetMethodName operation "WithHttpMessagesAsync"}}(
+                {{#operation.parameters}}
+                {{GetDotNetName .}},
+                {{/operation.parameters}}
+                null,
+                cancellationToken);
+            _result.Request.Dispose();
+            {{GetReturnType operation "_result.Body"}};
+            {{/IfReturnType operation "stream"}}
+            {{#IfReturnType operation "obj"}}
             using (var _result = await operations.{{GetMethodName operation "WithHttpMessagesAsync"}}(
                 {{#operation.parameters}}
                 {{GetDotNetName .}},
@@ -73,6 +84,17 @@ namespace k8s
             {
                 {{GetReturnType operation "_result.Body"}};
             }
+            {{/IfReturnType operation "obj"}}
+            {{#IfReturnType operation "void"}}
+            using (var _result = await operations.{{GetMethodName operation "WithHttpMessagesAsync"}}(
+                {{#operation.parameters}}
+                {{GetDotNetName .}},
+                {{/operation.parameters}}
+                null,
+                cancellationToken).ConfigureAwait(false))
+            {
+            }
+            {{/IfReturnType operation "void"}}
         }
 
         {{/.}}

diff --git a/gen/KubernetesGenerator/Program.cs b/gen/KubernetesGenerator/Program.cs
@@ -956,7 +956,7 @@ private static string GetApiVersion(JsonSchema4 definition)
                 {
                     fn(null);
                 }
-                else if (type == "stream" && rt == "Stream")
+                else if (type.ToLower() == rt.ToLower())
                 {
                     fn(null);
                 }