#1877 with security group

Author: yegor256

src/main/java/com/rultor/agents/Agents.java

@@ -271,7 +271,8 @@ public Agent agent(final Talk talk, final Profile profile)
                                 Manifests.read("Rultor-EC2Secret")
                             ),
                             Manifests.read("Rultor-EC2Image"),
-                            Manifests.read("Rultor-EC2Type")
+                            Manifests.read("Rultor-EC2Type"),
+                            Manifests.read("Rultor-EC2Group")
                         ),
                         profile,
                         Agents.PORT,

src/main/java/com/rultor/agents/aws/AwsEc2Image.java

@@ -61,35 +61,39 @@ public final class AwsEc2Image {
     private final transient InstanceType type;
 
     /**
-     * Ctor.
-     * @param api AwsEc2 api client
-     * @param image Ec2 instance ami_id
+     * EC2 security group.
      */
-    public AwsEc2Image(final AwsEc2 api, final String image) {
-        this(api, image, "t2.nano");
-    }
+    private final String sgroup;
 
     /**
      * Ctor.
      * @param api AwsEc2 api client
      * @param image Ec2 instance ami_id
      * @param type Instance type
+     * @param grp Security group
+     * @checkstyle ParameterNumberCheck (5 lines)
      */
     public AwsEc2Image(final AwsEc2 api, final String image,
-        final String type) {
+        final String type, final String grp) {
+        this.api = api;
         if (image.isEmpty()) {
             throw new IllegalArgumentException(
                 "Machine image id is mandatory"
             );
         }
+        this.image = image;
         if (type.isEmpty()) {
             throw new IllegalArgumentException(
                 "Machine type is mandatory"
             );
         }
-        this.api = api;
-        this.image = image;
         this.type = InstanceType.fromValue(type);
+        if (grp.isEmpty()) {
+            throw new IllegalArgumentException(
+                "Security group is mandatory"
+            );
+        }
+        this.sgroup = grp;
     }
 
     /**
@@ -98,6 +102,7 @@ public AwsEc2Image(final AwsEc2 api, final String image,
      */
     public AwsEc2Instance run() {
         final RunInstancesRequest request = new RunInstancesRequest()
+            .withSecurityGroups(this.sgroup)
             .withImageId(this.image)
             .withInstanceType(this.type)
             .withMaxCount(1)

src/main/java/com/rultor/agents/aws/AwsEc2Instance.java

@@ -122,7 +122,7 @@ public void stop() {
         final StopInstancesRequest request = new StopInstancesRequest()
             .withInstanceIds(this.id);
         client.stopInstances(request);
-        Logger.info("Successfully stop instance %s", this.id);
+        Logger.info("Successfully stopped instance %s", this.id);
     }
 
     /**

src/main/java/com/rultor/spi/Agent.java

@@ -133,4 +133,49 @@ public void execute(final Talk talk) throws IOException {
             }
         }
     }
+
+    /**
+     * Swallows all exceptions.
+     *
+     * @since 1.0
+     */
+    @Immutable
+    @ToString
+    @EqualsAndHashCode(of = "agent")
+    final class Quiet implements Agent {
+        /**
+         * Agent to disable.
+         */
+        private final transient Agent agent;
+
+        /**
+         * Disable it?
+         */
+        private final transient boolean disable;
+
+        /**
+         * Ctor.
+         * @param agt Agent
+         */
+        public Disabled(final Agent agt) {
+            this(agt, true);
+        }
+
+        /**
+         * Ctor.
+         * @param agt Agent
+         * @param dsbl Disable it?
+         */
+        public Disabled(final Agent agt, final boolean dsbl) {
+            this.agent = agt;
+            this.disable = dsbl;
+        }
+
+        @Override
+        public void execute(final Talk talk) throws IOException {
+            if (!this.disable) {
+                this.agent.execute(talk);
+            }
+        }
+    }
 }

src/main/resources/META-INF/MANIFEST.MF

@@ -16,6 +16,7 @@ Rultor-EC2Key: ${ec2.key}
 Rultor-EC2Secret: ${ec2.secret}
 Rultor-EC2Image: ${ec2.image}
 Rultor-EC2Type: ${ec2.type}
+Rultor-EC2Group: ${ec2.group}
 Rultor-TwitterKey: ${twitter.key}
 Rultor-TwitterSecret: ${twitter.secret}
 Rultor-TwitterToken: ${twitter.token}

src/test/resources/META-INF/MANIFEST.MF

@@ -19,3 +19,5 @@ Rultor-EC2Key: none
 Rultor-EC2Secret: none
 Rultor-EC2Image: none
 Rultor-EC2Type: t3.large
+Rultor-EC2Group: none
+