internal/task: add ".0" to major release tweets

There's one more place to update for the upcoming go1.21.0 version name,
the tweet announcing major releases.

Increase the consistency between the templates and other similar code
in the announcing, tweeting and mail-dl-cl tasks, to make them easier
to maintain.

The next CL will apply a few more simplifications.

For golang/go#57631.

Change-Id: I21957b05d14834f8d2d64a09a6f93bfb66ec228a
Reviewed-on: https://go-review.googlesource.com/c/build/+/504521
Reviewed-by: Heschi Kreinick <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Run-TryBot: Dmitri Shuralyov <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>

Author: dmitshur

internal/relui/workflows.go

@@ -362,7 +362,7 @@ func addCommTasks(
 	// Announce that a new Go release has been published.
 	sentMail := wf.Task4(wd, "mail-announcement", comm.AnnounceRelease, wf.Const(kind), published, securityFixes, coordinators, wf.After(okayToAnnounceAndTweet))
 	announcementURL := wf.Task1(wd, "await-announcement", comm.AwaitAnnounceMail, sentMail)
-	tweetURL := wf.Task3(wd, "post-tweet", comm.TweetRelease, published, securitySummary, announcementURL, wf.After(okayToAnnounceAndTweet))
+	tweetURL := wf.Task4(wd, "post-tweet", comm.TweetRelease, wf.Const(kind), published, securitySummary, announcementURL, wf.After(okayToAnnounceAndTweet))
 
 	wf.Output(wd, "Announcement URL", announcementURL)
 	wf.Output(wd, "Tweet URL", tweetURL)

internal/task/announce.go

@@ -39,13 +39,13 @@ type releaseAnnouncement struct {
 	// Version is the Go version that has been released.
 	//
 	// The version string must use the same format as Go tags. For example:
-	// 	• "go1.17.2" for a minor Go release
-	// 	• "go1.21.0" for a major Go release
-	// 	• "go1.21beta1" or "go1.21rc1" for a pre-release
+	//   - "go1.21rc2" for a pre-release
+	//   - "go1.21.0" for a major Go release
+	//   - "go1.21.1" for a minor Go release
 	Version string
 	// SecondaryVersion is an older Go version that was also released.
 	// This only applies to minor releases when two releases are made.
-	// For example, "go1.16.10".
+	// For example, "go1.20.9".
 	SecondaryVersion string
 
 	// Security is a list of descriptions, one for each distinct
@@ -407,7 +407,7 @@ var announceTmpl = template.Must(template.New("").Funcs(template.FuncMap{
 	// short and helpers below manipulate valid Go version strings
 	// for the current needs of the announcement templates.
 	"short": func(v string) string { return strings.TrimPrefix(v, "go") },
-	// major extracts the major part of a valid Go version.
+	// major extracts the major prefix of a valid Go version.
 	// For example, major("go1.18.4") == "1.18".
 	"major": func(v string) (string, error) {
 		x, ok := version.Go1PointX(v)

internal/task/dlcl.go

@@ -20,10 +20,10 @@ import (
 // MailDLCL mails a golang.org/dl CL that adds commands for the
 // specified Go version.
 //
-// The version must use the same format as Go tags. For example:
-//   - "go1.17.2" and "go1.16.9" for a minor Go release
+// The version string must use the same format as Go tags. For example:
+//   - "go1.21rc2" for a pre-release
 //   - "go1.21.0" for a major Go release
-//   - "go1.18beta1" or "go1.18rc1" for a pre-release
+//   - "go1.21.1" for a minor Go release
 //
 // On success, the ID of the change is returned, like "dl~1234".
 func (t *VersionTasks) MailDLCL(ctx *workflow.TaskContext, major int, kind ReleaseKind, version string, reviewers []string, dryRun bool) (changeID string, _ error) {

internal/task/dlcl_test.go

@@ -163,8 +163,8 @@ func main() {
 			if got, want := changeID, "(dry-run)"; got != want {
 				t.Errorf("unexpected changeID: got = %q, want %q", got, want)
 			}
-			if diff := cmp.Diff(buf.String(), tc.wantLog); diff != "" {
-				t.Errorf("unexpected log:\n%s", diff)
+			if diff := cmp.Diff(tc.wantLog, buf.String()); diff != "" {
+				t.Errorf("log mismatch (-want +got):\n%s", diff)
 			}
 		})
 	}

internal/task/tweet.go

@@ -35,27 +35,30 @@ import (
 
 // releaseTweet describes a tweet that announces a Go release.
 type releaseTweet struct {
+	// Kind is the kind of release being announced.
+	Kind ReleaseKind
+
 	// Version is the Go version that has been released.
 	//
 	// The version string must use the same format as Go tags. For example:
-	// 	• "go1.17.2" for a minor Go release
-	// 	• "go1.18" for a major Go release
-	// 	• "go1.18beta1" or "go1.18rc1" for a pre-release
+	//   - "go1.21rc2" for a pre-release
+	//   - "go1.21.0" for a major Go release
+	//   - "go1.21.1" for a minor Go release
 	Version string
 	// SecondaryVersion is an older Go version that was also released.
 	// This only applies to minor releases when two releases are made.
-	// For example, "go1.16.10".
+	// For example, "go1.20.9".
 	SecondaryVersion string
 
 	// Security is an optional sentence describing security fixes
 	// included in this release.
 	//
 	// The empty string means there are no security fixes to highlight.
 	// Past examples:
-	// 	• "Includes a security fix for the Wasm port (CVE-2021-38297)."
-	// 	• "Includes a security fix for archive/zip (CVE-2021-39293)."
-	// 	• "Includes a security fix for crypto/tls (CVE-2021-34558)."
-	// 	• "Includes security fixes for archive/zip, net, net/http/httputil, and math/big packages."
+	//   - "Includes a security fix for the Wasm port (CVE-2021-38297)."
+	//   - "Includes a security fix for archive/zip (CVE-2021-39293)."
+	//   - "Includes a security fix for crypto/tls (CVE-2021-34558)."
+	//   - "Includes security fixes for archive/zip, net, net/http/httputil, and math/big packages."
 	Security string
 
 	// Announcement is the announcement URL.
@@ -86,12 +89,13 @@ type TweetTasks struct {
 
 // TweetRelease posts a tweet announcing that a Go release has been published.
 // ErrTweetTooLong is returned if the inputs result in a tweet that's too long.
-func (t TweetTasks) TweetRelease(ctx *workflow.TaskContext, published []Published, security string, announcement string) (tweetURL string, _ error) {
+func (t TweetTasks) TweetRelease(ctx *workflow.TaskContext, kind ReleaseKind, published []Published, security string, announcement string) (tweetURL string, _ error) {
 	if len(published) < 1 || len(published) > 2 {
 		return "", fmt.Errorf("got %d published Go releases, TweetRelease supports only 1 or 2 at once", len(published))
 	}
 
 	r := releaseTweet{
+		Kind:         kind,
 		Version:      published[0].Version,
 		Security:     security,
 		Announcement: announcement,
@@ -153,33 +157,47 @@ func tweetText(r releaseTweet, rnd *rand.Rand) (string, error) {
 		name string
 		data interface{}
 	)
-	if i := strings.Index(r.Version, "beta"); i != -1 { // A beta release.
+	switch r.Kind {
+	case KindBeta:
+		maj, beta, ok := strings.Cut(r.Version, "beta")
+		if !ok {
+			return "", fmt.Errorf("no 'beta' substring in beta version %q", r.Version)
+		}
 		name, data = "beta", struct {
 			Maj, Beta string
 			releaseTweet
 		}{
-			Maj:          r.Version[len("go"):i],
-			Beta:         r.Version[i+len("beta"):],
+			Maj:          maj[len("go"):],
+			Beta:         beta,
 			releaseTweet: r,
 		}
-	} else if i := strings.Index(r.Version, "rc"); i != -1 { // Release Candidate.
+	case KindRC:
+		maj, rc, ok := strings.Cut(r.Version, "rc")
+		if !ok {
+			return "", fmt.Errorf("no 'rc' substring in RC version %q", r.Version)
+		}
 		name, data = "rc", struct {
 			Maj, RC string
 			releaseTweet
 		}{
-			Maj:          r.Version[len("go"):i],
-			RC:           r.Version[i+len("rc"):],
+			Maj:          maj[len("go"):],
+			RC:           rc,
 			releaseTweet: r,
 		}
-	} else if strings.Count(r.Version, ".") == 1 { // Major release like "go1.X".
+	case KindMajor:
+		if !strings.HasSuffix(r.Version, ".0") {
+			return "", fmt.Errorf("no '.0' suffix in major version %q", r.Version)
+		}
 		name, data = "major", struct {
-			Maj string
+			Maj                 string
+			CapitalSpaceVersion string // "Go 1.5.0"
 			releaseTweet
 		}{
-			Maj:          r.Version[len("go"):],
-			releaseTweet: r,
+			Maj:                 r.Version[len("go") : len(r.Version)-len(".0")],
+			CapitalSpaceVersion: strings.Replace(r.Version, "go", "Go ", 1),
+			releaseTweet:        r,
 		}
-	} else if strings.Count(r.Version, ".") == 2 { // Minor release like "go1.X.Y".
+	case KindCurrentMinor, KindPrevMinor:
 		name, data = "minor", struct {
 			Curr, Prev string
 			releaseTweet
@@ -188,10 +206,9 @@ func tweetText(r releaseTweet, rnd *rand.Rand) (string, error) {
 			Prev:         strings.TrimPrefix(r.SecondaryVersion, "go"),
 			releaseTweet: r,
 		}
-	} else {
-		return "", fmt.Errorf("unknown version format: %q", r.Version)
+	default:
+		return "", fmt.Errorf("unknown release kind: %v", r.Kind)
 	}
-
 	if r.SecondaryVersion != "" && name != "minor" {
 		return "", fmt.Errorf("tweet template %q doesn't support more than one release; the SecondaryVersion field can only be used in minor releases", name)
 	}
@@ -244,11 +261,11 @@ const tweetTextTmpl = `{{define "minor" -}}
 
 
 {{define "major" -}}
-{{emoji "release"}} Go {{.Maj}} is released!
+{{emoji "release"}} {{.CapitalSpaceVersion}} is released!
 
 {{with .Security}}{{emoji "security"}} Security: {{.}}{{"\n\n"}}{{end -}}
 
-{{emoji "notes"}} Release notes: https://go.dev/doc/{{.Version}}
+{{emoji "notes"}} Release notes: https://go.dev/doc/go{{.Maj}}
 
 {{emoji "download"}} Download: https://go.dev/dl/#{{.Version}}
 

internal/task/tweet_test.go

@@ -18,12 +18,14 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"golang.org/x/build/internal/workflow"
 )
 
 func TestTweetRelease(t *testing.T) {
 	tests := [...]struct {
 		name         string
+		kind         ReleaseKind
 		published    []Published
 		security     string
 		announcement string
@@ -32,6 +34,7 @@ func TestTweetRelease(t *testing.T) {
 	}{
 		{
 			name: "minor",
+			kind: KindCurrentMinor,
 			published: []Published{
 				{Version: "go1.17.1", Files: []WebsiteFile{{
 					OS: "linux", Arch: "arm64",
@@ -65,6 +68,7 @@ go version go1.17.1 linux/arm64` + "\n",
 		},
 		{
 			name: "minor-solo",
+			kind: KindCurrentMinor,
 			published: []Published{{Version: "go1.11.1", Files: []WebsiteFile{{
 				OS: "darwin", Arch: "amd64",
 				Filename: "go1.11.1.darwin-amd64.tar.gz", Size: 124181190, Kind: "archive"}},
@@ -92,6 +96,7 @@ go version go1.11.1 darwin/amd64` + "\n",
 		},
 		{
 			name: "beta",
+			kind: KindBeta,
 			published: []Published{{Version: "go1.17beta1", Files: []WebsiteFile{{
 				OS: "darwin", Arch: "amd64",
 				Filename: "go1.17beta1.darwin-amd64.tar.gz", Size: 135610703, Kind: "archive"}},
@@ -121,6 +126,7 @@ go version go1.17beta1 darwin/amd64` + "\n",
 		},
 		{
 			name: "rc",
+			kind: KindRC,
 			published: []Published{{Version: "go1.17rc2", Files: []WebsiteFile{{
 				OS: "windows", Arch: "arm64",
 				Filename: "go1.17rc2.windows-arm64.zip", Size: 116660997, Kind: "archive"}},
@@ -150,32 +156,33 @@ go version go1.17rc2 windows/arm64` + "\n",
 		},
 		{
 			name: "major",
-			published: []Published{{Version: "go1.17", Files: []WebsiteFile{{
+			kind: KindMajor,
+			published: []Published{{Version: "go1.21.0", Files: []WebsiteFile{{
 				OS: "freebsd", Arch: "amd64",
-				Filename: "go1.17.freebsd-amd64.tar.gz", Size: 133579378, Kind: "archive"}},
+				Filename: "go1.21.0.freebsd-amd64.tar.gz", Size: 133579378, Kind: "archive"}},
 			}},
 			security:   "Includes a super duper security fix (CVE-123).",
 			randomSeed: 123,
 			wantLog: `tweet text:
-🥳 Go 1.17 is released!
+🥳 Go 1.21.0 is released!
 
 🔐 Security: Includes a super duper security fix (CVE-123).
 
-📝 Release notes: https://go.dev/doc/go1.17
+📝 Release notes: https://go.dev/doc/go1.21
 
-📦 Download: https://go.dev/dl/#go1.17
+📦 Download: https://go.dev/dl/#go1.21.0
 
 #golang
 tweet image:
-$ go install golang.org/dl/go1.17@latest
-$ go1.17 download
+$ go install golang.org/dl/go1.21.0@latest
+$ go1.21.0 download
 Downloaded   0.0% (        0 / 133579378 bytes) ...
 Downloaded  50.0% ( 66789689 / 133579378 bytes) ...
 Downloaded 100.0% (133579378 / 133579378 bytes)
-Unpacking go1.17.freebsd-amd64.tar.gz ...
-Success. You may now run 'go1.17'
-$ go1.17 version
-go version go1.17 freebsd/amd64` + "\n",
+Unpacking go1.21.0.freebsd-amd64.tar.gz ...
+Success. You may now run 'go1.21.0'
+$ go1.21.0 version
+go version go1.21.0 freebsd/amd64` + "\n",
 		},
 	}
 	for _, tc := range tests {
@@ -184,15 +191,15 @@ go version go1.17 freebsd/amd64` + "\n",
 			// doesn't actually try to tweet, but capture its log.
 			var buf bytes.Buffer
 			ctx := &workflow.TaskContext{Context: context.Background(), Logger: fmtWriter{&buf}}
-			tweetURL, err := (TweetTasks{RandomSeed: tc.randomSeed}).TweetRelease(ctx, tc.published, tc.security, tc.announcement)
+			tweetURL, err := (TweetTasks{RandomSeed: tc.randomSeed}).TweetRelease(ctx, tc.kind, tc.published, tc.security, tc.announcement)
 			if err != nil {
 				t.Fatal("got a non-nil error:", err)
 			}
 			if got, want := tweetURL, "(dry-run)"; got != want {
 				t.Errorf("unexpected tweetURL: got = %q, want %q", got, want)
 			}
-			if got, want := buf.String(), tc.wantLog; got != want {
-				t.Errorf("unexpected log:\n got: %q\nwant: %q", got, want)
+			if diff := cmp.Diff(tc.wantLog, buf.String()); diff != "" {
+				t.Errorf("log mismatch (-want +got):\n%s", diff)
 			}
 		})
 	}