Fix/docsrelease (#10389)

Author: nfuden

changelog/v1.18.0-rc2/docsgen.yaml

@@ -0,0 +1,4 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >-
+      Fix docs gen

docs/Makefile

@@ -22,20 +22,20 @@ MIN_SCANNED_VERSION ?= v1.13.0
 site-common: clean gloo-enterprise-version
 	if [ ! -d themes/hugo-theme-soloio ]; then git clone https://github.com/solo-io/hugo-theme-soloio themes/hugo-theme-soloio; fi
 	git -C themes/hugo-theme-soloio checkout $(SOLO_HUGO_THEME_REVISION)
-	GO111MODULE=on go run cmd/generate_docs.go gen-releases -r gloo > opensource.out
-	GO111MODULE=on go run cmd/generate_docs.go gen-releases -r glooe > enterprise.out
-	GO111MODULE=on go run cmd/generate_docs.go gen-changelog-md -r gloo > content/static/content/gloo-changelog.docgen
-	GO111MODULE=on go run cmd/generate_docs.go gen-changelog-md -r glooe > content/static/content/glooe-changelog.docgen
+	go run cmd/generate_docs.go gen-releases -r gloo > opensource.out
+	go run cmd/generate_docs.go gen-releases -r glooe > enterprise.out
+	go run cmd/generate_docs.go gen-changelog-md -r gloo > content/static/content/gloo-changelog.docgen
+	go run cmd/generate_docs.go gen-changelog-md -r glooe > content/static/content/glooe-changelog.docgen
 
 	# generate split security scans for gloo versions which HAVE received new split-templating updates
-	MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) GO111MODULE=on go run cmd/generate_docs.go gen-security-scan-md -r gloo > content/static/content/gloo-security-scan.docgen
-	MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) GO111MODULE=on go run cmd/generate_docs.go gen-security-scan-md -r glooe > content/static/content/glooe-security-scan.docgen
+	MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) go run cmd/generate_docs.go gen-security-scan-md -r gloo > content/static/content/gloo-security-scan.docgen
+	MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) go run cmd/generate_docs.go gen-security-scan-md -r glooe > content/static/content/glooe-security-scan.docgen
 	cat content/static/content/gloo-security-scan.docgen
 	./split-file-by-delimiter.sh content/static/content/gloo-security-scan.docgen \\\*\\\*\\\*
 	./split-file-by-delimiter.sh content/static/content/glooe-security-scan.docgen \\\*\\\*\\\*
 
 	# get enterprise helm values based on contents of _output/gloo-enterprise-version
-	GO111MODULE=on go run cmd/generate_docs.go get-enterprise-helm-values > content/static/content/glooe-values.docgen
+	go run cmd/generate_docs.go get-enterprise-helm-values > content/static/content/glooe-values.docgen
 	rm -f opensource.out enterprise.out
 
 
@@ -90,7 +90,7 @@ build-site: clean
 # corresponding to content in changelog directory.
 .PHONY: gloo-enterprise-version
 gloo-enterprise-version:
-	cd .. && GO111MODULE=on go run hack/find_latest_enterprise_version/main.go
+	cd .. && go run hack/find_latest_enterprise_version/main.go
 
 #----------------------------------------------------------------------------------
 # Printing makefile variables utility

docs/cmd/generate_docs.go

@@ -23,6 +23,7 @@ import (
 	. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
 	changelogdocutils "github.com/solo-io/go-utils/changeloggenutils"
 	"github.com/solo-io/go-utils/githubutils"
+	"github.com/solo-io/go-utils/versionutils"
 	"github.com/spf13/cobra"
 )
 
