Unique branch name, brute force skip if contents already there (#25)

docsutils/cli.go

@@ -9,10 +9,12 @@ import (
 	"github.com/solo-io/go-utils/errors"
 	"github.com/solo-io/go-utils/githubutils"
 	"github.com/solo-io/go-utils/logger"
+	"github.com/solo-io/go-utils/testutils"
 	"github.com/spf13/afero"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 )
 
 const (
@@ -65,7 +67,7 @@ func CreateDocsPR(owner, repo, product, project, tag string, paths ...string) er
 		return err
 	}
 
-	branch := repo + "-docs-" + tag
+	branch := repo + "-docs-" + tag + testutils.RandString(4)
 	err = gitCheckoutNewBranch(branch)
 	if err != nil {
 		return errors.Wrapf(err, "Error checking out branch")
@@ -142,6 +144,11 @@ func updateChangelogFile(fs afero.Fs, product, project, markdown, tag string) er
 		if err != nil {
 			return err
 		}
+		oldContents := string(bytes)
+		if strings.Contains(oldContents, newContents) {
+			// re-release, don't do anything
+			return nil
+		}
 		newContents = newContents + string(bytes)
 	}
 	return afero.WriteFile(fs, changelogFile, []byte(newContents), 0700)