File tree Expand file tree Collapse file tree 1 file changed +15
-1
lines changed Expand file tree Collapse file tree 1 file changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -122,7 +122,21 @@ function aws_upload {
122122function  gcs_upload  {
123123    PATH_TO_BACKUP=gs://$LOGICAL_BACKUP_S3_BUCKET " /" $LOGICAL_BACKUP_S3_BUCKET_PREFIX " /" $SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX " /logical_backups/" $( date +%s)  .sql.gz
124124
125-     gsutil -o Credentials:gs_service_key_file=$LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS  cp - " $PATH_TO_BACKUP " 
125+     # Set local LOGICAL_GOOGLE_APPLICATION_CREDENTIALS to nothing or
126+     # value of LOGICAL_GOOGLE_APPLICATION_CREDENTIALS env var. Needed
127+     # because `set -o nounset` is globally set
128+     local  LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS=${LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS:- } 
129+ 
130+     GSUTIL_OPTIONS=(" -o"   " Credentials:gs_service_key_file=$LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS "  )
131+ 
132+     # If GOOGLE_APPLICATION_CREDENTIALS is not set try to get
133+     # creds from metadata
134+     if  [[ -z  $LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS  ]]
135+     then 
136+ 	    GSUTIL_OPTIONS[1]=" GoogleCompute:service_account=default" 
137+     fi 
138+ 
139+     gsutil ${GSUTIL_OPTIONS[@]}  cp - " $PATH_TO_BACKUP " 
126140}
127141
128142function  upload  {
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments