Skip to content

Commit 48f34c5

Browse files
Fix flake8 issues
1 parent e39563d commit 48f34c5

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

src/snowflake/connector/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ def __open_connection(self):
11461146
elif self._authenticator == PROGRAMMATIC_ACCESS_TOKEN:
11471147
self.auth_class = AuthByPAT(self._token)
11481148
elif self._authenticator == WORKLOAD_IDENTITY_AUTHENTICATOR:
1149-
if not ENV_VAR_EXPERIMENTAL_AUTHENTICATION in os.environ:
1149+
if ENV_VAR_EXPERIMENTAL_AUTHENTICATION not in os.environ:
11501150
Error.errorhandler_wrapper(
11511151
self,
11521152
None,

src/snowflake/connector/wif_util.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from base64 import b64encode
1111
from dataclasses import dataclass
1212
from enum import Enum, unique
13-
from typing import Union
1413

1514
import boto3
1615
import jwt
@@ -63,7 +62,7 @@ def try_metadata_service_call(
6362
)
6463
if not res.ok:
6564
return None
66-
except:
65+
except requests.RequestException:
6766
return None
6867
return res
6968

@@ -82,7 +81,7 @@ def extract_iss_and_sub_without_signature_verification(jwt_str: str) -> tuple[st
8281
"""
8382
try:
8483
claims = jwt.decode(jwt_str, options={"verify_signature": False})
85-
except jwt.exceptions.InvalidTokenError as e:
84+
except jwt.exceptions.InvalidTokenError:
8685
logger.warning("Token is not a valid JWT.", exc_info=True)
8786
return None, None
8887

@@ -312,7 +311,7 @@ def create_attestation(
312311
attestation = create_gcp_attestation()
313312
elif provider == AttestationProvider.OIDC:
314313
attestation = create_oidc_attestation(token)
315-
elif provider == None:
314+
elif provider is None:
316315
attestation = create_autodetect_attestation(entra_resource, token)
317316

318317
if not attestation:

test/csp_helpers.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class FakeMetadataService(ABC):
5757
def __init__(self):
5858
self.reset_defaults()
5959

60+
@abstractmethod
6061
def reset_defaults(self):
6162
"""Resets any default values for test parameters.
6263
@@ -122,6 +123,9 @@ def __exit__(self, *args, **kwargs):
122123
class NoMetadataService(FakeMetadataService):
123124
"""Emulates an environment without any metadata service."""
124125

126+
def reset_defaults(self):
127+
pass
128+
125129
@property
126130
def expected_hostname(self):
127131
return None # Always raise a ConnectTimeout.
@@ -153,7 +157,7 @@ def handle_request(self, method, parsed_url, headers, timeout):
153157
and headers.get("Metadata") == "True"
154158
and query_string["resource"]
155159
):
156-
return HTTPError(status_code=400)
160+
raise HTTPError()
157161

158162
logger.debug("Received request for Azure VM metadata service")
159163

@@ -191,7 +195,7 @@ def handle_request(self, method, parsed_url, headers, timeout):
191195
logger.warning(
192196
f"Received malformed request: {method} {parsed_url.path} {str(headers)} {str(query_string)}"
193197
)
194-
return HTTPError(status_code=400)
198+
raise HTTPError()
195199

196200
logger.debug("Received request for Azure Functions metadata service")
197201

@@ -234,7 +238,7 @@ def handle_request(self, method, parsed_url, headers, timeout):
234238
and headers.get("Metadata-Flavor") == "Google"
235239
and query_string["audience"]
236240
):
237-
return HTTPError(status_code=400)
241+
raise HTTPError()
238242

239243
logger.debug("Received request for GCE metadata service")
240244

test/unit/test_auth_workload_identity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_explicit_aws_uses_regional_hostname(fake_aws_environment: FakeAwsEnviro
132132
hostname_from_url = urlparse(decoded_token["url"]).hostname
133133
hostname_from_header = decoded_token["headers"]["Host"]
134134

135-
expected_hostname = f"sts.antarctica-northeast-3.amazonaws.com"
135+
expected_hostname = "sts.antarctica-northeast-3.amazonaws.com"
136136
assert expected_hostname == hostname_from_url
137137
assert expected_hostname == hostname_from_header
138138

0 commit comments

Comments
 (0)