ENH: include aws_bucket as a separate column

The idea is to phase out aws_series_url over time. Adding this as an
extra column will make transition and debugging easier.

Author: fedorov

scripts/sql/idc_index.sql

@@ -23,6 +23,9 @@ SELECT
   COUNT(dicom_all.SOPInstanceUID) AS instanceCount,
   ANY_VALUE(license_short_name) as license_short_name,
   # download related attributes
+  ANY_VALUE(aws_bucket)  AS aws_bucket,
+  ANY_VALUE(crdc_series_uuid) AS crdc_series_uuid,
+  # series_aws_url will be phased out in favor of constructing URL from bucket+UUID
   ANY_VALUE(CONCAT(series_aws_url,"*")) AS series_aws_url,
   ROUND(SUM(SAFE_CAST(instance_size AS float64))/1000000, 2) AS series_size_MB,
 FROM

scripts/sql/prior_versions_index.sql

@@ -72,6 +72,17 @@ SELECT
   WHEN gcs_bucket='idc-open-idc1' THEN CONCAT('s3://','idc-open-data-two/',crdc_series_uuid, '/*')
   WHEN gcs_bucket='idc-open-cr' THEN CONCAT('s3://','idc-open-data-cr/',crdc_series_uuid, '/*')
     END AS series_aws_url,
+
+  gcs_bucket,
+  CASE
+
+  # map GCS bucket to AWS bucket, since for idc-index we prefer AWS
+  # if new buckets are included in IDC, this will need to be updated!
+
+  WHEN gcs_bucket='public-datasets-idc' THEN 'idc-open-data'
+  WHEN gcs_bucket='idc-open-idc1' THEN 'idc-open-data-two'
+  WHEN gcs_bucket='idc-open-cr' THEN 'idc-open-data-cr'
+    END AS aws_bucket,
   MIN(idc_version) AS min_idc_version,
   MAX(idc_version) AS max_idc_version
 FROM all_versions