Skip to content

Commit 33d8c4b

Browse files
gcf-owl-bot[bot]telpirion
authored andcommitted
chore(python): use black==22.3.0 (#204)
Source-Link: googleapis/synthtool@6fab84a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:7cffbc10910c3ab1b852c05114a08d374c195a81cdec1d4a67a1d129331d0bfe
1 parent 81c919c commit 33d8c4b

18 files changed

+102
-36
lines changed

privateca/snippets/create_ca_pool.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ def create_ca_pool(project_id: str, location: str, ca_pool_name: str) -> None:
3939

4040
# Create the pool request.
4141
request = privateca_v1.CreateCaPoolRequest(
42-
parent=location_path, ca_pool_id=ca_pool_name, ca_pool=ca_pool,
42+
parent=location_path,
43+
ca_pool_id=ca_pool_name,
44+
ca_pool=ca_pool,
4345
)
4446

4547
# Create the CA pool.

privateca/snippets/create_certificate.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def create_certificate(
5454

5555
# Set the Public Key and its format.
5656
public_key = privateca_v1.PublicKey(
57-
key=public_key_bytes, format_=privateca_v1.PublicKey.KeyFormat.PEM,
57+
key=public_key_bytes,
58+
format_=privateca_v1.PublicKey.KeyFormat.PEM,
5859
)
5960

6061
subject_config = privateca_v1.CertificateConfig.SubjectConfig(
@@ -66,10 +67,12 @@ def create_certificate(
6667
x509_parameters = privateca_v1.X509Parameters(
6768
key_usage=privateca_v1.KeyUsage(
6869
base_key_usage=privateca_v1.KeyUsage.KeyUsageOptions(
69-
digital_signature=True, key_encipherment=True,
70+
digital_signature=True,
71+
key_encipherment=True,
7072
),
7173
extended_key_usage=privateca_v1.KeyUsage.ExtendedKeyUsageOptions(
72-
server_auth=True, client_auth=True,
74+
server_auth=True,
75+
client_auth=True,
7376
),
7477
),
7578
)

privateca/snippets/create_certificate_authority.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@ def create_certificate_authority(
5858
x509_parameters = privateca_v1.X509Parameters(
5959
key_usage=privateca_v1.KeyUsage(
6060
base_key_usage=privateca_v1.KeyUsage.KeyUsageOptions(
61-
crl_sign=True, cert_sign=True,
61+
crl_sign=True,
62+
cert_sign=True,
6263
)
6364
),
64-
ca_options=privateca_v1.X509Parameters.CaOptions(is_ca=True,),
65+
ca_options=privateca_v1.X509Parameters.CaOptions(
66+
is_ca=True,
67+
),
6568
)
6669

6770
# Set certificate authority settings.
@@ -70,7 +73,8 @@ def create_certificate_authority(
7073
type_=privateca_v1.CertificateAuthority.Type.SELF_SIGNED,
7174
key_spec=key_version_spec,
7275
config=privateca_v1.CertificateConfig(
73-
subject_config=subject_config, x509_config=x509_parameters,
76+
subject_config=subject_config,
77+
x509_config=x509_parameters,
7478
),
7579
lifetime=duration_pb2.Duration(seconds=ca_duration),
7680
)

privateca/snippets/create_certificate_csr.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def create_certificate_csr(
5050
# Create certificate with CSR.
5151
# The pem_csr contains the public key and the domain details required.
5252
certificate = privateca_v1.Certificate(
53-
pem_csr=pem_csr, lifetime=duration_pb2.Duration(seconds=certificate_lifetime),
53+
pem_csr=pem_csr,
54+
lifetime=duration_pb2.Duration(seconds=certificate_lifetime),
5455
)
5556

5657
# Create the Certificate Request.

privateca/snippets/create_certificate_template.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121

2222
def create_certificate_template(
23-
project_id: str, location: str, certificate_template_id: str,
23+
project_id: str,
24+
location: str,
25+
certificate_template_id: str,
2426
) -> None:
2527
"""
2628
Create a Certificate template. These templates can be reused for common
@@ -39,13 +41,16 @@ def create_certificate_template(
3941
x509_parameters = privateca_v1.X509Parameters(
4042
key_usage=privateca_v1.KeyUsage(
4143
base_key_usage=privateca_v1.KeyUsage.KeyUsageOptions(
42-
digital_signature=True, key_encipherment=True,
44+
digital_signature=True,
45+
key_encipherment=True,
4346
),
4447
extended_key_usage=privateca_v1.KeyUsage.ExtendedKeyUsageOptions(
4548
server_auth=True,
4649
),
4750
),
48-
ca_options=privateca_v1.X509Parameters.CaOptions(is_ca=False,),
51+
ca_options=privateca_v1.X509Parameters.CaOptions(
52+
is_ca=False,
53+
),
4954
)
5055

5156
# CEL expression that is evaluated against the Subject and

privateca/snippets/create_subordinate_ca.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,22 @@ def create_subordinate_ca(
6262
x509_parameters = privateca_v1.X509Parameters(
6363
key_usage=privateca_v1.KeyUsage(
6464
base_key_usage=privateca_v1.KeyUsage.KeyUsageOptions(
65-
crl_sign=True, cert_sign=True,
65+
crl_sign=True,
66+
cert_sign=True,
6667
)
6768
),
68-
ca_options=privateca_v1.X509Parameters.CaOptions(is_ca=True,),
69+
ca_options=privateca_v1.X509Parameters.CaOptions(
70+
is_ca=True,
71+
),
6972
)
7073

7174
# Set certificate authority settings.
7275
certificate_authority = privateca_v1.CertificateAuthority(
7376
type_=privateca_v1.CertificateAuthority.Type.SUBORDINATE,
7477
key_spec=key_version_spec,
7578
config=privateca_v1.CertificateConfig(
76-
subject_config=subject_config, x509_config=x509_parameters,
79+
subject_config=subject_config,
80+
x509_config=x509_parameters,
7781
),
7882
# Set the CA validity duration.
7983
lifetime=duration_pb2.Duration(seconds=ca_duration),

privateca/snippets/delete_certificate_template.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020

2121
def delete_certificate_template(
22-
project_id: str, location: str, certificate_template_id: str,
22+
project_id: str,
23+
location: str,
24+
certificate_template_id: str,
2325
) -> None:
2426
"""
2527
Delete the certificate template present in the given project and location.
@@ -35,7 +37,9 @@ def delete_certificate_template(
3537
# Request to delete a certificate template.
3638
request = privateca_v1.DeleteCertificateTemplateRequest(
3739
name=caServiceClient.certificate_template_path(
38-
project_id, location, certificate_template_id,
40+
project_id,
41+
location,
42+
certificate_template_id,
3943
)
4044
)
4145
operation = caServiceClient.delete_certificate_template(request=request)

privateca/snippets/enable_certificate_authority.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ def enable_certificate_authority(
3838
)
3939

4040
# Create the Enable Certificate Authority Request.
41-
request = privateca_v1.EnableCertificateAuthorityRequest(name=ca_path,)
41+
request = privateca_v1.EnableCertificateAuthorityRequest(
42+
name=ca_path,
43+
)
4244

4345
# Enable the Certificate Authority.
4446
operation = caServiceClient.enable_certificate_authority(request=request)

privateca/snippets/filter_certificates.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def filter_certificates(
3636

3737
# Create the certificate request and set the filter condition.
3838
request = privateca_v1.ListCertificatesRequest(
39-
parent=ca_pool_path, filter=filter_condition,
39+
parent=ca_pool_path,
40+
filter=filter_condition,
4041
)
4142

4243
# Retrieve and print the certificate names.

privateca/snippets/list_certificates.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
import google.cloud.security.privateca_v1 as privateca_v1
2020

2121

22-
def list_certificates(project_id: str, location: str, ca_pool_name: str,) -> None:
22+
def list_certificates(
23+
project_id: str,
24+
location: str,
25+
ca_pool_name: str,
26+
) -> None:
2327
"""
2428
List Certificates present in the given CA pool.
2529

privateca/snippets/noxfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# WARNING - WARNING - WARNING - WARNING - WARNING
3030
# WARNING - WARNING - WARNING - WARNING - WARNING
3131

32-
BLACK_VERSION = "black==19.10b0"
32+
BLACK_VERSION = "black==22.3.0"
3333

3434
# Copy `noxfile_config.py` to your directory and modify it instead.
3535

@@ -253,7 +253,7 @@ def py(session: nox.sessions.Session) -> None:
253253

254254

255255
def _get_repo_root() -> Optional[str]:
256-
""" Returns the root folder of the project. """
256+
"""Returns the root folder of the project."""
257257
# Get root of this repository. Assume we don't have directories nested deeper than 10 items.
258258
p = Path(os.getcwd())
259259
for i in range(10):

privateca/snippets/revoke_certificate.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222

2323

2424
def revoke_certificate(
25-
project_id: str, location: str, ca_pool_name: str, certificate_name: str,
25+
project_id: str,
26+
location: str,
27+
ca_pool_name: str,
28+
certificate_name: str,
2629
) -> None:
2730
"""
2831
Revoke an issued certificate. Once revoked, the certificate will become invalid and will expire post its lifetime.

privateca/snippets/test_certificate_authorities.py

+16-4
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,14 @@ def test_enable_and_disable_certificate_authority(
7070

7171
out, _ = capsys.readouterr()
7272

73-
assert re.search(f"Enabled Certificate Authority: {CA_NAME}", out,)
74-
assert re.search(f"Disabled Certificate Authority: {CA_NAME}", out,)
73+
assert re.search(
74+
f"Enabled Certificate Authority: {CA_NAME}",
75+
out,
76+
)
77+
assert re.search(
78+
f"Disabled Certificate Authority: {CA_NAME}",
79+
out,
80+
)
7581

7682

7783
def test_undelete_certificate_authority(
@@ -84,8 +90,14 @@ def test_undelete_certificate_authority(
8490
delete_ca_pool(PROJECT, LOCATION, CA_POOL_NAME)
8591

8692
out, _ = capsys.readouterr()
87-
assert re.search(f"Successfully undeleted Certificate Authority: {CA_NAME}", out,)
88-
assert re.search(f"Successfully deleted Certificate Authority: {CA_NAME}", out,)
93+
assert re.search(
94+
f"Successfully undeleted Certificate Authority: {CA_NAME}",
95+
out,
96+
)
97+
assert re.search(
98+
f"Successfully deleted Certificate Authority: {CA_NAME}",
99+
out,
100+
)
89101

90102

91103
def test_update_certificate_authority(

privateca/snippets/test_certificates.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ def test_create_and_revoke_certificate_authority(
8282
filter_certificates(PROJECT, LOCATION, CA_POOL_NAME, FILTER_CONDITION)
8383

8484
revoke_certificate(
85-
PROJECT, LOCATION, CA_POOL_NAME, CERT_NAME,
85+
PROJECT,
86+
LOCATION,
87+
CA_POOL_NAME,
88+
CERT_NAME,
8689
)
8790

8891
disable_certificate_authority(PROJECT, LOCATION, CA_POOL_NAME, CA_NAME)

privateca/snippets/test_subordinate_ca.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ def test_subordinate_certificate_authority(
9696
)
9797

9898
revoke_certificate(
99-
PROJECT, LOCATION, CA_POOL_NAME, CSR_CERT_NAME,
99+
PROJECT,
100+
LOCATION,
101+
CA_POOL_NAME,
102+
CSR_CERT_NAME,
100103
)
101104

102105
out, _ = capsys.readouterr()

privateca/snippets/update_ca_pool_issuance_policy.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121

2222

2323
def update_ca_pool_issuance_policy(
24-
project_id: str, location: str, ca_pool_name: str,
24+
project_id: str,
25+
location: str,
26+
ca_pool_name: str,
2527
) -> None:
2628
"""
2729
Update the issuance policy for a CA Pool. All certificates issued from this CA Pool should
@@ -52,7 +54,10 @@ def update_ca_pool_issuance_policy(
5254
),
5355
)
5456

55-
ca_pool = privateca_v1.CaPool(name=ca_pool_path, issuance_policy=issuance_policy,)
57+
ca_pool = privateca_v1.CaPool(
58+
name=ca_pool_path,
59+
issuance_policy=issuance_policy,
60+
)
5661

5762
# 1. Set the CA pool with updated values.
5863
# 2. Set the update mask to specify which properties of the CA Pool should be updated.

privateca/snippets/update_certificate_authority.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020

2121

2222
def update_ca_label(
23-
project_id: str, location: str, ca_pool_name: str, ca_name: str,
23+
project_id: str,
24+
location: str,
25+
ca_pool_name: str,
26+
ca_name: str,
2427
) -> None:
2528
"""
2629
Update the labels in a certificate authority.
@@ -39,7 +42,8 @@ def update_ca_label(
3942
project_id, location, ca_pool_name, ca_name
4043
)
4144
certificate_authority = privateca_v1.CertificateAuthority(
42-
name=ca_parent, labels={"env": "test"},
45+
name=ca_parent,
46+
labels={"env": "test"},
4347
)
4448

4549
# Create a request to update the CA.

privateca/snippets/update_certificate_template.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121

2222
def update_certificate_template(
23-
project_id: str, location: str, certificate_template_id: str,
23+
project_id: str,
24+
location: str,
25+
certificate_template_id: str,
2426
) -> None:
2527
"""
2628
Update an existing certificate template.
@@ -34,14 +36,17 @@ def update_certificate_template(
3436
caServiceClient = privateca_v1.CertificateAuthorityServiceClient()
3537

3638
certificate_name = caServiceClient.certificate_template_path(
37-
project_id, location, certificate_template_id,
39+
project_id,
40+
location,
41+
certificate_template_id,
3842
)
3943

4044
# Set the parent name and the properties to be updated.
4145
certificate_template = privateca_v1.CertificateTemplate(
4246
name=certificate_name,
4347
identity_constraints=privateca_v1.CertificateIdentityConstraints(
44-
allow_subject_passthrough=False, allow_subject_alt_names_passthrough=True,
48+
allow_subject_passthrough=False,
49+
allow_subject_alt_names_passthrough=True,
4550
),
4651
)
4752

@@ -56,7 +61,8 @@ def update_certificate_template(
5661
# Set the new template.
5762
# Set the mask to specify which properties of the template should be updated.
5863
request = privateca_v1.UpdateCertificateTemplateRequest(
59-
certificate_template=certificate_template, update_mask=field_mask,
64+
certificate_template=certificate_template,
65+
update_mask=field_mask,
6066
)
6167
operation = caServiceClient.update_certificate_template(request=request)
6268
result = operation.result()

0 commit comments

Comments
 (0)