trigger build and put to queue status

Author: gy2006

compose_local.yaml docker-compose.yamlcompose_local.yaml renamed to docker-compose.yaml

@@ -5,7 +5,6 @@ services:
   db:
     image: postgres:17
     restart: always
-    container_name: flowci_local_db
     shm_size: 128mb
     ports:
       - "5432:5432"
@@ -14,20 +13,19 @@ services:
       POSTGRES_PASSWORD: flowci
       POSTGRES_DB: flowci_db
 
+  rabbitmq:
+    image: rabbitmq:3-management
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
 #  zk:
 #    image: zookeeper:3.6
 #    container_name: flowci-debug-zk
 #    restart: always
 #    ports:
 #      - "2181:2181"
 #
-#  rabbitmq:
-#    image: rabbitmq:3-management
-#    container_name: flowci-debug-rabbitmq
-#    ports:
-#      - "5672:5672"
-#      - "15672:15672"
-#
 #  minio:
 #    image: quay.io/minio/minio:RELEASE.2023-12-02T10-51-33Z
 #    container_name: flowci-debug-minio

pom.xml

@@ -86,6 +86,11 @@
       <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-amqp</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>

src/main/java/com/flowci/common/business/PublishRabbitEvent.java

@@ -0,0 +1,7 @@
+package com.flowci.common.business;
+
+import com.flowci.common.model.RabbitEvent;
+
+public interface PublishRabbitEvent {
+    void invoke(RabbitEvent event);
+}

src/main/java/com/flowci/common/business/PublishRabbitEventImpl.java

@@ -0,0 +1,47 @@
+package com.flowci.common.business;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flowci.common.model.RabbitEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import static com.flowci.common.config.AmqpConfig.EXCHANGE_NAME;
+
+@Slf4j
+@Component
+public class PublishRabbitEventImpl implements PublishRabbitEvent {
+
+    private final static Long WAIT_TIMEOUT = 5000L; // 5 seconds
+
+    private final RabbitTemplate rabbitTemplate;
+    private final ObjectMapper objectMapper;
+
+    public PublishRabbitEventImpl(@Autowired(required = false) RabbitTemplate rabbitTemplate,
+                                  ObjectMapper objectMapper) {
+        this.rabbitTemplate = rabbitTemplate;
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public void invoke(RabbitEvent event) {
+        if (rabbitTemplate == null) {
+            log.debug("rabbitmq is not configured");
+            return;
+        }
+
+        try {
+            var eventJson = objectMapper.writeValueAsString(event);
+            rabbitTemplate.send(EXCHANGE_NAME, event.getRoutingKey(), new Message(eventJson.getBytes()));
+
+            if (rabbitTemplate.waitForConfirms(WAIT_TIMEOUT)) {
+                log.info("Event {} published successfully", eventJson);
+            }
+        } catch (JsonProcessingException e) {
+            log.error("unable parse event to json", e);
+        }
+    }
+}

src/main/java/com/flowci/common/config/AmqpConfig.java

@@ -0,0 +1,50 @@
+package com.flowci.common.config;
+
+import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.support.RetryTemplateBuilder;
+
+import java.time.Duration;
+
+@Configuration
+@ConditionalOnProperty("spring.rabbitmq.host")
+public class AmqpConfig {
+
+    public final static String EXCHANGE_NAME = "flows.exchange";
+//    public final static String BUILDS_QUEUE_NAME = "flows.builds.queue";
+//    public final static String BUILDS_ROUTING_KEY = "builds";
+
+    @Bean
+    public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) {
+        return new RabbitAdmin(connectionFactory);
+    }
+
+    @Bean
+    public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
+        var rabbitTemplate = new RabbitTemplate(connectionFactory);
+        rabbitTemplate.setRetryTemplate(new RetryTemplateBuilder()
+                .fixedBackoff(Duration.ofSeconds(2L))
+                .maxAttempts(3)
+                .build());
+        return rabbitTemplate;
+    }
+
+//    @Bean
+//    public Declarables declarables() {
+//        var exchange = new DirectExchange(EXCHANGE_NAME);
+//        var queueForBuilds = QueueBuilder.durable(BUILDS_QUEUE_NAME)
+//                .quorum()
+//                .build();
+//
+//        return new Declarables(
+//                exchange,
+//                queueForBuilds,
+//                BindingBuilder.bind(queueForBuilds).to(exchange).with(BUILDS_ROUTING_KEY)
+//        );
+//    }
+}

src/main/java/com/flowci/common/model/RabbitEvent.java

@@ -0,0 +1,18 @@
+package com.flowci.common.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import java.io.Serializable;
+
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.CLASS,
+        include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
+        property = "klass",
+        visible = true
+)
+public interface RabbitEvent extends Serializable {
+
+    @JsonIgnore
+    String getRoutingKey();
+}

src/main/resources/application-ci.yaml …c/main/resources/application-flowci.yamlsrc/main/resources/application-ci.yaml renamed to src/main/resources/application-flowci.yaml src/main/resources/application-ci.yaml renamed to src/main/resources/application-flowci.yaml

@@ -10,7 +10,7 @@ spring:
     import:
       - classpath:application-management.yaml
       - classpath:application-db.yaml
-      - classpath:application-ci.yaml
+      - classpath:application-flowci.yaml
 
 server:
   port: ${FLOWCI_SERVER_PORT:8080}

src/main/resources/application.yaml

@@ -7,6 +7,7 @@
 import com.flowci.flow.repo.FlowYamlRepo;
 import lombok.Getter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
@@ -30,7 +31,8 @@
         DataSourceAutoConfiguration.class,
         DataSourceTransactionManagerAutoConfiguration.class,
         HibernateJpaAutoConfiguration.class,
-        FlywayAutoConfiguration.class
+        FlywayAutoConfiguration.class,
+        RabbitAutoConfiguration.class,
 })
 @Import(SpringTest.MockRepositoriesConfig.class)
 public abstract class SpringTest {

src/test/java/com/flowci/SpringTest.java

@@ -2,16 +2,21 @@
 
 import com.flowci.SpringTest;
 import com.flowci.build.model.Build;
+import com.flowci.common.business.PublishRabbitEvent;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doNothing;
 
 class WaitForAgentTest extends SpringTest {
 
+    @MockBean
+    private PublishRabbitEvent publishRabbitEvent;
+
     @Autowired
     private MockRepositoriesConfig mockRepositoriesConfig;