td 0.16.6 → 0.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cc9144137963eda9f35f262eda8dc48b5757fcb2bc5259152f500af104681ce7
-  data.tar.gz: b56b85d17b7cfd3c07a1cd140961c267e27ecd476b419b8e31384b4efeff4761
+SHA1:
+  metadata.gz: 0e8a82e003b9c2d6667499b111602cdca509d2c7
+  data.tar.gz: db9933625ee612d1916878a0d8af9e6b7b533136
 SHA512:
-  metadata.gz: f1c60a7bdfceea5927a3b7ffb88b71a89b7ae8de11ad848e3bb877c23e7fb0229fc0219ff757af4bb7a090530b0358bdb0b93c443817b0214fc22a0e955dc7e3
-  data.tar.gz: 9c003ea54b6aaf2dc53f85266f6107910998070c5b48f32605dc3c82001f9fe1d737ccab2fe1e6dda307b82abbc347e0980a4028f813caf1511b9971b474db00
+  metadata.gz: e565c67246ce1ae52d3ce2c7417e6c656a09166c00878cedb9bb9b5d54025566c222944907bf8503e4589aac29a06062d222c26375995bcdab1bfd2a889b99ad
+  data.tar.gz: caf6024add00f26ccce68cd37665bbb5b24783cc1b47d430f9ee06e4ec65fec3a57a64ce9f96bb39179eb6e4242101024e45ff83250174b436096c37f7dbd68c

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2019-12-16 version 0.16.7
+
+* Disable direct download in Private Connect #225
+
 == 2019-11-13 version 0.16.6
 
 * Use HTTPS as default for downloading digdag module #223

data/lib/td/command/workflow.rb

@@ -43,6 +43,9 @@ module TreasureData
           ].join($/) + $/)
           cmd << '-Dio.digdag.standards.td.secrets.enabled=false'
           cmd << "-Dconfig.td.default_endpoint=#{Config.endpoint_domain}"
+          if workflow_endpoint.match(/\.connect\./i)
+            cmd << '-Dclient.http.disable_direct_download=true'
+          end
         else
           # Use the digdag td.conf plugin to configure wf api and apikey.
           env['TREASURE_DATA_CONFIG_PATH'] = Config.path

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.16.6'
+  TOOLBELT_VERSION = '0.16.7'
 end

data/spec/td/command/workflow_spec.rb

@@ -335,6 +335,7 @@ EOF
     let(:config_path){ nil }
     let(:apikey){ nil }
     let(:endpoint){ nil }
+    let(:command_args){ Hash.new }
     before do
       # TreasureData::Command::Runner#run
       if config_path
@@ -348,6 +349,7 @@ EOF
         TreasureData::Config.endpoint = endpoint
         TreasureData::Config.cl_endpoint = true
       end
+      command_args.clear
 
       allow(Kernel).to receive(:system) do |env, *cmd|
         digdag_env.replace env
@@ -365,6 +367,7 @@ EOF
             args[nil] << x
           end
         end
+        args.each { |key, value| command_args[key] = value }
         if args['--config']
           File.foreach(args['--config']) do |line|
             k, v = line.strip.split(/\s*=\s*/, 2)
@@ -402,6 +405,16 @@ EOF
         expect(workflow_config['client.http.headers.authorization']).to eq "TD1 #{apikey}"
         expect(workflow_config['secrets.td.apikey']).to eq apikey
         expect(digdag_env['TREASURE_DATA_WORKFLOW_ENDPOINT']).to eq 'https://api-workflow.treasuredata.co.jp'
+        expect(command_args['-Dclient.http.disable_direct_download']).to be_nil
+      end
+    end
+    context 'endpoint: https://api-hoge.connect.treasuredata.com' do
+      let(:apikey){ '1/deadbeaf' }
+      let(:endpoint){ 'https://api-hoge.connect.treasuredata.com' }
+      it 'add arg to disable direct download workflow logs from Private Connect' do
+        op = List::CommandParser.new("workflow", [], [], nil, ['log', '8000111'], true)
+        command.workflow(op, false, false)
+        expect(command_args['-Dclient.http.disable_direct_download']).to be_truthy
       end
     end
   end

data/td.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "parallel", "~> 1.8"
   gem.add_dependency "td-client", ">= 1.0.6", "< 2"
   gem.add_dependency "td-logger", ">= 0.3.21", "< 2"
-  gem.add_dependency "rubyzip", ">= 1.3.0"
+  gem.add_dependency "rubyzip", "~> 1.3.0"
   gem.add_dependency "zip-zip", "~> 0.3"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.16.7
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -110,14 +110,14 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
@@ -308,7 +308,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing