Skip to content

Commit 10d511f

Browse files
nhatnghihonhatnghiho
committed
Reformat code
1 parent 4fadbc4 commit 10d511f

31 files changed

+1072
-684
lines changed

‎tests/ci/cdk/app.py

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,34 @@
66
from aws_cdk import Environment, App
77

88
# from cdk.bm_framework_stack import BmFrameworkStack
9-
from cdk.aws_lc_analytics_stack import AwsLcGitHubAnalyticsStack
9+
from cdk.aws_lc_analytics_stack import AwsLcGitHubAnalyticsStack
1010
from cdk.aws_lc_android_ci_stack import AwsLcAndroidCIStack
1111
from cdk.aws_lc_github_ci_stack import AwsLcGitHubCIStack
12-
from cdk.aws_lc_github_fuzz_ci_stack import AwsLcGitHubFuzzCIStack
12+
from cdk.aws_lc_github_fuzz_ci_stack import AwsLcGitHubFuzzCIStack
1313
from cdk.aws_lc_ec2_test_framework_ci_stack import AwsLcEC2TestingCIStack
1414
from cdk.linux_docker_image_batch_build_stack import LinuxDockerImageBatchBuildStack
1515
from pipeline.pipeline_stack import AwsLcCiPipeline
1616
from cdk.windows_docker_image_build_stack import WindowsDockerImageBuildStack
1717
from cdk.aws_lc_github_ci_x509_stack import AwsLcGitHubX509CIStack
1818
from cdk.ecr_stack import EcrStack
19-
from util.metadata import LINUX_X86_ECR_REPO, LINUX_AARCH_ECR_REPO, WINDOWS_X86_ECR_REPO, \
20-
PIPELINE_ACCOUNT, PIPELINE_REGION, DEPLOY_ACCOUNT, DEPLOY_REGION
19+
from util.metadata import (
20+
LINUX_X86_ECR_REPO,
21+
LINUX_AARCH_ECR_REPO,
22+
WINDOWS_X86_ECR_REPO,
23+
PIPELINE_ACCOUNT,
24+
PIPELINE_REGION,
25+
DEPLOY_ACCOUNT,
26+
DEPLOY_REGION,
27+
)
2128

2229
# Initialize app.
2330
app = App()
2431

25-
AwsLcCiPipeline(app, "AwsLcCiPipeline", env=Environment(account=PIPELINE_ACCOUNT, region=PIPELINE_REGION))
32+
AwsLcCiPipeline(
33+
app,
34+
"AwsLcCiPipeline",
35+
env=Environment(account=PIPELINE_ACCOUNT, region=PIPELINE_REGION),
36+
)
2637

