Create Golang Release go tool

.gitignore

@@ -10,3 +10,5 @@ eks-distro-base/check-update/
 eks-distro-base/*-pushed
 eks-distro-base/make-tests/actual/
 builder-base/tmp/
+tools/eksDistroBuildToolingOpsTools/bin
+

projects/golang/go/README.md

@@ -8,24 +8,47 @@ and executing the Kubernetes conformance tests.
 
 EKS Go RPMs are publicly available; see [Access EKS Go Artifacts](#access-eks-go-artifacts). 
 
+## New Minor Releases and Patch Releases 
+### Adding Minor Version
+1. Build the CLI tool by opening [eksDistroBuildToolingOpsTools](/tools/eksDistroBuildToolingOpsTools/) and run `make build-eksGoRelease`
+2. Run `bin/$(GO_OS)/$(GO_ARCH)/eksGoRelease new -u <github user> -e <github email> --eksGoReleases=<new minor version of golang>`
+    1. example `bin/darwing/amd64/eksGoRelease new -u rcrozean -e [email protected] --eksGoReleases=1.22.0`
+3. Check the PRs and update changelogs before requesting approval.
+4. Once the PRs have been merged and post-submits finish and pass run `bin/$(GO_OS)/$(GO_ARCH)/eksGoRelease release -u <github user> -e <github email> --eksGoReleases=<version of EKS Go just updated>` to bump the release files and publish the new artifacts
+    1. example `bin/darwing/amd64/eksGoRelease release -u rcrozean -e [email protected] --eksGoReleases=1.20.11,1.21.4`
+
+### Updating Upstream Supported Patch Versions
+1. Build the CLI tool by opening [eksDistroBuildToolingOpsTools](/tools/eksDistroBuildToolingOpsTools/) and run `make build-eksGoRelease`
+2. Run `bin/$(GO_OS)/$(GO_ARCH)/eksGoRelease update -u <github user> -e <github email> --eksGoReleases=<new minor version of golang>`
+    1. example `bin/darwing/amd64/eksGoRelease update -u rcrozean -e [email protected] --eksGoReleases=1.20.11,1.21.4`
+3. Check the PRs and update changelogs before requesting approval.
+4. Once the PRs have been merged and post-submits finish and pass run `bin/$(GO_OS)/$(GO_ARCH)/eksGoRelease release -u <github user> -e <github email> --eksGoReleases=<version of EKS Go just updated>` to bump the release files and publish the new artifacts
+    1. example `bin/darwing/amd64/eksGoRelease release -u rcrozean -e [email protected] --eksGoReleases=1.20.11,1.21.4`
+
+### Updating Upstream Unsupported Patch Versions
+Follow [Updating Upstream Supported Patch Versions](#updating-upstream-supported-patch-versions) steps. There is a WIP cli command located at [patchEksGo.go](../../../tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/patchEksGo.go) and the tooling for the command [createPatch.go](../../../tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/createPatch.go).
+
+TODO for WIP: 
+- Add `git cherry-pick`, `git am`, and `git format-patch` to [eksDistroBuildToolingOpsTools/pkg/git](/tools/eksDistroBuildToolingOpsTools/pkg/git) or to [go-git](https://github.com/go-git/go-git/blob/master/COMPATIBILITY.md)
+- Add logic to apply patches, cherry pick [upstream's](https://github.com/golang/go) fix, and format patch to [createPatch.go](/tools/eksDistroBuildToolingOpsTools/pkg/eksGoReleases/createPatch.go)
 
 ## Supported Versions
 EKS currently supports the following Golang versions:
-- [`v1.19`](./1.19/GIT_TAG)
-- [`v1.20`](./1.20/GIT_TAG)
 - [`v1.21`](./1.21/GIT_TAG)
+- [`v1.20`](./1.20/GIT_TAG)
+- [`v1.19`](./1.19/GIT_TAG)
 
 
 ## Deprecated Versions
-- [`v1.15`](./1.15/GIT_TAG)
-- [`v1.16`](./1.16/GIT_TAG)
-- [`v1.17`](./1.16/GIT_TAG)
 - [`v1.18`](./1.18/GIT_TAG)
+- [`v1.17`](./1.16/GIT_TAG)
+- [`v1.16`](./1.16/GIT_TAG)
+- [`v1.15`](./1.15/GIT_TAG)
 
 For versions of `EKS-Go` EKS Distro has [discontinued support](#deprecated-versions) for, there are no plans for removing artifacts from the public ECR. EKS-Distro 
 won’t be backporting any upcoming golang security fixes for these versions.
 
-**Due to the increased security risk this poses, it is HIGHLY recommended that users of `EKS-GO v1.15 - v1.17` update to a supported version of EKS-Go (v1.18+) as soon as possible.**
+**Due to the increased security risk this poses, it is HIGHLY recommended that users of `EKS-GO v1.15 - v1.18` update to a supported version of EKS-Go (v1.19+) as soon as possible.**
 
 
 ## Upstream Patches

tools/eksDistroBuildToolingOpsTools/Makefile

@@ -20,6 +20,7 @@ EKS_GO_TOOLS_BINARY_NAME=eksGoTools
 CONSUMER_UPDATER_BINARY_NAME=consumerUpdater
 EKS_PROW_PLUGIN_BINARY_NAME=eksDistroOpsProwPlugin
 EKS_DISTRO_PROW_PLUGIN_ECR_NAME=eks-distro-ops-tool
+GOLANG_RELEASE_BINARY_NAME=eksGoRelease
 
 .PHONY: build-eks-go-tools
 build-eks-go-tools: 
@@ -33,6 +34,10 @@ build-consumerUpdater: unit-test lint
 build-binary-eksDistroOpsProwPlugin:  
 	./scripts/create_binaries.sh ${GOLANG_VERSION} ${GO_OS} ${GO_ARCH} ${GIT_VERSION} ${EKS_PROW_PLUGIN_BINARY_NAME}
 
+.PHONY: build-eksGoRelease
+build-eksGoRelease: unit-test
+	CGO_ENABLED=0 GOOS=$(GO_OS) GOARCH=$(GO_ARCH) go build -ldflags "-X github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/version.gitVersion=$(GIT_VERSION) -s -w -extldflags -static" -o bin/$(GO_OS)/$(GO_ARCH)/$(GOLANG_RELEASE_BINARY_NAME) github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/cmd/$(GOLANG_RELEASE_BINARY_NAME)
+
 .PHONY: build-eksDistroOpsProwPlugin
 build-eksDistroOpsProwPlugin: build-binary-eksDistroOpsProwPlugin local-images-eksDistroOpsProwPlugin
 

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/README.md

@@ -0,0 +1,29 @@
+## EKS Go Release Tool
+The EKS Go Release Tool is intended as a home for all automation used to release, update, and patch EKS Go with new releases.
+It is intended to eventually replace eksGoTool.
+
+### Using the Tool
+use `eksGoRelease --help` for up-to-date usage
+
+The tool has an `release` command which creates new minor version release structure and files.
+The tool has an `update` command which updates upstream supported versions for new patch releases.
+
+The `release` command accepts a EKS Go release version via the flag `eksGoRelease`. 
+For example to release a new version of eksGo `1.21.0`
+you would run the following:
+
+```shell
+eksGoRelease release --eksGoReleases=1.21.0
+```
+
+The `update` command accepts a comma-seperated list of EKS Go release versions via the flag `eksGoRelease`. 
+Updates are run for each given release version. For example, to run updaters for the EKS Go release `1.20.2` & `1.19.3`, 
+you would run the following:
+
+```shell
+eksGoRelease update --eksGoReleases=1.20.2,1.19.3
+```
+
+### Building the Tool
+To build the Consumer Updater binary, run the build make target `make build-eksGoRelease`
+from the root of the Ops Tool. This will produce a binary in `tools/eksDistroBuildToolingOpsTools/bin/$GOOS/$GOARCH/eksGoRelease`.

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/newMinorEksGo.go

@@ -0,0 +1,38 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease"
+)
+
+var newCmd = &cobra.Command{
+	Use:   "new",
+	Short: "Release a new minor version of EKS Go",
+	Long:  "Tool to release a new minor version of EKS Go",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var eksGoReleases []*eksGoRelease.Release
+		for _, v := range viper.GetStringSlice(eksGoReleasesFlag) {
+			r, err := eksGoRelease.NewEksGoReleaseObject(v)
+			if err != nil {
+				return err
+			}
+			eksGoReleases = append(eksGoReleases, r)
+		}
+
+		for _, r := range eksGoReleases {
+			err := eksGoRelease.NewMinorRelease(cmd.Context(), r, viper.GetBool(dryrunFlag), viper.GetString(emailFlag), viper.GetString(userFlag))
+			if err != nil {
+				return fmt.Errorf("you have failed this automation: %w", err)
+			}
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(newCmd)
+}

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/patchEksGo.go

@@ -0,0 +1,38 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease"
+)
+
+var backportCmd = &cobra.Command{
+	Use:   "patch",
+	Short: "Cherrypick a patch to versions of EKS Go",
+	Long:  "Tool to create PR for updaing EKS Go versions that require a patch applied",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var eksGoReleases []*eksGoRelease.Release
+		for _, v := range viper.GetStringSlice(eksGoReleasesFlag) {
+			r, err := eksGoRelease.NewEksGoReleaseObject(v)
+			if err != nil {
+				return err
+			}
+			eksGoReleases = append(eksGoReleases, r)
+		}
+
+		for _, r := range eksGoReleases {
+			err := eksGoRelease.BackportToRelease(cmd.Context(), r, viper.GetBool(dryrunFlag), "CVE", "HASH", viper.GetString(emailFlag), viper.GetString(userFlag))
+			if err != nil {
+				return fmt.Errorf("you have failed this automation: %w", err)
+			}
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(backportCmd)
+}

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/release.go

@@ -0,0 +1,38 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease"
+)
+
+var releaseCmd = &cobra.Command{
+	Use:   "release",
+	Short: "Release EKS Go",
+	Long:  "Tool to create PRs for releasing EKS Go versions",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var eksGoReleases []*eksGoRelease.Release
+		for _, v := range viper.GetStringSlice(eksGoReleasesFlag) {
+			r, err := eksGoRelease.NewEksGoReleaseObject(v)
+			if err != nil {
+				return err
+			}
+			eksGoReleases = append(eksGoReleases, r)
+		}
+
+		for _, r := range eksGoReleases {
+			err := eksGoRelease.ReleaseArtifacts(cmd.Context(), r, viper.GetBool(dryrunFlag), viper.GetString(emailFlag), viper.GetString(userFlag))
+			if err != nil {
+				return fmt.Errorf("you have failed this automation: %w", err)
+			}
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(releaseCmd)
+}

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/root.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/logger"
+)
+
+const (
+	eksGoReleasesFlag = "eksGoReleases"
+  dryrunFlag        = "dryrun"
+  userFlag          = "user"
+  emailFlag         = "email"
+)
+
+var (
+	rootCmd = &cobra.Command{
+		Use:              "eksGoRelease",
+		Short:            "Amazon EKS Go Release and automation commands",
+		Long:             `Tools for updating and releasing EKS Go`,
+		PersistentPreRun: rootPersistentPreRun,
+	}
+)
+
+func init() {
+	rootCmd.PersistentFlags().IntP("verbosity", "v", 0, "Set the log level verbosity")
+	rootCmd.PersistentFlags().StringSlice(eksGoReleasesFlag, []string{}, "EKS Go releases to update")
+  rootCmd.PersistentFlags().BoolP(dryrunFlag, "d", false, "run without creating PR")
+  rootCmd.PersistentFlags().StringP(emailFlag, "e", "", "github email for git functions")
+  rootCmd.PersistentFlags().StringP(userFlag, "u", "", "github username for git functions")
+
+	// Bind config flags to viper
+	if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
+		log.Fatalf("failed to bind persistent flags for root: %v", err)
+	}
+}
+
+func rootPersistentPreRun(cmd *cobra.Command, args []string) {
+	if err := initLogger(); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func initLogger() error {
+	if err := logger.InitZap(viper.GetInt("verbosity")); err != nil {
+		return fmt.Errorf("failed init zap logger in root command: %v", err)
+	}
+
+	return nil
+}
+
+func Execute() error {
+	return rootCmd.ExecuteContext(context.Background())
+}

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd/updateEksGo.go

@@ -0,0 +1,38 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease"
+)
+
+var updateCmd = &cobra.Command{
+	Use:   "update",
+	Short: "Update new patch versions of EKS Go",
+	Long:  "Tool to create PR for updaing EKS Go versions supported by upstream when a patch version is released",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var eksGoReleases []*eksGoRelease.Release
+		for _, v := range viper.GetStringSlice(eksGoReleasesFlag) {
+			r, err := eksGoRelease.NewEksGoReleaseObject(v)
+			if err != nil {
+				return err
+			}
+			eksGoReleases = append(eksGoReleases, r)
+		}
+
+		for _, r := range eksGoReleases {
+			err := eksGoRelease.UpdateVersion(cmd.Context(), r, viper.GetBool(dryrunFlag), viper.GetString(emailFlag), viper.GetString(userFlag))
+			if err != nil {
+				return fmt.Errorf("you have failed this automation: %w", err)
+			}
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(updateCmd)
+}

tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/main.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/aws/eks-distro-build-tooling/tools/eksDistroBuildToolingOpsTools/cmd/eksGoRelease/cmd"
+)
+
+func main() {
+	sigChannel := make(chan os.Signal, 1)
+	signal.Notify(sigChannel, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-sigChannel
+		os.Exit(-1)
+	}()
+	if cmd.Execute() == nil {
+		os.Exit(0)
+	}
+	os.Exit(-1)
+}

tools/eksDistroBuildToolingOpsTools/pkg/constants/constants.go

@@ -1,14 +1,30 @@
 package constants
 
 const (
-	AwsOrgName                 = "aws"
-	EksdBuildToolingRepoName   = "eks-distro-build-tooling"
-	EksDistroBotName           = "eks-distro-bot"
-	EksDistroPrBotName         = "eks-distro-pr-bot"
+	AwsOrgName               = "aws"
+	EksdBuildToolingRepoName = "eks-distro-build-tooling"
+	EksDistroBotName         = "eks-distro-bot"
+	EksDistroPrBotName       = "eks-distro-pr-bot"
+	OwnerWriteallReadOctal   = 0644
+	SemverRegex              = `[0-9]+\.[0-9]+\.[0-9]+`
+	AllowAllFailRespTemplate = "@%s only [%s](https://github.com/orgs/%s/people) org members may request may trigger automated issues. You can still create the issue manually."
+	GitTag                   = "GIT_TAG"
+	Release                  = "RELEASE"
+	Readme                   = "README.md"
+
+	// Github Constants
+	GolangOrgName = "golang"
+	GoRepoName    = "go"
+	GoRepoUrl     = "https://github.com/golang/go.git"
+
+	// EKS Go Constants
+	EksGoRepoUrl               = "https://github.com/%s/eks-distro-build-tooling.git"
+	EksGoProjectPath           = "projects/golang/go"
+	EksGoAmdBuildUrl           = "https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%d-%d-tooling-postsubmit"
+	EksGoArmBuildUrl           = "https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%d-%d-ARM64-PROD-tooling-postsubmit"
 	EksGoSupportedVersionsPath = "projects/golang/go/MAINTAINED_EOL_VERSIONS"
-	GolangOrgName              = "golang"
-	GoRepoName                 = "go"
-	OwnerWriteallReadOctal     = 0644
-	SemverRegex                = `[0-9]+\.[0-9]+\.[0-9]+`
-	AllowAllFailRespTemplate   = "@%s only [%s](https://github.com/orgs/%s/people) org members may request may trigger automated issues. You can still create the issue manually."
+	EksGoArtifactUrl           = "https://distro.eks.amazonaws.com/golang-go%d.%d.%d/releases/%d/%s/%s/%s"
+	EksGoTargzArtifactFmt      = "go%d.%d.%d.linux-%s.tar.gz"
+	EksGoRpmArtifactFmt        = "golang-%d.%d.%d-%d.amzn2.eks.%s.rpm"
+	EksGoNoarchRpmArtifactFmt  = "golang-src-%d.%d.%d-%d.amzn2.eks.%s.rpm"
 )