Add sts endpoint and fix validate func

exporter/awscloudwatchlogsexporter/config.go

@@ -16,6 +16,7 @@ package awscloudwatchlogsexporter // import "github.com/open-telemetry/opentelem
 
 import (
  "errors"
+ "fmt"
  "regexp"
 
  "go.opentelemetry.io/collector/component"
@@ -86,9 +87,9 @@ func (config *Config) Validate() error {
  if !isValidRetentionValue(config.LogRetention) {
  return errors.New("invalid value for retention policy. Please make sure to use the following values: 0 (Never Expire), 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 2192, 2557, 2922, 3288, or 3653")
  }
- tagInputReturnVal := isValidTagsInput(config.Tags)
- if tagInputReturnVal != "Valid" {
- return errors.New(tagInputReturnVal)
+ tagInputErr := validateTagsInput(config.Tags)
+ if tagInputErr != nil {
+ return errors.New(tagInputErr.Error())
  }
  return nil
 }
@@ -125,28 +126,28 @@ func isValidRetentionValue(input int64) bool {
 }
 
 // Check if the tags input is valid
-func isValidTagsInput(input map[string]*string) string {
+func validateTagsInput(input map[string]*string) error {
  if len(input) > 50 {
- return "invalid amount of items. Please input at most 50 tags."
+ return fmt.Errorf("invalid amount of items. Please input at most 50 tags")
  }
  validKeyPattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
  validValuePattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
  for key, value := range input {
  if len(key) < 1 || len(key) > 128 {
- return "key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters"
+ return fmt.Errorf("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
  }
  if len(*value) < 1 || len(*value) > 256 {
- return "value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters"
+ return fmt.Errorf("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
  }
  if !validKeyPattern.MatchString(key) {
- return "key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`
+ return fmt.Errorf("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
  }
  if !validValuePattern.MatchString(*value) {
- return "value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`
+ return fmt.Errorf("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
  }
  }
 
- return "Valid"
+ return nil
 }
 
 func (config *Config) enforcedQueueSettings() exporterhelper.QueueSettings {

exporter/awscloudwatchlogsexporter/config_test.go

@@ -183,7 +183,7 @@ func TestTagsValidateTooManyTags(t *testing.T) {
  QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
  },
  }
- assert.EqualError(t, component.ValidateConfig(wrongcfg), "invalid amount of items. Please input at most 50 tags.")
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "invalid amount of items. Please input at most 50 tags")
 }
 
 func TestTagsValidateWrongKeyRegex(t *testing.T) {

exporter/awsemfexporter/config.go

@@ -17,6 +17,7 @@ package awsemfexporter // import "github.com/open-telemetry/opentelemetry-collec
 import (
  "errors"
  "regexp"
+ "fmt"
 
  "go.uber.org/zap"
 
@@ -138,37 +139,37 @@ func (config *Config) Validate() error {
  return errors.New("invalid value for retention policy. Please make sure to use the following values: 0 (Never Expire), 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 2192, 2557, 2922, 3288, or 3653")
  }
 
- tagInputReturnVal := isValidTagsInput(config.Tags)
- if tagInputReturnVal != "Valid" {
- return errors.New(tagInputReturnVal)
+ tagInputErr := validateTagsInput(config.Tags)
+ if tagInputErr != nil {
+ return errors.New(tagInputErr.Error())
  }
 
  return nil
 }
 
 // Check if the tags input is valid
-func isValidTagsInput(input map[string]*string) string {
+func validateTagsInput(input map[string]*string) error {
  if len(input) > 50 {
- return "invalid amount of items. Please input at most 50 tags."
+ return fmt.Errorf("invalid amount of items. Please input at most 50 tags")
  }
  validKeyPattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
  validValuePattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
  for key, value := range input {
  if len(key) < 1 || len(key) > 128 {
- return "key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters"
+ return fmt.Errorf("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
  }
  if len(*value) < 1 || len(*value) > 256 {
- return "value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters"
+ return fmt.Errorf("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
  }
  if !validKeyPattern.MatchString(key) {
- return "key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`
+ return fmt.Errorf("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
  }
  if !validValuePattern.MatchString(*value) {
- return "value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`
+ return fmt.Errorf("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
  }
  }
 
- return "Valid"
+ return nil
 }
 
 // Added function to check if value is an accepted number of log retention days

exporter/awsemfexporter/config_test.go

@@ -214,7 +214,7 @@ func TestTagsValidateTooManyTags(t *testing.T) {
  ResourceToTelemetrySettings: resourcetotelemetry.Settings{Enabled: true},
  logger: zap.NewNop(),
  }
- assert.EqualError(t, component.ValidateConfig(wrongcfg), "invalid amount of items. Please input at most 50 tags.")
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "invalid amount of items. Please input at most 50 tags")
 }
 
 func TestTagsValidateWrongKeyRegex(t *testing.T) {

internal/aws/cwlogs/cwlog_client.go

@@ -22,6 +22,7 @@ import (
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/awserr"
+ "github.com/aws/aws-sdk-go/aws/endpoints"
  "github.com/aws/aws-sdk-go/aws/request"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/cloudwatchlogs"
@@ -70,6 +71,7 @@ func NewClient(logger *zap.Logger, awsConfig *aws.Config, buildInfo component.Bu
  if !reflect.ValueOf(awsConfig.Region).IsNil() {
  region = *awsConfig.Region
  }
+ awsConfig = awsConfig.WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint)
  stsClient := sts.New(sess, awsConfig)
  accountCall, err := stsClient.GetCallerIdentity(&sts.GetCallerIdentityInput{})
  if err != nil {