2738
if DEPLOY_ACCOUNT is not None and DEPLOY_REGION is not None:
2839
# Initialize env.
@@ -47,19 +58,27 @@
4758
arm_build_spec_file = "cdk/codebuild/github_ci_linux_arm_omnibus.yaml"
4859
AwsLcGitHubCIStack(app, "aws-lc-ci-linux-arm", arm_build_spec_file, env=env)
4960
integration_build_spec_file = "cdk/codebuild/github_ci_integration_omnibus.yaml"
50-
AwsLcGitHubCIStack(app, "aws-lc-ci-integration", integration_build_spec_file, env=env)
61+
AwsLcGitHubCIStack(
62+
app, "aws-lc-ci-integration", integration_build_spec_file, env=env
63+
)
5164
win_x86_build_spec_file = "cdk/codebuild/github_ci_windows_x86_omnibus.yaml"
5265
AwsLcGitHubCIStack(app, "aws-lc-ci-windows-x86", win_x86_build_spec_file, env=env)
5366
fuzz_build_spec_file = "cdk/codebuild/github_ci_fuzzing_omnibus.yaml"
5467
AwsLcGitHubFuzzCIStack(app, "aws-lc-ci-fuzzing", fuzz_build_spec_file, env=env)
5568
analytics_build_spec_file = "cdk/codebuild/github_ci_analytics_omnibus.yaml"
56-
AwsLcGitHubAnalyticsStack(app, "aws-lc-ci-analytics", analytics_build_spec_file, env=env)
69+
AwsLcGitHubAnalyticsStack(
70+
app, "aws-lc-ci-analytics", analytics_build_spec_file, env=env
71+
)
5772
# bm_framework_build_spec_file = "cdk/codebuild/bm_framework_omnibus.yaml"
5873
# BmFrameworkStack(app, "aws-lc-ci-bm-framework", bm_framework_build_spec_file, env=env)
5974
ec2_test_framework_build_spec_file = "cdk/codebuild/ec2_test_framework_omnibus.yaml"
60-
AwsLcEC2TestingCIStack(app, "aws-lc-ci-ec2-test-framework", ec2_test_framework_build_spec_file, env=env)
75+
AwsLcEC2TestingCIStack(
76+
app, "aws-lc-ci-ec2-test-framework", ec2_test_framework_build_spec_file, env=env
77+
)
6178
android_build_spec_file = "cdk/codebuild/github_ci_android_omnibus.yaml"
62-
AwsLcAndroidCIStack(app, "aws-lc-ci-devicefarm-android", android_build_spec_file, env=env)
79+
AwsLcAndroidCIStack(
80+
app, "aws-lc-ci-devicefarm-android", android_build_spec_file, env=env
81+
)
6382
AwsLcGitHubX509CIStack(app, "aws-lc-ci-x509", env=env)
6483

6584
app.synth()

‎tests/ci/cdk/cdk/aws_lc_analytics_stack.py

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,40 @@
22
# SPDX-License-Identifier: Apache-2.0 OR ISC
33
import typing
44

5-
from aws_cdk import Duration, Stack, aws_codebuild as codebuild, aws_iam as iam, aws_ec2 as ec2, aws_efs as efs, \
6-
Environment
5+
from aws_cdk import (
6+
Duration,
7+
Stack,
8+
aws_codebuild as codebuild,
9+
aws_iam as iam,
10+
aws_ec2 as ec2,
11+
aws_efs as efs,
12+
Environment,
13+
)
714
from constructs import Construct
815

916
from cdk.components import PruneStaleGitHubBuilds
1017
from util.iam_policies import code_build_publish_metrics_in_json
11-
from util.metadata import GITHUB_REPO_OWNER, GITHUB_REPO_NAME, PRE_PROD_ACCOUNT, STAGING_GITHUB_REPO_OWNER, \
12-
STAGING_GITHUB_REPO_NAME
18+
from util.metadata import (
19+
GITHUB_REPO_OWNER,
20+
GITHUB_REPO_NAME,
21+
PRE_PROD_ACCOUNT,
22+
STAGING_GITHUB_REPO_OWNER,
23+
STAGING_GITHUB_REPO_NAME,
24+
)
1325
from util.build_spec_loader import BuildSpecLoader
1426

1527

1628
class AwsLcGitHubAnalyticsStack(Stack):
1729
"""Define a stack used to batch execute AWS-LC tests in GitHub."""
1830

19-
def __init__(self,
20-
scope: Construct,
21-
id: str,
22-
spec_file_path: str,
23-
env: typing.Union[Environment, typing.Dict[str, typing.Any]],
24-
**kwargs) -> None:
31+
def __init__(
32+
self,
33+
scope: Construct,
34+
id: str,
35+
spec_file_path: str,
36+
env: typing.Union[Environment, typing.Dict[str, typing.Any]],
37+
**kwargs
38+
) -> None:
2539
super().__init__(scope, id, env=env, **kwargs)
2640

2741
# Define CodeBuild resource.
@@ -43,15 +57,20 @@ def __init__(self,
4357
# the branch or create a new FIPS branch it should be updated to '(main)|(fips.*)'
4458
.and_branch_is("main")
4559
],
46-
webhook_triggers_batch_build=True)
60+
webhook_triggers_batch_build=True,
61+
)
4762

