cnvrg 1.5.8.7 → 1.5.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3902f81d0a961b29dfb969f247eb3c347ec83ae950b18fd23e96a37ea9acd5
-  data.tar.gz: 6179adccab5ee3f4a57210bc7d6201afb637a6175a67a537cc7a33c04601bf9c
+  metadata.gz: 46794cf31d991b88da8a0cd142415448da418c1f8b3b6b48c4c4cd4bc80ef5b2
+  data.tar.gz: b9890d7f639aef2263c15006df1d6518abf7fe916ca03534540e67c204ad7dcf
 SHA512:
-  metadata.gz: 82dd3f6c559533e24f6e9ce5dc64e209ab947f8360ad4e4c8f8d93ff4fb67190f0389bdd9034cf56763e7f306df984fda4ef1a192180a26332728cb692b97bd5
-  data.tar.gz: e4c377b406a682540105d7f94966aa7f4a62e0d12e38051c5c7694549a932a4d209277ae071f3c5110862ba2d9ee8bf27ef24240318bb5892cf1be08e49f4b25
+  metadata.gz: 8fa64c6b9e9973aa4b64800f9f617651cf0d666b0108691c6cbd114b14c0fb5e3f91640f0472b85e5a7009ec0ff0b2d8e2e34a3523656da3a2a36fb017706410
+  data.tar.gz: 53810d239e43ef20c3504035a8ac6d9cb378e73aee56930fb3ab765cff40c7c51c63c3087ee5fcd32079c1f0df61b059bd5c8ddcf01d77b65fd3e86e19f0e6b7

data/cnvrg.gemspec

@@ -37,7 +37,8 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'sucker_punch', '~> 2.0'
     spec.add_runtime_dependency 'urlcrypt', '~> 0.1.1'
     spec.add_runtime_dependency 'parallel', '~> 1.12.0'
-    
+    spec.add_runtime_dependency 'azure-storage-blob', '~> 1.1.0'
+
     spec.add_runtime_dependency 'logstash-logger', '~> 0.22.1'
     spec.add_runtime_dependency 'launchy', '~> 2.4'
     spec.add_runtime_dependency 'docker-api', '~> 1.33'

data/lib/cnvrg/downloader/client.rb

@@ -43,7 +43,8 @@ module Cnvrg
         when 's3', 'minio'
           return Cnvrg::Downloader::Clients::S3Client.new(sts_path: params["path_sts"], access_key: params["sts_a"], secret: params["sts_s"], session_token: params["sts_st"], region: params["region"], bucket: params["bucket"], encryption: params["encryption"], endpoint: params["endpoint"], storage: params["storage"])
         when 'azure'
-          return Cnvrg::Downloader::Clients::AzureDownloader.new(params)
+          azure_params = params.symbolize_keys.slice(*[:storage_account_name, :storage_access_key, :container, :sts])
+          return Cnvrg::Downloader::Clients::AzureClient.new(**azure_params)
         when 'gcp'
           return Cnvrg::Downloader::Clients::GcpClient.new(project_id: params["project_id"], credentials: params["credentials"], bucket_name: params["bucket_name"], sts: params["sts"])
         end

data/lib/cnvrg/downloader/clients/azure_client.rb

@@ -1,20 +1,32 @@
+require 'azure/storage/blob'
+
 module Cnvrg
   module Downloader
     module Clients
       class AzureClient < Client
-        def initialize(storage: nil, account_name: nil, access_key: nil, container: nil, sts_path: nil)
-          @key, @iv = extract_key_iv(sts_path)
-          @account_name = Cnvrg::Helpers.decrypt(@key, @iv, account_name)
-          @access_key = Cnvrg::Helpers.decrypt(@key, @iv, access_key)
+        def initialize(storage_account_name: nil, storage_access_key: nil, container: nil, sts: nil)
+          @key, @iv = extract_key_iv(sts)
+          @account_name = Cnvrg::Helpers.decrypt(@key, @iv, storage_account_name)
+          @access_key = Cnvrg::Helpers.decrypt(@key, @iv, storage_access_key)
           @container = Cnvrg::Helpers.decrypt(@key, @iv, container)
         end
 
-        def download(storage_path, local_path)
-
+        def download(storage_path, local_path, decrypt: true)
+          prepare_download(local_path)
+          storage_path = Cnvrg::Helpers.decrypt(@key, @iv, storage_path) if decrypt
+          blob, content = client.get_blob(@container, storage_path)
+          ::File.open(local_path, 'wb') {|f| f.write(content)}
+          blob
         end
 
         def upload(storage_path, local_path)
+          client.create_block_blob(@container, storage_path, File.open(local_path, "rb"))
+        end
+
 
+        private
+        def client
+          Azure::Storage::Blob::BlobService.create(storage_account_name: @account_name, storage_access_key: @access_key)
         end
       end
     end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.5.8.7'
+  VERSION = '1.5.8.8'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.5.8.7
+  version: 1.5.8.8
 platform: ruby
 authors:
 - Yochay Ettun
@@ -288,6 +288,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.0
+- !ruby/object:Gem::Dependency
+  name: azure-storage-blob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: logstash-logger
   requirement: !ruby/object:Gem::Requirement