@@ -85,7 +85,9 @@ def _load_credentials(self):
8585 if self .access_key_id is not None and self .secret_access_key is not None :
8686 return
8787
88- # check if user provided custom path for credentials extraction
88+ # check if user provided custom path for credentials extraction
89+ if self .custom_credentials_path is None and "JP_DRIVES_CUSTOM_CREDENTIALS_PATH" in os .environ :
90+ self .custom_credentials_path = os .environ ["JP_DRIVES_CUSTOM_CREDENTIALS_PATH" ]
8991 if self .custom_credentials_path is not None :
9092 self .access_key_id , self .secret_access_key , self .session_token = self ._extract_credentials_from_file (self .custom_credentials_path )
9193 return
@@ -96,10 +98,12 @@ def _load_credentials(self):
9698 self .access_key_id , self .secret_access_key , self .session_token = self ._extract_credentials_from_file (aws_credentials_path )
9799 return
98100
99- # for dev purposes, use environment variables
100- if os .environ ["JP_AWS_ACCESS_KEY_ID" ] is not None and os .environ ["JP_AWS_SECRET_ACCESS_KEY" ] is not None :
101- self .access_key_id = os .environ ["JP_AWS_ACCESS_KEY_ID" ]
102- self .secret_access_key = os .environ ["JP_AWS_SECRET_ACCESS_KEY" ]
101+ # as a last resort, use environment variables
102+ if "JP_DRIVES_ACCESS_KEY_ID" in os .environ and "JP_DRIVES_SECRET_ACCESS_KEY" in os .environ :
103+ self .access_key_id = os .environ ["JP_DRIVES_ACCESS_KEY_ID" ]
104+ self .secret_access_key = os .environ ["JP_DRIVES_SECRET_ACCESS_KEY" ]
105+ if "JP_DRIVES_SESSION_TOKEN" in os .environ :
106+ self .session_token = os .environ ["JP_DRIVES_SESSION_TOKEN" ]
103107 return
104108
105109 def _extract_credentials_from_file (self , file_path ):
@@ -108,11 +112,11 @@ def _extract_credentials_from_file(self, file_path):
108112 access_key_id , secret_access_key , session_token = None , None , None
109113 lines = file .readlines ()
110114 for line in lines :
111- if line .startswith ("aws_access_key_id =" ):
115+ if line .startswith ("drives_access_key_id =" ):
112116 access_key_id = line .split ("=" )[1 ].strip ()
113- elif line .startswith ("aws_secret_access_key =" ):
117+ elif line .startswith ("drives_secret_access_key =" ):
114118 secret_access_key = line .split ("=" )[1 ].strip ()
115- elif line .startswith ("session_token =" ):
119+ elif line .startswith ("drives_session_token =" ):
116120 session_token = line .split ("=" )[1 ].strip ()
117121 return access_key_id , secret_access_key , session_token
118122 except Exception as e :
0 commit comments