Skip to content

Support for yaml in S3Config #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2022
Merged

Support for yaml in S3Config #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7804ed3
Support for yaml in S3Config
hatondo-bcov Jul 27, 2022
b28fd83
Support for yaml RemoteClientConfig sub structures
hatondo-bcov Jul 27, 2022
515c353
Fix broken test
hatondo-bcov Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion remoteconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions s3_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions s3_endpoint_expiry_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down