Patch release announce in golang

.golangci.yml

@@ -4,7 +4,9 @@ run:
   deadline: 5m
 issues:
   exclude-rules:
-    - path: fake_client\.go
+    # counterfeiter fakes are usually named 'fake_<something>.go'
+    # TODO: figure out why golangci-lint does not treat counterfeiter files as generated files
+    - path: fake_.*\.go
       linters:
         - gocritic
         - dupl

BUILD.bazel

@@ -30,13 +30,15 @@ filegroup(
         "//cmd/blocking-testgrid-tests:all-srcs",
         "//cmd/krel:all-srcs",
         "//cmd/kubepkg:all-srcs",
+        "//cmd/patch-announce:all-srcs",
         "//cmd/release-notes:all-srcs",
         "//lib:all-srcs",
         "//pkg/command:all-srcs",
         "//pkg/git:all-srcs",
         "//pkg/kubepkg:all-srcs",
         "//pkg/log:all-srcs",
         "//pkg/notes:all-srcs",
+        "//pkg/patch:all-srcs",
         "//pkg/release:all-srcs",
         "//pkg/util:all-srcs",
         "//pkg/version:all-srcs",

cmd/krel/cmd/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     srcs = [
         "changelog.go",
         "ff.go",
+        "patch-announce.go",
         "push.go",
         "root.go",
         "version.go",
@@ -16,6 +17,7 @@ go_library(
         "//pkg/log:go_default_library",
         "//pkg/notes:go_default_library",
         "//pkg/notes/options:go_default_library",
+        "//pkg/patch:go_default_library",
         "//pkg/release:go_default_library",
         "//pkg/util:go_default_library",
         "//pkg/version:go_default_library",
@@ -28,6 +30,16 @@ go_library(
     ],
 )
 
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "changelog_test.go",
+        "root_test.go",
+    ],
+    embed = [":go_default_library"],
+    deps = ["@com_github_stretchr_testify//require:go_default_library"],
+)
+
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),
@@ -41,13 +53,3 @@ filegroup(
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "changelog_test.go",
-        "root_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = ["@com_github_stretchr_testify//require:go_default_library"],
-)

cmd/krel/cmd/changelog.go

