several generation fixes

Azure · Nov 3, 2019 · f958360 · f958360
1 parent a615150
commit f958360
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 35 deletions.
diff --git a/AzureCli/CodeModelCli.ts b/AzureCli/CodeModelCli.ts
@@ -431,8 +431,16 @@ export class CodeModelCli
             }
             else if (moduleExample.Method == "get")
             {
-                // XXX - could be list
-                example.Method = "show";
+                // maybe this should be done in a different way, but if url ends with
+                // variable it means we are looking for specific resource instance
+                if (moduleExample.Url.endsWith("}"))
+                {
+                    example.Method = "show";
+                }
+                else
+                {
+                    example.Method = "list";
+                }
             }
             else if (moduleExample.Method == "delete")
             {

diff --git a/AzureCli/TemplateAzureCliCustom.ts b/AzureCli/TemplateAzureCliCustom.ts
@@ -151,25 +151,11 @@ export function GenerateAzureCliCustom(model: CodeModelCli) : string[] {
                         parts.forEach(part => {
                             if (part != "" && part != "*")
                             {
-                                if (!isUpdate)
-                                {
-                                    access += ".setdefault('" + part + "', {})";
-                                }
-                                else
-                                {
-                                    access += "." + part;
-                                }
+                                access += ".setdefault('" + part + "', {})";
                             }
                         });
 
-                        if (!isUpdate)
-                        {
-                            access += "['" + last + "'] = ";
-                        }
-                        else
-                        {
-                            access += "." + last + " = ";
-                        }
+                        access += "['" + last + "'] = ";
 
                         if (element.IsList)
                         {
@@ -192,8 +178,16 @@ export function GenerateAzureCliCustom(model: CodeModelCli) : string[] {
                         {
                             access += "json.loads(" + PythonParameterName(element.Name) + ") if isinstance(" + PythonParameterName(element.Name) + ", str) else " + PythonParameterName(element.Name)
                         }
-
-                        output_body.push(access);
+
+                        if (isUpdate)
+                        {
+                            output_body.push("    if " + PythonParameterName(element.Name) + " is not None:");
+                            output_body.push("    " + access);
+                        }
+                        else
+                        {
+                            output_body.push(access);
+                        }
                     }
                 });
             }

diff --git a/dist/AzureCli/CodeModelCli.js b/dist/AzureCli/CodeModelCli.js
@@ -299,8 +299,14 @@ class CodeModelCli {
                 example.Method = "update";
             }
             else if (moduleExample.Method == "get") {
-                // XXX - could be list
-                example.Method = "show";
+                // maybe this should be done in a different way, but if url ends with
+                // variable it means we are looking for specific resource instance
+                if (moduleExample.Url.endsWith("}")) {
+                    example.Method = "show";
+                }
+                else {
+                    example.Method = "list";
+                }
             }
             else if (moduleExample.Method == "delete") {
                 example.Method = "delete";

diff --git a/dist/AzureCli/TemplateAzureCliCustom.js b/dist/AzureCli/TemplateAzureCliCustom.js
@@ -108,20 +108,10 @@ function GenerateAzureCliCustom(model) {
                         let last = parts.pop();
                         parts.forEach(part => {
                             if (part != "" && part != "*") {
-                                if (!isUpdate) {
-                                    access += ".setdefault('" + part + "', {})";
-                                }
-                                else {
-                                    access += "." + part;
-                                }
+                                access += ".setdefault('" + part + "', {})";
                             }
                         });
-                        if (!isUpdate) {
-                            access += "['" + last + "'] = ";
-                        }
-                        else {
-                            access += "." + last + " = ";
-                        }
+                        access += "['" + last + "'] = ";
                         if (element.IsList) {
                             if (element.Type != "dict") {
                                 // a comma separated list
@@ -138,7 +128,13 @@ function GenerateAzureCliCustom(model) {
                         else {
                             access += "json.loads(" + PythonParameterName(element.Name) + ") if isinstance(" + PythonParameterName(element.Name) + ", str) else " + PythonParameterName(element.Name);
                         }
-                        output_body.push(access);
+                        if (isUpdate) {
+                            output_body.push("    if " + PythonParameterName(element.Name) + " is not None:");
+                            output_body.push("    " + access);
+                        }
+                        else {
+                            output_body.push(access);
+                        }
                     }
                 });
             }