From 5cba5801f4f276482f01bfeea46fde0dbbcce7b1 Mon Sep 17 00:00:00 2001 From: Parv Mital Date: Thu, 23 Apr 2020 11:38:44 -0400 Subject: [PATCH] [Changed] Remove +compatible in Go package versions [#171754392] Signed-off-by: Jeff Jun --- lib/license_finder/packages/go_package.rb | 2 +- .../package_managers/go_package_spec.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/license_finder/packages/go_package.rb b/lib/license_finder/packages/go_package.rb index dee88d901..790d86d7c 100644 --- a/lib/license_finder/packages/go_package.rb +++ b/lib/license_finder/packages/go_package.rb @@ -13,7 +13,7 @@ def from_dependency(hash, prefix, full_version) name = hash['ImportPath'] install_path = hash['InstallPath'] install_path ||= install_path(prefix.join(name)) - version = full_version ? hash['Rev'] : hash['Rev'][0..6] + version = full_version ? hash['Rev'].gsub('+incompatible', '') : hash['Rev'][0..6] homepage = hash['Homepage'] new(name, version, install_path: install_path, package_manager: 'Go', homepage: homepage) end diff --git a/spec/lib/license_finder/package_managers/go_package_spec.rb b/spec/lib/license_finder/package_managers/go_package_spec.rb index 20e36292e..144605bc9 100644 --- a/spec/lib/license_finder/package_managers/go_package_spec.rb +++ b/spec/lib/license_finder/package_managers/go_package_spec.rb @@ -31,5 +31,16 @@ module LicenseFinder its(:install_path) { should == '/Go/vendor/src/github.com/pivotal/spec_name' } end + + context 'when the version includes +incompatible string' do + let(:options) do + { + 'ImportPath' => 'github.com/pivotal/spec_name', + 'Rev' => '4326c3435332d06b410a2672d28d1343c4059fae+incompatible' + } + end + + its(:version) { should == '4326c3435332d06b410a2672d28d1343c4059fae' } + end end end