Fix create task NPE and permissions issues (#20)

* Avoid NPE if BytesPerSecond is not given

* Add logs:DescribeLogGroups to task resource permissions

Co-authored-by: Josh Sennett <[email protected]>

Author: Josh Sennett

aws-datasync-task/aws-datasync-task.json

@@ -314,6 +314,7 @@
         "fsx:DescribeFileSystems",
         "elasticfilesystem:DescribeFileSystems",
         "elasticfilesystem:DescribeMountTargets",
+        "logs:DescribeLogGroups",
         "iam:GetRole",
         "iam:PassRole"
       ]
@@ -330,7 +331,8 @@
         "datasync:DescribeTask",
         "datasync:ListTagsForResource",
         "datasync:TagResource",
-        "datasync:UntagResource"
+        "datasync:UntagResource",
+        "logs:DescribeLogGroups"
       ]
     },
     "delete": {

aws-datasync-task/resource-role.yaml

@@ -42,6 +42,7 @@ Resources:
                 - "fsx:DescribeFileSystems"
                 - "iam:GetRole"
                 - "iam:PassRole"
+                - "logs:DescribeLogGroups"
                 - "s3:ListAllMyBuckets"
                 - "s3:ListBucket"
                 Resource: "*"

aws-datasync-task/src/main/java/software/amazon/datasync/task/Translator.java

@@ -90,9 +90,10 @@ public static software.amazon.datasync.task.Options translateToResourceModelOpti
             final software.amazon.awssdk.services.datasync.model.Options options) {
         if (options == null)
             return software.amazon.datasync.task.Options.builder().build();
+        Integer bytesPerSecond = options.bytesPerSecond() != null ? options.bytesPerSecond().intValue() : null;
         return software.amazon.datasync.task.Options.builder()
                 .atime(options.atimeAsString())
-                .bytesPerSecond(options.bytesPerSecond().intValue())
+                .bytesPerSecond(bytesPerSecond)
                 .gid(options.gidAsString())
                 .logLevel(options.logLevelAsString())
                 .mtime(options.mtimeAsString())
@@ -111,9 +112,11 @@ private static software.amazon.awssdk.services.datasync.model.Options translateT
             final software.amazon.datasync.task.Options options) {
         if (options == null)
             return software.amazon.awssdk.services.datasync.model.Options.builder().build();
+
+        Long bytesPerSecond = options.getBytesPerSecond() != null ? options.getBytesPerSecond().longValue() : null;
         return software.amazon.awssdk.services.datasync.model.Options.builder()
                 .atime(options.getAtime())
-                .bytesPerSecond(options.getBytesPerSecond().longValue())
+                .bytesPerSecond(bytesPerSecond)
                 .gid(options.getGid())
                 .logLevel(options.getLogLevel())
                 .mtime(options.getMtime())