@@ -28,20 +28,20 @@ def sdk_automation(config: dict) -> List[dict]:
2828 re .IGNORECASE ,
2929 )
3030 if match and '/examples/' not in file_path :
31- group = match .group (1 )
31+ service = match .group (1 )
3232 file_name = match .group (2 )
3333 file_name_sans = '' .join (c for c in file_name if c .isalnum ())
34- module = 'azure-{0}-{1}' .format (group , file_name_sans )
34+ module = 'azure-{0}-{1}' .format (service , file_name_sans )
3535 input_file = os .path .join (spec_root , file_path )
3636 # placeholder, for lack of information
3737 credential_types = 'tokencredential'
38- credential_scopes = 'https://{0}.azure.com/.default' .format (group )
38+ credential_scopes = 'https://{0}.azure.com/.default' .format (service )
3939
4040 succeeded = generate (sdk_root , input_file ,
41- group , module , credential_types , credential_scopes ,
41+ service , module , credential_types , credential_scopes ,
4242 AUTOREST_CORE_VERSION , AUTOREST_JAVA , '' )
4343
44- generated_folder = 'sdk/{0}/{1}' .format (group , module )
44+ generated_folder = 'sdk/{0}/{1}' .format (service , module )
4545
4646 if succeeded :
4747 install_build_tools (sdk_root )
@@ -71,7 +71,7 @@ def sdk_automation(config: dict) -> List[dict]:
7171def generate (
7272 sdk_root : str ,
7373 input_file : str ,
74- group : str ,
74+ service : str ,
7575 module : str ,
7676 credential_types : str ,
7777 credential_scopes : str ,
@@ -83,7 +83,7 @@ def generate(
8383 namespace = 'com.{0}' .format (module .replace ('-' , '.' ))
8484 output_dir = os .path .join (
8585 sdk_root ,
86- 'sdk' , group , module
86+ 'sdk' , service , module
8787 )
8888 shutil .rmtree (os .path .join (output_dir , 'src/main' ), ignore_errors = True )
8989 shutil .rmtree (os .path .join (output_dir , 'src/samples/java' , namespace .replace ('.' , '/' ), 'generated' ),
@@ -137,14 +137,14 @@ def parse_args() -> argparse.Namespace:
137137 help = 'URL to OpenAPI 2.0 specification JSON as input file' ,
138138 )
139139 parser .add_argument (
140- '--group ' ,
140+ '--service ' ,
141141 required = True ,
142- help = 'Group name under sdk/, sample: storage' ,
142+ help = 'Service name under sdk/, sample: storage' ,
143143 )
144144 parser .add_argument (
145145 '--module' ,
146146 required = True ,
147- help = 'Module name under sdk/<group >/, sample: azure-storage-blob' ,
147+ help = 'Module name under sdk/<service >/, sample: azure-storage-blob' ,
148148 )
149149 parser .add_argument (
150150 '--credential-types' ,
@@ -189,7 +189,7 @@ def main():
189189
190190 output_dir = os .path .join (
191191 sdk_root ,
192- 'sdk' , args ['group ' ], args ['module' ]
192+ 'sdk' , args ['service ' ], args ['module' ]
193193 )
194194 install_build_tools (sdk_root )
195195 compile_package (output_dir )
0 commit comments