Skip to content

Commit

Permalink
Implement component.Component
Browse files Browse the repository at this point in the history
  • Loading branch information
damemi committed Mar 15, 2024
1 parent f67ee41 commit 09a443b
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 20 deletions.
37 changes: 20 additions & 17 deletions extension/googleclientauthextension/factory.go
Expand Up @@ -21,7 +21,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/auth"
"golang.org/x/oauth2/google"
"google.golang.org/grpc/credentials/oauth"

Expand All @@ -40,35 +39,39 @@ func NewFactory() extension.Factory {

func CreateExtension(ctx context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
config := cfg.(*Config)
ca := &clientAuthenticator{
config: config,
}
return ca, nil
}

// clientAuthenticator supplies credentials from an oauth.TokenSource.
type clientAuthenticator struct {
oauth.TokenSource
config *Config
}

func (ca *clientAuthenticator) Start(ctx context.Context, _ component.Host) error {
config := ca.config
creds, err := google.FindDefaultCredentials(ctx, config.Scopes...)
if err != nil {
return nil, err
return err
}
if config.Project == "" {
config.Project = creds.ProjectID
}
if config.Project == "" {
return nil, errors.New("no project set in config or found with application default credentials")
return errors.New("no project set in config or found with application default credentials")

Check warning on line 64 in extension/googleclientauthextension/factory.go

View check run for this annotation

Codecov / codecov/patch

extension/googleclientauthextension/factory.go#L64

Added line #L64 was not covered by tests
}
if config.QuotaProject == "" {
config.QuotaProject = quotaProjectFromCreds(creds)
}

ca := clientAuthenticator{
TokenSource: oauth.TokenSource{TokenSource: creds.TokenSource},
config: config,
}

return auth.NewClient(
auth.WithClientRoundTripper(ca.roundTripper),
auth.WithClientPerRPCCredentials(ca.perRPCCredentials),
), nil
ca.TokenSource = oauth.TokenSource{TokenSource: creds.TokenSource}
return nil
}

// clientAuthenticator supplies credentials from an oauth.TokenSource.
type clientAuthenticator struct {
oauth.TokenSource
config *Config
func (ca *clientAuthenticator) Shutdown(ctx context.Context) error {
return nil

Check warning on line 74 in extension/googleclientauthextension/factory.go

View check run for this annotation

Codecov / codecov/patch

extension/googleclientauthextension/factory.go#L73-L74

Added lines #L73 - L74 were not covered by tests
}

// quotaProjectFromCreds retrieves quota project from the credentials file.
Expand Down
18 changes: 18 additions & 0 deletions extension/googleclientauthextension/factory_test.go
Expand Up @@ -41,3 +41,21 @@ func TestCreateExtension(t *testing.T) {
assert.NotNil(t, ext)
assert.NoError(t, err)
}

func TestStart(t *testing.T) {
t.Setenv("GOOGLE_APPLICATION_CREDENTIALS", "testdata/fake_creds.json")
ext, err := NewFactory().CreateExtension(context.Background(), extension.CreateSettings{}, CreateDefaultConfig())
assert.NotNil(t, ext)
assert.NoError(t, err)
err = ext.Start(context.Background(), nil)
assert.NoError(t, err)
}

func TestStart_WithError(t *testing.T) {
t.Setenv("GOOGLE_APPLICATION_CREDENTIALS", "testdata/foo.json")
ext, err := NewFactory().CreateExtension(context.Background(), extension.CreateSettings{}, CreateDefaultConfig())
assert.NotNil(t, ext)
assert.NoError(t, err)
err = ext.Start(context.Background(), nil)
assert.Error(t, err)
}
2 changes: 1 addition & 1 deletion extension/googleclientauthextension/grpc.go
Expand Up @@ -22,7 +22,7 @@ import (

// perRPCCredentials returns gRPC credentials using the OAuth TokenSource, and adds
// google metadata.
func (ca clientAuthenticator) perRPCCredentials() (credentials.PerRPCCredentials, error) {
func (ca clientAuthenticator) PerRPCCredentials() (credentials.PerRPCCredentials, error) {

Check warning on line 25 in extension/googleclientauthextension/grpc.go

View check run for this annotation

Codecov / codecov/patch

extension/googleclientauthextension/grpc.go#L25

Added line #L25 was not covered by tests
return ca, nil
}

Expand Down
2 changes: 1 addition & 1 deletion extension/googleclientauthextension/http.go
Expand Up @@ -23,7 +23,7 @@ import (

// roundTripper provides an HTTP RoundTripper which adds gcp credentials and
// headers.
func (ca *clientAuthenticator) roundTripper(base http.RoundTripper) (http.RoundTripper, error) {
func (ca *clientAuthenticator) RoundTripper(base http.RoundTripper) (http.RoundTripper, error) {
return &oauth2.Transport{
Source: ca,
Base: &parameterTransport{
Expand Down
2 changes: 1 addition & 1 deletion extension/googleclientauthextension/http_test.go
Expand Up @@ -23,7 +23,7 @@ import (

func TestRoundTripper(t *testing.T) {
ca := clientAuthenticator{}
rt, err := ca.roundTripper(roundTripperFunc(func(r *http.Request) (*http.Response, error) {
rt, err := ca.RoundTripper(roundTripperFunc(func(r *http.Request) (*http.Response, error) {
return nil, nil
}))
assert.NotNil(t, rt)
Expand Down

0 comments on commit 09a443b

Please sign in to comment.