Skip to content

Commit

Permalink
Migrate to go module (#5292)
Browse files Browse the repository at this point in the history
* Migrate repository to go module
* licenses script in python
  • Loading branch information
clamoriniere committed Apr 28, 2020
1 parent 159d9cc commit 38a3470
Show file tree
Hide file tree
Showing 38 changed files with 2,572 additions and 3,056 deletions.
4 changes: 2 additions & 2 deletions .circleci/README.md
Expand Up @@ -16,9 +16,9 @@ should have it).
Example:
```bash
cd .circleci/images/runner
docker build -t datadog/datadog-agent-runner-circle:go1128 .
docker build -t datadog/datadog-agent-runner-circle:go1138 .
docker login
docker push datadog/datadog-agent-runner-circle:go1128
docker push datadog/datadog-agent-runner-circle:go1138
```

Once your image is pushed, update this file:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/builder/Dockerfile
@@ -1,4 +1,4 @@
FROM golang:1.12.7
FROM golang:1.13.8

RUN sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list \
&& sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list \
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -36,8 +36,8 @@
/docs/cluster-agent/ @DataDog/documentation @DataDog/container-integrations
/docs/dev/checks/ @DataDog/documentation @DataDog/agent-core

/Gopkg.lock @DataDog/agent-all
/Gopkg.toml @DataDog/agent-all
/go.mod @DataDog/agent-all
/go.sum @DataDog/agent-all

/Makefile.trace @DataDog/apm-agent

Expand Down
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Expand Up @@ -84,7 +84,7 @@ variables:
DATADOG_AGENT_BUILDERS: v2311927-0e261ab
DATADOG_AGENT_WINBUILDIMAGES: v2348149-ba6640d
DATADOG_AGENT_ARMBUILDIMAGES: v2287129-4816dc7
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v2336045-3227a35
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v2402855-1447971
BCC_VERSION: v0.12.0
SYSTEM_PROBE_GO_VERSION: 1.13.8

Expand Down Expand Up @@ -364,9 +364,9 @@ run_security_scan_test:
- SNYK_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.snyk_token --with-decryption --query "Parameter.Value" --out text)
snyk monitor --project-name=datadog-agent-requirements.txt --file=requirements.txt --package-manager=pip
- SNYK_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.snyk_token --with-decryption --query "Parameter.Value" --out text)
snyk monitor --project-name=datadog-agent-gopkg.lock --file=Gopkg.lock
snyk monitor --project-name=datadog-agent-go.sum --file=go.sum

# check consistency of Gopkg.lock
# check consistency of go.sum
run_dep_check_lock:
stage: source_test
needs: ["fail_on_non_triggered_tag"]
Expand All @@ -378,8 +378,8 @@ run_dep_check_lock:
- pip install -r requirements.txt
- inv -e deps --no-dep-ensure --no-checks
script:
# Print a message and fail if dep check fails
- dep check --skip-vendor || (echo "Gopkg.lock is out of sync with Gopkg.toml and project imports. Please run 'inv deps' and commit the change on Gopkg.lock." && false)
# Print a message and fail if go mod verify fails
- go mod verify || (echo "go.sum is out of sync with go.mod and project imports. Please run 'inv deps' and commit the change on go.sum." && false)

run_shell_script_lint:
stage: source_test
Expand Down
15 changes: 15 additions & 0 deletions .wwhrd.yml
@@ -0,0 +1,15 @@
---
blacklist:
- GPL-2.0

whitelist:
- 0BSD
- Apache-2.0
- BSD-2-Clause
- BSD-3-Clause
- JSON
- MIT
- MPL-2.0
- MPL-2.0-no-copyleft-exception
- UNKNOWN
- Unlicense

0 comments on commit 38a3470

Please sign in to comment.