From 52766cf7e86a2fcbae4149d58245558b41915895 Mon Sep 17 00:00:00 2001 From: lorsan Date: Thu, 16 Apr 2026 13:38:35 +0300 Subject: [PATCH] feat: add register agent in db --- .../compose/dev/hub.docker-compose.yaml | 24 ++++++++++++ .../compose/prod/hub.docker-compose.yaml | 0 go.mod | 9 ++++- go.sum | 33 ++++++++++------ internal/hub/app/app.go | 23 ++++++++--- .../20260415151037_create_agent_table.up.sql | 6 +-- internal/hub/migrator/migrator.go | 1 + internal/hub/rpc/server.go | 6 +-- internal/hub/service/hub_service/hub.go | 34 ++++++++++++++--- internal/hub/store/sqlc/gen/agent.sql.go | 38 +++++++++++++++++++ internal/hub/store/sqlc/gen/db.go | 32 ++++++++++++++++ internal/hub/store/sqlc/gen/models.go | 21 ++++++++++ internal/hub/store/sqlc/queries/agent.sql | 3 ++ internal/hub/store/store.go | 21 ++++++++++ internal/hub/store/structure.go | 37 ++++++++++++++++++ sqlc.yaml | 12 ++++++ 16 files changed, 271 insertions(+), 29 deletions(-) create mode 100644 deployments/compose/dev/hub.docker-compose.yaml create mode 100644 deployments/compose/prod/hub.docker-compose.yaml create mode 100644 internal/hub/store/sqlc/gen/agent.sql.go create mode 100644 internal/hub/store/sqlc/gen/db.go create mode 100644 internal/hub/store/sqlc/gen/models.go create mode 100644 internal/hub/store/sqlc/queries/agent.sql create mode 100644 internal/hub/store/store.go create mode 100644 internal/hub/store/structure.go create mode 100644 sqlc.yaml diff --git a/deployments/compose/dev/hub.docker-compose.yaml b/deployments/compose/dev/hub.docker-compose.yaml new file mode 100644 index 0000000..709e12d --- /dev/null +++ b/deployments/compose/dev/hub.docker-compose.yaml @@ -0,0 +1,24 @@ +services: + postgres-db: + image: postgres:latest + volumes: + - pgdata:/var/lib/postgresql + environment: + POSTGRES_DB: "${DB_NAME}" + POSTGRES_USER: "${DB_USER}" + POSTGRES_PASSWORD: "${DB_PASS}" + networks: + - homeops-dev + ports: + - "${DB_PORT}:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"] + interval: 5s + retries: 5 + restart: always + +volumes: + pgdata: + +networks: + homeops-dev: \ No newline at end of file diff --git a/deployments/compose/prod/hub.docker-compose.yaml b/deployments/compose/prod/hub.docker-compose.yaml new file mode 100644 index 0000000..e69de29 diff --git a/go.mod b/go.mod index 43ffb6b..874ab6b 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,9 @@ go 1.26.1 require ( github.com/docker/docker v28.5.2+incompatible + github.com/golang-migrate/migrate/v4 v4.19.1 github.com/ilyakaznacheev/cleanenv v1.5.0 - github.com/moby/moby v28.5.2+incompatible + github.com/jackc/pgx/v5 v5.9.1 github.com/rs/zerolog v1.35.0 google.golang.org/grpc v1.80.0 google.golang.org/protobuf v1.36.11 @@ -25,8 +26,11 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang-migrate/migrate/v4 v4.19.1 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/joho/godotenv v1.5.1 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect @@ -43,6 +47,7 @@ require ( go.opentelemetry.io/otel/metric v1.43.0 // indirect go.opentelemetry.io/otel/trace v1.43.0 // indirect golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.15.0 // indirect diff --git a/go.sum b/go.sum index ba537f0..c265e8f 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Microsoft/go-winio v0.4.21 h1:+6mVbXh4wPzUrl1COX9A+ZCvEpYsOBZ6/+kwDnvLyro= -github.com/Microsoft/go-winio v0.4.21/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= @@ -16,9 +14,11 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dhui/dktest v0.4.6 h1:+DPKyScKSEp3VLtbMDHcUq6V5Lm5zfZZVb0Sk7Ahom4= +github.com/dhui/dktest v0.4.6/go.mod h1:JHTSYDtKkvFNFHJKqCzVzqXecyv+tKt8EzceOmQOgbU= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM= @@ -46,20 +46,28 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= github.com/ilyakaznacheev/cleanenv v1.5.0 h1:0VNZXggJE2OYdXE87bfSSwGxeiGt9moSR2lOrsHHvr4= github.com/ilyakaznacheev/cleanenv v1.5.0/go.mod h1:a5aDzaJrLCQZsazHol1w8InnDcOX0OColm64SlIi6gk= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc= +github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/moby v28.5.2+incompatible h1:hIn6qcenb3JY1E3STwqEbBvJ8bha+u1LpqjX4CBvNCk= -github.com/moby/moby v28.5.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= @@ -74,17 +82,18 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= 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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/zerolog v1.35.0 h1:VD0ykx7HMiMJytqINBsKcbLS+BJ4WYjz+05us+LRTdI= github.com/rs/zerolog v1.35.0/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= @@ -109,8 +118,8 @@ go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpu go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= @@ -120,6 +129,7 @@ golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= +google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4= google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA= google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M= google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg= @@ -131,6 +141,7 @@ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= diff --git a/internal/hub/app/app.go b/internal/hub/app/app.go index 1349cf4..0153c0f 100644 --- a/internal/hub/app/app.go +++ b/internal/hub/app/app.go @@ -1,15 +1,18 @@ package app import ( + "context" "database/sql" "fmt" standartlog "log" "net" + "github.com/jackc/pgx/v5/pgxpool" hubdir "github.com/lorsanstand/HomeOps-Hub/internal/hub" "github.com/lorsanstand/HomeOps-Hub/internal/hub/migrator" grpcserv "github.com/lorsanstand/HomeOps-Hub/internal/hub/rpc" "github.com/lorsanstand/HomeOps-Hub/internal/hub/service/hub_service" + "github.com/lorsanstand/HomeOps-Hub/internal/hub/store" "github.com/lorsanstand/HomeOps-Hub/internal/shared/config" "github.com/lorsanstand/HomeOps-Hub/internal/shared/log" "github.com/rs/zerolog" @@ -32,6 +35,7 @@ func NewApp() *App { } func (a *App) Run() { + ctx := context.Background() migratePGConn, err := sql.Open("pgx", a.cfg.GetURLPostgres()) if err != nil { a.log.Error().Err(err).Msg("failed to connect to the database") @@ -47,23 +51,32 @@ func (a *App) Run() { if err = mgrt.ApplyMigrations(migratePGConn); err != nil { a.log.Error().Err(err).Msg("migrations were not applied") + return } migratePGConn.Close() - err = a.hubServe() + pool, err := pgxpool.New(ctx, a.cfg.GetURLPostgres()) + if err != nil { + a.log.Error().Err(err).Msg("failed create db pool") + return + } + + hubStore := store.NewHubStore(pool) + + hubService := hub_service.NewHubService(hubStore, a.log) + + err = a.hubServe(hubService) if err != nil { a.log.Error().Err(err).Msg("failed to start the server") return } } -func (a *App) hubServe() error { +func (a *App) hubServe(hubService *hub_service.HubService) error { address := fmt.Sprintf("0.0.0.0:%v", a.cfg.Port) a.log.Info().Str("address", "http://"+address).Msg("start GRPC server") - hub := hub_service.NewHubService(a.log) - - server := grpcserv.NewHubHandler(hub, a.log) + server := grpcserv.NewHubHandler(hubService, a.log) lis, err := net.Listen("tcp", address) if err != nil { diff --git a/internal/hub/migrations/20260415151037_create_agent_table.up.sql b/internal/hub/migrations/20260415151037_create_agent_table.up.sql index 1e7cf7e..dbba8b9 100644 --- a/internal/hub/migrations/20260415151037_create_agent_table.up.sql +++ b/internal/hub/migrations/20260415151037_create_agent_table.up.sql @@ -1,5 +1,5 @@ CREATE TABLE agents ( - id BIGINT UNIQUE PRIMARY KEY, + id SERIAL PRIMARY KEY, agent_id VARCHAR(32) UNIQUE NOT NULL, agent_name VARCHAR(255), architecture VARCHAR(10) NOT NULL, @@ -10,5 +10,5 @@ CREATE TABLE agents ( registered_at timestamp without time zone DEFAULT now() NOT NULL ); -CREATE UNIQUE INDEX idx_agent_id ON agent (id); -CREATE UNIQUE INDEX idx_agent_id_id On agent (agent_id) \ No newline at end of file +CREATE UNIQUE INDEX idx_agent_id ON agents (id); +CREATE UNIQUE INDEX idx_agent_id_id On agents (agent_id) \ No newline at end of file diff --git a/internal/hub/migrator/migrator.go b/internal/hub/migrator/migrator.go index 39a5830..22338f8 100644 --- a/internal/hub/migrator/migrator.go +++ b/internal/hub/migrator/migrator.go @@ -5,6 +5,7 @@ import ( "embed" "errors" "fmt" + _ "github.com/jackc/pgx/v5/stdlib" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/postgres" diff --git a/internal/hub/rpc/server.go b/internal/hub/rpc/server.go index 29fac52..bc629b3 100644 --- a/internal/hub/rpc/server.go +++ b/internal/hub/rpc/server.go @@ -11,7 +11,7 @@ import ( ) type HubService interface { - RegisterAgent(data domain.RegisterAgentRequest) domain.RegisterAgentResponse + RegisterAgent(ctx context.Context, data domain.RegisterAgentRequest) (domain.RegisterAgentResponse, error) } type HubHandler struct { @@ -39,6 +39,6 @@ func (h *HubHandler) Ping(ctx context.Context, _ *emptypb.Empty) (*pb.PongRespon func (h *HubHandler) RegisterAgent(ctx context.Context, request *pb.RegisterAgentRequest) (*pb.RegisterAgentResponse, error) { data := domain.ToDomainAgentRequest(request) - resp := h.hub.RegisterAgent(data) - return domain.ToGRPCAgentResponse(resp), nil + resp, err := h.hub.RegisterAgent(ctx, data) + return domain.ToGRPCAgentResponse(resp), err } diff --git a/internal/hub/service/hub_service/hub.go b/internal/hub/service/hub_service/hub.go index 712c3a2..686c505 100644 --- a/internal/hub/service/hub_service/hub.go +++ b/internal/hub/service/hub_service/hub.go @@ -1,20 +1,29 @@ package hub_service import ( + "context" + "github.com/lorsanstand/HomeOps-Hub/internal/domain" + "github.com/lorsanstand/HomeOps-Hub/internal/hub/store" "github.com/lorsanstand/HomeOps-Hub/internal/hub/utils/hasher" "github.com/rs/zerolog" ) +type Store interface { + NewAgent(ctx context.Context, agent store.Agent) error +} + type HubService struct { - log zerolog.Logger + store Store + log zerolog.Logger } -func NewHubService(logger zerolog.Logger) *HubService { - return &HubService{log: logger} +func NewHubService(store Store, logger zerolog.Logger) *HubService { + return &HubService{log: logger, store: store} } -func (h *HubService) RegisterAgent(data domain.RegisterAgentRequest) domain.RegisterAgentResponse { +func (h *HubService) RegisterAgent(ctx context.Context, data domain.RegisterAgentRequest) (domain.RegisterAgentResponse, error) { + h.log.Debug().Msg("registered new agent") AgentID := data.AgentId if data.AgentId == "" { var err error @@ -25,5 +34,20 @@ func (h *HubService) RegisterAgent(data domain.RegisterAgentRequest) domain.Regi } } - return domain.RegisterAgentResponse{AgentID: AgentID, Heartbeat: 5} + agentStore := store.Agent{ + AgentID: AgentID, + AgentName: data.AgentName, + Architecture: data.Host.Arch, + System: data.Host.System, + Hostname: data.Host.Hostname, + Version: data.AgentVersion, + Capabilities: data.Capabilities, + } + + if err := h.store.NewAgent(ctx, agentStore); err != nil { + h.log.Warn().Err(err).Msg("failed add new agent in db") + return domain.RegisterAgentResponse{}, err + } + + return domain.RegisterAgentResponse{AgentID: AgentID, Heartbeat: 5}, nil } diff --git a/internal/hub/store/sqlc/gen/agent.sql.go b/internal/hub/store/sqlc/gen/agent.sql.go new file mode 100644 index 0000000..f4d94a7 --- /dev/null +++ b/internal/hub/store/sqlc/gen/agent.sql.go @@ -0,0 +1,38 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: agent.sql + +package gen + +import ( + "context" +) + +const createAgent = `-- name: CreateAgent :exec +INSERT INTO agents (agent_id, agent_name, architecture, system, hostname, version, capabilities) +VALUES ($1, $2, $3, $4, $5, $6, $7) +` + +type CreateAgentParams struct { + AgentID string + AgentName *string + Architecture string + System string + Hostname string + Version string + Capabilities []byte +} + +func (q *Queries) CreateAgent(ctx context.Context, arg CreateAgentParams) error { + _, err := q.db.Exec(ctx, createAgent, + arg.AgentID, + arg.AgentName, + arg.Architecture, + arg.System, + arg.Hostname, + arg.Version, + arg.Capabilities, + ) + return err +} diff --git a/internal/hub/store/sqlc/gen/db.go b/internal/hub/store/sqlc/gen/db.go new file mode 100644 index 0000000..7593a67 --- /dev/null +++ b/internal/hub/store/sqlc/gen/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package gen + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/hub/store/sqlc/gen/models.go b/internal/hub/store/sqlc/gen/models.go new file mode 100644 index 0000000..dff6f06 --- /dev/null +++ b/internal/hub/store/sqlc/gen/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package gen + +import ( + "github.com/jackc/pgx/v5/pgtype" +) + +type Agent struct { + ID int64 + AgentID string + AgentName *string + Architecture string + System string + Hostname string + Version string + Capabilities []byte + RegisteredAt pgtype.Timestamp +} diff --git a/internal/hub/store/sqlc/queries/agent.sql b/internal/hub/store/sqlc/queries/agent.sql new file mode 100644 index 0000000..900c564 --- /dev/null +++ b/internal/hub/store/sqlc/queries/agent.sql @@ -0,0 +1,3 @@ +-- name: CreateAgent :exec +INSERT INTO agents (agent_id, agent_name, architecture, system, hostname, version, capabilities) +VALUES ($1, $2, $3, $4, $5, $6, $7); \ No newline at end of file diff --git a/internal/hub/store/store.go b/internal/hub/store/store.go new file mode 100644 index 0000000..a1ac28d --- /dev/null +++ b/internal/hub/store/store.go @@ -0,0 +1,21 @@ +package store + +import ( + "context" + + "github.com/jackc/pgx/v5/pgxpool" + "github.com/lorsanstand/HomeOps-Hub/internal/hub/store/sqlc/gen" +) + +type HubStore struct { + queries *gen.Queries +} + +func NewHubStore(db *pgxpool.Pool) *HubStore { + queries := gen.New(db) + return &HubStore{queries} +} + +func (h *HubStore) NewAgent(ctx context.Context, agent Agent) error { + return h.queries.CreateAgent(ctx, toDBAgent(agent)) +} diff --git a/internal/hub/store/structure.go b/internal/hub/store/structure.go new file mode 100644 index 0000000..b2eaa36 --- /dev/null +++ b/internal/hub/store/structure.go @@ -0,0 +1,37 @@ +package store + +import ( + "encoding/json" + + "github.com/lorsanstand/HomeOps-Hub/internal/domain" + "github.com/lorsanstand/HomeOps-Hub/internal/hub/store/sqlc/gen" +) + +type Agent struct { + AgentID string + AgentName string + Architecture string + System string + Hostname string + Version string + Capabilities []domain.Capability +} + +func toDBAgent(agent Agent) gen.CreateAgentParams { + return gen.CreateAgentParams{ + AgentID: agent.AgentID, + AgentName: &agent.AgentName, + Architecture: agent.Architecture, + System: agent.System, + Version: agent.Version, + Capabilities: toJsonCapabilities(agent.Capabilities), + } +} + +func toJsonCapabilities(caps []domain.Capability) []byte { + data, err := json.Marshal(caps) + if err != nil { + return []byte{} + } + return data +} diff --git a/sqlc.yaml b/sqlc.yaml new file mode 100644 index 0000000..4e02b14 --- /dev/null +++ b/sqlc.yaml @@ -0,0 +1,12 @@ +version: "2" + +sql: + - engine: "postgresql" + queries: "internal/hub/store/sqlc/queries" + schema: "./internal/hub/migrations/" + gen: + go: + sql_package: "pgx/v5" + package: "gen" + out: "internal/hub/store/sqlc/gen" + emit_pointers_for_null_types: true \ No newline at end of file