From 7804ed3be44805e3c2e96dc06e940c1735f5d539 Mon Sep 17 00:00:00 2001 From: hatondo-bcov Date: Tue, 26 Jul 2022 21:07:46 -0500 Subject: [PATCH 1/3] Support for yaml in S3Config --- s3_config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/s3_config.go b/s3_config.go index 4131dde..f8f6067 100644 --- a/s3_config.go +++ b/s3_config.go @@ -10,10 +10,10 @@ const ( ) type S3Config struct { - Endpoint *string `json:"endpoint,omitempty" remoteconfig:"optional"` - Bucket *string `json:"bucket,omitempty"` // i.e. bucket - Region *AWSRegion `json:"region,omitempty"` // i.e. us-west-2 - Expiry *uint `json:"expiry,omitempty" remoteconfig:"optional"` // i.e. 60 + Endpoint *string `json:"endpoint,omitempty" yaml:"endpoint,omitempty" remoteconfig:"optional"` + Bucket *string `json:"bucket,omitempty" yaml:"bucket,omitempty"` // i.e. bucket + Region *AWSRegion `json:"region,omitempty" yaml:"region,omitempty"` // i.e. us-west-2 + Expiry *uint `json:"expiry,omitempty" yaml:"expiry,omitempty" remoteconfig:"optional"` // i.e. 60 } func (c S3Config) GetEndpoint() string { From b28fd831bfaad5f50e541c5b4c6677857220c69e Mon Sep 17 00:00:00 2001 From: hatondo-bcov Date: Tue, 26 Jul 2022 21:43:36 -0500 Subject: [PATCH 2/3] Support for yaml RemoteClientConfig sub structures --- s3_endpoint_expiry_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s3_endpoint_expiry_config.go b/s3_endpoint_expiry_config.go index 2296046..b439093 100644 --- a/s3_endpoint_expiry_config.go +++ b/s3_endpoint_expiry_config.go @@ -5,8 +5,8 @@ const ( ) type S3EndpointExpiryConfig struct { - Endpoint *string `json:"endpoint,omitempty" remoteconfig:"optional"` - Expiry *uint `json:"expiry,omitempty" remoteconfig:"optional"` + Endpoint *string `json:"endpoint,omitempty" yaml:"endpoint,omitempty" remoteconfig:"optional"` + Expiry *uint `json:"expiry,omitempty" yaml:"expiry,omitempty" remoteconfig:"optional"` } func (c S3EndpointExpiryConfig) GetEndpoint() string { From 515c3539e4325491e343772a577136fc50f39f44 Mon Sep 17 00:00:00 2001 From: hatondo-bcov Date: Mon, 1 Aug 2022 13:06:33 -0500 Subject: [PATCH 3/3] Fix broken test --- remoteconfig_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remoteconfig_test.go b/remoteconfig_test.go index 635cea8..3796ccc 100644 --- a/remoteconfig_test.go +++ b/remoteconfig_test.go @@ -587,7 +587,7 @@ func (s *RemoteConfigSuite) TestLoadConfigFromURLError() { c := &SQSQueueConfig{} err := LoadConfigFromURL("invalid", c) assert.NotNil(s.T(), err) - assert.EqualError(s.T(), err, "Get invalid: unsupported protocol scheme \"\"") + assert.EqualError(s.T(), err, "Get \"invalid\": unsupported protocol scheme \"\"") } func (s *RemoteConfigSuite) TestReadJSONValidate() {