logstash-devutils 2.6.0-java → 2.6.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c290cf694538a9ee678b8c9120d9557551fc207b20b32e3a0ba4e0feb3401323
-  data.tar.gz: 216f32b8afbc96f5f73c439d6bc0b7c9b865fc14ea121ba9808028dbdbeea373
+  metadata.gz: eaeaec6174b1598f32f8c0d1e5a0ce417b735eab237f5ea608eee10861bb5be6
+  data.tar.gz: 2ca9dbaeed76c02ab9dc99d58581928bdaa6a330b7da5aa02206d277cd140b62
 SHA512:
-  metadata.gz: 45f671bfb3dce8899e6dab0b80214fc6c3773bf94bb7bf4510c64bd57c483ea456014272c0a12d9c219072ec7e1b0665081028212689c11c8c9e74c026549f76
-  data.tar.gz: b6ea02d32ce43a98b1a80fb444b7b326b74d4add0495fee450a43f708e194cb932c72c1cd454d24303235e18b223384c4ee3207b0c1534a476f361ff78ab5b0e
+  metadata.gz: 21b60cf75fda26617855824a0b524b99941805e5283058add1652187437b5a18109a4c1bf97a92a948dbafa80bc1b775712883248e80030ce4fbf58a22abfd74
+  data.tar.gz: 9f32edbbb1919261a526e8d21eb5d4a177a2a96bd38e730ea5383a5b22b56beb79fe803f5df72360dc704d12c4e32dfc44dd1e36918877fbae5317f36cea76d8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.6.2
+ - Fix: in case of redirected HTTP downloads, return the hash code of the downloaded artifact. [#106](https://github.com/elastic/logstash-devutils/pull/106)
+ - Fix: changed the prefix extraction from tar.gz name to the extracted folder name. [#109](https://github.com/elastic/logstash-devutils/pull/109) 
+
+## 2.6.1
+ - Fix: updated implementation of downloading of vendored artifacts to follow HTTP redirections. [#105](https://github.com/elastic/logstash-devutils/pull/105)
+
 ## 2.6.0
 - Removed SimpleCov configuration, as it will be moved directly to elastic/logstash [#103](https://github.com/elastic/logstash-devutils/pull/103)
 

data/lib/logstash/devutils/rake/vendor.rake

@@ -53,7 +53,7 @@ ensure
   fd.close if fd
 end
 
-def download(url, output)
+def download(url, output, redirect_hops = 1)
   uri = URI(url)
   digest = Digest::SHA1.new
   tmp = "#{output}.tmp"
@@ -61,6 +61,17 @@ def download(url, output)
     request = Net::HTTP::Get.new(uri.path)
     http.request(request) do |response|
       fail "HTTP fetch failed for #{url}. #{response}" if [200, 301].include?(response.code)
+      case response
+        when Net::HTTPRedirection, Net::HTTPFound then
+          location = response['location']
+      end
+
+      if location
+        fail "Too many redirects to follow" if redirect_hops < 0
+        puts "Follow redirect to: #{location}"
+        return download(location, output, redirect_hops - 1)
+      end
+
       size = (response["content-length"].to_i || -1).to_f
       count = 0
       File.open(tmp, "w") do |fd|
@@ -159,9 +170,10 @@ namespace "vendor" do
       @files.each do |file| 
         download = file_fetch(file['url'], file['sha1'])
         if download =~ /.tar.gz/
-          prefix = download.gsub('.tar.gz', '').gsub('vendor/', '')
           untar(download) do |entry|
             if !file['files'].nil?
+              # extraction folder name
+              prefix = entry.full_name.split("/").first
               next unless file['files'].include?(entry.full_name.gsub(prefix, ''))
               out = entry.full_name.split("/").last
             end

data/logstash-devutils.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "logstash-devutils"
-  spec.version = "2.6.0"
+  spec.version = "2.6.2"
   spec.license = "Apache-2.0"
   spec.authors = ["Elastic"]
   spec.email = "info@elastic.co"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-devutils
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement