diff --git a/.gitignore b/.gitignore index 1408303..91c1ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ lib/harbor/certs/* peer_configs/* work.txt .DS_Store -katana-services/* \ No newline at end of file +katana-services/* +.idea/ diff --git a/config.sample.toml b/config.sample.toml index 8905fe2..462c56d 100644 --- a/config.sample.toml +++ b/config.sample.toml @@ -60,4 +60,4 @@ country = "IN" province = "Delhi" locality = "Delhi" street_address = "smoking jawahar" -postal_code = "110080" \ No newline at end of file +postal_code = "110080" diff --git a/go.mod b/go.mod index ad7a551..a805fac 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible github.com/mholt/archiver/v3 v3.5.1 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + github.com/rs/zerolog v1.33.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 @@ -33,8 +34,6 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect github.com/acomagu/bufpipe v1.0.4 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/caddyserver/certmagic v0.21.2 // indirect - github.com/caddyserver/zerossl v0.1.3 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -71,16 +70,12 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/klauspost/pgzip v1.2.6 // indirect - github.com/libdns/libdns v0.2.2 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/mholt/acmez/v2 v2.0.1 // indirect - github.com/miekg/dns v1.1.59 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect github.com/moby/term v0.5.0 // indirect @@ -113,10 +108,7 @@ require ( github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/xlab/treeprint v1.2.0 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - github.com/zeebo/blake3 v0.2.3 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect diff --git a/go.sum b/go.sum index 4b238c6..0b9bc64 100644 --- a/go.sum +++ b/go.sum @@ -19,12 +19,10 @@ github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/caddyserver/certmagic v0.21.2 h1:O18LtaYBGDooyy257cYePnhp4lPfz6TaJELil6Q1fDg= -github.com/caddyserver/certmagic v0.21.2/go.mod h1:Zq6pklO9nVRl3DIFUw9gVUfXKdpc/0qwTUAQMBlfgtI= -github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA= -github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= @@ -34,9 +32,11 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -52,6 +52,7 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0= +github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= @@ -63,6 +64,7 @@ github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= @@ -70,6 +72,7 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmS github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A= github.com/go-git/go-git/v5 v5.8.1/go.mod h1:FHFuoD6yGz5OSKEBK+aWN9Oah0q54Jxl0abmj6GnqAo= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -86,6 +89,8 @@ github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofiber/fiber/v2 v2.48.0 h1:cRVMCb9aUJDsyHxGFLwz/sGzDggdailZZyptU9F9cU0= github.com/gofiber/fiber/v2 v2.48.0/go.mod h1:xqJgfqrc23FJuqGOW6DVgi3HyZEm2Mn9pRqUb2kHSX8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -124,7 +129,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -132,6 +136,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -158,23 +163,18 @@ github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= -github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -188,12 +188,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mholt/acmez/v2 v2.0.1 h1:3/3N0u1pLjMK4sNEAFSI+bcvzbPhRpY383sy1kLHJ6k= -github.com/mholt/acmez/v2 v2.0.1/go.mod h1:fX4c9r5jYwMyMsC+7tkYRxHibkOTgta5DIFGoe67e1U= github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= -github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= -github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= @@ -219,7 +215,9 @@ github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWk github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= +github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -242,6 +240,10 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= @@ -296,18 +298,10 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= -github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= -github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= -github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE= go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= -go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= -go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -316,8 +310,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -328,8 +320,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -347,8 +337,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -361,8 +349,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -383,8 +369,7 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -393,8 +378,6 @@ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -406,8 +389,6 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= @@ -422,8 +403,6 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/lib/deployment/deployment.go b/lib/deployment/deployment.go index 2df8144..ec43ae5 100644 --- a/lib/deployment/deployment.go +++ b/lib/deployment/deployment.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "github.com/sdslabs/katana/logging" "io" "log" "path/filepath" @@ -26,6 +27,8 @@ import ( "k8s.io/client-go/restmapper" ) +var logger = &logging.GlobalLogger + // ApplyManifest applies a given manifest to the cluster func ApplyManifest(kubeconfig *rest.Config, kubeclientset *kubernetes.Clientset, manifest []byte, namespace string) error { dd, err := dynamic.NewForConfig(kubeconfig) @@ -123,7 +126,7 @@ func DeployCluster(kubeconfig *rest.Config, kubeclientset *kubernetes.Clientset) for _, m := range clusterConfig.TemplatedManifests { manifest := &bytes.Buffer{} - log.Printf("Applying: %s\n", m) + logger.Info().Msgf("Applying: %s\n", m) tmpl, err := template.ParseFiles(filepath.Join(clusterConfig.TemplatedManifestDir, m)) if err != nil { return err @@ -135,7 +138,7 @@ func DeployCluster(kubeconfig *rest.Config, kubeclientset *kubernetes.Clientset) if err = ApplyManifest(kubeconfig, kubeclientset, manifest.Bytes(), g.KatanaConfig.KubeNameSpace); err != nil { return err } - + } return nil @@ -153,8 +156,8 @@ func DeployChallengeToCluster(challengeName, teamName string, firstPatch bool, r /// Retrieve the existing deployment existingDeployment, err := deploymentsClient.Get(context.TODO(), challengeName, metav1.GetOptions{}) if err != nil { - log.Println("Error in retrieving existing deployment.") - log.Println(err) + logger.Error().Msgf("Error in retrieving existing deployment.") + logger.Error().Err(err) return err } @@ -162,12 +165,12 @@ func DeployChallengeToCluster(challengeName, teamName string, firstPatch bool, r _, err = deploymentsClient.Update(context.TODO(), existingDeployment, metav1.UpdateOptions{}) if err != nil { - log.Println("Error in updating deployment.") - log.Println(err) + logger.Error().Msgf("Error in updating deployment.") + logger.Error().Err(err) return err } - log.Println("Updated deployment with new image.") + logger.Info().Msgf("Updated deployment with new image.") return nil } @@ -219,7 +222,6 @@ func DeployChallengeToCluster(challengeName, teamName string, firstPatch bool, r return nil } - func DeployChallengeCheckerToCluster(challengeCheckerName, namespace string, replicas int32) error { kubeclient, _ := utils.GetKubeClient() @@ -230,7 +232,7 @@ func DeployChallengeCheckerToCluster(challengeCheckerName, namespace string, rep manifest := &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, - Name: challengeCheckerName+"-deployment", + Name: challengeCheckerName + "-deployment", }, Spec: appsv1.DeploymentSpec{ Replicas: &replicas, @@ -264,16 +266,15 @@ func DeployChallengeCheckerToCluster(challengeCheckerName, namespace string, rep }, }, } - - log.Println("Creating deployment...") + + logger.Info().Msgf("Creating deployment...") result, err := deploymentsClient.Create(context.TODO(), manifest, metav1.CreateOptions{}) if err != nil { - log.Println("Unable to create deployment") + logger.Error().Msgf("Unable to create deployment") panic(err) } - log.Printf("Created deployment %q.\n", result.GetObjectMeta().GetName()+" in namespace "+namespace) + logger.Info().Msgf("Created deployment %q.\n", result.GetObjectMeta().GetName()+" in namespace "+namespace) return nil } - diff --git a/lib/harbor/api.go b/lib/harbor/api.go index 7207931..46b421d 100644 --- a/lib/harbor/api.go +++ b/lib/harbor/api.go @@ -5,12 +5,15 @@ import ( "crypto/tls" "encoding/json" "fmt" + "github.com/sdslabs/katana/logging" "net/http" config "github.com/sdslabs/katana/configs" "github.com/sdslabs/katana/lib/utils" ) +var logger = &logging.GlobalLogger + var baseURL string = "https://harbor.katana.local/api/v2.0" var httpClient *http.Client = &http.Client{ diff --git a/lib/harbor/setup.go b/lib/harbor/setup.go index 94e7e34..5df59bd 100644 --- a/lib/harbor/setup.go +++ b/lib/harbor/setup.go @@ -1,8 +1,6 @@ package harbor import ( - "log" - "github.com/sdslabs/katana/lib/utils" ) @@ -19,7 +17,7 @@ func SetupHarbor() error { for _, deploymentName := range deploymentNames { if err := utils.WaitForDeploymentReady(client, deploymentName, namespace); err != nil { - log.Printf("Error testing deployment '%s': %v\n", deploymentName, err) + logger.Error().Msgf("Error testing deployment '%s': %v\n", deploymentName, err) } } diff --git a/lib/mysql/connection.go b/lib/mysql/connection.go index 6b8e6be..0bd3210 100644 --- a/lib/mysql/connection.go +++ b/lib/mysql/connection.go @@ -3,6 +3,7 @@ package mysql import ( "database/sql" "fmt" + "github.com/sdslabs/katana/logging" "log" "time" @@ -13,6 +14,7 @@ import ( ) var db *sql.DB +var logger = &logging.GlobalLogger func setup() error { for i := 0; i < 10; i++ { diff --git a/lib/mysql/create.go b/lib/mysql/create.go index 89d0655..ca84347 100644 --- a/lib/mysql/create.go +++ b/lib/mysql/create.go @@ -30,12 +30,12 @@ func CreateGogsUser(username, password string) error { createdTime := time.Now().Unix() rand, err := utils.RandomSalt() if err != nil { - log.Println(err) + logger.Error().Err(err) } salt, err := utils.RandomSalt() if err != nil { - log.Println(err) + logger.Error().Err(err) } password = utils.EncodePassword(password, salt) @@ -58,7 +58,7 @@ func CreateGogsUser(username, password string) error { query := "INSERT INTO `user` (`id`, `lower_name`, `name`, `full_name`, `email`, `passwd`, `login_source`, `login_name`, `type`, `location`, `website`, `rands`, `salt`, `created_unix`, `updated_unix`, `last_repo_visibility`, `max_repo_creation`, `is_active`, `is_admin`, `allow_git_hook`, `allow_import_local`, `prohibit_login`, `avatar`, `avatar_email`, `use_custom_avatar`, `num_followers`, `num_following`, `num_stars`, `num_repos`, `description`, `num_teams`, `num_members`) VALUES (NULL, '" + user.LowerName + "', '" + user.Name + "', '" + user.FullName + "', '" + user.Email + "', '" + user.Password + "', '0', '', '0', '', '', '" + user.Rands + "', '" + user.Salt + "', '" + strconv.FormatInt(user.CreatedUnix, 10) + "', '" + strconv.FormatInt(user.UpdatedUnix, 10) + "', '0', '-1', '1', '0', '0', '0', '0', '" + user.Avatar + "', '" + user.AvatarEmail + "', '0', '0', '0', '0', '0', '', '0', '0')" _, err = gogs.Exec(query) if err != nil { - log.Println(err) + logger.Error().Err(err) } return nil } diff --git a/lib/utils/docker.go b/lib/utils/docker.go index 30e0809..b138393 100644 --- a/lib/utils/docker.go +++ b/lib/utils/docker.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "github.com/rs/zerolog" "io" "log" "os" @@ -14,13 +15,23 @@ import ( "github.com/sdslabs/katana/configs" ) +type CustomWriter struct { + logger zerolog.Logger +} + +// Write implements the io.Writer interface. +func (cw *CustomWriter) Write(p []byte) (n int, err error) { + cw.logger.Trace().Msg(string(p)) + return len(p), nil +} + func dockerLogin(username string, password string) { - log.Println("Logging into Harbor, Please wait...") + logger.Info().Msgf("Logging into Harbor, Please wait...") cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) if err != nil { - log.Fatal("Error creating Docker client:", err) + logger.Fatal().Err(err) return } @@ -32,10 +43,10 @@ func dockerLogin(username string, password string) { _, err = cli.RegistryLogin(context.Background(), authConfig) if err != nil { - log.Printf("Error during login: %s\n", err) + logger.Fatal().Msgf("Error during login: %s\n", err) return } - log.Println("Logged into Harbor successfully") + logger.Info().Msgf("Logged into Harbor successfully") } func CheckDockerfile(_DockerfilePath string) bool { @@ -46,19 +57,19 @@ func CheckDockerfile(_DockerfilePath string) bool { func BuildDockerImage(_ChallengeName string, _DockerfilePath string) { buf := new(bytes.Buffer) if err := Tar(_DockerfilePath, buf); err != nil { - log.Fatal(err, ": error tarring directory") + logger.Fatal().Err(err) return } cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) return } - log.Println(_ChallengeName) - log.Println(_DockerfilePath) + logger.Debug().Msgf(_ChallengeName) + logger.Debug().Msgf(_DockerfilePath) - log.Println("Building Docker image, Please wait......") + logger.Info().Msgf("Building Docker image, Please wait......") imageBuildResponse, err := cli.ImageBuild( context.Background(), @@ -70,21 +81,24 @@ func BuildDockerImage(_ChallengeName string, _DockerfilePath string) { }, ) if err != nil { - log.Fatal(err, " :unable to create image") + logger.Fatal().Err(err) return } - _, err = io.Copy(os.Stdout, imageBuildResponse.Body) + customWriter := &CustomWriter{logger: *logger} + + //_, err = io.Copy(os.Stdout, imageBuildResponse.Body) + _, err = io.Copy(customWriter, imageBuildResponse.Body) if err != nil { - log.Fatal(err, " :unable to read image build response") + logger.Fatal().Err(err) return } - log.Println("Docker image built successfully") + logger.Info().Msgf("Docker image built successfully") dockerLogin(configs.KatanaConfig.Harbor.Username, configs.KatanaConfig.Harbor.Password) - log.Println("Pushing Docker image to Harbor, please wait...") + logger.Info().Msgf("Pushing Docker image to Harbor, please wait...") authConfig := registry.AuthConfig{ Username: configs.KatanaConfig.Harbor.Username, @@ -92,7 +106,7 @@ func BuildDockerImage(_ChallengeName string, _DockerfilePath string) { } authJSON, err := json.Marshal(authConfig) if err != nil { - log.Fatal(err, ": error encoding credentials") + logger.Fatal().Err(err) return } @@ -104,15 +118,15 @@ func BuildDockerImage(_ChallengeName string, _DockerfilePath string) { _, err = cli.ImagePush(context.Background(), "harbor.katana.local/katana/"+_ChallengeName, pushOptions) if err != nil { - log.Fatal(err, " :unable to push docker image") + logger.Fatal().Err(err) return } - log.Println("Image Pushed to Harbor successfully") + logger.Info().Msgf("Image Pushed to Harbor successfully") } -//this func is modified to pass args to dockerfile, so that name of challenge could be identified +// this func is modified to pass args to dockerfile, so that name of challenge could be identified func BuildDockerImageCc(_ChallengeName string, _DockerfilePath string) { buf := new(bytes.Buffer) if err := Tar(_DockerfilePath, buf); err != nil { @@ -134,7 +148,7 @@ func BuildDockerImageCc(_ChallengeName string, _DockerfilePath string) { Dockerfile: "Dockerfile", Remove: true, Tags: []string{"harbor.katana.local/katana/" + _ChallengeName}, - BuildArgs: map[string]*string{"chall_name":&_ChallengeName}, + BuildArgs: map[string]*string{"chall_name": &_ChallengeName}, }, ) if err != nil { diff --git a/lib/utils/kube.go b/lib/utils/kube.go index 96e425c..3e67fbc 100644 --- a/lib/utils/kube.go +++ b/lib/utils/kube.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "github.com/sdslabs/katana/logging" "io" "io/ioutil" "log" @@ -28,6 +29,8 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" ) +var logger = &logging.GlobalLogger + // GetKubeConfig returns a kubernetes REST config object func GetKubeConfig() (*rest.Config, error) { var pathToCfg string @@ -183,18 +186,18 @@ func CopyFromPod(podName string, containerName string, pathInPod string, localFi func GetKatanaLoadbalancer() string { client, err := GetKubeClient() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } // Check if the service is ready err = WaitForLoadBalancerExternalIP(client, "katana-lb", "katana") if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } service, err := client.CoreV1().Services("katana").Get(context.TODO(), "katana-lb", metav1.GetOptions{}) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } externalIP := service.Status.LoadBalancer.Ingress[0].IP return externalIP @@ -227,15 +230,15 @@ func DeploymentConfig() types.ManifestConfig { harborKey, err := ioutil.ReadFile(basePath + "/lib/harbor/certs/harbor.katana.local.key") if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } harborCrt, err := ioutil.ReadFile(basePath + "/lib/harbor/certs/harbor.katana.local.crt") if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } harborCaCrt, err := ioutil.ReadFile(basePath + "/lib/harbor/certs/ca.crt") if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } config.HarborKey = Base64Encode(string(harborKey)) @@ -260,7 +263,7 @@ func Podexecutor(command []string, kubeClientset *kubernetes.Clientset, kubeConf }, scheme.ParameterCodec) exec, err := remotecommand.NewSPDYExecutor(kubeConfig, "POST", req.URL()) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } var stdout, stderr bytes.Buffer err = exec.Stream(remotecommand.StreamOptions{ @@ -269,7 +272,7 @@ func Podexecutor(command []string, kubeClientset *kubernetes.Clientset, kubeConf Tty: false, }) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } } @@ -282,7 +285,7 @@ func DeleteDaemonSetAndWait(kubeClientset *kubernetes.Clientset, kubeConfig *res watcher, err := kubeClientset.AppsV1().DaemonSets(daemonSetNamespace).Watch(context.Background(), listOptions) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } err = kubeClientset.AppsV1().DaemonSets(daemonSetNamespace).Delete(context.TODO(), daemonSetName, metav1.DeleteOptions{}) @@ -290,7 +293,7 @@ func DeleteDaemonSetAndWait(kubeClientset *kubernetes.Clientset, kubeConfig *res if strings.Contains(err.Error(), "not found") { return } - log.Fatal(err) + logger.Fatal().Err(err) } for event := range watcher.ResultChan() { @@ -317,7 +320,7 @@ func DeleteConfigMapAndWait(kubeClientset *kubernetes.Clientset, kubeConfig *res watcher, err := kubeClientset.CoreV1().ConfigMaps(configMapNamespace).Watch(context.Background(), listOptions) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } err = kubeClientset.CoreV1().ConfigMaps(configMapNamespace).Delete(context.TODO(), configMapName, metav1.DeleteOptions{}) @@ -325,7 +328,7 @@ func DeleteConfigMapAndWait(kubeClientset *kubernetes.Clientset, kubeConfig *res if strings.Contains(err.Error(), "not found") { return } - log.Fatal(err) + logger.Fatal().Err(err) } for event := range watcher.ResultChan() { @@ -465,7 +468,7 @@ func CopyIntoPod(podName string, containerName string, pathInPod string, localFi pod, err := client.CoreV1().Pods(namespace).Get(context.TODO(), podName, metav1.GetOptions{}) if err != nil { - log.Printf("Error getting pod: %s\n", err) + logger.Error().Msgf("Error getting pod: %s\n", err) } // Find the container in the pod @@ -478,7 +481,7 @@ func CopyIntoPod(podName string, containerName string, pathInPod string, localFi } if container == nil { - log.Printf("Container not found in pod\n") + logger.Error().Msgf("Container not found in pod\n") } // Create a stream to the container @@ -500,7 +503,7 @@ func CopyIntoPod(podName string, containerName string, pathInPod string, localFi exec, err := remotecommand.NewSPDYExecutor(config, "POST", req.URL()) if err != nil { - log.Printf("Error creating executor: %s\n", err) + logger.Error().Msgf("Error creating executor: %s\n", err) return err } diff --git a/lib/wireguard/firewall.go b/lib/wireguard/firewall.go index ba78798..6fbd41e 100644 --- a/lib/wireguard/firewall.go +++ b/lib/wireguard/firewall.go @@ -1,7 +1,7 @@ package wireguard import ( - "fmt" + "github.com/sdslabs/katana/logging" "log" "os" "strconv" @@ -9,20 +9,22 @@ import ( g "github.com/sdslabs/katana/configs" ) +var logger = &logging.GlobalLogger + func ApplyFirewall() error { //Read challenges folder dir, err := os.Open("./challenges") if err != nil { - log.Println("Error in opening challenges folder") + logger.Error().Msgf("Error in opening challenges folder") return err } defer dir.Close() fileInfos, err := dir.Readdir(-1) if err != nil { - log.Println("Error in reading challenges folder") + logger.Error().Msgf("Error in reading challenges folder") return err } @@ -79,7 +81,7 @@ func ApplyFirewall() error { filepath = filepath + "/katana-services/Wireguard/root/defaults/firewall.conf" err = os.WriteFile(filepath, []byte(finalIprules), 0644) if err != nil { - fmt.Println("Error writing to file:", err) + logger.Fatal().Err(err) return err } diff --git a/lib/wireguard/setup.go b/lib/wireguard/setup.go index 72676e1..dde1c4f 100644 --- a/lib/wireguard/setup.go +++ b/lib/wireguard/setup.go @@ -50,7 +50,7 @@ func SetupWireguard() error { if err = deployment.ApplyManifest(kubeConfig, kubeClient, manifest.Bytes(), namespace); err != nil { return err } - log.Println("Manifest Applied Successfully") + logger.Info().Msgf("Manifest Applied Successfully") noOfTeams := int(configs.ClusterConfig.TeamCount) configPath, err := os.Getwd() @@ -63,20 +63,20 @@ func SetupWireguard() error { if os.IsNotExist(err) { err = os.MkdirAll(configPath, os.ModePerm) if err != nil { - fmt.Printf("Error creating folder: %v\n", err) + logger.Error().Msgf("Error creating folder: %v\n", err) } else { - fmt.Println("peer_configs folder created successfully.") + logger.Info().Msgf("peer_configs folder created successfully.") } } else if err != nil { fmt.Printf("Error checking folder existence: %v\n", err) } - log.Println("created config folder") + logger.Info().Msgf("created config folder") for i := 0; i < noOfTeams; i++ { if err := GetConfigFiles(strconv.Itoa(i + 1)); err != nil { return err } } - log.Println("take me out") + logger.Debug().Msgf("take me out") return nil } diff --git a/logging/log.go b/logging/log.go new file mode 100644 index 0000000..62e0c95 --- /dev/null +++ b/logging/log.go @@ -0,0 +1,18 @@ +package logging + +import ( + "github.com/rs/zerolog" + "os" + "time" +) + +var GlobalLogger zerolog.Logger + +func InitializeLogger() { + GlobalLogger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}). + Level(zerolog.TraceLevel). + With(). + Timestamp(). + Caller(). + Logger() +} diff --git a/services/challengedeployerservice/controller.go b/services/challengedeployerservice/controller.go index ce5f7ee..39ced8e 100644 --- a/services/challengedeployerservice/controller.go +++ b/services/challengedeployerservice/controller.go @@ -3,6 +3,7 @@ package challengedeployerservice import ( "context" "fmt" + "github.com/sdslabs/katana/logging" "log" "os" "regexp" @@ -23,6 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +var logger = &logging.GlobalLogger + type ChallengeToml struct { Challenge Challenge `toml:"challenge"` } @@ -53,7 +56,7 @@ type Env struct { func LoadConfiguration(configFile string) ChallengeToml { var config ChallengeToml if _, err := toml.DecodeFile(configFile, &config); err != nil { - log.Fatal(err) + logger.Fatal().Err(err) return ChallengeToml{} } return config @@ -63,14 +66,14 @@ func Deploy(c *fiber.Ctx) error { patch := false replicas := int32(1) challengeType := "web" //hardcoded------------------------------------- - log.Println("Starting") + logger.Info().Msg("Starting") //Read folder challenge by os dir, err := os.Open("./challenges") //Loop over all subfolders in the challenge folder if err != nil { - log.Println("Error in opening challenges folder") + logger.Error().Msg("Error in opening challenges folder") return err } defer dir.Close() @@ -78,7 +81,7 @@ func Deploy(c *fiber.Ctx) error { //Read all challenges in the folder fileInfos, err := dir.Readdir(-1) if err != nil { - log.Println("Error in reading challenges folder") + logger.Error().Msg("Error in reading challenges folder") return err } @@ -90,21 +93,21 @@ func Deploy(c *fiber.Ctx) error { if fileInfo.IsDir() { //Get the challenger name folderName := fileInfo.Name() - log.Println("Folder name is : " + folderName) + logger.Debug().Str("folderName", folderName).Msg("Folder name: ") //Update challenge path to be absolute path challengePath, _ := os.Getwd() challengePath = challengePath + "/challenges/" + folderName - log.Println("Challenge path is : " + challengePath) - log.Println(challengePath + "/challenge/Dockerfile") + logger.Debug().Str("challengePath", challengePath).Msg("Challenge path: ") + logger.Debug().Str("filePath", challengePath+"/challenge/Dockerfile") ccName := folderName + "-cc" ccNamespace := "katana" //Check if the folder has a Dockerfile if _, err := os.Stat(challengePath + "/challenge/Dockerfile"); err != nil { - log.Println("Dockerfile not found in the " + folderName + " challenge folder. Please follow proper format.") + logger.Error().Msg("Dockerfile not found in the " + folderName + " challenge folder. Please follow proper format.") } else if _, err := os.Stat(challengePath + "/challenge-checker/Dockerfile"); err != nil { - log.Println("Dockerfile not found in the " + folderName + " challenge-checker folder. Please follow proper format.") + logger.Error().Msg("Dockerfile not found in the " + folderName + " challenge-checker folder. Please follow proper format.") } else { //pass path of folder which contains dockerfile //Update challenge path to get dockerfile @@ -126,7 +129,7 @@ func Deploy(c *fiber.Ctx) error { data := LoadConfiguration("./challenges/" + folderName + "/katana.toml") challengeType = data.Challenge.Metadata.Type for i := 0; i < int(numberOfTeams); i++ { - log.Println("-----------Deploying challenge for team: " + strconv.Itoa(i) + " --------") + logger.Info().Msg("-----------Deploying challenge for team: " + strconv.Itoa(i) + " --------") teamName := "katana-team-" + strconv.Itoa(i) deployment.DeployChallengeToCluster(folderName, teamName, patch, replicas) url, err := createServiceForChallenge(folderName, teamName, 3000, i) @@ -145,8 +148,9 @@ func Deploy(c *fiber.Ctx) error { } err = mongo.AddChallenge(challenge, teamName) if err != nil { - fmt.Println("Error in adding challenge to mongo") - log.Println(err) + //fmt.Println("Error in adding challenge to mongo") + //log.Println(err) + logger.Fatal().Err(err) } } } diff --git a/services/challengedeployerservice/helper.go b/services/challengedeployerservice/helper.go index 3dea737..0d887cd 100644 --- a/services/challengedeployerservice/helper.go +++ b/services/challengedeployerservice/helper.go @@ -16,7 +16,7 @@ import ( func copyChallengeIntoTsuka(dirPath string, challengeName string, challengeType string) error { localFilePath := dirPath + "/challenge" pathInPod := "/opt/katana/katana_" + challengeType + "_" + challengeName + ".tar.gz" - log.Println("Testing" + localFilePath + "....and..." + pathInPod) + logger.Info().Msgf("Testing" + localFilePath + "....and..." + pathInPod) filename := challengeName // Get pods from different namespaces @@ -26,12 +26,12 @@ func copyChallengeIntoTsuka(dirPath string, challengeName string, challengeType path := "katana-team-" + fmt.Sprint(i) + "/" + filename err := os.Mkdir("teams/"+path, 0755) if err != nil { - log.Println(err) + logger.Error().Err(err) } git.PlainInit("teams/"+path, false) repo, err := git.PlainOpen("teams/" + path) if err != nil { - log.Println(err) + logger.Error().Err(err) } remoteConfig := &config.RemoteConfig{ Name: "origin", @@ -39,13 +39,13 @@ func copyChallengeIntoTsuka(dirPath string, challengeName string, challengeType _, err = repo.CreateRemote(remoteConfig) if err != nil { - log.Println(err) + logger.Error().Err(err) } podsInTeam, err := utils.GetPods(map[string]string{ "app": g.ClusterConfig.TeamLabel, }, "katana-team-"+fmt.Sprint(i)+"-ns") if err != nil { - log.Println(err) + logger.Error().Err(err) return err } pods = append(pods, podsInTeam...) @@ -54,7 +54,7 @@ func copyChallengeIntoTsuka(dirPath string, challengeName string, challengeType for _, pod := range pods { // Copy file into pod if err := utils.CopyIntoPod(pod.Name, g.TeamVmConfig.ContainerName, pathInPod, localFilePath, pod.Namespace); err != nil { - log.Println(err) + logger.Error().Err(err) return err } } @@ -72,14 +72,14 @@ func createServiceForChallenge(challengeName, teamName string, targetPort int32, utils.CreateService(kubeclient, serviceName, teamNamespace, port, targetPort, selector) - log.Printf("Created service %s for challenge %s in namespace %s", serviceName, challengeName, teamNamespace) + logger.Info().Msgf("Created service %s for challenge %s in namespace %s", serviceName, challengeName, teamNamespace) return serviceName, nil } func createServiceForChallengeChecker(challengeCheckerName, namespace string, targetPort int32) (string, error) { kubeclient, _ := utils.GetKubeClient() - serviceName := challengeCheckerName+"-svc" + serviceName := challengeCheckerName + "-svc" port := int32(80) selector := map[string]string{ "app": challengeCheckerName, @@ -87,7 +87,7 @@ func createServiceForChallengeChecker(challengeCheckerName, namespace string, ta utils.CreateService(kubeclient, serviceName, namespace, port, targetPort, selector) - log.Printf("Created service %s for challenge %s in namespace %s", serviceName, challengeCheckerName, namespace) + logger.Info().Msgf("Created service %s for challenge %s in namespace %s", serviceName, challengeCheckerName, namespace) return serviceName, nil } @@ -143,7 +143,7 @@ func copyFlagDataIntoKashira(dirPath string, challengeName string) error { pathInPod := "/opt/kashira/kashira_" + challengeName + ".tar.gz" if err := utils.CopyIntoPod("kashira-0", "kashira", pathInPod, srcFilePath, "katana"); err != nil { - log.Println(err) + logger.Error().Err(err) return err } return nil diff --git a/services/infrasetservice/controller.go b/services/infrasetservice/controller.go index 9e4c534..81307a3 100644 --- a/services/infrasetservice/controller.go +++ b/services/infrasetservice/controller.go @@ -3,6 +3,8 @@ package infrasetservice import ( "bytes" "fmt" + "github.com/sdslabs/katana/logging" + "html/template" "log" "mime/multipart" @@ -26,40 +28,41 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func InfraSet(c *fiber.Ctx) error { +var logger = &logging.GlobalLogger +func InfraSet(c *fiber.Ctx) error { config, err := utils.GetKubeConfig() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } kubeclient, err := utils.GetKubeClient() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } - log.Println("Creating harbor certs ...") + logger.Info().Msg("Creating harbor certs ...") generateCertsforHarbor() - log.Println("Created harbor certs ...") + logger.Info().Msg("Created harbor certs ...") if err = deployment.DeployCluster(config, kubeclient); err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } err = harbor.SetupHarbor() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } err = wireguard.ApplyFirewall() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } buildKatanaServices() err = wireguard.SetupWireguard() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } return c.SendString("Infrastructure setup completed") @@ -68,11 +71,14 @@ func InfraSet(c *fiber.Ctx) error { func DB(c *fiber.Ctx) error { // TODO: run Mongo and MySQL setup in parallel if err := mongo.Init(); err != nil { + logger.Fatal().Err(err) return err } if err := mysql.Init(); err != nil { + logger.Fatal().Err(err) return err } + logger.Info().Msg("Database setup completed") return c.SendString("Database setup completed\n") } @@ -120,21 +126,21 @@ func CreateTeams(c *fiber.Ctx) error { config, err := utils.GetKubeConfig() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } client, err := utils.GetKubeClient() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } noOfTeams := int(configs.ClusterConfig.TeamCount) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } if _, err := os.Stat("teams"); os.IsNotExist(err) { errDir := os.Mkdir("teams", 0755) if errDir != nil { - log.Fatal(err) + logger.Fatal().Err(err) } } @@ -142,7 +148,7 @@ func CreateTeams(c *fiber.Ctx) error { if _, err := os.Stat("teams"); os.IsNotExist(err) { errDir := os.Mkdir("teams", 0755) if errDir != nil { - log.Fatal(err) + logger.Fatal().Err(err) } } @@ -150,14 +156,14 @@ func CreateTeams(c *fiber.Ctx) error { if _, err := os.Stat("teams"); os.IsNotExist(err) { errDir := os.Mkdir("teams", 0755) if errDir != nil { - log.Fatal(err) + logger.Fatal().Err(err) } } var teams []interface{} credsFile, err := os.Create(configs.SSHProviderConfig.CredsFile) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } for i := 0; i < noOfTeams; i++ { @@ -165,7 +171,7 @@ func CreateTeams(c *fiber.Ctx) error { if _, err := os.Stat("teams/katana-team-" + strconv.Itoa(i)); os.IsNotExist(err) { errDir := os.Mkdir("teams/katana-team-"+strconv.Itoa(i), 0755) if errDir != nil { - log.Fatal(err) + logger.Fatal().Err(err) } } @@ -179,7 +185,7 @@ func CreateTeams(c *fiber.Ctx) error { _, err = client.CoreV1().Namespaces().Create(c.Context(), nsName, metav1.CreateOptions{}) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } manifest := &bytes.Buffer{} @@ -208,48 +214,48 @@ func CreateTeams(c *fiber.Ctx) error { return c.SendString("Successfully created teams") } -func Apply_cc_yml(c *fiber.Ctx ,ccName, namespaceName string) error { +func Apply_cc_yml(c *fiber.Ctx, ccName, namespaceName string) error { config, err := utils.GetKubeConfig() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } - data:=struct{ + data := struct { Namespace string - AppName string - Image string + AppName string + Image string }{ Namespace: namespaceName, - AppName:ccName, - Image:ccName, + AppName: ccName, + Image: ccName, } client, err := utils.GetKubeClient() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } // namespace := &coreV1.Namespace{ - // ObjectMeta: metav1.ObjectMeta{ - // Name: namespaceName, - // }, - // } - - // _, err = client.CoreV1().Namespaces().Create(c.Context(),namespace,metav1.CreateOptions{}) - // if err != nil { - // panic(err) - // } - - manifest:=&bytes.Buffer{} - tmpl,err:=template.ParseFiles(filepath.Join(configs.ClusterConfig.TemplatedManifestDir,"runtime","cc.yml")) - if err!=nil{ + // ObjectMeta: metav1.ObjectMeta{ + // Name: namespaceName, + // }, + // } + + // _, err = client.CoreV1().Namespaces().Create(c.Context(),namespace,metav1.CreateOptions{}) + // if err != nil { + // panic(err) + // } + + manifest := &bytes.Buffer{} + tmpl, err := template.ParseFiles(filepath.Join(configs.ClusterConfig.TemplatedManifestDir, "runtime", "cc.yml")) + if err != nil { return err } // deploymentConfig:=utils.DeploymentConfig() - if err = tmpl.Execute(manifest,data);err!=nil{ + if err = tmpl.Execute(manifest, data); err != nil { return err } - if err=deployment.ApplyManifest(config,client,manifest.Bytes(),namespaceName);err!=nil{ + if err = deployment.ApplyManifest(config, client, manifest.Bytes(), namespaceName); err != nil { return err } diff --git a/services/infrasetservice/helper.go b/services/infrasetservice/helper.go index ed57941..c3483df 100644 --- a/services/infrasetservice/helper.go +++ b/services/infrasetservice/helper.go @@ -20,34 +20,30 @@ func generateCertsforHarbor() { path, _ := os.Getwd() path = path + "/lib/harbor/certs" - log.Println("CHECK 1") // Delete the directory if it already exists - _,err:=os.Stat(path) - if err==nil{ + _, err := os.Stat(path) + if err == nil { //If it exists, delete it errDir := os.RemoveAll(path) if errDir != nil { - log.Fatalf("Failed to remove directory: %v", errDir) + logger.Fatal().Msgf("Failed to remove directory: %v", errDir) } - }else if !errors.Is(err, os.ErrNotExist){ + } else if !errors.Is(err, os.ErrNotExist) { // If there is an error other than "does not exist", log it and exit - log.Fatalf("Failed to access directory: %v", err) + logger.Fatal().Msgf("Failed to access directory: %v", err) } - log.Println("CHECK 2") if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) { //creating directory errDir := os.Mkdir(path, 0755) if errDir != nil { - log.Fatalf("Failed to create directory: %v",errDir) + logger.Fatal().Msgf("Failed to create directory: %v", errDir) } } - log.Println("CHECK 3") // Generate the certificates if err := utils.GenerateCerts("harbor.katana.local", path); err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } - log.Println("CHECK 4") } func createTeamCredentials(teamNumber int) (string, types.CTFTeam) { @@ -60,11 +56,11 @@ func createTeamCredentials(teamNumber int) (string, types.CTFTeam) { // start watching for container events go envVariables(gogs, pwd, podNamespace) team := types.CTFTeam{ - Index: teamNumber, - Name: podNamespace, - PodName: podName, - Password: hashed, - Score: 0, + Index: teamNumber, + Name: podNamespace, + PodName: podName, + Password: hashed, + Score: 0, Challenges: []types.Challenge{}, } mysql.CreateGogsUser(team.Name, pwd) @@ -79,7 +75,7 @@ func envVariables(gogs string, pwd string, podNamespace string) { for event := range watch.ResultChan() { p, ok := event.Object.(*v1.Pod) if !ok { - log.Fatal("unexpected type") + logger.Fatal().Msgf("unexpected type") } if p.Status.Phase != "Pending" { log.Println("Pod created") @@ -105,13 +101,13 @@ func envVariables(gogs string, pwd string, podNamespace string) { func buildKatanaServices() { katanaDir, err := utils.GetKatanaRootPath() if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } katanaServicesDir := katanaDir + "/katana-services" services, err := os.ReadDir(katanaServicesDir) if err != nil { - log.Fatal(err) + logger.Fatal().Err(err) } for _, service := range services { diff --git a/services/master/server.go b/services/master/server.go index f2dd09c..275d1f8 100644 --- a/services/master/server.go +++ b/services/master/server.go @@ -2,6 +2,7 @@ package master import ( "fmt" + "github.com/sdslabs/katana/logging" "log" "time" @@ -17,6 +18,7 @@ import ( func Server() error { + logging.InitializeLogger() utils.InitTicker(10 * time.Second) fiberConfig := fiber.Config{ @@ -54,10 +56,10 @@ func Server() error { admin.Get("/deploy", challengeDeployerService.Deploy) admin.Post("/deployChallenge", challengeDeployerService.DeployChallenge) admin.Get("/gitServer", infraSetService.GitServer) - - admin.Get("/cc",challengeDeployerService.Cc) - admin.Get("/team",challengeDeployerService.Team) - + + admin.Get("/cc", challengeDeployerService.Cc) + admin.Get("/team", challengeDeployerService.Team) + admin.Get("/deleteChallenge/:chall_name", challengeDeployerService.DeleteChallenge) log.Printf("Listening on %s:%d\n", cfg.APIConfig.Host, cfg.APIConfig.Port) admin.Get("/startTicker", c.StartTicker)