Fix string bug in windows (#480)

Azure · Jul 23, 2020 · a7fd9bb · a7fd9bb
1 parent 5b3fa18
commit a7fd9bb
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 211 deletions.
diff --git a/src/plugins/azgenerator/TemplateAzureCliCustom.ts b/src/plugins/azgenerator/TemplateAzureCliCustom.ts
@@ -484,13 +484,7 @@ function GetPolyMethodCall(model: CodeModelAz, prefix: any, originalOperation: O
                 parameterPair = model.Parameter_NamePython(param) + "=None";
             }
         } else {
-            if(model.Parameter_Type(param) == SchemaType.Integer) {
-                parameterPair = parameterName + "=int(" + optionName + ")";
-            } else if(model.Parameter_Type(param) == SchemaType.Number) {
-                parameterPair = parameterName + "=float(" + optionName + ")";
-            } else {
-                parameterPair = parameterName + "=" + optionName;
-            }
+            parameterPair = parameterName + "=" + optionName;
         }
 
 
@@ -567,13 +561,7 @@ function GetMethodCall(model: CodeModelAz, required: any, prefix: any): string[]
                 }
             }
             else {
-                if(model.MethodParameter_Type == SchemaType.Integer) {
-                    parameterPair = model.MethodParameter_NamePython + "=int(" + model.MethodParameter_MapsTo + ")";
-                } else if(model.MethodParameter_Type == SchemaType.Number) {
-                    parameterPair = model.MethodParameter_NamePython + "=float(" + model.MethodParameter_MapsTo + ")";
-                } else {
-                    parameterPair = model.MethodParameter_NamePython + "=" + model.MethodParameter_MapsTo;
-                }
+                parameterPair = model.MethodParameter_NamePython + "=" + model.MethodParameter_MapsTo;
             }
 
             if (methodCall.endsWith("(")) {

diff --git a/src/plugins/azgenerator/TemplateAzureCliParams.ts b/src/plugins/azgenerator/TemplateAzureCliParams.ts
@@ -288,6 +288,14 @@ function getCommandBody(model: CodeModelAz, needGeneric: boolean = false, debug:
                     }
 
                     if (!needSkip) {
+                        if (model.MethodParameter_Type == SchemaType.Integer) {
+                            argument += ", type=int"
+                        } else if(model.MethodParameter_Type == SchemaType.Number) {
+                            argument += ", type=float"
+                        } else if(model.MethodParameter_Type == SchemaType.String) {
+                            argument += ", type=str"
+                        }
+
                         argument += ", help='" + EscapeString(model.MethodParameter_Description).trimRight();
                         if (model.MethodParameter_IsList && !model.MethodParameter_IsSimpleArray) {
                             let netDescription = model.MethodParameter_Description.trim();

diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_params.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_params.py
@@ -23,11 +23,11 @@ def load_arguments(self, _):
 
     with self.argument_context('attestation create-provider') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service')
+        c.argument('provider_name', type=str, help='Name of the attestation service')
         c.argument('location', arg_type=get_location_type(self.cli_ctx),
                    validator=get_default_location_from_resource_group)
         c.argument('tags', tags_type)
-        c.argument('attestation_policy', help='Name of attestation policy.')
+        c.argument('attestation_policy', type=str, help='Name of attestation policy.')
         c.argument('policy_signing_certificates_keys', action=AddPolicySigningCertificatesKeys, nargs='*', help='The '
                    'value of the "keys" parameter is an array of JWK values.  By default, the order of the JWK values '
                    'within the array does not imply an order of preference among them, although applications of JWK '
@@ -38,13 +38,13 @@ def load_arguments(self, _):
 
     with self.argument_context('attestation attestation-provider show') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service instance', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service instance', id_part='name')
 
     with self.argument_context('attestation attestation-provider update') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service', id_part='name')
         c.argument('tags', tags_type)
 
     with self.argument_context('attestation attestation-provider delete') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('provider_name', help='Name of the attestation service', id_part='name')
+        c.argument('provider_name', type=str, help='Name of the attestation service', id_part='name')