Skip to content

Commit 6fbf836

Browse files
authoredSep 9, 2019
[ci] Enable FOSSA scans again (m3db#1915)
Enable FOSSA and update config.
1 parent 4758a09 commit 6fbf836

File tree

4 files changed

+40
-14
lines changed

4 files changed

+40
-14
lines changed
 

‎.buildkite/pipeline.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ steps:
8585
gopath-checkout#v1.0.1:
8686
import: github.com/m3db/m3
8787
<<: *common
88-
# - label: "FOSSA license scan"
89-
# command: make clean install-vendor fossa
90-
# plugins:
91-
# docker-compose#v2.5.1:
92-
# run: app
93-
# workdir: /go/src/github.com/m3db/m3
94-
# env:
95-
# - FOSSA_API_KEY
96-
# <<: *common
88+
- label: "FOSSA license scan"
89+
command: make clean install-vendor fossa
90+
plugins:
91+
docker-compose#v2.5.1:
92+
run: app
93+
workdir: /go/src/github.com/m3db/m3
94+
env:
95+
- FOSSA_API_KEY
96+
<<: *common
9797
- name: "Check for docker and docs builds :docker: :books:"
9898
commands:
9999
- ".ci/docker/check_do_docker.sh"

‎.fossa.yml

100644100755
+29-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
2-
# Visit https://fossa.io to learn more
2+
# Visit https://fossa.com to learn more
33

4-
version: 1
4+
version: 2
55
cli:
6-
server: https://app.fossa.io
6+
server: https://app.fossa.com
77
fetcher: custom
88
project: https://github.com/m3db/m3
99
analyze:
1010
modules:
11+
- name: github.com/m3db/m3/scripts/lockfile
12+
type: go
13+
target: github.com/m3db/m3/scripts/lockfile
14+
path: scripts/lockfile
15+
- name: github.com/m3db/m3/scripts/md5
16+
type: go
17+
target: github.com/m3db/m3/scripts/md5
18+
path: scripts/md5
1119
- name: github.com/m3db/m3/src/cmd/services/m3aggregator/main
1220
type: go
1321
target: github.com/m3db/m3/src/cmd/services/m3aggregator/main
@@ -20,10 +28,22 @@ analyze:
2028
type: go
2129
target: github.com/m3db/m3/src/cmd/services/m3coordinator/main
2230
path: src/cmd/services/m3coordinator/main
31+
options:
32+
# FOSSA finds Go dependencies by first finding all dependencies that a project uses and then comparing them to the lockfile to obtain version numbers.
33+
# It appears that one of the dependencies is choosing to manually vendor a dependency, thereby omitting the version from its lockfile.
34+
# This results in cryptic FOSSA failures.
35+
# The solution for this is to allow this dependency to be discovered without a corresponding version.
36+
allow-unresolved: true
37+
- name: github.com/m3db/m3/src/cmd/services/m3ctl/main
38+
type: go
39+
target: github.com/m3db/m3/src/cmd/services/m3ctl/main
40+
path: src/cmd/services/m3ctl/main
2341
- name: github.com/m3db/m3/src/cmd/services/m3dbnode/main
2442
type: go
2543
target: github.com/m3db/m3/src/cmd/services/m3dbnode/main
2644
path: src/cmd/services/m3dbnode/main
45+
options:
46+
allow-unresolved: true
2747
- name: github.com/m3db/m3/src/cmd/services/m3em_agent/main
2848
type: go
2949
target: github.com/m3db/m3/src/cmd/services/m3em_agent/main
@@ -40,6 +60,12 @@ analyze:
4060
type: go
4161
target: github.com/m3db/m3/src/cmd/services/m3query/main
4262
path: src/cmd/services/m3query/main
63+
options:
64+
allow-unresolved: true
65+
- name: github.com/m3db/m3/src/cmd/tools/carbon_load/main
66+
type: go
67+
target: github.com/m3db/m3/src/cmd/tools/carbon_load/main
68+
path: src/cmd/tools/carbon_load/main
4369
- name: github.com/m3db/m3/src/cmd/tools/clone_fileset/main
4470
type: go
4571
target: github.com/m3db/m3/src/cmd/tools/clone_fileset/main

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ test-all-gen: all-gen
457457
# Runs a fossa license report
458458
.PHONY: fossa
459459
fossa: install-tools
460-
PATH=$(combined_bin_paths):$(PATH) fossa --option allow-nested-vendor:true --option allow-deep-vendor:true
460+
PATH=$(combined_bin_paths):$(PATH) fossa analyze --verbose --no-ansi --option allow-nested-vendor:true --option allow-deep-vendor:true
461461

462462
# Waits for the result of a fossa test and exits success if pass or fail if fails
463463
.PHONY: fossa-test

‎tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
{
2424
"Repository": "github.com/fossas/fossa-cli/cmd/fossa",
25-
"Commit": "623f658a3882ec0d4e64c43fa973c8088bee54fa"
25+
"Commit": "638f9f79fac6fd4b4fa2eb575d1faea4c5d04807"
2626
},
2727
{
2828
"Repository": "github.com/pointlander/peg",

0 commit comments

Comments
 (0)
Please sign in to comment.