Merge branch 'master' into efs-snapshot-list-fix

kanisterio · Aug 14, 2019 · 3ee4468 · 3ee4468
2 parents fd08822 + 9733431
commit 3ee4468
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,26 @@
+## Change Overview
+
+<!-- Insert PR description-->
+
+## Pull request type
+
+Please check the type of change your PR introduces:
+- [ ] Work in Progress
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Trival/Minor
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Documentation
+
+## Issues
+
+- #XXX
+
+## Test Plan
+
+<!-- Will run prior to merging.-->
+<!-- Include example how to run.-->
+
+- [ ] Manual
+- [ ] Unit test
+- [ ] E2E
diff --git a/pkg/blockstorage/awsefs/awsefs.go b/pkg/blockstorage/awsefs/awsefs.go
@@ -390,6 +390,9 @@ func (e *efs) SetTags(ctx context.Context, resource interface{}, tags map[string
 }
 
 func (e *efs) setBackupTags(ctx context.Context, arn string, tags map[string]string) error {
+	if len(tags) == 0 {
+		return nil
+	}
 	req := &backup.TagResourceInput{
 		ResourceArn: &arn,
 		Tags:        convertToBackupTags(tags),
@@ -399,6 +402,9 @@ func (e *efs) setBackupTags(ctx context.Context, arn string, tags map[string]str
 }
 
 func (e *efs) setEFSTags(ctx context.Context, id string, tags map[string]string) error {
+	if len(tags) == 0 {
+		return nil
+	}
 	req := &awsefs.CreateTagsInput{
 		FileSystemId: &id,
 		Tags:         convertToEFSTags(tags),