Skip to content

Commit

Permalink
[extension/sigv4authextension] Enable component (#8518)
Browse files Browse the repository at this point in the history
* enable sigv4 auth extension component

* fixed go.mod

* fixed go.sum

* aws sdk go v2

* fixed go.mod files post merge conflict

* gotidy change

* CHANGELOG entry
  • Loading branch information
erichsueh3 committed Mar 21, 2022
1 parent 5a82efc commit 97695a5
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
@@ -1,6 +1,7 @@
# Changelog

## Unreleased
- `sigv4authextension`: Enable component (#8518)

### 🛑 Breaking changes 🛑

Expand Down
12 changes: 12 additions & 0 deletions cmd/configschema/go.mod
Expand Up @@ -57,6 +57,15 @@ require (
github.com/armon/go-metrics v0.3.10 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aws/aws-sdk-go v1.43.20 // indirect
github.com/aws/aws-sdk-go-v2 v1.9.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.7.2 // indirect
github.com/aws/smithy-go v1.11.0 // indirect
github.com/beeker1121/goque v2.1.0+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
Expand Down Expand Up @@ -265,6 +274,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.47.0 // indirect
Expand Down Expand Up @@ -627,6 +637,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidc

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension => ../../extension/pprofextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension => ../../extension/sigv4authextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => ../../pkg/batchperresourceattr
Expand Down
9 changes: 9 additions & 0 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions go.mod
Expand Up @@ -57,6 +57,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0
Expand Down Expand Up @@ -171,6 +172,15 @@ require (
github.com/armon/go-metrics v0.3.10 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aws/aws-sdk-go v1.43.20 // indirect
github.com/aws/aws-sdk-go-v2 v1.9.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.7.2 // indirect
github.com/aws/smithy-go v1.11.0 // indirect
github.com/beeker1121/goque v2.1.0+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
Expand Down Expand Up @@ -631,6 +641,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidc

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension => ./extension/pprofextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension => ./extension/sigv4authextension

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ./extension/storage

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => ./pkg/batchperresourceattr
Expand Down
9 changes: 9 additions & 0 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions internal/components/components.go
Expand Up @@ -79,6 +79,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
Expand Down Expand Up @@ -163,6 +164,7 @@ func Components() (component.Factories, error) {
pprofextension.NewFactory(),
oauth2clientauthextension.NewFactory(),
oidcauthextension.NewFactory(),
sigv4authextension.NewFactory(),
zpagesextension.NewFactory(),
}
factories.Extensions, err = component.MakeExtensionFactoryMap(extensions...)
Expand Down
8 changes: 8 additions & 0 deletions internal/components/extensions_test.go
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
Expand Down Expand Up @@ -70,6 +71,13 @@ func TestDefaultExtensions(t *testing.T) {
return cfg
},
},
{
extension: "sigv4auth",
getConfigFn: func() config.Extension {
cfg := extFactories["sigv4auth"].CreateDefaultConfig().(*sigv4authextension.Config)
return cfg
},
},
{
extension: "zpages",
getConfigFn: func() config.Extension {
Expand Down

0 comments on commit 97695a5

Please sign in to comment.