From 51249d1b2c7df8dd79cedcf76feeecb848381405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Tue, 14 Jul 2020 00:01:42 +0200 Subject: [PATCH] Basic UI template --- .gitignore | 2 +- api.http | 17 ++++++++++- apps/main.go | 2 +- auth.go | 33 ++++++++++++++++++++ config.go | 41 +++++++++++++++++++++++++ docker/docker.go | 47 +++++++++++++++++------------ docker/types.go | 2 +- go.mod | 4 ++- go.sum | 58 +++++++++++++++++++++++++++++++++++ main.go | 26 +++++++++++++--- templates.go | 29 ++++++++++++++++++ ui/index.html | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 311 insertions(+), 28 deletions(-) create mode 100644 auth.go create mode 100644 config.go create mode 100644 templates.go create mode 100644 ui/index.html diff --git a/.gitignore b/.gitignore index ae00835..0d83950 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ rosti.db -apps-api +node-api .history/ diff --git a/api.http b/api.http index f158a4d..d510dd8 100644 --- a/api.http +++ b/api.http @@ -23,6 +23,8 @@ Content-type: application/json ### +# Start + PUT http://localhost:1323/v1/apps/test_1234/start Content-type: application/json @@ -34,18 +36,31 @@ Content-type: application/json ### +# Rebuild + + +PUT http://localhost:1323/v1/apps/test_1234/rebuild +Content-type: application/json +Authorization: Token 333ff32b-6c9e-4794-adab-c289447e66b0 + +### + +# Delete of app + DELETE http://localhost:1323/v1/apps/test_1234 Content-type: application/json ### +# Stats GET http://localhost:1323/v1/apps/test_1234/stats Content-type: application/json - ### +# List of all apps GET http://localhost:1323/v1/apps Content-type: application/json +Authorization: Token 333ff32b-6c9e-4794-adab-c289447e66b0 diff --git a/apps/main.go b/apps/main.go index e0c6a0d..41583b8 100644 --- a/apps/main.go +++ b/apps/main.go @@ -1,7 +1,7 @@ package apps import ( - "github.com/rosti-cz/apps-api/common" + "github.com/rosti-cz/node-api/common" ) func init() { diff --git a/auth.go b/auth.go new file mode 100644 index 0000000..1e5b1ff --- /dev/null +++ b/auth.go @@ -0,0 +1,33 @@ +package main + +import ( + "log" + "strings" + + "github.com/labstack/echo" +) + +var configuredToken string + +func init() { + configuredToken = setToken() + log.Println("Access token:", configuredToken) +} + +// TokenMiddleware handles authentication +func TokenMiddleware(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + tokenHeader := c.Request().Header.Get("Authorization") + token := strings.Replace(tokenHeader, "Token ", "", -1) + + if token != configuredToken || configuredToken == "" { + return c.JSONPretty(403, map[string]string{"message": "access denied"}, " ") + } + + if err := next(c); err != nil { + c.Error(err) + } + + return nil + } +} diff --git a/config.go b/config.go new file mode 100644 index 0000000..23ddb22 --- /dev/null +++ b/config.go @@ -0,0 +1,41 @@ +package main + +import ( + "io/ioutil" + "os" + "log" + + "github.com/satori/go.uuid" +) + +const configDirectory = "/var/lib/node-api" +const tokenFilename = "/var/lib/node-api/token" + +func setToken() string { + if _, err := os.Stat(configDirectory); os.IsNotExist(err) { + err = os.MkdirAll(configDirectory, 0700) + if err != nil { + log.Fatalln(err) + } + } + + // Load token from the file + var token string + + if _, err := os.Stat(tokenFilename); os.IsNotExist(err) { + token = uuid.NewV4().String() + + err = ioutil.WriteFile(tokenFilename, []byte(token), 0600) + if err != nil { + log.Fatalln(err) + } + } else { + tokenRaw, err := ioutil.ReadFile(tokenFilename) + if err != nil { + log.Fatalln(err) + } + token = string(tokenRaw) + } + + return token +} diff --git a/docker/docker.go b/docker/docker.go index 79d5293..ebe5d80 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "log" "os" + "strconv" "strings" "time" @@ -21,16 +22,24 @@ import ( const dockerTimeout = 10 // DOCKER_SOCK tells where to connect to docker, it will be always local sock -const dockerSock = "unix:///var/run/docker.sock" +const dockerSock = "/var/run/docker.sock" +const podmanSock = "/run/podman/podman.sock" // DOCKER_API_VERSION set API version of Docker, 1.40 belongs to Docker 19.03.11 -const dockerAPIVersion = "1.24" +const dockerAPIVersion = "1.40" // Driver keeps everything for connection to Docker type Driver struct{} func (d *Driver) getClient() (*dockerClient.Client, error) { - cli, err := dockerClient.NewClient(dockerSock, dockerAPIVersion, nil, nil) + var connectTo string + if _, err := os.Stat(podmanSock); !os.IsNotExist(err) { + connectTo = podmanSock + } else { + connectTo = dockerSock + } + + cli, err := dockerClient.NewClient("unix://"+connectTo, dockerAPIVersion, nil, nil) return cli, err } @@ -253,21 +262,21 @@ func (d *Driver) Create(name string, image string, volumePath string, HTTPPort i portmaps := nat.PortMap{} - // portbindingsHTTP := make([]nat.PortBinding, 1) - // portbindingsHTTP[0] = nat.PortBinding{ - // HostIP: "0.0.0.0", - // HostPort: strconv.Itoa(HTTPPort) + "/tcp", - // } - // portmaps["8000/tcp"] = portbindingsHTTP + portbindingsHTTP := make([]nat.PortBinding, 1) + portbindingsHTTP[0] = nat.PortBinding{ + HostIP: "0.0.0.0", + HostPort: strconv.Itoa(HTTPPort), + } + portmaps["8000"] = portbindingsHTTP - // if SSHPort != 0 { - // portbindingsSSH := make([]nat.PortBinding, 1) - // portbindingsSSH[0] = nat.PortBinding{ - // HostIP: "0.0.0.0", - // HostPort: strconv.Itoa(SSHPort) + "/tcp", - // } - // portmaps["22/tcp"] = portbindingsSSH - // } + if SSHPort != 0 { + portbindingsSSH := make([]nat.PortBinding, 1) + portbindingsSSH[0] = nat.PortBinding{ + HostIP: "0.0.0.0", + HostPort: strconv.Itoa(SSHPort), + } + portmaps["22"] = portbindingsSSH + } createdContainer, err := cli.ContainerCreate( context.Background(), @@ -281,8 +290,8 @@ func (d *Driver) Create(name string, image string, volumePath string, HTTPPort i Resources: container.Resources{ CPUPeriod: 100000, CPUQuota: int64(CPU) * 1000, - Memory: int64(memory*110/100)*1024 ^ 2, // Allow 10 % more memory so we have space for MemoryReservation - MemoryReservation: int64(memory)*1024 ^ 2, // This should provide softer way how to limit the memory of our containers + Memory: int64(memory*110/100)*1024 ^ 3, // Allow 10 % more memory so we have space for MemoryReservation + MemoryReservation: int64(memory)*1024 ^ 3, // This should provide softer way how to limit the memory of our containers }, PortBindings: portmaps, AutoRemove: false, diff --git a/docker/types.go b/docker/types.go index 0e584b9..65ea4dc 100644 --- a/docker/types.go +++ b/docker/types.go @@ -4,7 +4,7 @@ import ( "log" "path" - "github.com/rosti-cz/apps-api/apps" + "github.com/rosti-cz/node-api/apps" ) // Container extends App struct from App diff --git a/go.mod b/go.mod index 2705283..84ff853 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rosti-cz/apps-api +module github.com/rosti-cz/node-api go 1.14 @@ -7,10 +7,12 @@ require ( github.com/docker/docker v1.13.1 github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 // indirect + github.com/gobuffalo/packr v1.30.1 github.com/jinzhu/gorm v1.9.14 github.com/labstack/echo v3.3.10+incompatible github.com/labstack/gommon v0.3.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/satori/go.uuid v1.2.0 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect ) diff --git a/go.sum b/go.sum index 931e8fa..5ce528b 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,13 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -11,21 +18,41 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= +github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= +github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg= +github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= +github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jinzhu/gorm v1.9.14 h1:Kg3ShyTPcM6nzVo148fRrcMO6MNKuqtOUwnzqMgVniM= github.com/jinzhu/gorm v1.9.14/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labstack/echo v1.4.4 h1:1bEiBNeGSUKxcPDGfZ/7IgdhJJZx8wV/pICJh4W2NJI= github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg= github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -33,36 +60,67 @@ github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 2117e4d..885165c 100644 --- a/main.go +++ b/main.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/labstack/echo" - "github.com/rosti-cz/apps-api/apps" - "github.com/rosti-cz/apps-api/common" - "github.com/rosti-cz/apps-api/docker" - "github.com/rosti-cz/apps-api/nodes" + "github.com/rosti-cz/node-api/apps" + "github.com/rosti-cz/node-api/common" + "github.com/rosti-cz/node-api/docker" + "github.com/rosti-cz/node-api/nodes" ) // JSONIndent Indendation of JSON output format @@ -21,10 +21,19 @@ func main() { // db.AutoMigrate(apps.App{}) defer db.Close() + // Templating + t := &Template{} + // API e := echo.New() + e.Renderer = t + + // e.Use(TokenMiddleware) // Returns list of apps + e.GET("/", func(c echo.Context) error { + return c.Render(http.StatusOK, "index.html", "") + }) e.GET("/v1/apps", func(c echo.Context) error { applications, err := apps.List() @@ -241,6 +250,10 @@ func main() { } err = container.Destroy() + if err != nil && err.Error() == "no container found" { + // We don't care if the container didn't exist anyway + err = nil + } if err != nil { return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent) } @@ -279,6 +292,11 @@ func main() { return c.JSON(http.StatusOK, Message{Message: "deleted"}) }) + // Orphans returns directories in /srv that doesn't match any hosted application + e.GET("/v1/orphans", func(c echo.Context) error { + return c.JSON(http.StatusOK, []string{}) + }) + // Return info about the node including performance index e.GET("/v1/node", func(c echo.Context) error { node := nodes.GetNodeInfo() diff --git a/templates.go b/templates.go new file mode 100644 index 0000000..bf48b95 --- /dev/null +++ b/templates.go @@ -0,0 +1,29 @@ +package main + +import ( + "html/template" + "io" + + "github.com/gobuffalo/packr" + "github.com/labstack/echo" +) + +// Template struct +type Template struct{} + +// Render template saved in packr +func (t *Template) Render(w io.Writer, name string, data interface{}, c echo.Context) error { + box := packr.NewBox("./ui") + tmpl, err := template.New(name).Parse(box.String("index.html")) + if err != nil { + panic(err) + } + tmpl, err = tmpl.Parse(box.String(name)) + if err != nil { + panic(err) + } + + response := tmpl.ExecuteTemplate(w, name, data) + + return response +} diff --git a/ui/index.html b/ui/index.html new file mode 100644 index 0000000..4b24ccc --- /dev/null +++ b/ui/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + Bare - Start Bootstrap Template + + + + + + + + + +
+
+
+

Node

+ +

+ Load index: 12 +

+
+
+
+
+

Applications

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameStatusCPUMemoryDisk spaceInodesTags
test_1234running34 %50/128 MB5 GB12 598user:cx + + + + + +
+ +
+
+
+ + + + + + + +