API and Database Deployment Update
This commit is contained in:
@@ -1,15 +1,16 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"clickploy/internal/builder"
|
||||
"clickploy/internal/deployer"
|
||||
"clickploy/internal/ports"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"clickploy/internal/builder"
|
||||
"clickploy/internal/deployer"
|
||||
"clickploy/internal/ports"
|
||||
)
|
||||
|
||||
type Handler struct {
|
||||
@@ -32,7 +33,6 @@ type DeployRequest struct {
|
||||
Port int `json:"port"`
|
||||
GitToken string `json:"git_token"`
|
||||
}
|
||||
|
||||
type DeployResponse struct {
|
||||
Status string `json:"status"`
|
||||
AppName string `json:"app_name"`
|
||||
@@ -45,32 +45,27 @@ func (h *Handler) RegisterRoutes(r *gin.Engine) {
|
||||
r.POST("/deploy", h.handleDeploy)
|
||||
h.RegisterStreamRoutes(r)
|
||||
}
|
||||
|
||||
func (h *Handler) handleDeploy(c *gin.Context) {
|
||||
var req DeployRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
imageName, _, err := h.builder.Build(req.Repo, req.Name, req.GitToken, "", "", "", "", nil, os.Stdout)
|
||||
imageName, _, err := h.builder.Build(req.Repo, "", req.Name, req.GitToken, "", "", "", "", nil, os.Stdout)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Build failed: %v", err)})
|
||||
return
|
||||
}
|
||||
|
||||
port, err := h.ports.GetPort(req.Name, req.Port)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Port allocation failed: %v", err)})
|
||||
return
|
||||
}
|
||||
|
||||
_, err = h.deployer.RunContainer(c.Request.Context(), imageName, req.Name, port, nil)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Deployment failed: %v", err)})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, DeployResponse{
|
||||
Status: "success",
|
||||
AppName: req.Name,
|
||||
@@ -79,14 +74,42 @@ func (h *Handler) handleDeploy(c *gin.Context) {
|
||||
Message: "Container started successfully",
|
||||
})
|
||||
}
|
||||
|
||||
func (h *Handler) RegisterSystemRoutes(r *gin.Engine) {
|
||||
r.GET("/api/system/status", h.handleSystemStatus)
|
||||
}
|
||||
|
||||
func (h *Handler) handleSystemStatus(c *gin.Context) {
|
||||
localIP := GetLocalIP()
|
||||
publicIP := GetPublicIP()
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"version": "v0.1.0",
|
||||
"status": "All systems normal",
|
||||
"version": "v0.1.0",
|
||||
"status": "All systems normal",
|
||||
"local_ip": localIP,
|
||||
"public_ip": publicIP,
|
||||
})
|
||||
}
|
||||
func GetLocalIP() string {
|
||||
addrs, err := net.InterfaceAddrs()
|
||||
if err != nil {
|
||||
return "Unknown"
|
||||
}
|
||||
for _, address := range addrs {
|
||||
if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
|
||||
if ipnet.IP.To4() != nil {
|
||||
return ipnet.IP.String()
|
||||
}
|
||||
}
|
||||
}
|
||||
return "Unknown"
|
||||
}
|
||||
func GetPublicIP() string {
|
||||
resp, err := http.Get("https://api.ipify.org?format=text")
|
||||
if err != nil {
|
||||
return "Unknown"
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
ip, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "Unknown"
|
||||
}
|
||||
return string(ip)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user