dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Last few fixes 

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
This commit is contained in:
ItalyPaleAle 2023-01-10 18:35:29 +00:00
parent 47e8e41492
commit cd800cdbff
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/aws/s3/s3.go
View File

@ -156,7 +156,8 @@ func (s *AWSS3) create(ctx context.Context, req *bindings.InvokeRequest) (*bindi
key := req.Metadata[metadataKey]
if key == "" {
u, err := uuid.NewRandom()
var u uuid.UUID
u, err = uuid.NewRandom()
if err != nil {
return nil, fmt.Errorf("s3 binding error: failed to generate UUID: %w", err)
}

53
bindings/aws/s3/s3_test.go
View File

@ -27,11 +27,20 @@ func TestParseMetadata(t *testing.T) {
t.Run("Has correct metadata", func(t *testing.T) {
m := bindings.Metadata{}
m.Properties = map[string]string{
"AccessKey": "key", "Region": "region", "SecretKey": "secret", "Bucket": "test", "Endpoint": "endpoint", "SessionToken": "token", "ForcePathStyle": "true", "DisableSSL": "true", "InsecureSSL": "true",
"AccessKey": "key",
"Region": "region",
"SecretKey": "secret",
"Bucket": "test",
"Endpoint": "endpoint",
"SessionToken": "token",
"ForcePathStyle": "yes",
"DisableSSL": "true",
"InsecureSSL": "1",
}
s3 := AWSS3{}
meta, err := s3.parseMetadata(m)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, "key", meta.AccessKey)
assert.Equal(t, "region", meta.Region)
assert.Equal(t, "secret", meta.SecretKey)
@ -48,11 +57,17 @@ func TestMergeWithRequestMetadata(t *testing.T) {
t.Run("Has merged metadata", func(t *testing.T) {
m := bindings.Metadata{}
m.Properties = map[string]string{
"AccessKey": "key", "Region": "region", "SecretKey": "secret", "Bucket": "test", "Endpoint": "endpoint", "SessionToken": "token", "ForcePathStyle": "true",
"AccessKey": "key",
"Region": "region",
"SecretKey": "secret",
"Bucket": "test",
"Endpoint": "endpoint",
"SessionToken": "token",
"ForcePathStyle": "YES",
}
s3 := AWSS3{}
meta, err := s3.parseMetadata(m)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, "key", meta.AccessKey)
assert.Equal(t, "region", meta.Region)
assert.Equal(t, "secret", meta.SecretKey)
@ -71,9 +86,7 @@ func TestMergeWithRequestMetadata(t *testing.T) {
mergedMeta, err := meta.mergeWithRequestMetadata(&request)
assert.Nil(t, err)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, "key", mergedMeta.AccessKey)
assert.Equal(t, "region", mergedMeta.Region)
assert.Equal(t, "secret", mergedMeta.SecretKey)
@ -90,11 +103,17 @@ func TestMergeWithRequestMetadata(t *testing.T) {
t.Run("Has invalid merged metadata decodeBase64", func(t *testing.T) {
m := bindings.Metadata{}
m.Properties = map[string]string{
"AccessKey": "key", "Region": "region", "SecretKey": "secret", "Bucket": "test", "Endpoint": "endpoint", "SessionToken": "token", "ForcePathStyle": "true",
"AccessKey": "key",
"Region": "region",
"SecretKey": "secret",
"Bucket": "test",
"Endpoint": "endpoint",
"SessionToken": "token",
"ForcePathStyle": "true",
}
s3 := AWSS3{}
meta, err := s3.parseMetadata(m)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, "key", meta.AccessKey)
assert.Equal(t, "region", meta.Region)
assert.Equal(t, "secret", meta.SecretKey)
@ -110,19 +129,24 @@ func TestMergeWithRequestMetadata(t *testing.T) {
mergedMeta, err := meta.mergeWithRequestMetadata(&request)
assert.Nil(t, err)
assert.NotNil(t, mergedMeta)
assert.NoError(t, err)
assert.False(t, mergedMeta.DecodeBase64)
})
t.Run("Has invalid merged metadata encodeBase64", func(t *testing.T) {
m := bindings.Metadata{}
m.Properties = map[string]string{
"AccessKey": "key", "Region": "region", "SecretKey": "secret", "Bucket": "test", "Endpoint": "endpoint", "SessionToken": "token", "ForcePathStyle": "true",
"AccessKey": "key",
"Region": "region",
"SecretKey": "secret",
"Bucket": "test",
"Endpoint": "endpoint",
"SessionToken": "token",
"ForcePathStyle": "true",
}
s3 := AWSS3{}
meta, err := s3.parseMetadata(m)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, "key", meta.AccessKey)
assert.Equal(t, "region", meta.Region)
assert.Equal(t, "secret", meta.SecretKey)
@ -138,8 +162,7 @@ func TestMergeWithRequestMetadata(t *testing.T) {
mergedMeta, err := meta.mergeWithRequestMetadata(&request)
assert.Nil(t, err)
assert.NotNil(t, mergedMeta)
assert.NoError(t, err)
assert.False(t, mergedMeta.EncodeBase64)
})
}