From 53da3eb078aac55292ae067fd4acfc50f819f056 Mon Sep 17 00:00:00 2001
From: Eric Stroczynski <ericstroczynski@gmail.com>
Date: Wed, 15 Jan 2020 14:02:20 -0800
Subject: [PATCH] controller-gen's output rule for CRD generation disallows
 directory strings containing numbers starting with 0 that contain non-octal
 digits, ex. "012345678". This commit fixes a flakey unit test that
 occasionally triggers this bug. A more thorough fix will be implemented in
 the near future.

internal/generate/crd: fix controller-gen octal string bug
---
 internal/generate/crd/crd.go      |  2 +-
 internal/generate/crd/crd_test.go | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/internal/generate/crd/crd.go b/internal/generate/crd/crd.go
index bced131c29d..784d81fc708 100644
--- a/internal/generate/crd/crd.go
+++ b/internal/generate/crd/crd.go
@@ -154,7 +154,7 @@ func (g crdGenerator) generateGo() (map[string][]byte, error) {
 	// Generate files in the generator's cache so we can modify the file name
 	// and annotations.
 	defName := "output:crd:cache"
-	cacheOutputDir := string(filepath.Separator) + filepath.Clean(g.OutputDir)
+	cacheOutputDir := filepath.Clean(g.OutputDir)
 	rawOpts := []string{
 		"crd",
 		fmt.Sprintf("paths=%s/...", fileutil.DotPath(g.Inputs[APIsDirKey])),
diff --git a/internal/generate/crd/crd_test.go b/internal/generate/crd/crd_test.go
index 013cc75d0d3..cf02cefd3c3 100644
--- a/internal/generate/crd/crd_test.go
+++ b/internal/generate/crd/crd_test.go
@@ -15,13 +15,14 @@
 package crd
 
 import (
-	"io/ioutil"
+	"encoding/base32"
 	"math/rand"
 	"os"
 	"path"
 	"path/filepath"
 	"strconv"
 	"testing"
+	"time"
 
 	gen "github.com/operator-framework/operator-sdk/internal/generate/gen"
 	"github.com/operator-framework/operator-sdk/internal/scaffold"
@@ -41,13 +42,24 @@ var (
 	testAPIVersion = path.Join(testGroup, testVersion)
 )
 
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}
+
+// randomString returns a base32-encoded random string, reasonably sized for
+// directory creation.
+func randomString() string {
+	rb := []byte(strconv.Itoa(rand.Int() % (2 << 20)))
+	return base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(rb)
+}
+
 func TestGenerate(t *testing.T) {
-	tmp, err := ioutil.TempDir("", "")
-	if err != nil {
+	tmp := filepath.Join(os.TempDir(), randomString())
+	if err := os.MkdirAll(tmp, 0755); err != nil {
 		t.Fatal(err)
 	}
 	defer func() {
-		if err = os.RemoveAll(tmp); err != nil {
+		if err := os.RemoveAll(tmp); err != nil {
 			t.Fatal(err)
 		}
 	}()
@@ -66,7 +78,7 @@ func TestGenerate(t *testing.T) {
 				Inputs: map[string]string{
 					APIsDirKey: filepath.Join(testGoDataDir, scaffold.ApisDir),
 				},
-				OutputDir: filepath.Join(tmp, strconv.Itoa(rand.Int())),
+				OutputDir: filepath.Join(tmp, randomString()),
 			}),
 		},
 		{
@@ -75,7 +87,7 @@ func TestGenerate(t *testing.T) {
 				Inputs: map[string]string{
 					APIsDirKey: filepath.Join(testGoDataDir, scaffold.ApisDir),
 				},
-				OutputDir: filepath.Join(tmp, strconv.Itoa(rand.Int())),
+				OutputDir: filepath.Join(tmp, randomString()),
 			}, *r),
 		},
 	}