Skip to content

Commit ca22f12

Browse files
author
Alex Boten
authored
split config/configtls module (#7907)
Part of #7895 Signed-off-by: Alex Boten <[email protected]>
1 parent 084a64e commit ca22f12

File tree

28 files changed

+107
-8
lines changed

28 files changed

+107
-8
lines changed

‎.chloggen/codeboten_split-config-mod-tls.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
5+
component: configtls
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Split config/configtls into its own module
9+
10+
# One or more tracking issues or pull requests related to the change
11+
issues: [7895]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ updates:
4242
schedule:
4343
interval: "weekly"
4444
day: "wednesday"
45+
- package-ecosystem: "gomod"
46+
directory: "/config/configtls"
47+
schedule:
48+
interval: "weekly"
49+
day: "wednesday"
4550
- package-ecosystem: "gomod"
4651
directory: "/confmap"
4752
schedule:

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ check-contrib:
277277
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression"
278278
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confignet=$(CURDIR)/config/confignet"
279279
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configopaque=$(CURDIR)/config/configopaque"
280+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtls=$(CURDIR)/config/configtls"
280281
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/confmap=$(CURDIR)/confmap"
281282
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/consumer=$(CURDIR)/consumer"
282283
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/exporter=$(CURDIR)/exporter"
@@ -310,6 +311,7 @@ restore-contrib:
310311
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configcompression"
311312
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/confignet"
312313
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configopaque"
314+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtls"
313315
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/confmap"
314316
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/consumer"
315317
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/exporter"

‎cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ replaces:
2727
- go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet
2828
- go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque
2929
# - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
30-
# - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
30+
- go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
3131
- go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
3232
- go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer
3333
- go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replaces:
3030
- go.opentelemetry.io/collector/config/confignet => ../../config/confignet
3131
- go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
3232
# - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
33-
# - go.opentelemetry.io/collector/config/configtls => ../../config/configtls
33+
- go.opentelemetry.io/collector/config/configtls => ../../config/configtls
3434
- go.opentelemetry.io/collector/confmap => ../../confmap
3535
- go.opentelemetry.io/collector/consumer => ../../consumer
3636
- go.opentelemetry.io/collector/connector => ../../connector

‎cmd/otelcorecol/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ require (
7474
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect
7575
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect
7676
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 // indirect
77+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 // indirect
7778
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
7879
go.opentelemetry.io/collector/consumer v0.79.0 // indirect
7980
go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect
@@ -114,6 +115,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
114115

115116
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
116117

118+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
119+
117120
replace go.opentelemetry.io/collector/confmap => ../../confmap
118121

119122
replace go.opentelemetry.io/collector/consumer => ../../consumer

‎component/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
7070
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
7171

7272
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
73+
74+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

‎config/configtls/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../Makefile.Common

‎config/configtls/go.mod

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module go.opentelemetry.io/collector/config/configtls
2+
3+
go 1.19
4+
5+
require (
6+
github.com/fsnotify/fsnotify v1.6.0
7+
github.com/stretchr/testify v1.8.4
8+
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
9+
)
10+
11+
require (
12+
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/pmezard/go-difflib v1.0.0 // indirect
14+
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
15+
gopkg.in/yaml.v3 v3.0.1 // indirect
16+
)
17+
18+
replace go.opentelemetry.io/collector/config/configopaque => ../configopaque

‎config/configtls/go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
4+
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
5+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
8+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
9+
golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
10+
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
12+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
14+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)