feat(swift):Add support for swift object storage

Author: Keerthan Mala

rootfs/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update \
 		python-dev \
 		--no-install-recommends \
 	&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python - pip==8.1.1 \
-	&& pip install --disable-pip-version-check --no-cache-dir boto3==1.2.6 gcloud==0.11.0 azure-storage==0.30.0 docker-py==1.7.2 \
+	&& pip install --disable-pip-version-check --no-cache-dir docker-py==1.7.2 \
 	&& apt-get remove -y --auto-remove --purge \
 		gcc \
 		libffi-dev \
@@ -23,6 +23,9 @@ RUN apt-get update \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
 
+ADD https://storage.googleapis.com/object-storage-cli/bb8e054/objstorage-bb8e054-linux-amd64 /bin/objstorage
+RUN chmod +x /bin/objstorage
+
 COPY . /
 
 CMD ["python", "/deploy.py"]

rootfs/deploy.py

@@ -2,14 +2,7 @@
 import os
 import tarfile
 import requests
-
-import boto3
-import json
-from botocore.utils import fix_s3_host
-from botocore.client import Config
-from oauth2client.service_account import ServiceAccountCredentials
-from gcloud.storage.client import Client
-from azure.storage.blob import BlockBlobService
+import subprocess
 
 
 DEBUG = os.environ.get('DEIS_DEBUG') in ('true', '1')
@@ -38,63 +31,16 @@ def log(msg):
 
 
 def download_file(tar_path):
-    if os.getenv('BUILDER_STORAGE') == "s3":
-        with open('/var/run/secrets/deis/objectstore/creds/accesskey', 'r') as access_file:
-            os.putenv('AWS_ACCESS_KEY_ID', access_file.read())
-        with open('/var/run/secrets/deis/objectstore/creds/secretkey', 'r') as secret_file:
-            os.putenv('AWS_SECRET_ACCESS_KEY', secret_file.read())
-        with open('/var/run/secrets/deis/objectstore/creds/region', 'r') as region_file:
-            os.putenv('AWS_DEFAULT_REGION', region_file.read())
-
-        bucket_name = ""
-        with open('/var/run/secrets/deis/objectstore/creds/builder-bucket', 'r') as bucket_file:
-            bucket_name = bucket_file.read()
-
-        conn = boto3.resource('s3')
-        conn.Bucket(bucket_name).Object(tar_path).download_file('apptar')
-
-    elif os.getenv('BUILDER_STORAGE') == "gcs":
-        bucket_name = ""
-        with open('/var/run/secrets/deis/objectstore/creds/builder-bucket', 'r') as bucket_file:
-            bucket_name = bucket_file.read()
-        scopes = ['https://www.googleapis.com/auth/devstorage.full_control']
-        credentials = ServiceAccountCredentials.from_json_keyfile_name('/var/run/secrets/deis/objectstore/creds/key.json', scopes=scopes)
-        with open('/var/run/secrets/deis/objectstore/creds/key.json') as data_file:
-            data = json.load(data_file)
-        client = Client(credentials=credentials, project=data['project_id'])
-        client.get_bucket(bucket_name).get_blob(tar_path).download_to_filename("apptar")
-
-    elif os.getenv('BUILDER_STORAGE') == "azure":
-      with open('/var/run/secrets/deis/objectstore/creds/accountname', 'r') as account_file:
-          accountname = account_file.read()
-      with open('/var/run/secrets/deis/objectstore/creds/accountkey', 'r') as key_file:
-          accountkey = key_file.read()
-      with open('/var/run/secrets/deis/objectstore/creds/builder-container', 'r') as container_file:
-          container_name = container_file.read()
-      block_blob_service = BlockBlobService(account_name=accountname, account_key=accountkey)
-      block_blob_service.get_blob_to_path(container_name, tar_path, 'apptar')
-
-    else :
-      with open('/var/run/secrets/deis/objectstore/creds/accesskey', 'r') as access_file:
-          AWS_ACCESS_KEY_ID = access_file.read()
-      with open('/var/run/secrets/deis/objectstore/creds/secretkey', 'r') as secret_file:
-          AWS_SECRET_ACCESS_KEY = secret_file.read()
-
-      AWS_DEFAULT_REGION = "us-east-1"
-      bucket_name = "git"
-      mHost = os.getenv('DEIS_MINIO_SERVICE_HOST')
-      mPort = os.getenv('DEIS_MINIO_SERVICE_PORT')
-      if mPort == "80" :
-      	# If you add port 80 to the end of the endpoint_url, boto3 freaks out.
-      	S3_URL = "http://"+mHost
-      else :
-      	S3_URL="http://"+mHost+":"+mPort
-
-      conn = boto3.resource('s3', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=AWS_DEFAULT_REGION, endpoint_url=S3_URL, config=Config(signature_version='s3v4'))
-      # stop boto3 from automatically changing the endpoint
-      conn.meta.client.meta.events.unregister('before-sign.s3', fix_s3_host)
-
-      conn.Bucket(bucket_name).Object(tar_path).download_file('apptar')
+    if os.getenv('BUILDER_STORAGE') == "minio":
+        os.makedirs("/tmp/objectstore/minio")
+        bucketFile = open('/tmp/objectstore/minio/builder-bucket', 'w')
+        bucketFile.write('git')
+        bucketFile.close()
+        os.putenv('BUCKET_FILE', "/tmp/objectstore/minio/builder-bucket")
+    elif os.getenv('BUILDER_STORAGE') in ["azure", "swift"]:
+        os.putenv('CONTAINER_FILE', "/var/run/secrets/deis/objectstore/creds/builder-container")
+    command = ["objstorage", "--storage-type="+os.getenv('BUILDER_STORAGE'), "download", tar_path, "apptar"]
+    subprocess.check_call(command)
 
 tar_path = os.getenv('TAR_PATH')
 if tar_path: