Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
SHELL = /bin/bash -eo pipefail

GORELEASER_VERSION = "v1.19.2"
GO_LICENSER_VERSION = "v0.4.0"
GOLANGCI_LINT_VERSION = "v1.64.4"
export DOCKER_IMAGE_NAME = observability/apm-lambda-extension
export DOCKER_REGISTRY = docker.elastic.co
Expand Down Expand Up @@ -42,14 +41,22 @@ lint:
@if [ "$(CI)" != "" ]; then go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) version; fi
@go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --build-tags tools

MODULE_DEPS=$(sort $(shell go list -deps -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" .))

NOTICE.txt: go.mod
@bash ./scripts/notice.sh
go list -m -json $(MODULE_DEPS) | go tool go.elastic.co/go-licence-detector \
-includeIndirect \
-rules scripts/rules.json \
-noticeTemplate scripts/templates/NOTICE.txt.tmpl \
-noticeOut NOTICE.txt \
-depsTemplate scripts/templates/dependencies.asciidoc.tmpl \
-depsOut dependencies.asciidoc

.PHONY: check-licenses
check-licenses:
@go run github.com/elastic/go-licenser@$(GO_LICENSER_VERSION) -d -exclude tf -exclude testing -exclude e2e-testing .
@go run github.com/elastic/go-licenser@$(GO_LICENSER_VERSION) -d -exclude tf -exclude testing -exclude e2e-testing -ext .java .
@go run github.com/elastic/go-licenser@$(GO_LICENSER_VERSION) -d -exclude tf -exclude testing -exclude e2e-testing -ext .js .
@go tool github.com/elastic/go-licenser -d -exclude tf -exclude testing -exclude e2e-testing .
@go tool github.com/elastic/go-licenser -d -exclude tf -exclude testing -exclude e2e-testing -ext .java .
@go tool github.com/elastic/go-licenser -d -exclude tf -exclude testing -exclude e2e-testing -ext .js .


.PHONY: check-notice
Expand Down
615 changes: 304 additions & 311 deletions NOTICE.txt

Large diffs are not rendered by default.

28 changes: 19 additions & 9 deletions dependencies.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,40 @@ This page lists the third-party dependencies used to build {n}.
|===
| Name | Version | Licence

| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2$$] | v1.36.3 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/config$$] | v1.29.14 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/acm$$] | v1.32.0 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/secretsmanager$$] | v1.35.4 | Apache-2.0
| link:https://github.com/tidwall/gjson[$$github.com/tidwall/gjson$$] | v1.18.0 | MIT
| link:https://github.com/tidwall/sjson[$$github.com/tidwall/sjson$$] | v1.2.5 | MIT
| link:https://go.elastic.co/ecszap[$$go.elastic.co/ecszap$$] | v1.0.3 | Apache-2.0
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.5.1 | MIT
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.27.0 | MIT
|===


[float]
[id="{p}-dependencies-indirect"]
== Indirect dependencies

[options="header"]
|===
| Name | Version | Licence

| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/credentials$$] | v1.17.67 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/feature/ec2/imds$$] | v1.16.30 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/configsources$$] | v1.3.34 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/endpoints/v2$$] | v2.6.34 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/ini$$] | v1.8.3 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/acm$$] | v1.31.3 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding$$] | v1.12.3 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/internal/presigned-url$$] | v1.12.15 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/secretsmanager$$] | v1.35.4 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sso$$] | v1.25.3 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/ssooidc$$] | v1.30.1 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sts$$] | v1.33.19 | Apache-2.0
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2$$] | v1.36.3 | Apache-2.0
| link:https://github.com/aws/smithy-go[$$github.com/aws/smithy-go$$] | v1.22.2 | Apache-2.0
| link:https://github.com/pkg/errors[$$github.com/pkg/errors$$] | v0.9.1 | BSD-2-Clause
| link:https://github.com/tidwall/gjson[$$github.com/tidwall/gjson$$] | v1.18.0 | MIT
| link:https://github.com/tidwall/match[$$github.com/tidwall/match$$] | v1.1.1 | MIT
| link:https://github.com/tidwall/pretty[$$github.com/tidwall/pretty$$] | v1.2.1 | MIT
| link:https://github.com/tidwall/sjson[$$github.com/tidwall/sjson$$] | v1.2.5 | MIT
| link:https://go.elastic.co/ecszap[$$go.elastic.co/ecszap$$] | v1.0.3 | Apache-2.0
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.5.0 | MIT
| link:https://go.uber.org/multierr[$$go.uber.org/multierr$$] | v1.11.0 | MIT
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.27.0 | MIT
|===


