#1906 terminate instead of stop

yegor256 · Feb 28, 2024 · fedcf11 · fedcf11
1 parent 65d4710
commit fedcf11
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 35 deletions.
diff --git a/src/main/java/com/rultor/agents/aws/DescribesInstance.java b/src/main/java/com/rultor/agents/aws/DescribesInstance.java
@@ -69,25 +69,24 @@ public DescribesInstance(final AwsEc2 aws) {
     @Override
     public Iterable<Directive> process(final XML xml) throws IOException {
         final String instance = xml.xpath("/talk/ec2/@id").get(0);
-        while (true) {
-            final DescribeInstanceStatusResult res = this.api.aws().describeInstanceStatus(
-                new DescribeInstanceStatusRequest()
-                    .withIncludeAllInstances(true)
+        final DescribeInstanceStatusResult res = this.api.aws().describeInstanceStatus(
+            new DescribeInstanceStatusRequest()
+                .withIncludeAllInstances(true)
+                .withInstanceIds(instance)
+        );
+        final InstanceState state = res.getInstanceStatuses().get(0).getInstanceState();
+        Logger.info(this, "AWS instance %s state: %s", instance, state.getName());
+        final Directives dirs = new Directives();
+        if ("running".equals(state.getName())) {
+            final Instance ready = this.api.aws().describeInstances(
+                new DescribeInstancesRequest()
                     .withInstanceIds(instance)
-            );
-            final InstanceState state = res.getInstanceStatuses().get(0).getInstanceState();
-            Logger.info(this, "AWS instance %s state: %s", instance, state.getName());
-            if ("running".equals(state.getName())) {
-                break;
-            }
-            new Sleep(5L).now();
+            ).getReservations().get(0).getInstances().get(0);
+            final String host = ready.getPublicIpAddress();
+            dirs.xpath("/talk/ec2").add("host").set(host);
+            Logger.info(this, "AWS instance %s is at %s", instance, host);
         }
-        final Instance ready = this.api.aws().describeInstances(
-            new DescribeInstancesRequest()
-                .withInstanceIds(instance)
-        ).getReservations().get(0).getInstances().get(0);
-        final String host = ready.getPublicIpAddress();
-        return new Directives().xpath("/talk/ec2").add("host").set(host);
+        return dirs;
     }
 
 }
diff --git a/src/main/java/com/rultor/agents/aws/StartsInstance.java b/src/main/java/com/rultor/agents/aws/StartsInstance.java
@@ -104,8 +104,8 @@ public Iterable<Directive> process(final XML xml) throws IOException {
         try {
             final Instance instance = this.run(xml.xpath("/talk/@name").get(0));
             Logger.info(
-                this, "EC2 instance %s on %s started in %s",
-                instance.getInstanceId(), instance.getPublicIpAddress(),
+                this, "EC2 instance %s started for %s",
+                instance.getInstanceId(),
                 xml.xpath("/talk/@name").get(0)
             );
             dirs.xpath("/talk")

diff --git a/src/main/resources/com/rultor/spi/talk.xsd b/src/main/resources/com/rultor/spi/talk.xsd
@@ -295,10 +295,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <xs:sequence>
       <xs:element name="log" minOccurs="0" maxOccurs="unbounded">
         <xs:annotation>
-          <xs:documentation source="description">
-                        This element has the log specification for the archive
-                        task.
-                    </xs:documentation>
+          <xs:documentation source="description">This element has the log specification for the archive task.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
           <xs:simpleContent>
@@ -314,32 +311,31 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   </xs:complexType>
   <xs:complexType name="ec2">
     <xs:annotation>
-      <xs:documentation source="description">
-                This type describes the specification about the EC2.
-            </xs:documentation>
+      <xs:documentation source="description">This type describes the specification about the EC2.</xs:documentation>
     </xs:annotation>
+    <xs:all>
+      <xs:element name="host" type="xs:string" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="description">IP of the EC2 server.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
     <xs:attribute name="id" type="xs:string" use="required"/>
   </xs:complexType>
   <xs:element name="talk">
     <xs:annotation>
-      <xs:documentation source="description">
-                This element has the definition of the talk task.
-            </xs:documentation>
+      <xs:documentation source="description">This element has the definition of the talk task.</xs:documentation>
     </xs:annotation>
     <xs:complexType>
       <xs:all>
         <xs:element name="daemon" type="daemon" minOccurs="0">
           <xs:annotation>
-            <xs:documentation source="description">
-                            This element has the daemon definition.
-                        </xs:documentation>
+            <xs:documentation source="description">This element has the daemon definition.</xs:documentation>
           </xs:annotation>
         </xs:element>
         <xs:element name="wire" type="wire" minOccurs="0">
           <xs:annotation>
-            <xs:documentation source="description">
-                            This element has the wire definition.
-                        </xs:documentation>
+            <xs:documentation source="description">This element has the wire definition.</xs:documentation>
           </xs:annotation>
         </xs:element>
         <xs:element name="shell" type="shell" minOccurs="0">