Skip to content

Commit a270f42

Browse files
DPG, integrate with apiview (Azure#28054)
1 parent ebe60c2 commit a270f42

File tree

6 files changed

+229
-156
lines changed

6 files changed

+229
-156
lines changed

eng/mgmt/automation/changelog.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))
99
from parameters import *
1010
from generate import update_parameters
11-
from generate import get_version
11+
from generate_utils import get_version
1212
from generate import compile_package
1313
from generate import compare_with_maven_package
14+
1415
os.chdir(pwd)
1516

1617

1718
def parse_args() -> argparse.Namespace:
1819
parser = argparse.ArgumentParser()
19-
parser.add_argument('-s', '--service', required = True)
20+
parser.add_argument('-s', '--service', required=True)
2021
parser.add_argument('--suffix')
21-
parser.add_argument('-c', '--compile', action = 'store_true')
22+
parser.add_argument('-c', '--compile', action='store_true')
2223
return parser.parse_args()
2324

2425

eng/mgmt/automation/generate.py

Lines changed: 38 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
get_and_update_service_from_api_specs,
2020
get_suffix_from_api_specs,
2121
)
22+
2223
os.chdir(pwd)
2324

2425

@@ -40,50 +41,48 @@ def parse_args() -> argparse.Namespace:
4041
parser = argparse.ArgumentParser()
4142
parser.add_argument(
4243
'--spec-root',
43-
default =
44-
'https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/',
45-
help = 'Spec root folder',
44+
default='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/',
45+
help='Spec root folder',
4646
)
4747
parser.add_argument(
4848
'-r',
4949
'--readme',
50-
help =
51-
'Readme path, Sample: "storage" or "specification/storage/resource-manager/readme.md"',
50+
help='Readme path, Sample: "storage" or "specification/storage/resource-manager/readme.md"',
5251
)
53-
parser.add_argument('-t', '--tag', help = 'Specific tag')
54-
parser.add_argument('-v', '--version', help = 'Specific sdk version')
52+
parser.add_argument('-t', '--tag', help='Specific tag')
53+
parser.add_argument('-v', '--version', help='Specific sdk version')
5554
parser.add_argument(
5655
'-s',
5756
'--service',
58-
help = 'Service Name if not the same as spec name',
57+
help='Service Name if not the same as spec name',
5958
)
6059
parser.add_argument(
6160
'-u',
6261
'--use',
63-
default = AUTOREST_JAVA,
64-
help = 'Autorest java plugin',
62+
default=AUTOREST_JAVA,
63+
help='Autorest java plugin',
6564
)
6665
parser.add_argument(
6766
'--autorest',
68-
default = AUTOREST_CORE_VERSION,
69-
help = 'Autorest version',
67+
default=AUTOREST_CORE_VERSION,
68+
help='Autorest version',
7069
)
7170
parser.add_argument(
7271
'--autorest-options',
73-
default = '',
74-
help = 'Additional autorest options',
72+
default='',
73+
help='Additional autorest options',
7574
)
76-
parser.add_argument('--suffix', help = 'Suffix for namespace and artifact')
75+
parser.add_argument('--suffix', help='Suffix for namespace and artifact')
7776
parser.add_argument(
7877
'--auto-commit-external-change',
79-
action = 'store_true',
80-
help = 'Automatic commit the generated code',
78+
action='store_true',
79+
help='Automatic commit the generated code',
8180
)
82-
parser.add_argument('--user-name', help = 'User Name for commit')
83-
parser.add_argument('--user-email', help = 'User Email for commit')
81+
parser.add_argument('--user-name', help='User Name for commit')
82+
parser.add_argument('--user-email', help='User Email for commit')
8483
parser.add_argument(
8584
'config',
86-
nargs = '*',
85+
nargs='*',
8786
)
8887

8988
return parser.parse_args()
@@ -140,14 +139,14 @@ def sdk_automation(input_file: str, output_file: str):
140139
succeeded = generate(
141140
sdk_root,
142141
service,
143-
spec_root = config['specFolder'],
144-
readme = readme,
145-
autorest = AUTOREST_CORE_VERSION,
146-
use = AUTOREST_JAVA,
147-
output_folder = output_folder,
148-
module = module,
149-
namespace = namespace,
150-
tag = tag,
142+
spec_root=config['specFolder'],
143+
readme=readme,
144+
autorest=AUTOREST_CORE_VERSION,
145+
use=AUTOREST_JAVA,
146+
output_folder=output_folder,
147+
module=module,
148+
namespace=namespace,
149+
tag=tag,
151150
)
152151
if succeeded:
153152
compile_package(sdk_root, module)
@@ -163,14 +162,11 @@ def sdk_automation(input_file: str, output_file: str):
163162
'pom.xml',
164163
],
165164
'readmeMd': [readme],
166-
'artifacts': [
167-
'{0}/pom.xml'.format(output_folder),
168-
] + [
169-
jar for jar in glob.glob('{0}/target/*.jar'.format(
170-
output_folder))
171-
],
172-
'result':
173-
'succeeded' if succeeded else 'failed',
165+
'artifacts': ['{0}/pom.xml'.format(output_folder)] +
166+
[jar for jar in glob.glob('{0}/target/*.jar'.format(output_folder))],
167+
'apiViewArtifact': next(iter(glob.glob('{0}/target/*-sources.jar'.format(output_folder))), None),
168+
'language': 'Java',
169+
'result': 'succeeded' if succeeded else 'failed',
174170
})
175171

176172
update_parameters(pre_suffix)
@@ -224,20 +220,19 @@ def main():
224220
namespace = NAMESPACE_FORMAT.format(service)
225221
succeeded = generate(
226222
sdk_root,
227-
module = module,
228-
output_folder = output_folder,
229-
namespace = namespace,
223+
module=module,
224+
output_folder=output_folder,
225+
namespace=namespace,
230226
**args
231227
)
232228

233229
if succeeded:
234230
succeeded = compile_package(sdk_root, module)
235231
if succeeded:
236232
compare_with_maven_package(sdk_root, service, stable_version,
237-
current_version, module)
233+
current_version, module)
238234

239-
if args.get('auto_commit_external_change') and args.get(
240-
'user_name') and args.get('user_email'):
235+
if args.get('auto_commit_external_change') and args.get('user_name') and args.get('user_email'):
241236
pwd = os.getcwd()
242237
try:
243238
os.chdir(sdk_root)
@@ -246,7 +241,7 @@ def main():
246241
POM_FILE_FORMAT.format(service)))
247242
os.system(
248243
'git -c user.name={0} -c user.email={1} commit -m "[Automation] External Change"'
249-
.format(args['user_name'], args['user_email']))
244+
.format(args['user_name'], args['user_email']))
250245
finally:
251246
os.chdir(pwd)
252247

0 commit comments

Comments
 (0)