@@ -89,8 +89,6 @@ const (
 )
 
 func init() {
-	cobra.OnInitialize(initConfig)
-
 	const (
 		tagFlag   = "tag"
 		tarsFlag  = "tars"

cmd/krel/cmd/ff.go

@@ -53,8 +53,6 @@ var ffCmd = &cobra.Command{
 }
 
 func init() {
-	cobra.OnInitialize(initConfig)
-
 	ffCmd.PersistentFlags().StringVar(&ffOpts.branch, "branch", "", "branch")
 	ffCmd.PersistentFlags().StringVar(&ffOpts.masterRef, "ref", kgit.DefaultMasterRef, "ref on master")
 	ffCmd.PersistentFlags().StringVar(&ffOpts.org, "org", kgit.DefaultGithubOrg, "org to run tool against")

cmd/krel/cmd/patch-announce.go

@@ -0,0 +1,96 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"k8s.io/release/pkg/log"
+	"k8s.io/release/pkg/patch"
+	"k8s.io/release/pkg/util"
+)
+
+// slap the subcommand onto the parent/root
+func init() {
+	cmd := patchAnnounceCommand()
+	rootCmd.AddCommand(cmd)
+}
+
+func patchAnnounceCommand() *cobra.Command {
+	opts := patch.AnnounceOptions{}
+
+	cmd := &cobra.Command{
+		Use:           "patch-announce",
+		Short:         "Send out patch release announcement mails",
+		SilenceUsage:  true,
+		SilenceErrors: true,
+		Args:          cobra.MaximumNArgs(0), // no additional/positional args allowed
+	}
+
+	// setup local flags
+	cmd.PersistentFlags().StringVarP(&opts.SenderName, "sender-name", "n", "", "email sender's name")
+	cmd.PersistentFlags().StringVarP(&opts.SenderEmail, "sender-email", "e", "", "email sender's address")
+	cmd.PersistentFlags().StringVarP(&opts.FreezeDate, "freeze-date", "f", "", "date when no CPs are allowed anymore")
+	cmd.PersistentFlags().StringVarP(&opts.CutDate, "cut-date", "c", "", "date when the patch release is planned to be cut")
+	cmd.PersistentFlags().StringVarP(&opts.ReleaseRepoPath, "release-repo", "r", "./release", "local path of the k/release checkout")
+
+	// TODO: figure out, how we can read env vars and also be able to set the flags to required in a cobra-native way
+	cmd.PersistentFlags().StringVarP(&opts.SendgridAPIKey, "sendgrid-api-key", "s", util.EnvDefault("SENDGRID_API_KEY", ""), "API key for sendgrid")
+	cmd.PersistentFlags().StringVarP(&opts.GithubToken, "github-token", "g", util.EnvDefault("GITHUB_TOKEN", ""), "a GitHub token, used r/o for generating the release notes")
+
+	cmd.PreRunE = func(cmd *cobra.Command, _ []string) error {
+		// TODO: make github-token & sendgrid-api-key required too
+		if err := setFlagsRequired(cmd, "sender-name", "sender-email", "freeze-date", "cut-date"); err != nil {
+			return err
+		}
+
+		var err error
+		if opts.Nomock, err = cmd.Flags().GetBool("nomock"); err != nil {
+			return err
+		}
+		if opts.K8sRepoPath, err = cmd.Flags().GetString("repo"); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	cmd.RunE = func(cmd *cobra.Command, args []string) error {
+		// Get the global logger, add the command's name as an initial tracing
+		// field and use that from here on
+		localLogger := logrus.NewEntry(logrus.StandardLogger())
+		logger := log.AddTracePath(localLogger, cmd.Name()).WithField("mock", !opts.Nomock)
+
+		announcer := &patch.Announcer{
+			Opts: opts,
+		}
+		announcer.SetLogger(logger, "announcer")
+
+		logger.Debug("run announcer")
+		return announcer.Run()
+	}
+
+	return cmd
+}
+
+func setFlagsRequired(cmd *cobra.Command, flags ...string) error {
+	for _, f := range flags {
+		if err := cmd.MarkPersistentFlagRequired(f); err != nil {
+			return err
+		}
+	}
+	return nil
+}

cmd/krel/cmd/root.go

@@ -28,9 +28,9 @@ import (
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:     "krel",
-	Short:   "krel",
-	PreRunE: initLogging,
+	Use:               "krel",
+	Short:             "krel",
+	PersistentPreRunE: initLogging,
 }
 
 type rootOptions struct {
@@ -51,26 +51,12 @@ func Execute() {
 }
 
 func init() {
-	cobra.OnInitialize(initConfig)
-
 	rootCmd.PersistentFlags().BoolVar(&rootOpts.nomock, "nomock", false, "nomock flag")
 	rootCmd.PersistentFlags().BoolVar(&rootOpts.cleanup, "cleanup", false, "cleanup flag")
 	rootCmd.PersistentFlags().StringVar(&rootOpts.repoPath, "repo", filepath.Join(os.TempDir(), "k8s"), "the local path to the repository to be used")
 	rootCmd.PersistentFlags().StringVar(&rootOpts.logLevel, "log-level", "info", "the logging verbosity, either 'panic', 'fatal', 'error', 'warn', 'warning', 'info', 'debug' or 'trace'")
 }
 
-// initConfig reads in config file and ENV variables if set.
-func initConfig() {
-}
-
 func initLogging(*cobra.Command, []string) error {
-	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
-	lvl, err := logrus.ParseLevel(rootOpts.logLevel)
-	if err != nil {
-		return err
-	}
-	logrus.SetLevel(lvl)
-	logrus.AddHook(log.NewFilenameHook())
-	logrus.Debugf("Using log level %q", lvl)
-	return nil
+	return log.SetupGlobalLogger(rootOpts.logLevel)
 }

cmd/krel/cmd/version.go

@@ -44,7 +44,6 @@ var versionCmd = &cobra.Command{
 }
 
 func init() {
-	cobra.OnInitialize(initConfig)
 	versionCmd.PersistentFlags().BoolVarP(&versionOpts.json, "json", "j", false,
 		"print JSON instead of text")
 	rootCmd.AddCommand(versionCmd)