4863
# Define a IAM role for this stack.
49-
metrics_policy = iam.PolicyDocument.from_json(code_build_publish_metrics_in_json(env))
64+
metrics_policy = iam.PolicyDocument.from_json(
65+
code_build_publish_metrics_in_json(env)
66+
)
5067
inline_policies = {"metric_policy": metrics_policy}
51-
role = iam.Role(scope=self,
52-
id="{}-role".format(id),
53-
assumed_by=iam.ServicePrincipal("codebuild.amazonaws.com"),
54-
inline_policies=inline_policies)
68+
role = iam.Role(
69+
scope=self,
70+
id="{}-role".format(id),
71+
assumed_by=iam.ServicePrincipal("codebuild.amazonaws.com"),
72+
inline_policies=inline_policies,
73+
)
5574

5675
# Define CodeBuild.
5776
analytics = codebuild.Project(
@@ -61,10 +80,19 @@ def __init__(self,
6180
source=git_hub_source,
6281
role=role,
6382
timeout=Duration.minutes(120),
64-
environment=codebuild.BuildEnvironment(compute_type=codebuild.ComputeType.LARGE,
65-
privileged=True,
66-
build_image=codebuild.LinuxBuildImage.STANDARD_4_0),
67-
build_spec=BuildSpecLoader.load(spec_file_path, env))
83+
environment=codebuild.BuildEnvironment(
84+
compute_type=codebuild.ComputeType.LARGE,
85+
privileged=True,
86+
build_image=codebuild.LinuxBuildImage.STANDARD_4_0,
87+
),
88+
build_spec=BuildSpecLoader.load(spec_file_path, env),
89+
)
6890
analytics.enable_batch_builds()
6991

70-
PruneStaleGitHubBuilds(scope=self, id="PruneStaleGitHubBuilds", project=analytics, ec2_permissions=False, env=env)
92+
PruneStaleGitHubBuilds(
93+
scope=self,
94+
id="PruneStaleGitHubBuilds",
95+
project=analytics,
96+
ec2_permissions=False,
97+
env=env,
98+
)

‎tests/ci/cdk/cdk/aws_lc_android_ci_stack.py

Lines changed: 58 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,28 @@
22
# SPDX-License-Identifier: Apache-2.0 OR ISC
33
import typing
44

5-
from aws_cdk import Duration, Stack, aws_codebuild as codebuild, aws_iam as iam, Environment
5+
from aws_cdk import (
6+
Duration,
7+
Environment,
8+
Stack,
9+
aws_codebuild as codebuild,
10+
aws_iam as iam,
11+
)
612
from constructs import Construct
713

814
from cdk.components import PruneStaleGitHubBuilds
9-
from util.iam_policies import code_build_batch_policy_in_json, device_farm_access_policy_in_json
10-
from util.metadata import GITHUB_REPO_OWNER, GITHUB_REPO_NAME, GITHUB_PUSH_CI_BRANCH_TARGETS, PRE_PROD_ACCOUNT, \
11-
STAGING_GITHUB_REPO_OWNER, STAGING_GITHUB_REPO_NAME
15+
from util.iam_policies import (
16+
code_build_batch_policy_in_json,
17+
device_farm_access_policy_in_json,
18+
)
19+
from util.metadata import (
20+
GITHUB_REPO_OWNER,
21+
GITHUB_REPO_NAME,
22+
GITHUB_PUSH_CI_BRANCH_TARGETS,
23+
PRE_PROD_ACCOUNT,
24+
STAGING_GITHUB_REPO_OWNER,
25+
STAGING_GITHUB_REPO_NAME,
26+
)
1227
from util.build_spec_loader import BuildSpecLoader
1328

1429

@@ -18,12 +33,14 @@ class AwsLcAndroidCIStack(Stack):
1833
# The Device Farm resource used to in this CI spec, must be manually created.
1934
# TODO: Automate Device Farm creation with cdk script.
2035

