Skip to content

Commit

Permalink
feat(ci): Add a new test to validate modules are correctly set in DEF…
Browse files Browse the repository at this point in the history
…AULT_MODULES (#26226)
  • Loading branch information
chouetz authored Jun 5, 2024
1 parent 30ff86b commit c04c866
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 171 deletions.
9 changes: 9 additions & 0 deletions .gitlab/source_test/technical_linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@ lint_update_go:
script:
- source /root/.bashrc
- inv -e linter.update-go

validate_modules:
stage: source_test
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
needs: []
script:
- source /root/.bashrc
- inv -e modules.validate
2 changes: 1 addition & 1 deletion comp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ Package logsagentpipeline contains logs agent pipeline component

### [comp/otelcol/provider](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol/provider)


Package provider TBD

## [comp/process](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/process) (Component Bundle)

Expand Down
2 changes: 2 additions & 0 deletions comp/otelcol/provider/def/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2024-present Datadog, Inc.

// Package provider TBD
package provider

import (
Expand All @@ -19,6 +20,7 @@ type Component interface {
GetEnhancedConf() string
}

// Requires TBD
type Requires struct {
URIs []string
}
64 changes: 63 additions & 1 deletion comp/otelcol/provider/impl/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,66 @@ module github.com/DataDog/datadog-agent/comp/otelcol/provider/impl

go 1.21.0

replace github.com/DataDog/datadog-agent/comp/otelcol/provider/def => ../def
replace (
github.com/DataDog/datadog-agent/cmd/agent/common/path => ../../../../cmd/agent/common/path
github.com/DataDog/datadog-agent/comp/core/config => ../../../core/config
github.com/DataDog/datadog-agent/comp/core/flare/builder => ../../../core/flare/builder
github.com/DataDog/datadog-agent/comp/core/flare/types => ../../../core/flare/types
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface => ../../../core/hostname/hostnameinterface
github.com/DataDog/datadog-agent/comp/core/log => ../../../core/log
github.com/DataDog/datadog-agent/comp/core/secrets => ../../../core/secrets
github.com/DataDog/datadog-agent/comp/core/telemetry => ../../../core/telemetry
github.com/DataDog/datadog-agent/comp/def => ../../../def
github.com/DataDog/datadog-agent/comp/logs/agent/config => ../../../logs/agent/config
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../otelcol/logsagentpipeline
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl => ../../../otelcol/logsagentpipeline/logsagentpipelineimpl
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter => ../../../otelcol/otlp/components/exporter/logsagentexporter
github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil => ../../otlp/testutil
github.com/DataDog/datadog-agent/comp/otelcol/provider/def => ../def
github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults
github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env
github.com/DataDog/datadog-agent/pkg/config/logs => ../../../../pkg/config/logs
github.com/DataDog/datadog-agent/pkg/config/model => ../../../../pkg/config/model
github.com/DataDog/datadog-agent/pkg/config/setup => ../../../../pkg/config/setup
github.com/DataDog/datadog-agent/pkg/config/utils => ../../../../pkg/config/utils
github.com/DataDog/datadog-agent/pkg/logs/auditor => ../../../../pkg/logs/auditor
github.com/DataDog/datadog-agent/pkg/logs/client => ../../../../pkg/logs/client
github.com/DataDog/datadog-agent/pkg/logs/diagnostic => ../../../../pkg/logs/diagnostic
github.com/DataDog/datadog-agent/pkg/logs/message => ../../../../pkg/logs/message
github.com/DataDog/datadog-agent/pkg/logs/metrics => ../../../../pkg/logs/metrics
github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline
github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor
github.com/DataDog/datadog-agent/pkg/logs/sds => ../../../../pkg/logs/sds
github.com/DataDog/datadog-agent/pkg/logs/sender => ../../../../pkg/logs/sender
github.com/DataDog/datadog-agent/pkg/logs/sources => ../../../../pkg/logs/sources
github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface => ../../../../pkg/logs/status/statusinterface
github.com/DataDog/datadog-agent/pkg/logs/status/utils => ../../../../pkg/logs/status/utils
github.com/DataDog/datadog-agent/pkg/logs/util/testutils => ../../../../pkg/logs/util/testutils
github.com/DataDog/datadog-agent/pkg/obfuscate => ../../../../pkg/obfuscate
github.com/DataDog/datadog-agent/pkg/proto => ../../../../pkg/proto
github.com/DataDog/datadog-agent/pkg/remoteconfig/state => ../../../../pkg/remoteconfig/state
github.com/DataDog/datadog-agent/pkg/status/health => ../../../../pkg/status/health
github.com/DataDog/datadog-agent/pkg/telemetry => ../../../../pkg/telemetry
github.com/DataDog/datadog-agent/pkg/trace => ../../../../pkg/trace
github.com/DataDog/datadog-agent/pkg/util/backoff => ../../../../pkg/util/backoff
github.com/DataDog/datadog-agent/pkg/util/cgroups => ../../../../pkg/util/cgroups
github.com/DataDog/datadog-agent/pkg/util/executable => ../../../../pkg/util/executable
github.com/DataDog/datadog-agent/pkg/util/filesystem => ../../../../pkg/util/filesystem
github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil
github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../../pkg/util/hostname/validate
github.com/DataDog/datadog-agent/pkg/util/http => ../../../../pkg/util/http
github.com/DataDog/datadog-agent/pkg/util/log => ../../../../pkg/util/log
github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../pkg/util/optional
github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../pkg/util/pointer
github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../pkg/util/scrubber
github.com/DataDog/datadog-agent/pkg/util/startstop => ../../../../pkg/util/startstop
github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../../../pkg/util/statstracker
github.com/DataDog/datadog-agent/pkg/util/system => ../../../../pkg/util/system
github.com/DataDog/datadog-agent/pkg/util/system/socket => ../../../../pkg/util/system/socket
github.com/DataDog/datadog-agent/pkg/util/testutil => ../../../../pkg/util/testutil
github.com/DataDog/datadog-agent/pkg/util/winutil => ../../../../pkg/util/winutil
github.com/DataDog/datadog-agent/pkg/version => ../../../../pkg/version
)

require (
github.com/DataDog/datadog-agent/comp/otelcol/provider/def v0.55.0-rc.1
Expand Down Expand Up @@ -129,6 +188,8 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
Expand Down Expand Up @@ -248,6 +309,7 @@ require (
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
k8s.io/api v0.29.3 // indirect
Expand Down
Loading

0 comments on commit c04c866

Please sign in to comment.