diff --git a/Taskfile.yml b/Taskfile.yml index 1891112..1a26098 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -6,7 +6,7 @@ vars: GO_CMD: sh: command -v go >/dev/null 2>&1 && echo "go" - GO_FLAGS: "-ldflags=-s -w -trimpath" + GO_FLAGS: '-ldflags="-s -w"' TAILWIND_CMD: "tailwindcss" @@ -18,6 +18,8 @@ tasks: - task --parallel tailwind templ run: + env: + STRAPI_TOKEN: 918aad014c203e302ee185628a0591b1bc875bd999cb9cd7b9c81fac68f275cda75ea806c7ea7b352253a680838887b65a09a9904c6a140bfb3b794d19083c2659d5ad210bca8044436d67b3f6db4d7262168f66b5748b367e8d3239167c185f3b0f0932f8e10800bfb6ad0355ec7d5ca1edbe0d06814bee0a92ab7ebcef3022 desc: Build and run go server binary deps: [build, build-css] cmds: @@ -34,7 +36,7 @@ tasks: generates: - dist/server cmds: - - "{{ .GO_CMD }} build {{ .PROD_FLAGS }} -o dist/server cmd/main.go" + - "{{ .GO_CMD }} build {{ .GO_FLAGS }} -o dist/server cmd/main.go" build-queries: desc: Builds GraphQL queries diff --git a/cmd/main.go b/cmd/main.go index 2d3997f..73d6da8 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,11 +1,14 @@ package main import ( - "blog/internal/database" - "blog/internal/config" - "github.com/charmbracelet/log" "blog/internal/cache" + "blog/internal/config" + "blog/internal/database" "blog/internal/services" + "context" + "os" + + "github.com/charmbracelet/log" ) func main() { @@ -26,8 +29,25 @@ func main() { // Create Redis caches strapi_cache := cache.CreateCache(server_config.RedisHost, server_config.RedisPort, 0) - analytics_cache := cache.CreateCache(server_config.RedisHost, server_config.RedisPort, 1) + // analytics_cache := cache.CreateCache(server_config.RedisHost, server_config.RedisPort, 1) // Create Strapi service - strapi_service := services.NewStrapiService(server_config.StrapiHost, server_config.StrapiApiKey, strapi_cache) + strapi_service := services.NewStrapiService(server_config.StrapiEndpoint+"/graphql", server_config.StrapiToken, strapi_cache) + + // Strapi logger + strapi_logger := log.NewWithOptions(os.Stderr, log.Options{ + ReportTimestamp: true, + Prefix: "STRAPI", + }) + + // Test strapi get + posts, err := strapi_service.GetFeaturedPosts(context.Background(), 10, 1) + if err != nil { + strapi_logger.Error(err) + os.Exit(0) + } + + post := posts[0] + + strapi_logger.Info(post) } diff --git a/internal/config/server.go b/internal/config/server.go index 3d59233..0cfe1bf 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -8,10 +8,10 @@ import ( type ServerConfig struct { Host string Port int - StrapiHost string + StrapiEndpoint string RedisHost string RedisPort int - StrapiApiKey string + StrapiToken string CacheTTL int EchoMode string } @@ -23,8 +23,8 @@ func NewServerConfig() *ServerConfig { func (c *ServerConfig) LoadConfig() { c.Host = env.GetString("HOST", "0.0.0.0") c.Port = env.GetInt("PORT", 3000) - c.StrapiHost = env.GetString("STRAPI_HOST", "https://strapi.darwincereska.dev") - c.StrapiApiKey = env.GetString("STRAPI_API_KEY", "") + c.StrapiEndpoint = env.GetString("STRAPI_ENDPOINT", "https://strapi.darwincereska.dev") + c.StrapiToken = env.GetString("STRAPI_TOKEN", "") c.RedisHost = env.GetString("REDIS_HOST", "localhost") c.RedisPort = env.GetInt("REDIS_PORT", 6379) c.CacheTTL = env.GetInt("CACHE_TTL", 3600) @@ -34,7 +34,7 @@ func (c *ServerConfig) LoadConfig() { log.Info("Host", "host", c.Host) log.Info("Port", "port", c.Port) log.Info("Redis Host", "host", c.RedisHost) - log.Info("Strapi URL", "host", c.StrapiHost) + log.Info("Strapi URL", "host", c.StrapiEndpoint) log.Info("Echo Mode", "mode", c.EchoMode) log.Info("Cache TTL", "ttl", c.CacheTTL) }