Don't error if ECR Repository exists already

We were returning an error if the ECR repo already exists. This shouldnt give an error because it's not a failure. If the repo doesn't exist then we create it, if it exists then that's fine. Tested by deploying an ECR backed OFC installation, first time round it creates the new repo, then after that it's not throwing an error, only saying it already exists. Signed-off-by: Alistair Hey <[email protected]>
openfaas · Apr 22, 2020 · 27eb84d · 27eb84d
1 parent 90d3204
commit 27eb84d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/register-image/Gopkg.lock b/register-image/Gopkg.lock
diff --git a/register-image/handler.go b/register-image/handler.go
@@ -3,6 +3,7 @@ package function
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"log"
 	"os"
 	"strings"
@@ -68,9 +69,14 @@ func Handle(req []byte) string {
 	output, err := client.CreateRepository(&repoReq)
 
 	if err != nil {
-		log.Printf("CreateRepository error: %s\n", err.Error())
-		os.Exit(1)
+		if aerr, ok := err.(awserr.Error); ok {
+			if aerr.Code() != ecr.ErrCodeRepositoryAlreadyExistsException {
+				log.Printf("CreateRepository error: %s\n", err.Error())
+				os.Exit(1)
+			}
+		}
+		return fmt.Sprintf("Repo Exists: %s", *repoReq.RepositoryName)
 	}
 
-	return fmt.Sprintf("Created repo: %s\n", output.String())
+	return fmt.Sprintf("Created the repo: %s", output.String())
 }