From 09eb7ee111876779932be3762c785dc1be05aeed Mon Sep 17 00:00:00 2001 From: Sven Rebhan <36194019+srebhan@users.noreply.github.com> Date: Tue, 16 Aug 2022 19:04:30 +0200 Subject: [PATCH] chore: Move aws credentials to plugins/common. (#11681) --- {config => plugins/common}/aws/credentials.go | 0 plugins/inputs/cloudwatch/cloudwatch.go | 3 ++- plugins/inputs/cloudwatch/cloudwatch_test.go | 2 +- plugins/inputs/kinesis_consumer/kinesis_consumer.go | 3 ++- plugins/outputs/cloudwatch/cloudwatch.go | 5 ++--- plugins/outputs/cloudwatch_logs/cloudwatch_logs.go | 5 +++-- .../outputs/cloudwatch_logs/cloudwatch_logs_test.go | 12 ++++++------ plugins/outputs/http/http.go | 3 ++- plugins/outputs/http/http_test.go | 2 +- plugins/outputs/kinesis/kinesis.go | 3 ++- plugins/outputs/timestream/timestream.go | 3 ++- plugins/outputs/timestream/timestream_test.go | 2 +- 12 files changed, 24 insertions(+), 19 deletions(-) rename {config => plugins/common}/aws/credentials.go (100%) diff --git a/config/aws/credentials.go b/plugins/common/aws/credentials.go similarity index 100% rename from config/aws/credentials.go rename to plugins/common/aws/credentials.go diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go index b9d8738bf..2c67f0287 100644 --- a/plugins/inputs/cloudwatch/cloudwatch.go +++ b/plugins/inputs/cloudwatch/cloudwatch.go @@ -18,16 +18,17 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" - internalaws "github.com/influxdata/telegraf/config/aws" "github.com/influxdata/telegraf/filter" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal/limiter" internalMetric "github.com/influxdata/telegraf/metric" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" internalProxy "github.com/influxdata/telegraf/plugins/common/proxy" "github.com/influxdata/telegraf/plugins/inputs" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go index ef5b18fb1..6b05f5527 100644 --- a/plugins/inputs/cloudwatch/cloudwatch_test.go +++ b/plugins/inputs/cloudwatch/cloudwatch_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "github.com/influxdata/telegraf/config" - internalaws "github.com/influxdata/telegraf/config/aws" "github.com/influxdata/telegraf/filter" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/plugins/common/proxy" "github.com/influxdata/telegraf/testutil" ) diff --git a/plugins/inputs/kinesis_consumer/kinesis_consumer.go b/plugins/inputs/kinesis_consumer/kinesis_consumer.go index e0eba6546..9f15d62b9 100644 --- a/plugins/inputs/kinesis_consumer/kinesis_consumer.go +++ b/plugins/inputs/kinesis_consumer/kinesis_consumer.go @@ -20,12 +20,13 @@ import ( "github.com/harlow/kinesis-consumer/store/ddb" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index 8b06526bd..ae5240b36 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -14,14 +14,13 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" - + internalaws "github.com/influxdata/telegraf/plugins/common/aws" httpconfig "github.com/influxdata/telegraf/plugins/common/http" - "github.com/influxdata/telegraf/plugins/outputs" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/outputs/cloudwatch_logs/cloudwatch_logs.go b/plugins/outputs/cloudwatch_logs/cloudwatch_logs.go index 492aac297..22b05473d 100644 --- a/plugins/outputs/cloudwatch_logs/cloudwatch_logs.go +++ b/plugins/outputs/cloudwatch_logs/cloudwatch_logs.go @@ -15,11 +15,12 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/plugins/outputs" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string @@ -34,7 +35,7 @@ type logStreamContainer struct { sequenceToken string } -//Cloudwatch Logs service interface +// Cloudwatch Logs service interface type cloudWatchLogs interface { DescribeLogGroups(context.Context, *cloudwatchlogs.DescribeLogGroupsInput, ...func(options *cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeLogGroupsOutput, error) DescribeLogStreams(context.Context, *cloudwatchlogs.DescribeLogStreamsInput, ...func(options *cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeLogStreamsOutput, error) diff --git a/plugins/outputs/cloudwatch_logs/cloudwatch_logs_test.go b/plugins/outputs/cloudwatch_logs/cloudwatch_logs_test.go index 3107eaadf..660a95ef0 100644 --- a/plugins/outputs/cloudwatch_logs/cloudwatch_logs_test.go +++ b/plugins/outputs/cloudwatch_logs/cloudwatch_logs_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/testutil" ) @@ -63,7 +63,7 @@ func (c *mockCloudWatchLogs) PutLogEvents(_ context.Context, input *cloudwatchlo return output, nil } -//Ensure mockCloudWatchLogs implement cloudWatchLogs interface +// Ensure mockCloudWatchLogs implement cloudWatchLogs interface var _ cloudWatchLogs = (*mockCloudWatchLogs)(nil) func RandStringBytes(n int) string { @@ -243,8 +243,8 @@ func TestConnect(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _, _ = fmt.Fprintln(w, `{ - "logGroups": [ - { + "logGroups": [ + { "arn": "string", "creationTime": 123456789, "kmsKeyId": "string", @@ -283,8 +283,8 @@ func TestWrite(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _, _ = fmt.Fprintln(w, `{ - "logGroups": [ - { + "logGroups": [ + { "arn": "string", "creationTime": 123456789, "kmsKeyId": "string", diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go index 546e70720..668e7c04b 100644 --- a/plugins/outputs/http/http.go +++ b/plugins/outputs/http/http.go @@ -17,8 +17,8 @@ import ( v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" "github.com/influxdata/telegraf/internal" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" httpconfig "github.com/influxdata/telegraf/plugins/common/http" "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" @@ -27,6 +27,7 @@ import ( ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go index fd03efa78..5150376bc 100644 --- a/plugins/outputs/http/http_test.go +++ b/plugins/outputs/http/http_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/metric" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" httpconfig "github.com/influxdata/telegraf/plugins/common/http" "github.com/influxdata/telegraf/plugins/common/oauth" "github.com/influxdata/telegraf/plugins/serializers" diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go index 249a1560f..ecc4e4107 100644 --- a/plugins/outputs/kinesis/kinesis.go +++ b/plugins/outputs/kinesis/kinesis.go @@ -12,12 +12,13 @@ import ( "github.com/gofrs/uuid" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/outputs/timestream/timestream.go b/plugins/outputs/timestream/timestream.go index e8f6f6096..124c83dff 100644 --- a/plugins/outputs/timestream/timestream.go +++ b/plugins/outputs/timestream/timestream.go @@ -18,11 +18,12 @@ import ( "github.com/aws/smithy-go" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/plugins/outputs" ) // DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data. +// //go:embed sample.conf var sampleConfig string diff --git a/plugins/outputs/timestream/timestream_test.go b/plugins/outputs/timestream/timestream_test.go index e070eb3d7..dfde353a3 100644 --- a/plugins/outputs/timestream/timestream_test.go +++ b/plugins/outputs/timestream/timestream_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" - internalaws "github.com/influxdata/telegraf/config/aws" + internalaws "github.com/influxdata/telegraf/plugins/common/aws" "github.com/influxdata/telegraf/testutil" )