21-
def __init__(self,
22-
scope: Construct,
23-
id: str,
24-
spec_file_path: str,
25-
env: typing.Union[Environment, typing.Dict[str, typing.Any]],
26-
**kwargs) -> None:
36+
def __init__(
37+
self,
38+
scope: Construct,
39+
id: str,
40+
spec_file_path: str,
41+
env: typing.Union[Environment, typing.Dict[str, typing.Any]],
42+
**kwargs
43+
) -> None:
2744
super().__init__(scope, id, env=env, **kwargs)
2845

2946
github_repo_owner = GITHUB_REPO_OWNER
@@ -42,11 +59,14 @@ def __init__(self,
4259
codebuild.FilterGroup.in_event_of(
4360
codebuild.EventAction.PULL_REQUEST_CREATED,
4461
codebuild.EventAction.PULL_REQUEST_UPDATED,
45-
codebuild.EventAction.PULL_REQUEST_REOPENED),
46-
codebuild.FilterGroup.in_event_of(codebuild.EventAction.PUSH).and_branch_is(
47-
GITHUB_PUSH_CI_BRANCH_TARGETS),
62+
codebuild.EventAction.PULL_REQUEST_REOPENED,
63+
),
64+
codebuild.FilterGroup.in_event_of(
65+
codebuild.EventAction.PUSH
66+
).and_branch_is(GITHUB_PUSH_CI_BRANCH_TARGETS),
4867
],
49-
webhook_triggers_batch_build=True)
68+
webhook_triggers_batch_build=True,
69+
)
5070

5171
# Define a IAM role for this stack.
5272
code_build_batch_policy = iam.PolicyDocument.from_json(
@@ -55,11 +75,16 @@ def __init__(self,
5575
device_farm_policy = iam.PolicyDocument.from_json(
5676
device_farm_access_policy_in_json(env)
5777
)
58-
inline_policies = {"code_build_batch_policy": code_build_batch_policy, "device_farm_policy": device_farm_policy}
59-
role = iam.Role(scope=self,
60-
id="{}-role".format(id),
61-
assumed_by=iam.ServicePrincipal("codebuild.amazonaws.com"),
62-
inline_policies=inline_policies)
78+
inline_policies = {
79+
"code_build_batch_policy": code_build_batch_policy,
80+
"device_farm_policy": device_farm_policy,
81+
}
82+
role = iam.Role(
83+
scope=self,
84+
id="{}-role".format(id),
85+
assumed_by=iam.ServicePrincipal("codebuild.amazonaws.com"),
86+
inline_policies=inline_policies,
87+
)
6388

6489
# Define CodeBuild.
6590
project = codebuild.Project(
@@ -69,10 +94,19 @@ def __init__(self,
6994
source=git_hub_source,
7095
role=role,
7196
timeout=Duration.minutes(180),
72-
environment=codebuild.BuildEnvironment(compute_type=codebuild.ComputeType.SMALL,
73-
privileged=False,
74-
build_image=codebuild.LinuxBuildImage.STANDARD_4_0),
75-
build_spec=BuildSpecLoader.load(spec_file_path, env))
97+
environment=codebuild.BuildEnvironment(
98+
compute_type=codebuild.ComputeType.SMALL,
99+
privileged=False,
100+
build_image=codebuild.LinuxBuildImage.STANDARD_4_0,
101+
),
102+
build_spec=BuildSpecLoader.load(spec_file_path, env),
103+
)
76104
project.enable_batch_builds()
77105

78-
PruneStaleGitHubBuilds(scope=self, id="PruneStaleGitHubBuilds", project=project, ec2_permissions=False, env=env)
106+
PruneStaleGitHubBuilds(
107+
scope=self,
108+
id="PruneStaleGitHubBuilds",
109+
project=project,
110+
ec2_permissions=False,
111+
env=env,
112+
)

0 commit comments

Comments
 (0)