Fix #5

hayorov · Mar 20, 2018 · 9090b94 · 9090b94
1 parent dfc9a31
commit 9090b94
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/helm-gcs/gcs/gcs.go b/helm-gcs/gcs/gcs.go
@@ -10,6 +10,8 @@ import (
 	"cloud.google.com/go/storage"
 )
 
+var ErrObjectNotExist = errors.New("gcs: " + storage.ErrObjectNotExist.Error())
+
 func NewWriter(url string) (io.WriteCloser, error) {
 	makeError := makeErrorFunc("gcs.NewWriter")
 	bucket, fullname, err := splitURL(url)
@@ -43,6 +45,9 @@ func NewReader(url string) (io.ReadCloser, error) {
 	o := b.Object(fullname[1:])
 	r, err := o.NewReader(ctx)
 	if err != nil {
+		if err == storage.ErrObjectNotExist {
+			return nil, ErrObjectNotExist
+		}
 		return nil, makeError(err)
 	}
 	return r, nil

diff --git a/helm-gcs/repo/repo.go b/helm-gcs/repo/repo.go
@@ -50,6 +50,17 @@ func CreateRepo(path string) error {
 	if err != nil {
 		return makeError(err)
 	}
+	// Do not rewrite index.yaml if it already exists
+	_, err = gcs.NewReader(indexFileURL)
+	if err != nil {
+		if err != gcs.ErrObjectNotExist {
+			return makeError(err)
+		}
+	} else {
+		debug("repository already initialized")
+		return nil
+	}
+	// Create index.yaml
 	w, err := gcs.NewWriter(indexFileURL)
 	if err != nil {
 		return makeError(err)