#1877 stop properly

yegor256 · Feb 27, 2024 · 2282ae7 · 2282ae7
1 parent 4b430ae
commit 2282ae7
Showing 1 changed file with 5 additions and 30 deletions.
diff --git a/src/main/java/com/rultor/agents/aws/StopsInstance.java b/src/main/java/com/rultor/agents/aws/StopsInstance.java
@@ -29,9 +29,6 @@
  */
 package com.rultor.agents.aws;
 
-import com.amazonaws.services.ec2.AmazonEC2;
-import com.amazonaws.services.ec2.model.DryRunResult;
-import com.amazonaws.services.ec2.model.DryRunSupportedRequest;
 import com.amazonaws.services.ec2.model.StopInstancesRequest;
 import com.jcabi.aspects.Immutable;
 import com.jcabi.log.Logger;
@@ -71,33 +68,11 @@ public StopsInstance(final AwsEc2 api) {
     @Override
     public Iterable<Directive> process(final XML xml) throws IOException {
         final String instance = xml.xpath("/talk/ec2/@id").get(0);
-        this.stop(instance);
-        return new Directives().xpath("/talk/ec2").strict(1).remove();
-    }
-
-    /**
-     * Stop instance.
-     * @param instance Instance ID
-     */
-    private void stop(final String instance) {
-        final DryRunSupportedRequest<StopInstancesRequest> draft = () -> {
-            final StopInstancesRequest request = new StopInstancesRequest()
-                .withInstanceIds(instance);
-            return request.getDryRunRequest();
-        };
-        final AmazonEC2 client = this.api.aws();
-        final DryRunResult<StopInstancesRequest> response =
-            client.dryRun(draft);
-        if (!response.isSuccessful()) {
-            Logger.error(
-                this,
-                "Failed dry run to stop instance %s", instance
-            );
-            throw response.getDryRunResponse();
-        }
-        final StopInstancesRequest request = new StopInstancesRequest()
-            .withInstanceIds(instance);
-        client.stopInstances(request);
+        this.api.aws().stopInstances(
+            new StopInstancesRequest()
+                .withInstanceIds(instance)
+        );
         Logger.info("Successfully stopped instance %s", instance);
+        return new Directives().xpath("/talk/ec2").strict(1).remove();
     }
 }