Skip to content

Commit

Permalink
fix: try002 for provider alibaba (#38787)
Browse files Browse the repository at this point in the history
  • Loading branch information
dondaum authored Apr 6, 2024
1 parent 6fd8f36 commit a747aec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
14 changes: 7 additions & 7 deletions airflow/providers/alibaba/cloud/hooks/oss.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,30 +338,30 @@ def get_credential(self) -> oss2.auth.Auth:
extra_config = self.oss_conn.extra_dejson
auth_type = extra_config.get("auth_type", None)
if not auth_type:
raise Exception("No auth_type specified in extra_config. ")
raise ValueError("No auth_type specified in extra_config. ")

if auth_type != "AK":
raise Exception(f"Unsupported auth_type: {auth_type}")
raise ValueError(f"Unsupported auth_type: {auth_type}")
oss_access_key_id = extra_config.get("access_key_id", None)
oss_access_key_secret = extra_config.get("access_key_secret", None)
if not oss_access_key_id:
raise Exception(f"No access_key_id is specified for connection: {self.oss_conn_id}")
raise ValueError(f"No access_key_id is specified for connection: {self.oss_conn_id}")

if not oss_access_key_secret:
raise Exception(f"No access_key_secret is specified for connection: {self.oss_conn_id}")
raise ValueError(f"No access_key_secret is specified for connection: {self.oss_conn_id}")

return oss2.Auth(oss_access_key_id, oss_access_key_secret)

def get_default_region(self) -> str:
extra_config = self.oss_conn.extra_dejson
auth_type = extra_config.get("auth_type", None)
if not auth_type:
raise Exception("No auth_type specified in extra_config. ")
raise ValueError("No auth_type specified in extra_config. ")

if auth_type != "AK":
raise Exception(f"Unsupported auth_type: {auth_type}")
raise ValueError(f"Unsupported auth_type: {auth_type}")

default_region = extra_config.get("region", None)
if not default_region:
raise Exception(f"No region is specified for connection: {self.oss_conn_id}")
raise ValueError(f"No region is specified for connection: {self.oss_conn_id}")
return default_region
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,6 @@ combine-as-imports = true
"airflow/providers/airbyte/hooks/airbyte.py" = ["TRY002"]
"airflow/providers/airbyte/operators/airbyte.py" = ["TRY002"]
"airflow/providers/airbyte/sensors/airbyte.py" = ["TRY002"]
# alibaba
"airflow/providers/alibaba/cloud/hooks/oss.py" = ["TRY002"]
# amazon
"airflow/providers/amazon/aws/operators/athena.py" = ["TRY002"]
"airflow/providers/amazon/aws/operators/emr.py" = ["TRY002"]
Expand Down

0 comments on commit a747aec

Please sign in to comment.