@@ -193,6 +194,10 @@ const (
 	repoOwner          = "solo-io"
 	glooOpenSourceRepo = "gloo"
 	glooEnterpriseRepo = "solo-projects"
+
+	// donated names
+	repoOwnerDonated      = "k8sgateway"
+	donatedOpenSourceRepo = "k8sgateway"
 )
 
 const (
@@ -219,20 +224,46 @@ var (
 // Github defaults to a chronological order
 func generateChangelogMd(opts *options) error {
 	client := githubutils.GetClientOrExit(context.Background())
+	preNameChangeGatewayVersion := versionutils.NewVersion(1, 13, 0, "", 0)
 	switch opts.targetRepo {
 	case glooDocGen:
+
 		generator := changelogdocutils.NewMinorReleaseGroupedChangelogGenerator(changelogdocutils.Options{
-			MainRepo:         "gloo",
-			RepoOwner:        "solo-io",
+			MainRepo:         donatedOpenSourceRepo,
+			RepoOwner:        repoOwnerDonated,
+			MaxVersion:       preNameChangeGatewayVersion,
+			MainRepoReleases: getCachedReleases(glooCachedReleasesFile),
+		}, client)
+
+		out, err := generator.AddToOutput(context.Background())
+		if err != nil {
+			return err
+		}
+
+		generator = changelogdocutils.NewMinorReleaseGroupedChangelogGenerator(changelogdocutils.Options{
+			MainRepo:         glooOpenSourceRepo,
+			RepoOwner:        repoOwner,
+			MinVersion:       preNameChangeGatewayVersion,
 			MainRepoReleases: getCachedReleases(glooCachedReleasesFile),
 		}, client)
-		out, err := generator.GenerateJSON(context.Background())
+		out2, err := generator.AddToOutput(context.Background())
 		if err != nil {
 			return err
 		}
-		fmt.Println(out)
+
+		err = out2.AddReleaseData(out)
+		if err != nil {
+			return err
+		}
+
+		body, err := out2.GenerateJSON()
+		if err != nil {
+			return err
+		}
+		fmt.Println(body)
+
 	case glooEDocGen:
-		err := generateGlooEChangelog()
+		err := generateGlooEChangelog(preNameChangeGatewayVersion)
 		if err != nil {
 			return err
 		}
@@ -244,7 +275,7 @@ func generateChangelogMd(opts *options) error {
 }
 
 // Fetches Gloo Enterprise releases, merges in open source release notes, and orders them by version
-func generateGlooEChangelog() error {
+func generateGlooEChangelog(preNameVersion *versionutils.Version) error {
 	// Initialize Auth
 	ctx := context.Background()
 	ghToken := os.Getenv("GITHUB_TOKEN")
@@ -259,6 +290,7 @@ func generateGlooEChangelog() error {
 		NumVersions:           200,
 		MainRepo:              glooEnterpriseRepo,
 		DependentRepo:         glooOpenSourceRepo,
+		MinVersion:            preNameVersion,
 		RepoOwner:             repoOwner,
 		MainRepoReleases:      getCachedReleases(glooeCachedReleasesFile),
 		DependentRepoReleases: getCachedReleases(glooCachedReleasesFile),
@@ -268,6 +300,7 @@ func generateGlooEChangelog() error {
 		return err
 	}
 	generator := changelogdocutils.NewMergedReleaseGeneratorWithDepFn(opts, client, depFn)
+
 	out, err := generator.GenerateJSON(context.Background())
 	if err != nil {
 		return err

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0
 	github.com/sergi/go-diff v1.2.0
 	github.com/solo-io/go-list-licenses v0.1.4
-	github.com/solo-io/go-utils v0.27.1
+	github.com/solo-io/go-utils v0.27.2
 	github.com/solo-io/k8s-utils v0.8.1
 	github.com/solo-io/protoc-gen-ext v0.0.25
 	github.com/solo-io/protoc-gen-openapi v0.2.5

go.sum

@@ -2695,8 +2695,8 @@ github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRz
 github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw=
 github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA=
 github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
-github.com/solo-io/go-utils v0.27.1 h1:14XwaKv21EaYYeUF2wFfPe3DPz2Gbm9sfenGv/aRIls=
-github.com/solo-io/go-utils v0.27.1/go.mod h1:cwbQIYO1/BeU4aPB0Yy8WzzS77dfVTZyCVqbA4YsRSY=
+github.com/solo-io/go-utils v0.27.2 h1:4ixkKeOYsBVAL72mNUYfAUfqi5+ws3p6ztlKrG3A3Bg=
+github.com/solo-io/go-utils v0.27.2/go.mod h1:cwbQIYO1/BeU4aPB0Yy8WzzS77dfVTZyCVqbA4YsRSY=
 github.com/solo-io/k8s-utils v0.8.1 h1:Xqqze6RLWsHCYetbaiXDEnuhFRXyqw0azyogggK43H8=
 github.com/solo-io/k8s-utils v0.8.1/go.mod h1:fOIFkh4+F45MmrUZEFx0pW75EvFYOR7v5/BIIQiSIwA=
 github.com/solo-io/protoc-gen-ext v0.0.25 h1:UqNW/A4UqCO5aUFg7LYdV82tK0R2mqu7RFftYtT/Fu8=