From 634df7cad947079032651e8ed7d2fdadfa6f1cf9 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Thu, 10 Sep 2020 11:11:34 +1000 Subject: Use golang_version as install dir --- config/projects/golang.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/projects/golang.rb b/config/projects/golang.rb index 0a53092..cb21ae8 100644 --- a/config/projects/golang.rb +++ b/config/projects/golang.rb @@ -6,8 +6,7 @@ name "golang-#{golang_version}" maintainer "GitLab B.V." homepage "https://golang.org/" -major, minor, _patch = golang_version.split('.') -install_dir "/opt/asdf/installs/golang/#{major}.#{minor}/go" +install_dir "/opt/asdf/installs/golang/#{golang_version}/go" package_scripts_path Pathname.pwd.join("config/scripts/golang") build_version golang_version -- cgit v1.2.3 From 1b84732cfd3f231cb3ff0003f4caff2e91a19ba6 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 10 Sep 2020 09:37:11 -0600 Subject: Add CHANGELOG entry and bump version --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/license/management/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0344a7a..b0940c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.25.4 + +- Fix patch number of `GOLANG_VERSION` being ignored, making the scan fail if there's no match for MAJOR.MINOR (!215) + ## v3.25.3 - Ensure `apt-get` db is valid for `before_script` blocks. (!215) diff --git a/Gemfile.lock b/Gemfile.lock index 6b0909c..1088739 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.25.3) + license-management (3.25.4) license_finder (~> 6.7) GEM diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index f99a3b6..f1203fc 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.25.3' + VERSION = '3.25.4' end end -- cgit v1.2.3 From 85766e00f7283f5c6fcb738802703fc28f7b5e70 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 10 Sep 2020 09:42:51 -0600 Subject: test: add a test the reproduces the defect --- spec/integration/go/modules_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/integration/go/modules_spec.rb b/spec/integration/go/modules_spec.rb index 6486096..2048bdb 100644 --- a/spec/integration/go/modules_spec.rb +++ b/spec/integration/go/modules_spec.rb @@ -15,7 +15,7 @@ RSpec.describe "modules" do include_examples "each report version", "go", "modules" - ['1.11', '1.12', '1.13', '1.14', '1.15'].each do |version| + ['1.11', '1.12', '1.13', '1.14', '1.15', '1.15.1'].each do |version| context "when scanning a go.mod and go.sum files with v#{version}" do before do runner.add_file('main.go', fixture_file_content('go/main.go')) -- cgit v1.2.3 From 05f08a9d2ff612a99094a957892af9227de57e6e Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 10 Sep 2020 11:06:02 -0600 Subject: fix: export ASDF_JAVA_VERSION when invoking gradle --- lib/license/finder/ext/gradle.rb | 14 ++++++-------- lib/license/management/shell.rb | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/license/finder/ext/gradle.rb b/lib/license/finder/ext/gradle.rb index 4d6b000..a683207 100644 --- a/lib/license/finder/ext/gradle.rb +++ b/lib/license/finder/ext/gradle.rb @@ -18,7 +18,7 @@ module LicenseFinder end def package_management_command - wrapper? ? './gradlew' : 'gradle' + wrapper? ? './gradlew' : :gradle end private @@ -29,22 +29,18 @@ module LicenseFinder def download_licenses _stdout, _stderr, status = within_project_path do - env = { - 'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}"), - 'TERM' => 'noop' - } shell.execute([ @command, ENV.fetch('GRADLE_CLI_OPTS', '--exclude-task=test --no-daemon --debug'), 'downloadLicenses' - ], env: env) + ], env: default_env) end status.success? end def wrapper? - File.exist?(File.join(project_path, 'gradlew')) + project_path.join('gradlew').exist? end def xml_parsing_options @@ -63,8 +59,10 @@ module LicenseFinder def default_env @default_env = { + 'ASDF_JAVA_VERSION' => ENV.fetch('ASDF_JAVA_VERSION', java_version), 'CACHE_DIR' => '/opt/gitlab', - 'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}") + 'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}"), + 'TERM' => 'noop' } end end diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb index b066bc1..e4fd35a 100644 --- a/lib/license/management/shell.rb +++ b/lib/license/management/shell.rb @@ -10,6 +10,7 @@ module License cargo: '/opt/asdf/bin/asdf exec cargo', cert_sync: '/opt/asdf/installs/mono/6.8.0.123/bin/cert-sync', embedded_bundle: '/opt/gitlab/embedded/bin/bundle', + gradle: '/opt/asdf/bin/asdf exec gradle', gem: '/opt/asdf/bin/asdf exec gem', go: '/opt/asdf/bin/asdf exec go', keytool: '/opt/asdf/bin/asdf exec keytool', -- cgit v1.2.3 From 16623808ec59a553faae04b2dd71f834eca8f7fc Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 10 Sep 2020 11:24:46 -0600 Subject: chore: remove duplicate test for golang project --- spec/integration/ruby/bundler_spec.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/spec/integration/ruby/bundler_spec.rb b/spec/integration/ruby/bundler_spec.rb index 1c0e472..5d18b12 100644 --- a/spec/integration/ruby/bundler_spec.rb +++ b/spec/integration/ruby/bundler_spec.rb @@ -93,19 +93,6 @@ RSpec.describe "bundler" do end end - context "when scanning the `gitlab-runner` project" do - before do - runner.clone('https://gitlab.com/gitlab-org/gitlab-runner.git') - end - - specify do - expect(subject).to match_schema - expect(subject[:licenses]).not_to be_empty - expect(subject[:dependencies]).not_to be_empty - expect(subject.dependency_names).to include('gitlab.com/gitlab-org/gitlab-terminal') - end - end - context "when fetching dependencies from a custom registry" do before do add_host('rubygems.test', '127.0.0.1') -- cgit v1.2.3 From f4edc9a8e9c0a94056ecb80ec6333dfa42857a14 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 10 Sep 2020 11:25:06 -0600 Subject: chore: split integration-java job --- .gitlab/test.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 1dbc2c9..e44a90d 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -73,10 +73,17 @@ integration-go: RSPEC_DIR: spec/integration/go needs: ['build-docker-image'] -integration-java: +integration-java-gradle: extends: .rspec variables: - RSPEC_DIR: spec/integration/java + RSPEC_DIR: spec/integration/java/gradle_spec.rb + needs: + - build-docker-image + +integration-java-maven: + extends: .rspec + variables: + RSPEC_DIR: spec/integration/java/maven_spec.rb needs: - build-docker-image - build-mvn-pkg -- cgit v1.2.3