rename object bug fix

Author: toddbirchard

config.py

@@ -1,9 +1,9 @@
-"""BigQuery Upload Configuration."""
+"""Google Cloud Storage Configuration."""
 from os import environ
 
 
 # Google Cloud Storage
-bucketURI = environ.get('GCP_BUCKET_URI')
+bucketURL = environ.get('GCP_BUCKET_URL')
 bucketName = environ.get('GCP_BUCKET_NAME')
 bucketFolder = environ.get('GCP_BUCKET_FOLDER_NAME')
 

main.py

@@ -1,17 +1,17 @@
-"""Programatically create a BigQuery table from a CSV."""
+"""Programatically interact with a Google Cloud Storage bucket."""
 from os import listdir
 from os.path import isfile, join
 from random import randint
 from google.cloud import storage
-from config import bucketURI, bucketName, localFolder, bucketFolder
+from config import bucketName, localFolder, bucketFolder
+
+storage_client = storage.Client()
+bucket = storage_client.get_bucket(bucketName)
 
 
 def upload_files(bucketName):
-    """Upload files to bucket."""
+    """Upload files to GCP bucket."""
     files = [f for f in listdir(localFolder) if isfile(join(localFolder, f))]
-    print(files)
-    storage_client = storage.Client()
-    bucket = storage_client.get_bucket(bucketName)
     for file in files:
         localFile = localFolder + file
         blob = bucket.blob(bucketFolder + file)
@@ -20,49 +20,41 @@ def upload_files(bucketName):
 
 
 def list_files(bucketName):
-    """List all files in bucket."""
-    storage_client = storage.Client()
-    bucket = storage_client.get_bucket(bucketName)
+    """List all files in GCP bucket."""
     files = bucket.list_blobs(prefix=bucketFolder)
     fileList = [file.name for file in files if '.' in file.name]
-    print('fileList:', fileList)
     return fileList
 
 
-def download_random_file(bucketURI, bucketName, bucketFolder):
-    """Get random file from bucket."""
-    storage_client = storage.Client()
-    bucket = storage_client.get_bucket(bucketName)
+def download_random_file(bucketName, bucketFolder, localFolder):
+    """Download random file from GCP bucket."""
     fileList = list_files(bucketName)
     rand = randint(0, len(fileList) - 1)
     blob = bucket.blob(fileList[rand])
     fileName = blob.name.split('/')[-1]
-    blob.download_to_filename('./files/' + fileName)
-    return fileName
+    blob.download_to_filename(localFolder + fileName)
+    return f'{fileName} downloaded from bucket.'
 
 
 def delete_file(bucketName, bucketFolder, fileName):
-    """Delete file from bucket."""
-    storage_client = storage.Client()
-    bucket = storage_client.get_bucket(bucketName)
+    """Delete file from GCP bucket."""
     bucket.delete_blob(bucketFolder + fileName)
     return f'{fileName} deleted from bucket.'
 
 
 def rename_file(bucketName, bucketFolder, fileName, newFileName):
-    """Delete file from bucket."""
-    storage_client = storage.Client()
-    bucket = storage_client.get_bucket(bucketName)
-    bucket.rename_blob(bucketFolder + fileName,
+    """Rename file in GCP bucket."""
+    blob = bucket.blob(bucketFolder + fileName)
+    bucket.rename_blob(blob,
                        new_name=newFileName)
     return f'{fileName} renamed to {newFileName}.'
 
 
 print(upload_files(bucketName))
 print(list_files(bucketName))
-print(download_random_file(bucketURI,
-                           bucketName,
-                           bucketFolder))
+print(download_random_file(bucketName,
+                           bucketFolder,
+                           localFolder))
 print(rename_file(bucketName,
                   bucketFolder,
                   'test.csv',