[OIL] Templatization of PS Remove-Xen* cmdlets. Refactoring of HTTP_actions.mustache #5554
Conversation
kc284
force-pushed
the
private/konstantin1/sdk-ps
branch
from
24cc4a7
to
4e8200b
Compare
| let cmdlets = | ||
| classes |> List.filter generated |> List.map gen_cmdlets |> List.concat | ||
| in | ||
| List.iter (fun x -> write_file x.filename x.content) cmdlets | ||
| List.iter (fun x -> write_file x.filename x.content) cmdlets ; | ||
|
|
||
| classes |> List.filter generated |> List.iter gen_destructor |
There was a problem hiding this comment.
| let cmdlets = | |
| classes |> List.filter generated |> List.map gen_cmdlets |> List.concat | |
| in | |
| List.iter (fun x -> write_file x.filename x.content) cmdlets | |
| List.iter (fun x -> write_file x.filename x.content) cmdlets ; | |
| classes |> List.filter generated |> List.iter gen_destructor | |
| let classes_filterd = List.filter generated classes in | |
| let cmdlets = | |
| classes_filterd |> List.map gen_cmdlets |> List.concat | |
| in | |
| List.iter (fun x -> write_file x.filename x.content) cmdlets ; | |
| List.iter gen_destructor classes_filterd |
There was a problem hiding this comment.
List.concat_map can be used to generate cmdlets as well
| `O | ||
| [ | ||
| ("licence", `String Licence.bsd_two_clause) | ||
| ; ("http_actions", `A (List.map action_json filtered_actions)) | ||
| ( "http_actions" | ||
| , `A | ||
| (List.map | ||
| (fun (name, (meth, uri, _, sdkargs, _, _)) -> | ||
| `O | ||
| [ | ||
| ("name", `String name) | ||
| ; ("isPut", `Bool (meth == Put)) | ||
| ; ("isGet", `Bool (meth == Get)) | ||
| ; ("uri", `String uri) | ||
| ; ( "args" | ||
| , `A | ||
| (List.map | ||
| (fun x -> | ||
| `O | ||
| [ | ||
| ("arg_decl", `String (decl_of_sdkarg x)) | ||
| ; ("arg_use", `String (use_of_sdkarg x)) | ||
| ] | ||
| ) | ||
| sdkargs | ||
| ) | ||
| ) | ||
| ] | ||
| ) | ||
| filtered_actions | ||
| ) | ||
| ) |
There was a problem hiding this comment.
Maybe below is little better:
let of_arg arg =
`O
[
("arg_decl", `String (decl_of_sdkarg arg))
; ("arg_use", `String (use_of_sdkarg arg))
]
let of_action (name, (meth, uri, _, sdkargs, _, _)) =
`O
[
("name", `String name)
; ("isPut", `Bool (meth == Put))
; ("isGet", `Bool (meth == Get))
; ("uri", `String uri)
; ("args", `A (List.map of_arg sdkargs))
]
in
`O [( "http_actions", `A (List.map of_action filtered_actions))]
kc284
force-pushed
the
private/konstantin1/sdk-ps
branch
from
4e8200b
to
3721583
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅ Additional details and impacted files@@ Coverage Diff @@
## master #5554 +/- ##
========================================
- Coverage 51.4% 44.8% -6.6%
========================================
Files 13 16 +3
Lines 1928 2210 +282
========================================
+ Hits 991 992 +1
- Misses 937 1218 +281 see 4 files with indirect coverage changes
Flags with carried forward coverage won't be shown. Click here to find out more. |
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
kc284
force-pushed
the
private/konstantin1/sdk-ps
branch
from
3721583
to
694da51
Compare
| @@ -21,11 +46,11 @@ namespace XenAPI | |||
| } | |||
|
|
|||
| {{#http_actions}} | |||
| public static void {{name}}(HTTP.{{delegate_type}} {{delegate_name}}, HTTP.FuncBool cancellingDelegate, int timeout_ms, | |||
| string hostname, IWebProxy proxy, string path, {{{sdkargs_decl}}}) | |||
| public static void {{name}}(HTTP.{{#isPut}}UpdateProgressDelegate progressDelegate{{/isPut}}{{#isGet}}DataCopiedDelegate dataCopiedDelegate{{/isGet}}, HTTP.FuncBool cancellingDelegate, int timeout_ms, | |||
There was a problem hiding this comment.
If there just two possible cases, "Put" or "Get", I think 1 var "isPut" is enough, like
HTTP.{{#isPut}}UpdateProgressDelegate progressDelegate{{/isPut}}{{^isPut}}DataCopiedDelegate dataCopiedDelegate{{/isPut}}
There was a problem hiding this comment.
At the moment, yes, we only have Put and Get methods, but I used two separate variables isPut and isGet in case it is expanded in future to include other types of methods like Post etc.
| {{#async}} | ||
| [OutputType(typeof(XenAPI.Task))] | ||
| {{/async}} | ||
| [OutputType(typeof(void))] |
There was a problem hiding this comment.
Do we miss {{^async}} here for "[OutputType(typeof(void))] "?
There was a problem hiding this comment.
No, when the call has an async version the Task will be returned only if the switch -PassThru is specified. If the user does not use the switch, the return type is void, so the OutputType attribute needs to describe both cases. However, one thing I've just noticed is that we don't need the first line [OutputType(typeof({{type}}))], because the object is deleted so it cannot be returned. This looks like an issue in the old generation code and I just copied it over without thinking. I'll mark the PR as needs updating and have a better look, thanks for bringing it up 👍
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com> # Conflicts: # ocaml/sdk-gen/powershell/gen_powershell_binding.ml
kc284
force-pushed
the
private/konstantin1/sdk-ps
branch
from
694da51
to
1f80e89
Compare
First installment of PS templatization.