diff --git a/a_main-packr.go b/a_main-packr.go index 14bcbbc..aa9be8c 100644 --- a/a_main-packr.go +++ b/a_main-packr.go @@ -24,10 +24,10 @@ func init() { packr.PackJSONBytes("./templates", "k8s_deployment.tpl", "\"YXBpVmVyc2lvbjogYXBwcy92MQpraW5kOiBEZXBsb3ltZW50Cm1ldGFkYXRhOgogIGxhYmVsczoKICAgIGFwcDoge3sgLlNlcnZpY2UuTmFtZSB9fQogICAgcGxhdGZvcm06IGdvCiAgICBmcmFtZXdvcms6IGdva2l0CiAgICBnZW5lcmF0b3I6IGdvZGluCiAgICB2ZXJzaW9uOiB7eyAuU2VydmljZS5OYW1lc3BhY2UgfX0te3sgLlNlcnZpY2UuTmFtZSB9fS12ZXJzaW9uCiAgbmFtZToge3sgLlNlcnZpY2UuTmFtZSB9fQogIG5hbWVzcGFjZToge3sgLlNlcnZpY2UuTmFtZXNwYWNlIH19CnNwZWM6CiAgcHJvZ3Jlc3NEZWFkbGluZVNlY29uZHM6IDYwMAogIHJlcGxpY2FzOiAxCiAgcmV2aXNpb25IaXN0b3J5TGltaXQ6IDEwCiAgc2VsZWN0b3I6CiAgICBtYXRjaExhYmVsczoKICAgICAgYXBwOiB7eyAuU2VydmljZS5OYW1lIH19CiAgc3RyYXRlZ3k6CiAgICByb2xsaW5nVXBkYXRlOgogICAgICBtYXhTdXJnZTogMQogICAgICBtYXhVbmF2YWlsYWJsZTogMAogICAgdHlwZTogUm9sbGluZ1VwZGF0ZQogIHRlbXBsYXRlOgogICAgbWV0YWRhdGE6CiAgICAgIGFubm90YXRpb25zOgogICAgICAgIHByb21ldGhldXMuaW8uc2NyYXBlOiAidHJ1ZSIKICAgICAgICBwcm9tZXRoZXVzLmlvLnBvcnQ6ICIzMDAwIgogICAgICAgIHByb21ldGhldXMuaW8ucGF0aDogL21ldHJpY3MKICAgICAgbGFiZWxzOgogICAgICAgIGFwcDoge3sgLlNlcnZpY2UuTmFtZSB9fQogICAgICAgIHBsYXRmb3JtOiBnbwogICAgICAgIGZyYW1ld29yazogZ29raXQKICAgICAgICBnZW5lcmF0b3I6IGdvZGluCiAgICAgICAgdmVyc2lvbjoge3sgLlNlcnZpY2UuTmFtZXNwYWNlIH19LXt7IC5TZXJ2aWNlLk5hbWUgfX0tdmVyc2lvbgogICAgc3BlYzoKICAgICAgY29udGFpbmVyczoKICAgICAgICAtIGVudjoKICAgICAgICAgICAgLSBuYW1lOiBUWgogICAgICAgICAgICAgIHZhbHVlOiBFdXJvcGUvWnVyaWNoCiAgICAgICAgICAgIC0gbmFtZTogR1JQQ19BRERSRVNTCiAgICAgICAgICAgICAgdmFsdWU6ICIwLjAuMC4wOjUwMDUxIgogICAgICAgICAgICAtIG5hbWU6IERFQlVHX0FERFJFU1MKICAgICAgICAgICAgICB2YWx1ZTogIjAuMC4wLjA6MzAwMCIKICAgICAgICAgICAgLSBuYW1lOiBMT0dfTEVWRUwKICAgICAgICAgICAgICB2YWx1ZTogImluZm8iCiAgICAgICAgICAgIHt7LSBpZiAuU2VydmljZS5UcmFuc3BvcnQuQU1RUCB9fQogICAgICAgICAgICAtIG5hbWU6IEFNUVBfQUREUkVTUwogICAgICAgICAgICAgIHZhbHVlRnJvbToKICAgICAgICAgICAgICAgIHNlY3JldEtleVJlZjoKICAgICAgICAgICAgICAgICAga2V5OiBNRVNTQUdFX0JST0tFUl9VUkwKICAgICAgICAgICAgICAgICAgbmFtZTogcmFiYml0bXEKICAgICAgICAgICAgICAgICAgb3B0aW9uYWw6IGZhbHNlCiAgICAgICAgICAgIHt7LSBlbmQgfX0KICAgICAgICAgIGltYWdlOiB7eyAuRG9ja2VyLlJlZ2lzdHJ5IH19L3t7IC5TZXJ2aWNlLk5hbWVzcGFjZSB9fS17eyAuU2VydmljZS5OYW1lIH19Ont7IC5TZXJ2aWNlLk5hbWVzcGFjZSB9fS17eyAuU2VydmljZS5OYW1lIH19LXZlcnNpb24KICAgICAgICAgIGltYWdlUHVsbFBvbGljeTogSWZOb3RQcmVzZW50CiAgICAgICAgICBuYW1lOiB7eyAuU2VydmljZS5OYW1lIH19CiAgICAgICAgICByZXNvdXJjZXM6CiAgICAgICAgICAJcmVxdWVzdHM6CiAgICAgICAgICAJICBjcHU6IDFtCiAgICAgICAgICAgICAgbWVtb3J5OiAxNU1pCiAgICAgICAgICBzZWN1cml0eUNvbnRleHQ6CiAgICAgICAgICAgIGFsbG93UHJpdmlsZWdlRXNjYWxhdGlvbjogZmFsc2UKICAgICAgICAgICAgcHJpdmlsZWdlZDogZmFsc2UKICAgICAgICAgICAgY2FwYWJpbGl0aWVzOgogICAgICAgICAgICAgIGRyb3A6CiAgICAgICAgICAgICAgICAtIGFsbAogICAgICAgICAgICByZWFkT25seVJvb3RGaWxlc3lzdGVtOiB0cnVlCiAgICAgICAgICAgIHJ1bkFzTm9uUm9vdDogdHJ1ZQogICAgICAgICAgICBydW5Bc1VzZXI6IDY1NTM0CiAgICAgICAgICBzdGRpbjogdHJ1ZQogICAgICAgICAgdGVybWluYXRpb25NZXNzYWdlUGF0aDogL2Rldi90ZXJtaW5hdGlvbi1sb2cKICAgICAgICAgIHRlcm1pbmF0aW9uTWVzc2FnZVBvbGljeTogRmlsZQogICAgICAgICAgdHR5OiB0cnVlCiAgICAgIGRuc1BvbGljeTogQ2x1c3RlckZpcnN0CiAgICAgIHJlc3RhcnRQb2xpY3k6IEFsd2F5cwogICAgICBzY2hlZHVsZXJOYW1lOiBkZWZhdWx0LXNjaGVkdWxlcgogICAgICBzZWN1cml0eUNvbnRleHQ6IHt9CiAgICAgIHRlcm1pbmF0aW9uR3JhY2VQZXJpb2RTZWNvbmRzOiAzMAo=\"") packr.PackJSONBytes("./templates", "k8s_service.tpl", "\"YXBpVmVyc2lvbjogdjEKa2luZDogU2VydmljZQptZXRhZGF0YToKICBuYW1lOiB7eyAuU2VydmljZS5OYW1lIH19CiAgbmFtZXNwYWNlOiB7eyAuU2VydmljZS5OYW1lc3BhY2UgfX0Kc3BlYzoKICBwb3J0czoKICAgIC0gbmFtZTogZ3JwYwogICAgICBwb3J0OiA1MDA1MQogICAgICBwcm90b2NvbDogVENQCiAgICAgIHRhcmdldFBvcnQ6IDUwMDUxCiAgICAtIG5hbWU6IGh0dHAtZGVidWcKICAgICAgcG9ydDogMzAwMAogICAgICBwcm90b2NvbDogVENQCiAgICAgIHRhcmdldFBvcnQ6IDMwMDAKICBzZWxlY3RvcjoKICAgIGFwcDoge3sgLlNlcnZpY2UuTmFtZSB9fQogIHNlc3Npb25BZmZpbml0eTogTm9uZQogIHR5cGU6IENsdXN0ZXJJUAo=\"") packr.PackJSONBytes("./templates", "logging_middleware.tpl", "\"cGFja2FnZSBtaWRkbGV3YXJlCgppbXBvcnQgKAogICAgImNvbnRleHQiCiAgICAidGltZSIKCiAgICAiZ2l0aHViLmNvbS9nby1nb2Rpbi9sb2ciCglncnBjX21ldGFkYXRhICJnaXRodWIuY29tL2dvLWdvZGluL2dycGMtbWV0YWRhdGEiCgogICAgInt7IC5TZXJ2aWNlLk1vZHVsZSB9fS9pbnRlcm5hbC9zZXJ2aWNlIgogICAgInt7IC5TZXJ2aWNlLk1vZHVsZSB9fS9pbnRlcm5hbC9zZXJ2aWNlL2VuZHBvaW50IgopCgp0eXBlIGxvZ2dpbmdNaWRkbGV3YXJlIHN0cnVjdCB7CiAgICBuZXh0IHNlcnZpY2Uue3sgdGl0bGUgLlNlcnZpY2UuTmFtZSB9fQogICAgbG9nZ2VyIGxvZy5Mb2dnZXIKfQoKLy8gTG9nZ2luZ01pZGRsZXdhcmUgbG9ncyBldmVyeSByZXF1ZXN0IGFuZCByZXNwb25zZSBvZiB0aGUgc2VydmljZS4KZnVuYyBMb2dnaW5nTWlkZGxld2FyZShsb2dnZXIgbG9nLkxvZ2dlcikgTWlkZGxld2FyZSB7CiAgICByZXR1cm4gZnVuYyhuZXh0IHNlcnZpY2Uue3sgdGl0bGUgLlNlcnZpY2UuTmFtZSB9fSkgc2VydmljZS57eyB0aXRsZSAuU2VydmljZS5OYW1lIH19IHsKICAgICAgICByZXR1cm4gJmxvZ2dpbmdNaWRkbGV3YXJle25leHQsIGxvZ2dlcn0KICAgIH0KfQoKe3sgcmFuZ2UgLlNlcnZpY2UuTWV0aG9kcyB9fQp7eyB0ZW1wbGF0ZSAibG9nZ2luZ19tZXRob2QiIC4gfX0Ke3sgZW5kIH19Cg==\"") - packr.PackJSONBytes("./templates", "makefile.tpl", "\"R09CQVNFPSQoc2hlbGwgcHdkKQpHT0JJTj0kKEdPQkFTRSkvYmluCkdPRElSUyA9ICQoc2hlbGwgZ28gbGlzdCAtZiAne3suRGlyfX0nIC4vLi4uKQpDT01NSVQ9JChzaGVsbCBnaXQgcmV2LXBhcnNlIC0tc2hvcnQgSEVBRCkKCkRPQ0tFUl9JTUFHRT0iZG9ja2VyLmNvb3p6eS5jaC88PCAuU2VydmljZS5OYW1lc3BhY2UgPj4tPDwgLlNlcnZpY2UuTmFtZSA+PiIKRE9DS0VSX1RBRz0idi0ke0NPTU1JVH0tZGV2IgpQUk9UT19TUkM9Ijw8IC5Qcm90b2J1Zi5QYXRoID4+IgoKLlBIT05ZOiBidWlsZApidWlsZDoKCUBlY2hvICItLT4gYnVpbGRpbmciCglAZ28gYnVpbGQgLW8gJHtHT0JJTn0vPDwgLlNlcnZpY2UuTmFtZSA+PiAuL2NtZC88PCAuU2VydmljZS5OYW1lID4+L21haW4uZ28KCi5QSE9OWTogcnVuCnJ1bjoKCUBlY2hvICItLT4gc3RhcnRpbmcgbG9jYWxseSIKCUBMT0dfTEVWRUw9ZGVidWcgZ28gcnVuIGNtZC88PCAuU2VydmljZS5OYW1lID4+L21haW4uZ28KCi5QSE9OWTogZ3JwY3VpCmdycGN1aToKCUBncnBjdWkgLXByb3RvICR7UFJPVE9fU1JDfSAtcG9ydCA1MDAwIC1wbGFpbnRleHQgbG9jYWxob3N0OjUwMDUxCgouUEhPTlk6IGNsZWFuCmNsZWFuOgoJQGVjaG8gIi0tPiBjbGVhbmluZyB1cCBiaW5hcmllcyIKCUBnbyBjbGVhbiAtdGFncyBuZXRnbyAtaSAuLy4uLgoJQHJtIC1yZiAkKEdPQklOKS8qCgouUEhPTlk6IGRvY2tlcgpkb2NrZXI6CglAZWNobyAiLS0+IGJ1aWxkaW5nIGRvY2tlciBpbWFnZSIKCWRvY2tlciBidWlsZCAuIC10ICR7RE9DS0VSX0lNQUdFfToke0RPQ0tFUl9UQUd9IC1mIC4vRG9ja2VyZmlsZQoKLlBIT05ZOiBkb2NrZXItcnVuCmRvY2tlci1ydW46CglAZWNobyAiLS0+IHN0YXJ0aW5nIGNvbnRhaW5lciAke0RPQ0tFUl9JTUFHRX06JHtET0NLRVJfVEFHfSIKCUBkb2NrZXIgcnVuIFwKCQktLXJtIFwKCQktLW5hbWUgPDwgLlNlcnZpY2UuTmFtZSA+PiBcCgkJLS1uZXR3b3JrIGhvc3QgXAoJCSR7RE9DS0VSX0lNQUdFfToke0RPQ0tFUl9UQUd9CgouUEhPTlk6IGNoZWNrCmNoZWNrOiBmb3JtYXQuY2hlY2sgbGludAoKLlBIT05ZOiBmb3JtYXQuY2hlY2sKZm9ybWF0LmNoZWNrOiB0b29scy5nb2ltcG9ydHMKCUBlY2hvICItLT4gY2hlY2tpbmcgY29kZSBmb3JtYXR0aW5nIHdpdGggJ2dvaW1wb3J0cyciCglAZ29pbXBvcnRzIC13IC1sIC4KCi5QSE9OWTogbGludApsaW50OiB0b29scy5nb2xpbnQKCUBlY2hvICItLT4gY2hlY2tpbmcgY29kZSBzdHlsZSB3aXRoICdnb2xpbnQnIgoJQGVjaG8gJChHT0RJUlMpIHwgeGFyZ3MgLW4gMSBnb2xpbnQKCiMtLS0tLS0tLS0tLS0tLS0KIy0tIHRvb2xzCiMtLS0tLS0tLS0tLS0tLS0KLlBIT05ZOiB0b29scyB0b29scy5nb2ltcG9ydHMgdG9vbHMuZ29saW50IHRvb2xzLmdvdmV0Cgp0b29sczogdG9vbHMuZ29pbXBvcnRzIHRvb2xzLmdvbGludCB0b29scy5nb3ZldAoKdG9vbHMuZ29pbXBvcnRzOgoJQGNvbW1hbmQgLXYgZ29pbXBvcnRzID4vZGV2L251bGwgOyBpZiBbICQkPyAtbmUgMCBdOyB0aGVuIFwKCQllY2hvICItLT4gaW5zdGFsbGluZyBnb2ltcG9ydHMiOyBcCgkJZ28gZ2V0IGdvbGFuZy5vcmcveC90b29scy9jbWQvZ29pbXBvcnRzOyBcCglmaQoKdG9vbHMuZ292ZXQ6CglAZ28gdG9vbCB2ZXQgMj4vZGV2L251bGwgOyBpZiBbICQkPyAtZXEgMyBdOyB0aGVuIFwKCQllY2hvICItLT4gaW5zdGFsbGluZyBnb3ZldCI7IFwKCQlnbyBnZXQgZ29sYW5nLm9yZy94L3Rvb2xzL2NtZC92ZXQ7IFwKCWZpCgp0b29scy5nb2xpbnQ6CglAY29tbWFuZCAtdiBnb2xpbnQgPi9kZXYvbnVsbCA7IGlmIFsgJCQ/IC1uZSAwIF07IHRoZW4gXAoJCWVjaG8gIi0tPiBpbnN0YWxsaW5nIGdvbGludCI7IFwKCQlnbyBnZXQgLXUgZ29sYW5nLm9yZy94L2xpbnQvZ29saW50OyBcCglmaQo=\"") + packr.PackJSONBytes("./templates", "makefile.tpl", "\"R09CQVNFPSQoc2hlbGwgcHdkKQpHT0JJTj0kKEdPQkFTRSkvYmluCkdPRElSUyA9ICQoc2hlbGwgZ28gbGlzdCAtZiAne3suRGlyfX0nIC4vLi4uKQpDT01NSVQ9JChzaGVsbCBnaXQgcmV2LXBhcnNlIC0tc2hvcnQgSEVBRCkKR09GSUxFUz0kKHNoZWxsIGdvIGxpc3QgLWYge3suRGlyfX0gLi8uLi4gfCBncmVwIC12IC92ZW5kb3IvKQoKRE9DS0VSX0lNQUdFPSI8PCAuRG9ja2VyLlJlZ2lzdHJ5ID4+Lzw8IC5TZXJ2aWNlLk5hbWVzcGFjZSA+Pi08PCAuU2VydmljZS5OYW1lID4+IgpET0NLRVJfVEFHPSJ2LSR7Q09NTUlUfS1kZXYiClBST1RPX1NSQz0iPDwgLlByb3RvYnVmLlBhdGggPj4iCgouUEhPTlk6IGJ1aWxkCmJ1aWxkOiBjaGVjayB2ZW5kb3IKCUBlY2hvICItLT4gYnVpbGRpbmciCglAZ28gYnVpbGQgLW8gJHtHT0JJTn0vPDwgLlNlcnZpY2UuTmFtZSA+PiAuL2NtZC88PCAuU2VydmljZS5OYW1lID4+L21haW4uZ28KCi5QSE9OWTogcnVuCnJ1bjoKCUBlY2hvICItLT4gc3RhcnRpbmcgbG9jYWxseSIKCUBMT0dfTEVWRUw9ZGVidWcgZ28gcnVuIGNtZC88PCAuU2VydmljZS5OYW1lID4+L21haW4uZ28KCi5QSE9OWTogdmVuZG9yCnZlbmRvcjoKCUBlY2hvICItLT4gdmVuZG9yaW5nIGRlcGVuZGVuY2llcyIKCUBnbyBtb2QgdmVuZG9yCgouUEhPTlk6IGdycGN1aQpncnBjdWk6CglAZ3JwY3VpIC1wcm90byAke1BST1RPX1NSQ30gLXBvcnQgNTAwMCAtcGxhaW50ZXh0IGxvY2FsaG9zdDo1MDA1MQoKLlBIT05ZOiBjbGVhbgpjbGVhbjoKCUBlY2hvICItLT4gY2xlYW5pbmcgdXAgYmluYXJpZXMiCglAZ28gY2xlYW4gLXRhZ3MgbmV0Z28gLWkgLi8uLi4KCUBybSAtcmYgJChHT0JJTikvKgoKLlBIT05ZOiBkb2NrZXIKZG9ja2VyOiBjaGVjayB2ZW5kb3IKCUBlY2hvICItLT4gYnVpbGRpbmcgZG9ja2VyIGltYWdlIgoJZG9ja2VyIGJ1aWxkIC4gLXQgJHtET0NLRVJfSU1BR0V9OiR7RE9DS0VSX1RBR30gLWYgLi9Eb2NrZXJmaWxlCgouUEhPTlk6IGRvY2tlci1ydW4KZG9ja2VyLXJ1bjoKCUBlY2hvICItLT4gc3RhcnRpbmcgY29udGFpbmVyICR7RE9DS0VSX0lNQUdFfToke0RPQ0tFUl9UQUd9IgoJQGRvY2tlciBydW4gXAoJCS0tcm0gXAoJCS0tbmFtZSA8PCAuU2VydmljZS5OYW1lID4+IFwKCQktLW5ldHdvcmsgaG9zdCBcCgkJJHtET0NLRVJfSU1BR0V9OiR7RE9DS0VSX1RBR30KCi5QSE9OWTogY2hlY2sKY2hlY2s6IGZvcm1hdC5jaGVjayBsaW50CgouUEhPTlk6IGZvcm1hdC5jaGVjawpmb3JtYXQuY2hlY2s6IHRvb2xzLmdvaW1wb3J0cwoJCUBlY2hvICItLT4gY2hlY2tpbmcgY29kZSBmb3JtYXR0aW5nIHdpdGggJ2dvaW1wb3J0cyciCgkJQGdvaW1wb3J0cyAtdyAke0dPRklMRVN9CgoKLlBIT05ZOiBsaW50CmxpbnQ6IHRvb2xzLmdvbGludAoJQGVjaG8gIi0tPiBjaGVja2luZyBjb2RlIHN0eWxlIHdpdGggJ2dvbGludCciCglAZWNobyAkKEdPRElSUykgfCB4YXJncyAtbiAxIGdvbGludAoKIy0tLS0tLS0tLS0tLS0tLQojLS0gdG9vbHMKIy0tLS0tLS0tLS0tLS0tLQouUEhPTlk6IHRvb2xzIHRvb2xzLmdvaW1wb3J0cyB0b29scy5nb2xpbnQgdG9vbHMuZ292ZXQKCnRvb2xzOiB0b29scy5nb2ltcG9ydHMgdG9vbHMuZ29saW50IHRvb2xzLmdvdmV0Cgp0b29scy5nb2ltcG9ydHM6CglAY29tbWFuZCAtdiBnb2ltcG9ydHMgPi9kZXYvbnVsbCA7IGlmIFsgJCQ/IC1uZSAwIF07IHRoZW4gXAoJCWVjaG8gIi0tPiBpbnN0YWxsaW5nIGdvaW1wb3J0cyI7IFwKCQlnbyBnZXQgZ29sYW5nLm9yZy94L3Rvb2xzL2NtZC9nb2ltcG9ydHM7IFwKCWZpCgp0b29scy5nb3ZldDoKCUBnbyB0b29sIHZldCAyPi9kZXYvbnVsbCA7IGlmIFsgJCQ/IC1lcSAzIF07IHRoZW4gXAoJCWVjaG8gIi0tPiBpbnN0YWxsaW5nIGdvdmV0IjsgXAoJCWdvIGdldCBnb2xhbmcub3JnL3gvdG9vbHMvY21kL3ZldDsgXAoJZmkKCnRvb2xzLmdvbGludDoKCUBjb21tYW5kIC12IGdvbGludCA+L2Rldi9udWxsIDsgaWYgWyAkJD8gLW5lIDAgXTsgdGhlbiBcCgkJZWNobyAiLS0+IGluc3RhbGxpbmcgZ29saW50IjsgXAoJCWdvIGdldCAtdSBnb2xhbmcub3JnL3gvbGludC9nb2xpbnQ7IFwKCWZpCg==\"") packr.PackJSONBytes("./templates", "middleware.tpl", "\"cGFja2FnZSBtaWRkbGV3YXJlCgppbXBvcnQgKAogICAgInt7IC5TZXJ2aWNlLk1vZHVsZSB9fS9pbnRlcm5hbC9zZXJ2aWNlIgopCgovLyBNaWRkbGV3YXJlIGRlZmluZXMgdGhlIHNlcnZpY2Utc3BlY2lmaWMgbWlkZGxld2FyZSB0eXBlCnR5cGUgTWlkZGxld2FyZSBmdW5jKHNlcnZpY2Ugc2VydmljZS57eyB0aXRsZSAuU2VydmljZS5OYW1lIH19KSBzZXJ2aWNlLnt7IHRpdGxlIC5TZXJ2aWNlLk5hbWUgfX0K\"") packr.PackJSONBytes("./templates", "middleware_logging.tpl", "\"Ly8gQ29kZSBnZW5lcmF0ZWQgYnkgR29kaW4gdnt7IC5Hb2Rpbi5WZXJzaW9uIH19OyBETyBOT1QgRURJVC4KCnBhY2thZ2UgbWlkZGxld2FyZQoKaW1wb3J0ICgKICAgICJjb250ZXh0IgogICAgInRpbWUiCgogICAgImdpdGh1Yi5jb20vZ28ta2l0L2tpdC9sb2ciCglncnBjX21ldGFkYXRhICJnaXRodWIuY29tL2dvLWdvZGluL2dycGMtbWV0YWRhdGEiCgogICAgc2VydmljZSAie3sgLlNlcnZpY2UuSW1wb3J0UGF0aCB9fSIKKQoKdHlwZSBsb2dnaW5nTWlkZGxld2FyZSBzdHJ1Y3QgewogICAgbG9nZ2VyIGxvZy5Mb2dnZXIKICAgIG5leHQgc2VydmljZS57eyAuU2VydmljZS5OYW1lIH19Cn0KCmZ1bmMgTmV3TG9nZ2luZ01pZGRsZXdhcmUobG9nZ2VyIGxvZy5Mb2dnZXIpIE1pZGRsZXdhcmUgewogICAgcmV0dXJuIGZ1bmMobmV4dCBzZXJ2aWNlLnt7IC5TZXJ2aWNlLk5hbWUgfX0pIHNlcnZpY2Uue3sgLlNlcnZpY2UuTmFtZSB9fSB7CiAgICAgICAgcmV0dXJuICZsb2dnaW5nTWlkZGxld2FyZXtsb2dnZXIsIG5leHR9CiAgICB9Cn0KCnt7IHJhbmdlIC5TZXJ2aWNlLk1ldGhvZHMgfX0KZnVuYyAobCBsb2dnaW5nTWlkZGxld2FyZSkge3sgLk5hbWUgfX0oe3sgLlBhcmFtTGlzdCB9fSkgKHt7IC5SZXR1cm5MaXN0IH19KSB7Cn0Ke3stIGVuZCB9fQ==\"") - packr.PackJSONBytes("./templates", "partials/amqp/encode_decode/publish_encode.tpl", "\"e3stIGRlZmluZSAiYW1xcF9wdWJsaXNoX2VuY29kZSIgfX0KLy8ge3sgLk5hbWUgfX1FbmNvZGVyIGlzIGNhbGxlZCBqdXN0IGJlZm9yZSBwdWJsaXNoaW5nIGFuIGV2ZW50IHRvICd7eyAuUHVibGlzaGluZy5Ub3BpYyB9fScgYW5kIGVuY29kZXMKLy8gdGhlIERBTyB0byBwcm90b2J1Zi4KZnVuYyB7eyAuTmFtZSB9fUVuY29kZXIoZXZlbnQgaW50ZXJmYWNle30pICgqcGIue3sgLlB1Ymxpc2hpbmcuUHJvdG9idWZNZXNzYWdlIH19LCBlcnJvcikgewp2YXIgZW5jb2RlZCBwYi57eyAuUHVibGlzaGluZy5Qcm90b2J1Zk1lc3NhZ2UgfX0KCi8vIFRPRE86IG1hcCB0byBwcm90b2J1ZgoKcmV0dXJuICZlbmNvZGVkLCBuaWwKfQp7ey0gZW5kIH19Cg==\"") + packr.PackJSONBytes("./templates", "partials/amqp/encode_decode/publish_encode.tpl", "\"e3stIGRlZmluZSAiYW1xcF9wdWJsaXNoX2VuY29kZSIgfX0KLy8ge3sgLk5hbWUgfX1FbmNvZGVyIGlzIGNhbGxlZCBqdXN0IGJlZm9yZSBwdWJsaXNoaW5nIGFuIGV2ZW50IHRvICd7eyAuUHVibGlzaGluZy5Ub3BpYyB9fScgYW5kIGVuY29kZXMKLy8gdGhlIERBTyB0byBwcm90b2J1Zi4gR29kaW4gZG9lc24ndCBrbm93IHdoYXQgeW91IHdpbGwgcGFzcyB0byB0aGlzIGZ1bmN0aW9uLCBzbyBlbnN1cmUgdGhhdCB5b3UKLy8gdXNlIGEgcnVudGltZS1hc3NlcnRpb24gdG8gZW5zdXJlIHRoYXQgeW91J3ZlIGdvdCB0aGUgY29ycmVjdCB0eXBlLgpmdW5jIHt7IC5OYW1lIH19RW5jb2RlcihldmVudCBpbnRlcmZhY2V7fSkgKCpwYi57eyAuUHVibGlzaGluZy5Qcm90b2J1Zk1lc3NhZ2UgfX0sIGVycm9yKSB7CnZhciBlbmNvZGVkIHBiLnt7IC5QdWJsaXNoaW5nLlByb3RvYnVmTWVzc2FnZSB9fQoKLy8gVE9ETzogbWFwIHRvIHByb3RvYnVmCgpyZXR1cm4gJmVuY29kZWQsIG5pbAp9Cnt7LSBlbmQgfX0K\"") packr.PackJSONBytes("./templates", "partials/amqp/encode_decode/subscribe_decode.tpl", "\"e3stIGRlZmluZSAiYW1xcF9zdWJzY3JpYmVfZGVjb2RlIiB9fQovLyB7eyAuSGFuZGxlciB9fURlY29kZXIgd2lsbCB1bm1hcnNoYWwgdGhlIEJvZHkgb2YgdGhlIGluY29taW5nIERlbGl2ZXJ5IGludG8gYSBwcm90b2J1ZiBtZXNzYWdlLgovLwovLyBOb3RlOiBHb2RpbiB3aWxsIG5vdCByZWdlbmVyYXRlIHRoaXMgZmlsZSwgb25seSBhcHBlbmQgbmV3IGZ1bmN0aW9ucy4gU28gaWYgdGhpcyBmaWxlIHdhcyBhbHJlYWR5IHByZXNlbnQgd2hlbgovLyB5b3UgYWRkZWQgdGhlIHN1YnNjcmliZXIsIHlvdSBuZWVkIHRvIGZpeCB0aGUgaW1wb3J0cyBieSBhZGRpbmc6Ci8vCSB7eyB1bnRpdGxlIC5IYW5kbGVyIH19UHJvdG8gInt7IC5Qcm90b2J1Zi5JbXBvcnQgfX0iCmZ1bmMge3sgLkhhbmRsZXIgfX1EZWNvZGVyKGRlbGl2ZXJ5ICpyYWJiaXRtcS5EZWxpdmVyeSkgKGRlY29kZWQgaW50ZXJmYWNle30sIGVyciBlcnJvcikgewoJZXZlbnQgOj0gJnt7IHVudGl0bGUgLkhhbmRsZXIgfX1Qcm90by57eyAuUHJvdG9idWYuTWVzc2FnZSB9fXt9CgoJaWYgZXJyIDo9IHByb3RvLlVubWFyc2hhbChkZWxpdmVyeS5Cb2R5LCBldmVudCk7IGVyciAhPSBuaWwgewoJCXJldHVybiBuaWwsIGZtdC5FcnJvcmYoImZhaWxlZCB0byB1bm1hcnNoYWwgRGVsaXZlcnkgaW50byAqe3sgdW50aXRsZSAuSGFuZGxlciB9fVByb3RvLnt7IC5Qcm90b2J1Zi5NZXNzYWdlIH19OiAlcyIsIGVycikKCX0KCglyZXR1cm4gZXZlbnQsIG5pbAp9Cnt7LSBlbmQgfX0K\"") packr.PackJSONBytes("./templates", "partials/amqp/encode_decode/subscribe_decoder_interfaces.tpl", "\"e3stIGRlZmluZSAiYW1xcF9zdWJzY3JpYmVfZGVjb2Rlcl9pbnRlcmZhY2UiIH19Cnt7LSBlbmQgfX0K\"") packr.PackJSONBytes("./templates", "partials/endpoint.tpl", "\"e3stIGRlZmluZSAiZW5kcG9pbnQiIH19Ci8vIHt7IC5OYW1lIH19RW5kcG9pbnQgcHJvdmlkZXMgc2VydmljZS57eyAuTmFtZSB9fSgpIGFzIGdlbmVyYWwgZW5kcG9pbnQKLy8gd2hpY2ggY2FuIGJlIHVzZWQgd2l0aCBhcmJpdHJhcnkgdHJhbnNwb3J0IGxheWVycy4KZnVuYyB7eyAuTmFtZSB9fUVuZHBvaW50KHNlcnZpY2Ugc2VydmljZS57eyB0aXRsZSAuU2VydmljZU5hbWUgfX0pIGVuZHBvaW50LkVuZHBvaW50IHsKICAgIHJldHVybiBmdW5jIChjdHggY29udGV4dC5Db250ZXh0LCByZXF1ZXN0IGludGVyZmFjZXt9KSAoaW50ZXJmYWNle30sIGVycm9yKSB7CiAgICAgICAgcmVxIDo9IHJlcXVlc3QuKHt7IC5SZXF1ZXN0TmFtZSB9fSkKICAgICAgICBfID0gcmVxIC8vIGJ5cGFzcyAiZGVjbGFyZWQgYW5kIG5vdCB1c2VkIiBjb21waWxlciBlcnJvciBpZiB0aGUgcmVxdWVzdCBpcyBlbXB0eSBhbmQgbm90IHVzZWQKICAgICAgICB7eyAuUmV0dXJuVmFyaWFibGVMaXN0IH19IDo9IHNlcnZpY2Uue3sgLk5hbWUgfX0oCiAgICAgICAgICAgIHt7LSByYW5nZSAuUGFyYW1zIH19CiAgICAgICAgICAgICAgICB7ey0gaWYgZXEgLk5hbWUgImN0eCIgfX0KICAgICAgICAgICAgICAgICAgICB7ey0gLk5hbWUgfX0sCiAgICAgICAgICAgICAgICB7ey0gZWxzZSAtfX0KICAgICAgICAgICAgICAgICAgICByZXEue3sgdGl0bGUgLk5hbWUgfX0sCiAgICAgICAgICAgICAgICB7ey0gZW5kIH19CiAgICAgICAgICAgIHt7LSBlbmQgfX0pCgogICAgICAgIHJldHVybiB7eyAuUmVzcG9uc2VOYW1lIH19ewogICAgICAgICAgICB7ey0gcmFuZ2UgLlJldHVybnMgfX0KICAgICAgICAgICAge3sgdGl0bGUgLk5hbWUgfX06IHt7IC5OYW1lIH19LAogICAgICAgICAgICB7ey0gZW5kIH19CiAgICAgICAgfSwgZXJyCiAgICB9Cn0Ke3stIGVuZCB9fQo=\"") diff --git a/templates/makefile.tpl b/templates/makefile.tpl index 9a874cf..10d1501 100644 --- a/templates/makefile.tpl +++ b/templates/makefile.tpl @@ -2,13 +2,14 @@ GOBASE=$(shell pwd) GOBIN=$(GOBASE)/bin GODIRS = $(shell go list -f '{{.Dir}}' ./...) COMMIT=$(shell git rev-parse --short HEAD) +GOFILES=$(shell go list -f {{.Dir}} ./... | grep -v /vendor/) -DOCKER_IMAGE="docker.coozzy.ch/<< .Service.Namespace >>-<< .Service.Name >>" +DOCKER_IMAGE="<< .Docker.Registry >>/<< .Service.Namespace >>-<< .Service.Name >>" DOCKER_TAG="v-${COMMIT}-dev" PROTO_SRC="<< .Protobuf.Path >>" .PHONY: build -build: +build: check vendor @echo "--> building" @go build -o ${GOBIN}/<< .Service.Name >> ./cmd/<< .Service.Name >>/main.go @@ -17,6 +18,11 @@ run: @echo "--> starting locally" @LOG_LEVEL=debug go run cmd/<< .Service.Name >>/main.go +.PHONY: vendor +vendor: + @echo "--> vendoring dependencies" + @go mod vendor + .PHONY: grpcui grpcui: @grpcui -proto ${PROTO_SRC} -port 5000 -plaintext localhost:50051 @@ -28,7 +34,7 @@ clean: @rm -rf $(GOBIN)/* .PHONY: docker -docker: +docker: check vendor @echo "--> building docker image" docker build . -t ${DOCKER_IMAGE}:${DOCKER_TAG} -f ./Dockerfile @@ -46,8 +52,10 @@ check: format.check lint .PHONY: format.check format.check: tools.goimports - @echo "--> checking code formatting with 'goimports'" - @goimports -w -l . + + @echo "--> checking code formatting with 'goimports'" + @goimports -w ${GOFILES} + .PHONY: lint lint: tools.golint