From cd3b87e483a788f05baf051b1edeb2807f5fa5a5 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Thu, 14 May 2020 13:51:35 -0700 Subject: [PATCH 01/14] Basic structure of releasing program --- releasing/releasing/go.mod | 8 ++ releasing/releasing/go.sum | 127 +++++++++++++++++++++++++++++++ releasing/releasing/releasing.go | 87 +++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 releasing/releasing/go.mod create mode 100644 releasing/releasing/go.sum create mode 100644 releasing/releasing/releasing.go diff --git a/releasing/releasing/go.mod b/releasing/releasing/go.mod new file mode 100644 index 000000000..195063de6 --- /dev/null +++ b/releasing/releasing/go.mod @@ -0,0 +1,8 @@ +module sigs.k8s.io/kustomize/releasing + +go 1.13 + +require ( + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b + github.com/spf13/cobra v1.0.0 +) diff --git a/releasing/releasing/go.sum b/releasing/releasing/go.sum new file mode 100644 index 000000000..6cf129d9c --- /dev/null +++ b/releasing/releasing/go.sum @@ -0,0 +1,127 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go new file mode 100644 index 000000000..63de6c4d6 --- /dev/null +++ b/releasing/releasing/releasing.go @@ -0,0 +1,87 @@ +package main + +import ( + "fmt" + "log" + + "github.com/spf13/cobra" +) + +var modules = [...]string{ + "kyaml", "api", "kstatus", "cmd/config", + "cmd/resource", "cmd/kubectl", "pluginator", "kustomize", +} +var verbose bool + +// === Log helper functions === +func logDebug(s string) { + if verbose { + log.Println("DEBUG " + s) + } +} + +func logInfo(s string) { + log.Println("INFO " + s) +} + +func logFatal(s string) { + log.Fatalln("FATAL " + s) +} + +var rootCmd = &cobra.Command{ + Use: "releasing", + Short: "This go program is used to improve the modules releasing process in Kustomize repository.", +} + +var listSubCmd = &cobra.Command{ + Use: "list", + Short: "List current version of all covered modules", + Run: func(cmd *cobra.Command, args []string) { + res := []string{} + for _, mod := range modules { + res = append(res, fmt.Sprintf("%s/%s", mod, getModuleCurrentVersion(mod))) + } + for _, l := range res { + fmt.Println(l) + } + }, +} + +var subCmds = [...]*cobra.Command{ + listSubCmd, +} + +func main() { + for _, cmd := range subCmds { + rootCmd.AddCommand(cmd) + } + rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") + + if err := rootCmd.Execute(); err != nil { + logFatal(err.Error()) + } +} + +func getModuleCurrentVersion(modName string) string { + mod := newModule(modName) + mod.updateCurrentVersion() + return mod.currentVersion +} + +type module struct { + name string + path string + currentVersion string +} + +func newModule(modName string) module { + mod := module{ + name: modName, + } + logDebug(fmt.Sprintf("Created module struct for %s", modName)) + return mod +} + +func (m *module) updateCurrentVersion() { + m.currentVersion = "v1.0.0" +} From 0b12f6c73d2b1ee373c1df489e273489af501da0 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Thu, 14 May 2020 14:14:57 -0700 Subject: [PATCH 02/14] Add test --- releasing/releasing/releasing_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 releasing/releasing/releasing_test.go diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go new file mode 100644 index 000000000..6f954e225 --- /dev/null +++ b/releasing/releasing/releasing_test.go @@ -0,0 +1,12 @@ +package main + +import ( + "testing" +) + +func TestGetModuleCurrentVersion(t *testing.T) { + output := getModuleCurrentVersion("test") + if output != "v1.0.0" { + t.Errorf("Unexpected output: %s", output) + } +} From 32ed552ea6fe293c93221a4ac1666c3b4de58ddc Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 18 May 2020 11:42:53 -0700 Subject: [PATCH 03/14] List latest versions --- releasing/releasing/go.sum | 13 ++ releasing/releasing/releasing.go | 197 +++++++++++++++++++++++--- releasing/releasing/releasing_test.go | 24 +++- 3 files changed, 215 insertions(+), 19 deletions(-) diff --git a/releasing/releasing/go.sum b/releasing/releasing/go.sum index 6cf129d9c..3585e1894 100644 --- a/releasing/releasing/go.sum +++ b/releasing/releasing/go.sum @@ -17,6 +17,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -37,6 +38,7 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -48,12 +50,16 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -72,13 +78,17 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -107,7 +117,9 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -123,5 +135,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index 63de6c4d6..462b61a88 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -1,8 +1,16 @@ package main import ( + "bytes" "fmt" + "io/ioutil" "log" + "os" + "os/exec" + "regexp" + "sort" + "strconv" + "strings" "github.com/spf13/cobra" ) @@ -11,23 +19,28 @@ var modules = [...]string{ "kyaml", "api", "kstatus", "cmd/config", "cmd/resource", "cmd/kubectl", "pluginator", "kustomize", } -var verbose bool +var verbose bool // Enable verbose or not +var tempDir string // Temporary directory path for git worktree +var pwd string // Current working directory // === Log helper functions === -func logDebug(s string) { + +func logDebug(format string, v ...interface{}) { if verbose { - log.Println("DEBUG " + s) + log.Printf("DEBUG "+format, v...) } } -func logInfo(s string) { - log.Println("INFO " + s) +func logInfo(format string, v ...interface{}) { + log.Printf("INFO "+format, v...) } -func logFatal(s string) { - log.Fatalln("FATAL " + s) +func logFatal(format string, v ...interface{}) { + log.Fatalf("FATAL "+format, v...) } +// === Command line commands === + var rootCmd = &cobra.Command{ Use: "releasing", Short: "This go program is used to improve the modules releasing process in Kustomize repository.", @@ -37,7 +50,18 @@ var listSubCmd = &cobra.Command{ Use: "list", Short: "List current version of all covered modules", Run: func(cmd *cobra.Command, args []string) { - res := []string{} + var err error + pwd, err = os.Getwd() + if err != nil { + logFatal(err.Error()) + } + logDebug("Working directory: %s", pwd) + remote := "upstream" + // Check remotes + checkRemoteExistence(pwd, remote) + // Fetch latest tags from remote + fetchTags(pwd, remote) + res := []string{} // Store result strings for _, mod := range modules { res = append(res, fmt.Sprintf("%s/%s", mod, getModuleCurrentVersion(mod))) } @@ -47,10 +71,29 @@ var listSubCmd = &cobra.Command{ }, } +var release = &cobra.Command{ + Use: "release", + Short: "Release a new version of specified module", + PreRun: func(cmd *cobra.Command, args []string) { + logDebug("Preparing Git environemnt") + prepareGit() + }, + Run: func(cmd *cobra.Command, args []string) { + logInfo("Done") + }, + PostRun: func(cmd *cobra.Command, args []string) { + logDebug("Cleaning Git environment") + cleanGit() + }, +} + var subCmds = [...]*cobra.Command{ listSubCmd, + release, } +// === Main function === + func main() { for _, cmd := range subCmds { rootCmd.AddCommand(cmd) @@ -63,25 +106,147 @@ func main() { } func getModuleCurrentVersion(modName string) string { - mod := newModule(modName) + mod := newModule(modName, pwd) mod.updateCurrentVersion() - return mod.currentVersion + v := mod.version.toString() + logDebug("module %s version.toString => %s", mod.name, v) + return v } +func checkRemoteExistence(path string, remote string) { + logDebug("Checking remote %s in %s", remote, path) + cmd := exec.Command("git", "remote") + cmd.Dir = path + var out bytes.Buffer + cmd.Stdout = &out + err := cmd.Run() + if err != nil { + logFatal(err.Error()) + } + logDebug("Remotes:\n%s", out.String()) + + regString := fmt.Sprintf("(?m)^%s$", remote) + reg := regexp.MustCompile(regString) + if !reg.MatchString(out.String()) { + logFatal("Cannot find remote named %s", remote) + } + logDebug("Remote %s exists", remote) +} + +func fetchTags(path string, remote string) { + logDebug("Fetching latest tags") + cmd := exec.Command("git", "fetch", "-t", remote) + cmd.Dir = path + err := cmd.Run() + if err != nil { + logFatal(err.Error()) + } + logDebug("Finished fetching") +} + +// === module version struct and functions definition === + +type moduleVersion struct { + major int + minor int + patch int +} + +func (v moduleVersion) toString() string { + return fmt.Sprintf("v%d.%d.%d", v.major, v.minor, v.patch) +} + +func (v *moduleVersion) set(major int, minor int, patch int) { + v.major = major + v.minor = minor + v.patch = patch +} + +// === module struct and functions definition === + type module struct { - name string - path string - currentVersion string + name string + path string + version moduleVersion } -func newModule(modName string) module { +func newModule(modName string, path string) module { mod := module{ name: modName, + path: path, } - logDebug(fmt.Sprintf("Created module struct for %s", modName)) + logDebug("Created module struct for %s", modName) return mod } func (m *module) updateCurrentVersion() { - m.currentVersion = "v1.0.0" + logDebug("Getting latest tag for %s", m.name) + cmd := exec.Command("git", "tag", "-l") + var out bytes.Buffer + cmd.Stdout = &out + cmd.Dir = m.path + err := cmd.Run() + if err != nil { + logFatal(err.Error()) + } + + // Search for module tag + regString := fmt.Sprintf("(?m)^%s/v(\\d+\\.){2}\\d+$", m.name) + reg := regexp.MustCompile(regString) + tagsString := reg.FindAllString(out.String(), -1) + logDebug("Tags for module %s:\n%s", m.name, tagsString) + var versions []moduleVersion + for _, tag := range tagsString { + v := tag[len(m.name)+2:] + vs := strings.Split(v, ".") + major, err := strconv.Atoi(vs[0]) + if err != nil { + logFatal(err.Error()) + } + minor, err := strconv.Atoi(vs[1]) + if err != nil { + logFatal(err.Error()) + } + patch, err := strconv.Atoi(vs[2]) + if err != nil { + logFatal(err.Error()) + } + versions = append(versions, moduleVersion{ + major: major, + minor: minor, + patch: patch, + }) + } + // Sort to find latest tag + sort.Slice(versions, func(i, j int) bool { + if versions[i].major == versions[j].major && versions[i].minor == versions[j].minor { + return versions[i].patch > versions[j].patch + } else if versions[i].major == versions[j].major { + return versions[i].minor > versions[j].minor + } else { + return versions[i].major > versions[j].major + } + }) + + m.version = versions[0] +} + +// === Git environment functions === + +func prepareGit() { + var err error + tempDir, err = ioutil.TempDir("", "kustomize-releases") + if err != nil { + logFatal(err.Error()) + } + logDebug("Created git temp dir: " + tempDir) +} + +func cleanGit() { + logDebug("Deleting git temp dir: " + tempDir) + err := os.RemoveAll(tempDir) + if err != nil { + logFatal(err.Error()) + } + logDebug("Deleting done") } diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go index 6f954e225..28c389b71 100644 --- a/releasing/releasing/releasing_test.go +++ b/releasing/releasing/releasing_test.go @@ -1,12 +1,30 @@ package main import ( + "os" + "regexp" "testing" ) func TestGetModuleCurrentVersion(t *testing.T) { - output := getModuleCurrentVersion("test") - if output != "v1.0.0" { - t.Errorf("Unexpected output: %s", output) + var err error + pwd, err = os.Getwd() + if err != nil { + t.Errorf(err.Error()) + } + remote := "upstream" + // Check remotes + checkRemoteExistence(pwd, remote) + // Fetch latest tags from remote + fetchTags(pwd, remote) + for _, mod := range modules { + v := getModuleCurrentVersion(mod) + valid, err := regexp.MatchString("^v(\\d+\\.){2}\\d+$", v) + if err != nil { + t.Errorf(err.Error()) + } + if !valid { + t.Errorf("Returned version %s is not valid", v) + } } } From 81da8f6f99f4e6acb46daddbe42e3238e7ac0cdc Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 18 May 2020 12:01:48 -0700 Subject: [PATCH 04/14] Update functions names --- releasing/releasing/releasing.go | 51 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index 462b61a88..0f80f0bf0 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -107,8 +107,8 @@ func main() { func getModuleCurrentVersion(modName string) string { mod := newModule(modName, pwd) - mod.updateCurrentVersion() - v := mod.version.toString() + mod.UpdateCurrentVersion() + v := mod.version.String() logDebug("module %s version.toString => %s", mod.name, v) return v } @@ -152,16 +152,33 @@ type moduleVersion struct { patch int } -func (v moduleVersion) toString() string { +func (v moduleVersion) String() string { return fmt.Sprintf("v%d.%d.%d", v.major, v.minor, v.patch) } -func (v *moduleVersion) set(major int, minor int, patch int) { +func (v *moduleVersion) Set(major int, minor int, patch int) { v.major = major v.minor = minor v.patch = patch } +func (v *moduleVersion) FromString(vs string) { + versions := strings.Split(vs, ".") + major, err := strconv.Atoi(versions[0]) + if err != nil { + logFatal(err.Error()) + } + minor, err := strconv.Atoi(versions[1]) + if err != nil { + logFatal(err.Error()) + } + patch, err := strconv.Atoi(versions[2]) + if err != nil { + logFatal(err.Error()) + } + v.Set(major, minor, patch) +} + // === module struct and functions definition === type module struct { @@ -179,7 +196,7 @@ func newModule(modName string, path string) module { return mod } -func (m *module) updateCurrentVersion() { +func (m *module) UpdateCurrentVersion() { logDebug("Getting latest tag for %s", m.name) cmd := exec.Command("git", "tag", "-l") var out bytes.Buffer @@ -197,25 +214,11 @@ func (m *module) updateCurrentVersion() { logDebug("Tags for module %s:\n%s", m.name, tagsString) var versions []moduleVersion for _, tag := range tagsString { - v := tag[len(m.name)+2:] - vs := strings.Split(v, ".") - major, err := strconv.Atoi(vs[0]) - if err != nil { - logFatal(err.Error()) - } - minor, err := strconv.Atoi(vs[1]) - if err != nil { - logFatal(err.Error()) - } - patch, err := strconv.Atoi(vs[2]) - if err != nil { - logFatal(err.Error()) - } - versions = append(versions, moduleVersion{ - major: major, - minor: minor, - patch: patch, - }) + tag = tag[len(m.name)+2:] + v := moduleVersion{} + v.FromString(tag) + + versions = append(versions, v) } // Sort to find latest tag sort.Slice(versions, func(i, j int) bool { From 650f111e63c1864cb88c221e1b6254b9f822a2bc Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 18 May 2020 14:08:40 -0700 Subject: [PATCH 05/14] Add release command --- releasing/releasing/go.mod | 5 +- releasing/releasing/go.sum | 1 + releasing/releasing/releasing.go | 293 +++++++++++++++++++++----- releasing/releasing/releasing_test.go | 5 +- 4 files changed, 245 insertions(+), 59 deletions(-) diff --git a/releasing/releasing/go.mod b/releasing/releasing/go.mod index 195063de6..7b7020029 100644 --- a/releasing/releasing/go.mod +++ b/releasing/releasing/go.mod @@ -2,7 +2,4 @@ module sigs.k8s.io/kustomize/releasing go 1.13 -require ( - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/spf13/cobra v1.0.0 -) +require github.com/spf13/cobra v1.0.0 diff --git a/releasing/releasing/go.sum b/releasing/releasing/go.sum index 3585e1894..193d57c78 100644 --- a/releasing/releasing/go.sum +++ b/releasing/releasing/go.sum @@ -40,6 +40,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index 0f80f0bf0..156bd5a0c 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -2,11 +2,13 @@ package main import ( "bytes" + "errors" "fmt" "io/ioutil" "log" "os" "os/exec" + "path" "regexp" "sort" "strconv" @@ -20,8 +22,9 @@ var modules = [...]string{ "cmd/resource", "cmd/kubectl", "pluginator", "kustomize", } var verbose bool // Enable verbose or not +var noDryRun bool // Disable dry run +var noTest bool // Disable module tests var tempDir string // Temporary directory path for git worktree -var pwd string // Current working directory // === Log helper functions === @@ -35,6 +38,10 @@ func logInfo(format string, v ...interface{}) { log.Printf("INFO "+format, v...) } +func logWarn(format string, v ...interface{}) { + log.Printf("WARN "+format, v...) +} + func logFatal(format string, v ...interface{}) { log.Fatalf("FATAL "+format, v...) } @@ -50,8 +57,7 @@ var listSubCmd = &cobra.Command{ Use: "list", Short: "List current version of all covered modules", Run: func(cmd *cobra.Command, args []string) { - var err error - pwd, err = os.Getwd() + pwd, err := os.Getwd() if err != nil { logFatal(err.Error()) } @@ -63,7 +69,7 @@ var listSubCmd = &cobra.Command{ fetchTags(pwd, remote) res := []string{} // Store result strings for _, mod := range modules { - res = append(res, fmt.Sprintf("%s/%s", mod, getModuleCurrentVersion(mod))) + res = append(res, fmt.Sprintf("%s/%s", mod, getModuleCurrentVersion(mod, pwd))) } for _, l := range res { fmt.Println(l) @@ -72,18 +78,98 @@ var listSubCmd = &cobra.Command{ } var release = &cobra.Command{ - Use: "release", + Use: "release [module name] [version type]", Short: "Release a new version of specified module", + Args: func(cmd *cobra.Command, args []string) error { + if len(args) != 2 { + return errors.New("2 arguments are required") + } + found := false + for _, mod := range modules { + if mod == args[0] { + found = true + break + } + } + if !found { + return fmt.Errorf("%s is not a valid module. Valid modules are %s", args[0], modules) + } + types := []string{"major", "minor", "patch"} + found = false + for _, t := range types { + if t == args[1] { + found = true + break + } + } + if !found { + return fmt.Errorf("%s is not a valid version type. Valid types are %s", args[1], types) + } + return nil + }, PreRun: func(cmd *cobra.Command, args []string) { logDebug("Preparing Git environemnt") prepareGit() }, Run: func(cmd *cobra.Command, args []string) { - logInfo("Done") - }, - PostRun: func(cmd *cobra.Command, args []string) { - logDebug("Cleaning Git environment") + modName := args[0] + versionType := args[1] + logInfo("Creating tag for module %s", modName) + pwd, err := os.Getwd() + if err != nil { + logFatal(err.Error()) + } + logDebug("Working directory: %s", pwd) + remote := "upstream" + // Check remotes + checkRemoteExistence(pwd, remote) + // Fetch latest tags from remote + fetchTags(pwd, remote) + + mod := module{ + name: modName, + path: pwd, + } + mod.UpdateCurrentVersion() + + oldVersion := mod.version.String() + mod.version.Bump(versionType) + newVersion := mod.version.String() + logInfo("Bumping version: %s => %s", oldVersion, newVersion) + + // Create branch + branch := fmt.Sprintf("release-%s-v%d.%d", mod.name, mod.version.major, mod.version.minor) + newBranch(pwd, branch) + + addWorktree(pwd, tempDir, branch) + + merge(tempDir, "upstream/master") + // Update module path + mod.path = tempDir + + logInfo( + "Releasing summary:\nDir:\t%s\nModule:\t%s %s\nBranch:\t%s\nTag:\t%s", + tempDir, + mod.name, + mod.version.String(), + branch, + mod.Tag(), + ) + + // Run module tests + output, err := mod.RunTest() + if err != nil { + logWarn(output) + } else if !noDryRun { + logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) + } else { + // TODO: Push tags + } + // Clean cleanGit() + pruneWorktree(pwd) + deleteBranch(pwd, branch) + logInfo("Done") }, } @@ -99,51 +185,25 @@ func main() { rootCmd.AddCommand(cmd) } rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") + release.Flags().BoolVarP(&noDryRun, "no-dry-run", "", false, "disable dry-run") + release.Flags().BoolVarP(&noTest, "no-test", "", false, "don't run module tests") if err := rootCmd.Execute(); err != nil { logFatal(err.Error()) } } -func getModuleCurrentVersion(modName string) string { - mod := newModule(modName, pwd) +func getModuleCurrentVersion(modName, path string) string { + mod := module{ + name: modName, + path: path, + } mod.UpdateCurrentVersion() v := mod.version.String() logDebug("module %s version.toString => %s", mod.name, v) return v } -func checkRemoteExistence(path string, remote string) { - logDebug("Checking remote %s in %s", remote, path) - cmd := exec.Command("git", "remote") - cmd.Dir = path - var out bytes.Buffer - cmd.Stdout = &out - err := cmd.Run() - if err != nil { - logFatal(err.Error()) - } - logDebug("Remotes:\n%s", out.String()) - - regString := fmt.Sprintf("(?m)^%s$", remote) - reg := regexp.MustCompile(regString) - if !reg.MatchString(out.String()) { - logFatal("Cannot find remote named %s", remote) - } - logDebug("Remote %s exists", remote) -} - -func fetchTags(path string, remote string) { - logDebug("Fetching latest tags") - cmd := exec.Command("git", "fetch", "-t", remote) - cmd.Dir = path - err := cmd.Run() - if err != nil { - logFatal(err.Error()) - } - logDebug("Finished fetching") -} - // === module version struct and functions definition === type moduleVersion struct { @@ -156,7 +216,7 @@ func (v moduleVersion) String() string { return fmt.Sprintf("v%d.%d.%d", v.major, v.minor, v.patch) } -func (v *moduleVersion) Set(major int, minor int, patch int) { +func (v *moduleVersion) Set(major, minor, patch int) { v.major = major v.minor = minor v.patch = patch @@ -179,6 +239,21 @@ func (v *moduleVersion) FromString(vs string) { v.Set(major, minor, patch) } +func (v *moduleVersion) Bump(t string) { + if t == "major" { + v.major++ + v.minor = 0 + v.patch = 0 + } else if t == "minor" { + v.minor++ + v.patch = 0 + } else if t == "patch" { + v.patch++ + } else { + logFatal("Invalid version type: %s", t) + } +} + // === module struct and functions definition === type module struct { @@ -187,15 +262,6 @@ type module struct { version moduleVersion } -func newModule(modName string, path string) module { - mod := module{ - name: modName, - path: path, - } - logDebug("Created module struct for %s", modName) - return mod -} - func (m *module) UpdateCurrentVersion() { logDebug("Getting latest tag for %s", m.name) cmd := exec.Command("git", "tag", "-l") @@ -234,10 +300,32 @@ func (m *module) UpdateCurrentVersion() { m.version = versions[0] } +func (m *module) Tag() string { + return m.name + "/" + m.version.String() +} + +func (m *module) RunTest() (string, error) { + if noTest { + logInfo("Tests disabled.") + return "", nil + } + testPath := path.Join(m.path, m.name) + logInfo("Running tests in %s...", testPath) + cmd := exec.Command("go", "test", "./...") + cmd.Dir = testPath + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return string(stdoutStderr), err + } + logInfo("Tests are successfully finished") + return "", nil +} + // === Git environment functions === func prepareGit() { var err error + // Create temporary directory tempDir, err = ioutil.TempDir("", "kustomize-releases") if err != nil { logFatal(err.Error()) @@ -253,3 +341,104 @@ func cleanGit() { } logDebug("Deleting done") } + +func checkRemoteExistence(path, remote string) { + logDebug("Checking remote %s in %s", remote, path) + cmd := exec.Command("git", "remote") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logDebug("Remotes:\n%s", string(stdoutStderr)) + + regString := fmt.Sprintf("(?m)^%s$", remote) + reg := regexp.MustCompile(regString) + if !reg.MatchString(string(stdoutStderr)) { + logFatal("Cannot find remote named %s", remote) + } + logDebug("Remote %s exists", remote) +} + +func fetchTags(path, remote string) { + logDebug("Fetching latest tags") + cmd := exec.Command("git", "fetch", "-t", remote) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logDebug("Finished fetching") +} + +func checkBranchExistence(path, name string) bool { + logDebug("Checking branch %s existence", name) + cmd := exec.Command("git", "branch", "-a") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + return strings.Contains(string(stdoutStderr), name) +} + +func newBranch(path, name string) { + logInfo("Creating new branch %s", name) + upstreamBranch := "upstream/" + name + cmd := exec.Command("git", "branch", name, upstreamBranch) + if !checkBranchExistence(path, upstreamBranch) { + logInfo("Remote branch %s doesn't exist", upstreamBranch) + cmd = exec.Command("git", "branch", name) + } + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logInfo("Finished creating branch") +} + +func deleteBranch(path, name string) { + logDebug("Deleting branch %s", name) + cmd := exec.Command("git", "branch", "-D", name) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logDebug("Finished deleting branch") +} + +func addWorktree(path, tempDir, branch string) { + logInfo("Adding worktree %s for branch %s", tempDir, branch) + cmd := exec.Command("git", "worktree", "add", tempDir, branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logInfo("Finished adding worktree") +} + +func pruneWorktree(path string) { + logDebug("Pruning worktree for repo %s", path) + cmd := exec.Command("git", "worktree", "prune") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logDebug("Finished pruning worktree") +} + +func merge(path, branch string) { + logInfo("Merging %s", branch) + logDebug("Working dir: %s", path) + cmd := exec.Command("git", "merge", branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + logInfo("Finished merging") +} diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go index 28c389b71..6400fcdc6 100644 --- a/releasing/releasing/releasing_test.go +++ b/releasing/releasing/releasing_test.go @@ -7,8 +7,7 @@ import ( ) func TestGetModuleCurrentVersion(t *testing.T) { - var err error - pwd, err = os.Getwd() + pwd, err := os.Getwd() if err != nil { t.Errorf(err.Error()) } @@ -18,7 +17,7 @@ func TestGetModuleCurrentVersion(t *testing.T) { // Fetch latest tags from remote fetchTags(pwd, remote) for _, mod := range modules { - v := getModuleCurrentVersion(mod) + v := getModuleCurrentVersion(mod, pwd) valid, err := regexp.MatchString("^v(\\d+\\.){2}\\d+$", v) if err != nil { t.Errorf(err.Error()) From 557cd656ab4e04b2a9bbdae9fe8ea71e3168e171 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 18 May 2020 14:30:05 -0700 Subject: [PATCH 06/14] Finish pushing tag --- releasing/releasing/releasing.go | 34 ++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index 156bd5a0c..ce0bb6b90 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -163,13 +163,13 @@ var release = &cobra.Command{ } else if !noDryRun { logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) } else { - // TODO: Push tags + pushRelease(tempDir, branch, mod) } // Clean cleanGit() pruneWorktree(pwd) deleteBranch(pwd, branch) - logInfo("Done") + logInfo("Module %s completes", mod.name) }, } @@ -442,3 +442,33 @@ func merge(path, branch string) { } logInfo("Finished merging") } + +func pushRelease(path, branch string, mod module) { + logInfo("Pushing branch %s", branch) + cmd := exec.Command("git", "push", "upstream", branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + + logInfo("Creating tag %s", mod.Tag()) + cmd = exec.Command( + "git", "tag", + "-a", mod.Tag(), + "-m", fmt.Sprintf("Release %s on branch %s", mod.Tag(), branch), + ) + cmd.Dir = path + stdoutStderr, err = cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } + + logInfo("Pushing tag %s", mod.Tag()) + cmd = exec.Command("git", "push", "upstream", mod.Tag()) + cmd.Dir = path + stdoutStderr, err = cmd.CombinedOutput() + if err != nil { + logFatal(string(stdoutStderr)) + } +} From 44f5093ae3de191fe9b7ed815cebe4def62f6503 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 18 May 2020 14:37:44 -0700 Subject: [PATCH 07/14] Add tests --- releasing/releasing/releasing_test.go | 43 ++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go index 6400fcdc6..3eb67d067 100644 --- a/releasing/releasing/releasing_test.go +++ b/releasing/releasing/releasing_test.go @@ -1,12 +1,13 @@ package main import ( + "fmt" "os" "regexp" "testing" ) -func TestGetModuleCurrentVersion(t *testing.T) { +func TestList(t *testing.T) { pwd, err := os.Getwd() if err != nil { t.Errorf(err.Error()) @@ -27,3 +28,43 @@ func TestGetModuleCurrentVersion(t *testing.T) { } } } + +func TestRelease(t *testing.T) { + prepareGit() + modName := "api" + versionType := "patch" + pwd, err := os.Getwd() + if err != nil { + t.Errorf(err.Error()) + } + remote := "upstream" + // Check remotes + checkRemoteExistence(pwd, remote) + // Fetch latest tags from remote + fetchTags(pwd, remote) + mod := module{ + name: modName, + path: pwd, + } + mod.UpdateCurrentVersion() + + oldVersion := mod.version.String() + mod.version.Bump(versionType) + newVersion := mod.version.String() + logInfo("Bumping version: %s => %s", oldVersion, newVersion) + + // Create branch + branch := fmt.Sprintf("release-%s-v%d.%d", mod.name, mod.version.major, mod.version.minor) + newBranch(pwd, branch) + + addWorktree(pwd, tempDir, branch) + + merge(tempDir, "upstream/master") + // Update module path + mod.path = tempDir + + // Clean + cleanGit() + pruneWorktree(pwd) + deleteBranch(pwd, branch) +} From 68d6b9add66421407f5e9592094f3254fe1f08b3 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 19 May 2020 10:49:36 -0700 Subject: [PATCH 08/14] Remove testing --- releasing/releasing/releasing.go | 32 +++++++++++---------------- releasing/releasing/releasing_test.go | 4 ++-- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index ce0bb6b90..8d1c669be 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -107,13 +107,10 @@ var release = &cobra.Command{ } return nil }, - PreRun: func(cmd *cobra.Command, args []string) { - logDebug("Preparing Git environemnt") - prepareGit() - }, Run: func(cmd *cobra.Command, args []string) { modName := args[0] versionType := args[1] + createTempDir() logInfo("Creating tag for module %s", modName) pwd, err := os.Getwd() if err != nil { @@ -156,20 +153,16 @@ var release = &cobra.Command{ mod.Tag(), ) - // Run module tests - output, err := mod.RunTest() - if err != nil { - logWarn(output) - } else if !noDryRun { + if !noDryRun { logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) } else { pushRelease(tempDir, branch, mod) } // Clean - cleanGit() + removeTempDir() pruneWorktree(pwd) deleteBranch(pwd, branch) - logInfo("Module %s completes", mod.name) + logInfo("Releasing for module %s completes", mod.name) }, } @@ -304,7 +297,7 @@ func (m *module) Tag() string { return m.name + "/" + m.version.String() } -func (m *module) RunTest() (string, error) { +func (m module) RunTest() (string, error) { if noTest { logInfo("Tests disabled.") return "", nil @@ -323,17 +316,21 @@ func (m *module) RunTest() (string, error) { // === Git environment functions === -func prepareGit() { - var err error +func createTempDir() { // Create temporary directory - tempDir, err = ioutil.TempDir("", "kustomize-releases") + temp, err := ioutil.TempDir("", "kustomize-releases") if err != nil { logFatal(err.Error()) } logDebug("Created git temp dir: " + tempDir) + tempDir = path.Join(temp, "sigs.k8s.io/kustomize") + err = os.MkdirAll(tempDir, 0700) + if err != nil { + logFatal(err.Error()) + } } -func cleanGit() { +func removeTempDir() { logDebug("Deleting git temp dir: " + tempDir) err := os.RemoveAll(tempDir) if err != nil { @@ -395,7 +392,6 @@ func newBranch(path, name string) { if err != nil { logFatal(string(stdoutStderr)) } - logInfo("Finished creating branch") } func deleteBranch(path, name string) { @@ -417,7 +413,6 @@ func addWorktree(path, tempDir, branch string) { if err != nil { logFatal(string(stdoutStderr)) } - logInfo("Finished adding worktree") } func pruneWorktree(path string) { @@ -440,7 +435,6 @@ func merge(path, branch string) { if err != nil { logFatal(string(stdoutStderr)) } - logInfo("Finished merging") } func pushRelease(path, branch string, mod module) { diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go index 3eb67d067..b0a44aaa5 100644 --- a/releasing/releasing/releasing_test.go +++ b/releasing/releasing/releasing_test.go @@ -30,7 +30,7 @@ func TestList(t *testing.T) { } func TestRelease(t *testing.T) { - prepareGit() + createTempDir() modName := "api" versionType := "patch" pwd, err := os.Getwd() @@ -64,7 +64,7 @@ func TestRelease(t *testing.T) { mod.path = tempDir // Clean - cleanGit() + removeTempDir() pruneWorktree(pwd) deleteBranch(pwd, branch) } From 1dced55f60362f3466177ba9a5c1dae4fd227c1e Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 19 May 2020 11:00:00 -0700 Subject: [PATCH 09/14] Improve branch existence check --- releasing/releasing/releasing.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index 8d1c669be..b53dae179 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -376,7 +376,13 @@ func checkBranchExistence(path, name string) bool { if err != nil { logFatal(string(stdoutStderr)) } - return strings.Contains(string(stdoutStderr), name) + branches := strings.Split(string(stdoutStderr), "\n") + for _, branch := range branches { + if strings.Trim(branch, " ") == "remotes/"+name { + return true + } + } + return false } func newBranch(path, name string) { From 2b0b29aec594314659f08c9266832aca72f037ba Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 19 May 2020 11:09:53 -0700 Subject: [PATCH 10/14] Add flag for running test --- releasing/releasing/releasing.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go index b53dae179..a94488755 100644 --- a/releasing/releasing/releasing.go +++ b/releasing/releasing/releasing.go @@ -23,7 +23,7 @@ var modules = [...]string{ } var verbose bool // Enable verbose or not var noDryRun bool // Disable dry run -var noTest bool // Disable module tests +var doTest bool // Enable module tests var tempDir string // Temporary directory path for git worktree // === Log helper functions === @@ -153,7 +153,11 @@ var release = &cobra.Command{ mod.Tag(), ) - if !noDryRun { + // Run module tests + output, err := mod.RunTest() + if err != nil { + logWarn(output) + } else if !noDryRun { logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) } else { pushRelease(tempDir, branch, mod) @@ -179,7 +183,7 @@ func main() { } rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") release.Flags().BoolVarP(&noDryRun, "no-dry-run", "", false, "disable dry-run") - release.Flags().BoolVarP(&noTest, "no-test", "", false, "don't run module tests") + release.Flags().BoolVarP(&doTest, "do-test", "", false, "run module tests before releasing") if err := rootCmd.Execute(); err != nil { logFatal(err.Error()) @@ -298,7 +302,7 @@ func (m *module) Tag() string { } func (m module) RunTest() (string, error) { - if noTest { + if !doTest { logInfo("Tests disabled.") return "", nil } From 2df3a7fc0873f38795e4d43a4f0f3950b546a7f0 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Wed, 20 May 2020 12:53:05 -0700 Subject: [PATCH 11/14] Refactor --- releasing/releasing/gitrunner.go | 293 ++++++++++++++++ releasing/releasing/main.go | 271 +++++++++++++++ releasing/releasing/main_test.go | 20 ++ releasing/releasing/modulemeta.go | 42 +++ releasing/releasing/moduleversion.go | 93 +++++ releasing/releasing/releasing.go | 478 -------------------------- releasing/releasing/releasing_test.go | 70 ---- 7 files changed, 719 insertions(+), 548 deletions(-) create mode 100644 releasing/releasing/gitrunner.go create mode 100644 releasing/releasing/main.go create mode 100644 releasing/releasing/main_test.go create mode 100644 releasing/releasing/modulemeta.go create mode 100644 releasing/releasing/moduleversion.go delete mode 100644 releasing/releasing/releasing.go delete mode 100644 releasing/releasing/releasing_test.go diff --git a/releasing/releasing/gitrunner.go b/releasing/releasing/gitrunner.go new file mode 100644 index 000000000..5dbf0e03b --- /dev/null +++ b/releasing/releasing/gitrunner.go @@ -0,0 +1,293 @@ +package main + +import ( + "fmt" + "io/ioutil" + "os" + "os/exec" + "path/filepath" + "regexp" + "strings" +) + +type gitRunner struct { + // Original git repo path, which should be current working directory + originalGitPath string + // A temporary path for worktree + worktreePath string + // Does this have worktree + hasWorktree bool +} + +func newGitRunner(worktree bool) (gitRunner, error) { + gr := gitRunner{} + pwd, err := os.Getwd() + if err != nil { + return gr, err + } + gr.originalGitPath = pwd + gr.hasWorktree = worktree + if worktree { + err = gr.CreateWorktreeDir() + if err != nil { + return gr, err + } + } + return gr, nil +} + +func (gr *gitRunner) Close() error { + if !gr.hasWorktree { + return nil + } + err := gr.DeleteWorktreeDir() + if err != nil { + return err + } + err = gr.PruneWorktree() + if err != nil { + return err + } + return nil +} + +func (gr *gitRunner) DeleteWorktreeDir() error { + logDebug("Deleting git worktree dir: %s", gr.worktreePath) + err := os.RemoveAll(gr.worktreePath) + if err != nil { + return err + } + logDebug("Deleting done") + return nil +} + +func (gr *gitRunner) WorktreePath() (string, error) { + if gr.worktreePath == "" { + return "", fmt.Errorf("Empty worktree path") + } + return gr.worktreePath, nil +} + +func (gr *gitRunner) OriginalGitPath() (string, error) { + if gr.originalGitPath == "" { + return "", fmt.Errorf("Empty git path") + } + return gr.originalGitPath, nil +} + +func (gr *gitRunner) CreateWorktreeDir() error { + // Create temporary directory + temp, err := ioutil.TempDir("", "kustomize-releases") + if err != nil { + return err + } + gr.worktreePath = filepath.Join(temp, "sigs.k8s.io/kustomize") + err = os.MkdirAll(gr.worktreePath, 0700) + logDebug("Created git worktree dir: %s", gr.worktreePath) + if err != nil { + return err + } + return nil +} + +func (gr *gitRunner) CheckRemoteExistence(remote string) error { + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + logDebug("Checking remote %s in %s", remote, path) + cmd := exec.Command("git", "remote") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + logDebug("Remotes:\n%s", string(stdoutStderr)) + + regString := fmt.Sprintf("(?m)^%s$", remote) + reg := regexp.MustCompile(regString) + if !reg.MatchString(string(stdoutStderr)) { + return fmt.Errorf("Cannot find remote named %s", remote) + } + logDebug("Remote %s exists", remote) + return nil +} + +func (gr *gitRunner) FetchTags(remote string) error { + logDebug("Fetching latest tags") + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + cmd := exec.Command("git", "fetch", "-t", remote) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + logDebug("Finished fetching") + return nil +} + +func (gr *gitRunner) GetTags() (string, error) { + path, err := gr.OriginalGitPath() + if err != nil { + return "", err + } + logDebug("Getting latest tag in repo %s", path) + cmd := exec.Command("git", "tag", "-l") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return "", fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + logDebug("Finished getting tags") + return string(stdoutStderr), nil +} + +func (gr *gitRunner) CheckBranchExistence(name string) (bool, error) { + logDebug("Checking branch %s existence", name) + path, err := gr.OriginalGitPath() + if err != nil { + return false, err + } + cmd := exec.Command("git", "branch", "-a") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return false, fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + branches := strings.Split(string(stdoutStderr), "\n") + for _, branch := range branches { + if strings.Trim(branch, " ") == "remotes/"+name { + return true, nil + } + } + return false, nil +} + +func (gr *gitRunner) NewBranch(name string) error { + logInfo("Creating new branch %s", name) + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + upstreamBranch := "upstream/" + name + cmd := exec.Command("git", "branch", name, upstreamBranch) + exist, err := gr.CheckBranchExistence(upstreamBranch) + if err != nil { + return err + } + if !exist { + logInfo("Remote branch %s doesn't exist", upstreamBranch) + cmd = exec.Command("git", "branch", name) + } + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + return nil +} + +func (gr *gitRunner) DeleteBranch(name string) error { + logDebug("Deleting branch %s", name) + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + cmd := exec.Command("git", "branch", "-D", name) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + logDebug("Finished deleting branch") + return nil +} + +func (gr *gitRunner) AddWorktree(branch string) error { + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + tempDir, err := gr.WorktreePath() + if err != nil { + return err + } + logInfo("Adding worktree %s for branch %s", tempDir, branch) + cmd := exec.Command("git", "worktree", "add", tempDir, branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + return nil +} + +func (gr *gitRunner) PruneWorktree() error { + path, err := gr.OriginalGitPath() + if err != nil { + return err + } + logDebug("Pruning worktree for repo %s", path) + cmd := exec.Command("git", "worktree", "prune") + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + logDebug("Finished pruning worktree") + return nil +} + +func (gr *gitRunner) Merge(branch string) error { + logInfo("Merging %s", branch) + path, err := gr.WorktreePath() + if err != nil { + return err + } + logDebug("Working dir: %s", path) + cmd := exec.Command("git", "merge", branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + return nil +} + +func (gr *gitRunner) PushRelease(branch string, mod module) error { + logInfo("Pushing branch %s", branch) + path, err := gr.WorktreePath() + if err != nil { + return err + } + cmd := exec.Command("git", "push", "upstream", branch) + cmd.Dir = path + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + + logInfo("Creating tag %s", mod.Tag()) + cmd = exec.Command( + "git", "tag", + "-a", mod.Tag(), + "-m", fmt.Sprintf("Release %s on branch %s", mod.Tag(), branch), + ) + cmd.Dir = path + stdoutStderr, err = cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + + logInfo("Pushing tag %s", mod.Tag()) + cmd = exec.Command("git", "push", "upstream", mod.Tag()) + cmd.Dir = path + stdoutStderr, err = cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("%s %s", err.Error(), stdoutStderr) + } + return nil +} diff --git a/releasing/releasing/main.go b/releasing/releasing/main.go new file mode 100644 index 000000000..bbada8d96 --- /dev/null +++ b/releasing/releasing/main.go @@ -0,0 +1,271 @@ +package main + +import ( + "errors" + "fmt" + "log" + + "github.com/spf13/cobra" +) + +var modules = [...]string{ + "kyaml", "api", "kstatus", "cmd/config", + "cmd/resource", "cmd/kubectl", "pluginator", "kustomize", +} + +// Enable verbose or not +var verbose bool + +// Disable dry run +var noDryRun bool + +// Enable module tests +var doTest bool + +// === Log helper functions === + +func logDebug(format string, v ...interface{}) { + if verbose { + log.Printf("DEBUG "+format, v...) + } +} + +func logInfo(format string, v ...interface{}) { + log.Printf("INFO "+format, v...) +} + +func logWarn(format string, v ...interface{}) { + log.Printf("WARN "+format, v...) +} + +func logFatal(format string, v ...interface{}) { + log.Fatalf("FATAL "+format, v...) +} + +func logFatalE(e error) { + log.Fatalf("FATAL %s", e.Error()) +} + +// === Command line commands === + +var rootCmd = &cobra.Command{ + Use: "releasing", + Short: "This go program is used to improve the modules releasing process in Kustomize repository.", +} + +func listCmdImpl() error { + gr, err := newGitRunner(false) + if err != nil { + return err + } + logDebug("Working directory: %s", gr.originalGitPath) + remote := "upstream" + + err = gr.CheckRemoteExistence(remote) + if err != nil { + return err + } + err = gr.FetchTags(remote) + if err != nil { + return err + } + tags, err := gr.GetTags() + if err != nil { + return err + } + + res := []string{} // Store result strings + for _, modName := range modules { + mod := module{ + name: modName, + } + err = mod.UpdateVersion(tags) + if err != nil { + return err + } + res = append(res, fmt.Sprintf("%s/%s", mod.name, mod.version.String())) + } + err = gr.Close() + if err != nil { + return err + } + for _, l := range res { + fmt.Println(l) + } + return nil +} + +var listSubCmd = &cobra.Command{ + Use: "list", + Short: "List current version of all covered modules", + Run: func(cmd *cobra.Command, args []string) { + err := listCmdImpl() + if err != nil { + logFatalE(err) + } + }, +} + +func checkReleaseArgs(args []string) error { + if len(args) != 2 { + return errors.New("2 arguments are required") + } + found := false + for _, mod := range modules { + if mod == args[0] { + found = true + break + } + } + if !found { + return fmt.Errorf("%s is not a valid module. Valid modules are %s", args[0], modules) + } + types := []string{"major", "minor", "patch"} + found = false + for _, t := range types { + if t == args[1] { + found = true + break + } + } + if !found { + return fmt.Errorf("%s is not a valid version type. Valid types are %s", args[1], types) + } + return nil +} + +func releaseCmdImpl(args []string) error { + modName := args[0] + versionType := args[1] + gr, err := newGitRunner(true) + if err != nil { + return err + } + logInfo("Creating tag for module %s", modName) + logDebug("Working directory: %s", gr.originalGitPath) + remote := "upstream" + + err = gr.CheckRemoteExistence(remote) + if err != nil { + return err + } + err = gr.FetchTags(remote) + if err != nil { + return err + } + tags, err := gr.GetTags() + if err != nil { + return err + } + + gitPath, err := gr.OriginalGitPath() + if err != nil { + return err + } + mod := module{ + name: modName, + path: gitPath, + } + err = mod.UpdateVersion(tags) + if err != nil { + return err + } + + oldVersion := mod.version.String() + err = mod.version.Bump(versionType) + if err != nil { + return err + } + newVersion := mod.version.String() + logInfo("Bumping version: %s => %s", oldVersion, newVersion) + + // Create branch + branch := fmt.Sprintf("release-%s-v%d.%d", mod.name, mod.version.major, mod.version.minor) + err = gr.NewBranch(branch) + if err != nil { + return err + } + + err = gr.AddWorktree(branch) + if err != nil { + return err + } + + err = gr.Merge("upstream/master") + if err != nil { + return err + } + // Update module path + worktreePath, err := gr.WorktreePath() + if err != nil { + return err + } + mod.path = worktreePath + + logInfo( + "Releasing summary:\nDir:\t%s\nModule:\t%s %s\nBranch:\t%s\nTag:\t%s", + worktreePath, + mod.name, + mod.version.String(), + branch, + mod.Tag(), + ) + + // Run module tests + output, err := mod.RunTest() + if err != nil { + logWarn(output) + } else if !noDryRun { + logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) + } else { + err = gr.PushRelease(branch, mod) + if err != nil { + return err + } + } + // Clean + err = gr.Close() + if err != nil { + return err + } + err = gr.DeleteBranch(branch) + if err != nil { + return err + } + logInfo("Releasing for module %s completes", mod.name) + return nil +} + +var release = &cobra.Command{ + Use: "release [module name] [version type]", + Short: "Release a new version of specified module", + Args: func(cmd *cobra.Command, args []string) error { + return checkReleaseArgs(args) + }, + Run: func(cmd *cobra.Command, args []string) { + err := releaseCmdImpl(args) + if err != nil { + logFatalE(err) + } + }, +} + +var subCmds = [...]*cobra.Command{ + listSubCmd, + release, +} + +// === Main function === + +func main() { + for _, cmd := range subCmds { + rootCmd.AddCommand(cmd) + } + rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") + release.Flags().BoolVarP(&noDryRun, "no-dry-run", "", false, "disable dry-run") + release.Flags().BoolVarP(&doTest, "do-test", "", false, "run module tests before releasing") + + if err := rootCmd.Execute(); err != nil { + logFatal(err.Error()) + } +} diff --git a/releasing/releasing/main_test.go b/releasing/releasing/main_test.go new file mode 100644 index 000000000..fe1988b23 --- /dev/null +++ b/releasing/releasing/main_test.go @@ -0,0 +1,20 @@ +package main + +import ( + "testing" +) + +func TestList(t *testing.T) { + err := listCmdImpl() + if err != nil { + t.Error(err) + } +} + +func TestRelease(t *testing.T) { + args := []string{"api", "minor"} + err := releaseCmdImpl(args) + if err != nil { + t.Error(err) + } +} diff --git a/releasing/releasing/modulemeta.go b/releasing/releasing/modulemeta.go new file mode 100644 index 000000000..80744f6d8 --- /dev/null +++ b/releasing/releasing/modulemeta.go @@ -0,0 +1,42 @@ +package main + +import ( + "os/exec" + "path/filepath" +) + +type module struct { + name string + path string + version moduleVersion +} + +func (m *module) UpdateVersion(tags string) error { + v, err := newModuleVersionFromGitTags(tags, m.name) + if err != nil { + return err + } + m.version = v + return nil +} + +func (m *module) Tag() string { + return m.name + "/" + m.version.String() +} + +func (m *module) RunTest() (string, error) { + if !doTest { + logInfo("Tests disabled.") + return "", nil + } + testPath := filepath.Join(m.path, m.name) + logInfo("Running tests in %s...", testPath) + cmd := exec.Command("go", "test", "./...") + cmd.Dir = testPath + stdoutStderr, err := cmd.CombinedOutput() + if err != nil { + return string(stdoutStderr), err + } + logInfo("Tests are successfully finished") + return "", nil +} diff --git a/releasing/releasing/moduleversion.go b/releasing/releasing/moduleversion.go new file mode 100644 index 000000000..c2e087190 --- /dev/null +++ b/releasing/releasing/moduleversion.go @@ -0,0 +1,93 @@ +package main + +import ( + "fmt" + "regexp" + "sort" + "strconv" + "strings" +) + +type moduleVersion struct { + major int + minor int + patch int +} + +func (v *moduleVersion) String() string { + return fmt.Sprintf("v%d.%d.%d", v.major, v.minor, v.patch) +} + +func (v *moduleVersion) Bump(t string) error { + if t == "major" { + v.major++ + v.minor = 0 + v.patch = 0 + } else if t == "minor" { + v.minor++ + v.patch = 0 + } else if t == "patch" { + v.patch++ + } else { + return fmt.Errorf("Invalid version type: %s", t) + } + return nil +} + +func newModuleVersionFromString(vs string) (*moduleVersion, error) { + if len(vs) < 1 { + return nil, fmt.Errorf("Invalid version string %s", vs) + } + if vs[0] == 'v' { + vs = vs[1:] + } + versions := strings.Split(vs, ".") + major, err := strconv.Atoi(versions[0]) + if err != nil { + return nil, err + } + minor, err := strconv.Atoi(versions[1]) + if err != nil { + return nil, err + } + patch, err := strconv.Atoi(versions[2]) + if err != nil { + return nil, err + } + v := moduleVersion{ + major: major, + minor: minor, + patch: patch, + } + + return &v, nil +} + +func newModuleVersionFromGitTags(tags, modName string) (moduleVersion, error) { + // Search for module tag + regString := fmt.Sprintf("(?m)^%s/v(\\d+\\.){2}\\d+$", modName) + reg := regexp.MustCompile(regString) + modTagsString := reg.FindAllString(tags, -1) + logDebug("Tags for module %s:\n%s", modName, modTagsString) + var versions []moduleVersion + for _, tag := range modTagsString { + tag = tag[len(modName)+2:] + v, err := newModuleVersionFromString(tag) + if err != nil { + return moduleVersion{}, err + } + + versions = append(versions, *v) + } + // Sort to find latest tag + sort.Slice(versions, func(i, j int) bool { + if versions[i].major == versions[j].major && versions[i].minor == versions[j].minor { + return versions[i].patch > versions[j].patch + } else if versions[i].major == versions[j].major { + return versions[i].minor > versions[j].minor + } else { + return versions[i].major > versions[j].major + } + }) + return versions[0], nil +} diff --git a/releasing/releasing/releasing.go b/releasing/releasing/releasing.go deleted file mode 100644 index a94488755..000000000 --- a/releasing/releasing/releasing.go +++ /dev/null @@ -1,478 +0,0 @@ -package main - -import ( - "bytes" - "errors" - "fmt" - "io/ioutil" - "log" - "os" - "os/exec" - "path" - "regexp" - "sort" - "strconv" - "strings" - - "github.com/spf13/cobra" -) - -var modules = [...]string{ - "kyaml", "api", "kstatus", "cmd/config", - "cmd/resource", "cmd/kubectl", "pluginator", "kustomize", -} -var verbose bool // Enable verbose or not -var noDryRun bool // Disable dry run -var doTest bool // Enable module tests -var tempDir string // Temporary directory path for git worktree - -// === Log helper functions === - -func logDebug(format string, v ...interface{}) { - if verbose { - log.Printf("DEBUG "+format, v...) - } -} - -func logInfo(format string, v ...interface{}) { - log.Printf("INFO "+format, v...) -} - -func logWarn(format string, v ...interface{}) { - log.Printf("WARN "+format, v...) -} - -func logFatal(format string, v ...interface{}) { - log.Fatalf("FATAL "+format, v...) -} - -// === Command line commands === - -var rootCmd = &cobra.Command{ - Use: "releasing", - Short: "This go program is used to improve the modules releasing process in Kustomize repository.", -} - -var listSubCmd = &cobra.Command{ - Use: "list", - Short: "List current version of all covered modules", - Run: func(cmd *cobra.Command, args []string) { - pwd, err := os.Getwd() - if err != nil { - logFatal(err.Error()) - } - logDebug("Working directory: %s", pwd) - remote := "upstream" - // Check remotes - checkRemoteExistence(pwd, remote) - // Fetch latest tags from remote - fetchTags(pwd, remote) - res := []string{} // Store result strings - for _, mod := range modules { - res = append(res, fmt.Sprintf("%s/%s", mod, getModuleCurrentVersion(mod, pwd))) - } - for _, l := range res { - fmt.Println(l) - } - }, -} - -var release = &cobra.Command{ - Use: "release [module name] [version type]", - Short: "Release a new version of specified module", - Args: func(cmd *cobra.Command, args []string) error { - if len(args) != 2 { - return errors.New("2 arguments are required") - } - found := false - for _, mod := range modules { - if mod == args[0] { - found = true - break - } - } - if !found { - return fmt.Errorf("%s is not a valid module. Valid modules are %s", args[0], modules) - } - types := []string{"major", "minor", "patch"} - found = false - for _, t := range types { - if t == args[1] { - found = true - break - } - } - if !found { - return fmt.Errorf("%s is not a valid version type. Valid types are %s", args[1], types) - } - return nil - }, - Run: func(cmd *cobra.Command, args []string) { - modName := args[0] - versionType := args[1] - createTempDir() - logInfo("Creating tag for module %s", modName) - pwd, err := os.Getwd() - if err != nil { - logFatal(err.Error()) - } - logDebug("Working directory: %s", pwd) - remote := "upstream" - // Check remotes - checkRemoteExistence(pwd, remote) - // Fetch latest tags from remote - fetchTags(pwd, remote) - - mod := module{ - name: modName, - path: pwd, - } - mod.UpdateCurrentVersion() - - oldVersion := mod.version.String() - mod.version.Bump(versionType) - newVersion := mod.version.String() - logInfo("Bumping version: %s => %s", oldVersion, newVersion) - - // Create branch - branch := fmt.Sprintf("release-%s-v%d.%d", mod.name, mod.version.major, mod.version.minor) - newBranch(pwd, branch) - - addWorktree(pwd, tempDir, branch) - - merge(tempDir, "upstream/master") - // Update module path - mod.path = tempDir - - logInfo( - "Releasing summary:\nDir:\t%s\nModule:\t%s %s\nBranch:\t%s\nTag:\t%s", - tempDir, - mod.name, - mod.version.String(), - branch, - mod.Tag(), - ) - - // Run module tests - output, err := mod.RunTest() - if err != nil { - logWarn(output) - } else if !noDryRun { - logInfo("Skipping push module %s. Run with --no-dry-run to push the release.", mod.name) - } else { - pushRelease(tempDir, branch, mod) - } - // Clean - removeTempDir() - pruneWorktree(pwd) - deleteBranch(pwd, branch) - logInfo("Releasing for module %s completes", mod.name) - }, -} - -var subCmds = [...]*cobra.Command{ - listSubCmd, - release, -} - -// === Main function === - -func main() { - for _, cmd := range subCmds { - rootCmd.AddCommand(cmd) - } - rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") - release.Flags().BoolVarP(&noDryRun, "no-dry-run", "", false, "disable dry-run") - release.Flags().BoolVarP(&doTest, "do-test", "", false, "run module tests before releasing") - - if err := rootCmd.Execute(); err != nil { - logFatal(err.Error()) - } -} - -func getModuleCurrentVersion(modName, path string) string { - mod := module{ - name: modName, - path: path, - } - mod.UpdateCurrentVersion() - v := mod.version.String() - logDebug("module %s version.toString => %s", mod.name, v) - return v -} - -// === module version struct and functions definition === - -type moduleVersion struct { - major int - minor int - patch int -} - -func (v moduleVersion) String() string { - return fmt.Sprintf("v%d.%d.%d", v.major, v.minor, v.patch) -} - -func (v *moduleVersion) Set(major, minor, patch int) { - v.major = major - v.minor = minor - v.patch = patch -} - -func (v *moduleVersion) FromString(vs string) { - versions := strings.Split(vs, ".") - major, err := strconv.Atoi(versions[0]) - if err != nil { - logFatal(err.Error()) - } - minor, err := strconv.Atoi(versions[1]) - if err != nil { - logFatal(err.Error()) - } - patch, err := strconv.Atoi(versions[2]) - if err != nil { - logFatal(err.Error()) - } - v.Set(major, minor, patch) -} - -func (v *moduleVersion) Bump(t string) { - if t == "major" { - v.major++ - v.minor = 0 - v.patch = 0 - } else if t == "minor" { - v.minor++ - v.patch = 0 - } else if t == "patch" { - v.patch++ - } else { - logFatal("Invalid version type: %s", t) - } -} - -// === module struct and functions definition === - -type module struct { - name string - path string - version moduleVersion -} - -func (m *module) UpdateCurrentVersion() { - logDebug("Getting latest tag for %s", m.name) - cmd := exec.Command("git", "tag", "-l") - var out bytes.Buffer - cmd.Stdout = &out - cmd.Dir = m.path - err := cmd.Run() - if err != nil { - logFatal(err.Error()) - } - - // Search for module tag - regString := fmt.Sprintf("(?m)^%s/v(\\d+\\.){2}\\d+$", m.name) - reg := regexp.MustCompile(regString) - tagsString := reg.FindAllString(out.String(), -1) - logDebug("Tags for module %s:\n%s", m.name, tagsString) - var versions []moduleVersion - for _, tag := range tagsString { - tag = tag[len(m.name)+2:] - v := moduleVersion{} - v.FromString(tag) - - versions = append(versions, v) - } - // Sort to find latest tag - sort.Slice(versions, func(i, j int) bool { - if versions[i].major == versions[j].major && versions[i].minor == versions[j].minor { - return versions[i].patch > versions[j].patch - } else if versions[i].major == versions[j].major { - return versions[i].minor > versions[j].minor - } else { - return versions[i].major > versions[j].major - } - }) - - m.version = versions[0] -} - -func (m *module) Tag() string { - return m.name + "/" + m.version.String() -} - -func (m module) RunTest() (string, error) { - if !doTest { - logInfo("Tests disabled.") - return "", nil - } - testPath := path.Join(m.path, m.name) - logInfo("Running tests in %s...", testPath) - cmd := exec.Command("go", "test", "./...") - cmd.Dir = testPath - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - return string(stdoutStderr), err - } - logInfo("Tests are successfully finished") - return "", nil -} - -// === Git environment functions === - -func createTempDir() { - // Create temporary directory - temp, err := ioutil.TempDir("", "kustomize-releases") - if err != nil { - logFatal(err.Error()) - } - logDebug("Created git temp dir: " + tempDir) - tempDir = path.Join(temp, "sigs.k8s.io/kustomize") - err = os.MkdirAll(tempDir, 0700) - if err != nil { - logFatal(err.Error()) - } -} - -func removeTempDir() { - logDebug("Deleting git temp dir: " + tempDir) - err := os.RemoveAll(tempDir) - if err != nil { - logFatal(err.Error()) - } - logDebug("Deleting done") -} - -func checkRemoteExistence(path, remote string) { - logDebug("Checking remote %s in %s", remote, path) - cmd := exec.Command("git", "remote") - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - logDebug("Remotes:\n%s", string(stdoutStderr)) - - regString := fmt.Sprintf("(?m)^%s$", remote) - reg := regexp.MustCompile(regString) - if !reg.MatchString(string(stdoutStderr)) { - logFatal("Cannot find remote named %s", remote) - } - logDebug("Remote %s exists", remote) -} - -func fetchTags(path, remote string) { - logDebug("Fetching latest tags") - cmd := exec.Command("git", "fetch", "-t", remote) - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - logDebug("Finished fetching") -} - -func checkBranchExistence(path, name string) bool { - logDebug("Checking branch %s existence", name) - cmd := exec.Command("git", "branch", "-a") - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - branches := strings.Split(string(stdoutStderr), "\n") - for _, branch := range branches { - if strings.Trim(branch, " ") == "remotes/"+name { - return true - } - } - return false -} - -func newBranch(path, name string) { - logInfo("Creating new branch %s", name) - upstreamBranch := "upstream/" + name - cmd := exec.Command("git", "branch", name, upstreamBranch) - if !checkBranchExistence(path, upstreamBranch) { - logInfo("Remote branch %s doesn't exist", upstreamBranch) - cmd = exec.Command("git", "branch", name) - } - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } -} - -func deleteBranch(path, name string) { - logDebug("Deleting branch %s", name) - cmd := exec.Command("git", "branch", "-D", name) - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - logDebug("Finished deleting branch") -} - -func addWorktree(path, tempDir, branch string) { - logInfo("Adding worktree %s for branch %s", tempDir, branch) - cmd := exec.Command("git", "worktree", "add", tempDir, branch) - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } -} - -func pruneWorktree(path string) { - logDebug("Pruning worktree for repo %s", path) - cmd := exec.Command("git", "worktree", "prune") - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - logDebug("Finished pruning worktree") -} - -func merge(path, branch string) { - logInfo("Merging %s", branch) - logDebug("Working dir: %s", path) - cmd := exec.Command("git", "merge", branch) - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } -} - -func pushRelease(path, branch string, mod module) { - logInfo("Pushing branch %s", branch) - cmd := exec.Command("git", "push", "upstream", branch) - cmd.Dir = path - stdoutStderr, err := cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - - logInfo("Creating tag %s", mod.Tag()) - cmd = exec.Command( - "git", "tag", - "-a", mod.Tag(), - "-m", fmt.Sprintf("Release %s on branch %s", mod.Tag(), branch), - ) - cmd.Dir = path - stdoutStderr, err = cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } - - logInfo("Pushing tag %s", mod.Tag()) - cmd = exec.Command("git", "push", "upstream", mod.Tag()) - cmd.Dir = path - stdoutStderr, err = cmd.CombinedOutput() - if err != nil { - logFatal(string(stdoutStderr)) - } -} diff --git a/releasing/releasing/releasing_test.go b/releasing/releasing/releasing_test.go deleted file mode 100644 index b0a44aaa5..000000000 --- a/releasing/releasing/releasing_test.go +++ /dev/null @@ -1,70 +0,0 @@ -package main - -import ( - "fmt" - "os" - "regexp" - "testing" -) - -func TestList(t *testing.T) { - pwd, err := os.Getwd() - if err != nil { - t.Errorf(err.Error()) - } - remote := "upstream" - // Check remotes - checkRemoteExistence(pwd, remote) - // Fetch latest tags from remote - fetchTags(pwd, remote) - for _, mod := range modules { - v := getModuleCurrentVersion(mod, pwd) - valid, err := regexp.MatchString("^v(\\d+\\.){2}\\d+$", v) - if err != nil { - t.Errorf(err.Error()) - } - if !valid { - t.Errorf("Returned version %s is not valid", v) - } - } -} - -func TestRelease(t *testing.T) { - createTempDir() - modName := "api" - versionType := "patch" - pwd, err := os.Getwd() - if err != nil { - t.Errorf(err.Error()) - } - remote := "upstream" - // Check remotes - checkRemoteExistence(pwd, remote) - // Fetch latest tags from remote - fetchTags(pwd, remote) - mod := module{ - name: modName, - path: pwd, - } - mod.UpdateCurrentVersion() - - oldVersion := mod.version.String() - mod.version.Bump(versionType) - newVersion := mod.version.String() - logInfo("Bumping version: %s => %s", oldVersion, newVersion) - - // Create branch - branch := fmt.Sprintf("release-%s-v%d.%d", mod.name, mod.version.major, mod.version.minor) - newBranch(pwd, branch) - - addWorktree(pwd, tempDir, branch) - - merge(tempDir, "upstream/master") - // Update module path - mod.path = tempDir - - // Clean - removeTempDir() - pruneWorktree(pwd) - deleteBranch(pwd, branch) -} From 909bc25e123f5aa639ec40b61c4f659e216239f3 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Wed, 20 May 2020 13:33:37 -0700 Subject: [PATCH 12/14] Add tests for modulemeta and moduleversion --- releasing/releasing/gitrunner.go | 2 +- releasing/releasing/modulemeta_test.go | 68 ++++++++++ releasing/releasing/moduleversion.go | 22 ++-- releasing/releasing/moduleversion_test.go | 144 ++++++++++++++++++++++ 4 files changed, 226 insertions(+), 10 deletions(-) create mode 100644 releasing/releasing/modulemeta_test.go create mode 100644 releasing/releasing/moduleversion_test.go diff --git a/releasing/releasing/gitrunner.go b/releasing/releasing/gitrunner.go index 5dbf0e03b..d1219b1f7 100644 --- a/releasing/releasing/gitrunner.go +++ b/releasing/releasing/gitrunner.go @@ -104,7 +104,7 @@ func (gr *gitRunner) CheckRemoteExistence(remote string) error { } logDebug("Remotes:\n%s", string(stdoutStderr)) - regString := fmt.Sprintf("(?m)^%s$", remote) + regString := fmt.Sprintf("(?m)^\\s*%s\\s*$", remote) reg := regexp.MustCompile(regString) if !reg.MatchString(string(stdoutStderr)) { return fmt.Errorf("Cannot find remote named %s", remote) diff --git a/releasing/releasing/modulemeta_test.go b/releasing/releasing/modulemeta_test.go new file mode 100644 index 000000000..c8764ac4e --- /dev/null +++ b/releasing/releasing/modulemeta_test.go @@ -0,0 +1,68 @@ +package main + +import ( + "testing" +) + +func TestModuleTags(t *testing.T) { + tags := `api/v0.1.1 + api/v0.2.0 + api/v0.3.0 + api/v0.3.1 + api/v0.3.2 + api/v0.3.3 + cmd/config/v0.0.1 + cmd/config/v0.0.10 + cmd/config/v0.0.11 + cmd/config/v0.0.12 + cmd/config/v0.0.13 + cmd/config/v0.0.2 + cmd/config/v0.0.3 + cmd/config/v0.0.4 + cmd/config/v0.0.5 + cmd/config/v0.0.6 + cmd/config/v0.0.7 + cmd/config/v0.0.8 + cmd/config/v0.0.9 + cmd/config/v0.1.0 + cmd/config/v0.1.1 + cmd/config/v0.1.10 + cmd/config/v0.1.11 + cmd/config/v0.1.2 + cmd/config/v0.1.3 + cmd/config/v0.1.4 + cmd/config/v0.1.5 + cmd/config/v0.1.6 + cmd/config/v0.1.7 + cmd/config/v0.1.8 + cmd/kubectl/v0.0.1 + cmd/kubectl/v0.0.2 + cmd/kubectl/v0.0.3 + cmd/resource/v0.0.1 + cmd/resource/v0.0.2 + kstatus/v0.0.1 + kustomize/v3.2.1 + kustomize/v3.2.2 + kustomize/v3.2.3 + kustomize/v3.3.0 + kustomize/v3.4.0 + kustomize/v3.5.1 + kustomize/v3.5.2 + kustomize/v3.5.3 + kustomize/v3.5.4 + kustomize/v3.5.5` + expect := "cmd/config/v0.1.11" + + m := module{ + name: "cmd/config", + } + + err := m.UpdateVersion(tags) + if err != nil { + t.Error(err) + } + + if m.Tag() != expect { + t.Errorf("Tag %s doesn't match expected %s", m.Tag(), expect) + } +} diff --git a/releasing/releasing/moduleversion.go b/releasing/releasing/moduleversion.go index c2e087190..5370262ad 100644 --- a/releasing/releasing/moduleversion.go +++ b/releasing/releasing/moduleversion.go @@ -34,38 +34,42 @@ func (v *moduleVersion) Bump(t string) error { return nil } -func newModuleVersionFromString(vs string) (*moduleVersion, error) { +func newModuleVersionFromString(vs string) (moduleVersion, error) { + v := moduleVersion{} if len(vs) < 1 { - return nil, fmt.Errorf("Invalid version string %s", vs) + return v, fmt.Errorf("Invalid version string %s", vs) } if vs[0] == 'v' { vs = vs[1:] } versions := strings.Split(vs, ".") + if len(versions) != 3 { + return v, fmt.Errorf("Invalid version string %s", vs) + } major, err := strconv.Atoi(versions[0]) if err != nil { - return nil, err + return v, err } minor, err := strconv.Atoi(versions[1]) if err != nil { - return nil, err + return v, err } patch, err := strconv.Atoi(versions[2]) if err != nil { - return nil, err + return v, err } - v := moduleVersion{ + v = moduleVersion{ major: major, minor: minor, patch: patch, } - return &v, nil + return v, nil } func newModuleVersionFromGitTags(tags, modName string) (moduleVersion, error) { // Search for module tag - regString := fmt.Sprintf("(?m)^%s/v(\\d+\\.){2}\\d+$", modName) + regString := fmt.Sprintf("(?m)^\\s*%s/v(\\d+\\.){2}\\d+\\s*$", modName) reg := regexp.MustCompile(regString) modTagsString := reg.FindAllString(tags, -1) logDebug("Tags for module %s:\n%s", modName, modTagsString) @@ -77,7 +81,7 @@ func newModuleVersionFromGitTags(tags, modName string) (moduleVersion, error) { return moduleVersion{}, err } - versions = append(versions, *v) + versions = append(versions, v) } // Sort to find latest tag sort.Slice(versions, func(i, j int) bool { diff --git a/releasing/releasing/moduleversion_test.go b/releasing/releasing/moduleversion_test.go new file mode 100644 index 000000000..251af609e --- /dev/null +++ b/releasing/releasing/moduleversion_test.go @@ -0,0 +1,144 @@ +package main + +import ( + "testing" +) + +func TestVersionFromAndToString(t *testing.T) { + vs := "1.1.1" + expect := "v1.1.1" + v, err := newModuleVersionFromString(vs) + if err != nil { + t.Error(err) + } + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } + + vs = "v0.0.0" + expect = "v0.0.0" + v, err = newModuleVersionFromString(vs) + if err != nil { + t.Error(err) + } + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } + + vs = "v0.0" + v, err = newModuleVersionFromString(vs) + if err == nil { + t.Errorf("%s should be invalid", vs) + } + + vs = "" + v, err = newModuleVersionFromString(vs) + if err == nil { + t.Errorf("%s should be invalid", vs) + } +} + +func TestVersionFromGitTags(t *testing.T) { + tags := `api/v0.1.1 + api/v0.2.0 + api/v0.3.0 + api/v0.3.1 + api/v0.3.2 + api/v0.3.3 + cmd/config/v0.0.1 + cmd/config/v0.0.10 + cmd/config/v0.0.11 + cmd/config/v0.0.12 + cmd/config/v0.0.13 + cmd/config/v0.0.2 + cmd/config/v0.0.3 + cmd/config/v0.0.4 + cmd/config/v0.0.5 + cmd/config/v0.0.6 + cmd/config/v0.0.7 + cmd/config/v0.0.8 + cmd/config/v0.0.9 + cmd/config/v0.1.0 + cmd/config/v0.1.1 + cmd/config/v0.1.10 + cmd/config/v0.1.11 + cmd/config/v0.1.2 + cmd/config/v0.1.3 + cmd/config/v0.1.4 + cmd/config/v0.1.5 + cmd/config/v0.1.6 + cmd/config/v0.1.7 + cmd/config/v0.1.8 + cmd/kubectl/v0.0.1 + cmd/kubectl/v0.0.2 + cmd/kubectl/v0.0.3 + cmd/resource/v0.0.1 + cmd/resource/v0.0.2 + kstatus/v0.0.1 + kustomize/v3.2.1 + kustomize/v3.2.2 + kustomize/v3.2.3 + kustomize/v3.3.0 + kustomize/v3.4.0 + kustomize/v3.5.1 + kustomize/v3.5.2 + kustomize/v3.5.3 + kustomize/v3.5.4 + kustomize/v3.5.5` + expect := "v0.1.11" + + v, err := newModuleVersionFromGitTags(tags, "cmd/config") + if err != nil { + t.Error(err) + } + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } +} + +func TestVersionBumpPatch(t *testing.T) { + v := moduleVersion{0, 1, 1} + expect := "v0.1.2" + err := v.Bump("patch") + if err != nil { + t.Error(err) + } + + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } +} + +func TestVersionBumpMinor(t *testing.T) { + v := moduleVersion{0, 1, 1} + expect := "v0.2.0" + err := v.Bump("minor") + if err != nil { + t.Error(err) + } + + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } +} + +func TestVersionBumpMajor(t *testing.T) { + v := moduleVersion{0, 1, 1} + expect := "v1.0.0" + err := v.Bump("major") + if err != nil { + t.Error(err) + } + + if v.String() != expect { + t.Errorf("%s doesn't match expected %s", v.String(), expect) + } +} + +func TestVersionBumpError(t *testing.T) { + v := moduleVersion{} + err := v.Bump("unknown") + if err == nil { + t.Errorf("Invalid bumping type should have error") + } +} From 4d88032e11609d5eed2ee52ec5b9e9033f5f61e5 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Wed, 20 May 2020 13:42:38 -0700 Subject: [PATCH 13/14] Add comments --- releasing/releasing/modulemeta.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/releasing/releasing/modulemeta.go b/releasing/releasing/modulemeta.go index 80744f6d8..4e90fb255 100644 --- a/releasing/releasing/modulemeta.go +++ b/releasing/releasing/modulemeta.go @@ -6,8 +6,11 @@ import ( ) type module struct { - name string - path string + // Module name + name string + // Module path. This path is only used for running test. + path string + // Module version version moduleVersion } From 4b68425d86d6198e59f02c27cbf22555cd9cfda2 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Thu, 21 May 2020 10:07:42 -0700 Subject: [PATCH 14/14] Update readme for releasing --- releasing/README.md | 13 ++----------- releasing/releasing/main.go | 5 +++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/releasing/README.md b/releasing/README.md index 366f31ade..4effe6152 100644 --- a/releasing/README.md +++ b/releasing/README.md @@ -112,17 +112,8 @@ The tag appears in the URL, e.g. [pluginator/v1.0.0]. ## Release procedure -> TODO: script what follows, so someone can enter -> ``` -> go run ./releasing/release.go kustomize minor -> # or: -> # go run ./releasing/release.go api patch -> # go run ./releasing/release.go pluginator minor -> ``` -> The program would look at the existing remote tags, -> confirm sanity and increment the appropriate major/minor/patch -> component, create the right branch and tag, etc. -> No more bash please. +The script used to release modules is in progress. Check it in +`releasing/releasing` directory. At any given moment, the repository's master branch is passing all its tests and contains code one could release. diff --git a/releasing/releasing/main.go b/releasing/releasing/main.go index bbada8d96..821fd946d 100644 --- a/releasing/releasing/main.go +++ b/releasing/releasing/main.go @@ -49,8 +49,9 @@ func logFatalE(e error) { // === Command line commands === var rootCmd = &cobra.Command{ - Use: "releasing", - Short: "This go program is used to improve the modules releasing process in Kustomize repository.", + Use: "releasing", + Short: `This go program is used to improve the modules releasing process in Kustomize repository. +Note: You may need to run fixgomod.sh in the module to make the module ready to release.`, } func listCmdImpl() error {