11 changes: 10 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ require (
go.uber.org/zap v1.27.0
)

tool github.com/terraform-docs/terraform-docs
tool (
github.com/elastic/go-licenser
github.com/terraform-docs/terraform-docs
go.elastic.co/go-licence-detector
)

require (
dario.cat/mergo v1.0.1 // indirect
Expand All @@ -38,11 +42,14 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/elastic/go-licenser v0.4.2 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-plugin v1.6.1 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
Expand All @@ -67,6 +74,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
Expand All @@ -80,6 +88,7 @@ require (
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/zclconf/go-cty v1.15.0 // indirect
go.elastic.co/go-licence-detector v0.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
Expand Down
13 changes: 13 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,14 @@ github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxY
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A=
github.com/elastic/go-licenser v0.4.2/go.mod h1:W8eH6FaZDR8fQGm+7FnVa7MxI1b/6dAqxz+zPB8nm5c=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
Expand All @@ -69,6 +73,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 h1:OggOMmdI0JLwg1FkOKH9S7fVHF0oEm8PX6S8kAdpOps=
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
Expand Down Expand Up @@ -148,6 +154,8 @@ github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
Expand All @@ -167,6 +175,7 @@ github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
Expand Down Expand Up @@ -196,6 +205,8 @@ go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
go.elastic.co/fastjson v1.5.1 h1:zeh1xHrFH79aQ6Xsw7YxixvnOdAl3OSv0xch/jRDzko=
go.elastic.co/fastjson v1.5.1/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
go.elastic.co/go-licence-detector v0.7.0 h1:qC31sfyfNcNx/zMYcLABU0ac3MbGHZgksCAb5lMDUMg=
go.elastic.co/go-licence-detector v0.7.0/go.mod h1:f5ty8pjynzQD8BcS+s0qtlOGKc35/HKQxCVi8SHhV5k=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
Expand Down Expand Up @@ -251,6 +262,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.3.2 h1:ytYb4rOqyp1TSa2EPvNVwtPQJctSELKaMyLfqNP4+34=
Expand Down
48 changes: 0 additions & 48 deletions scripts/notice.sh

This file was deleted.

Empty file removed scripts/overrides/overrides.json
Empty file.
27 changes: 8 additions & 19 deletions scripts/templates/NOTICE.txt.tmpl
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
{{- define "depInfo" -}}
{{- range $i, $dep := . }}
{{ "-" | line }}
Module : {{ $dep.Name }}
Version : {{ $dep.Version }}
Time : {{ $dep.VersionTime }}
Licence : {{ $dep.LicenceType }}
Dependency : {{ $dep.Name }}
Version: {{ $dep.Version }}
Licence type (autodetected): {{ $dep.LicenceType }}
{{ "-" | line }}

{{ $dep | licenceText }}
{{ end }}
{{- end -}}

Copyright {{ currentYear }} Elasticsearch BV

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Elastic APM AWS Lambda extension
Copyright 2021-{{ currentYear }} Elasticsearch BV

{{ "=" | line }}
Third party libraries used by the Elastic APM AWS Lambda extension.
Expand All @@ -34,5 +23,5 @@ Third party libraries used by the Elastic APM AWS Lambda extension.
{{ "=" | line }}
Indirect dependencies

{{ template "depInfo" .Indirect }}
{{ end }}
{{ template "depInfo" .Indirect -}}
{{- end}}