Skip to content

Commit f7ac844

Browse files
authored
Add generic client codegen diff to PR bot (#2383)
1 parent 2473c5c commit f7ac844

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

tools/ci-scripts/codegen-diff-revisions.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,26 @@ def generate_and_commit_generated_code(revision_sha):
9393
run("./gradlew codegen-core:clean codegen-client:clean codegen-server:clean aws:sdk-codegen:clean")
9494

9595
# Generate code
96-
run("./gradlew --rerun-tasks :aws:sdk:assemble")
97-
run("./gradlew --rerun-tasks :codegen-server-test:assemble")
96+
run("./gradlew --rerun-tasks aws:sdk:assemble codegen-client-test:assemble codegen-server-test:assemble")
9897
run("cd rust-runtime/aws-smithy-http-server-python/examples && make build", shell=True)
9998

10099
# Move generated code into codegen-diff/ directory
101100
run(f"rm -rf {OUTPUT_PATH}")
102101
run(f"mkdir {OUTPUT_PATH}")
103102
run(f"mv aws/sdk/build/aws-sdk {OUTPUT_PATH}/")
103+
run(f"mv codegen-client-test/build/smithyprojections/codegen-client-test {OUTPUT_PATH}/")
104104
run(f"mv codegen-server-test/build/smithyprojections/codegen-server-test {OUTPUT_PATH}/")
105105
run(f"mv rust-runtime/aws-smithy-http-server-python/examples/pokemon-service-server-sdk/ {OUTPUT_PATH}/codegen-server-test-python/")
106106

107+
# Clean up the SDK directory
108+
run(f"rm -f {OUTPUT_PATH}/aws-sdk/versions.toml")
109+
110+
# Clean up the client-test folder
111+
run(f"rm -rf {OUTPUT_PATH}/codegen-client-test/source")
112+
run(f"find {OUTPUT_PATH}/codegen-client-test | "
113+
f"grep -E 'smithy-build-info.json|sources/manifest|model.json' | "
114+
f"xargs rm -f", shell=True)
115+
107116
# Clean up the server-test folder
108117
run(f"rm -rf {OUTPUT_PATH}/codegen-server-test/source")
109118
run(f"find {OUTPUT_PATH}/codegen-server-test | "
@@ -152,6 +161,10 @@ def make_diffs(base_commit_sha, head_commit_sha):
152161
head_commit_sha, "aws-sdk", whitespace=True)
153162
sdk_nows = make_diff("AWS SDK", f"{OUTPUT_PATH}/aws-sdk", base_commit_sha, head_commit_sha,
154163
"aws-sdk-ignore-whitespace", whitespace=False)
164+
client_ws = make_diff("Client Test", f"{OUTPUT_PATH}/codegen-client-test", base_commit_sha,
165+
head_commit_sha, "client-test", whitespace=True)
166+
client_nows = make_diff("Client Test", f"{OUTPUT_PATH}/codegen-client-test", base_commit_sha,
167+
head_commit_sha, "client-test-ignore-whitespace", whitespace=False)
155168
server_ws = make_diff("Server Test", f"{OUTPUT_PATH}/codegen-server-test", base_commit_sha,
156169
head_commit_sha, "server-test", whitespace=True)
157170
server_nows = make_diff("Server Test", f"{OUTPUT_PATH}/codegen-server-test", base_commit_sha,
@@ -163,13 +176,16 @@ def make_diffs(base_commit_sha, head_commit_sha):
163176

164177
sdk_links = diff_link('AWS SDK', 'No codegen difference in the AWS SDK',
165178
sdk_ws, 'ignoring whitespace', sdk_nows)
179+
client_links = diff_link('Client Test', 'No codegen difference in the Client Test',
180+
client_ws, 'ignoring whitespace', client_nows)
166181
server_links = diff_link('Server Test', 'No codegen difference in the Server Test',
167182
server_ws, 'ignoring whitespace', server_nows)
168183
server_links_python = diff_link('Server Test Python', 'No codegen difference in the Server Test Python',
169184
server_ws_python, 'ignoring whitespace', server_nows_python)
170185
# Save escaped newlines so that the GitHub Action script gets the whole message
171186
return "A new generated diff is ready to view.\\n"\
172187
f"- {sdk_links}\\n"\
188+
f"- {client_links}\\n"\
173189
f"- {server_links}\\n"\
174190
f"- {server_links_python}\\n"
175191

0 commit comments

Comments
 (0)