From 06fd0f892edf5b98dc14a499147c6d628f0c30ef Mon Sep 17 00:00:00 2001 From: Doug Jacobsen Date: Thu, 3 Mar 2022 17:34:33 -0700 Subject: Revert GCS fetch strategy, to remove s3 interface (#28736) This commit reverts the GCS fetch strategy to before commit: d7596125231e800ca41c60e379be2b8abb47d20d The previous commit added some s3 syntax to handle connections, but added them into the GCS fetch strategy in a way that prevents GCS from working anymore. --- lib/spack/spack/fetch_strategy.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index f85f04efb2..bb7d446240 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1437,13 +1437,7 @@ class GCSFetchStrategy(URLFetchStrategy): basename = os.path.basename(parsed_url.path) with working_dir(self.stage.path): - import spack.util.s3 as s3_util - s3 = s3_util.create_s3_session(self.url, - connection=s3_util.get_mirror_connection(parsed_url), url_type="fetch") # noqa: E501 - - headers = s3.get_object(Bucket=parsed_url.netloc, - Key=parsed_url.path.lstrip("/")) - stream = headers["Body"] + _, headers, stream = web_util.read_from_url(self.url) with open(basename, 'wb') as f: shutil.copyfileobj(stream, f) -- cgit v1.2.3-60-g2f50