a

Author: keroxp

cli/cage/cageapp/flags.go

@@ -2,6 +2,7 @@ package cageapp
 
 import (
 	"io"
+	"os"
 
 	"github.com/loilo-inc/canarycage/env"
 	"github.com/urfave/cli/v2"
@@ -12,6 +13,10 @@ type App struct {
 	Stdin io.Reader
 }
 
+func NewApp() *App {
+	return &App{Stdin: os.Stdin}
+}
+
 func RegionFlag(dest *string) *cli.StringFlag {
 	return &cli.StringFlag{
 		Name:        "region",

cli/cage/cageapp/flags_test.go

@@ -0,0 +1,17 @@
+package cageapp
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewApp(t *testing.T) {
+	app := NewApp()
+	assert := assert.New(t)
+
+	assert.NotNil(app, "NewApp() returned nil")
+	assert.Equal(os.Stdin, app.Stdin, "expected Stdin to be os.Stdin")
+	assert.False(app.CI, "expected CI to be false")
+}

cli/cage/main.go

@@ -19,7 +19,7 @@ var (
 )
 
 func main() {
-	flag := &cageapp.App{}
+	appConf := cageapp.NewApp()
 	app := cli.NewApp()
 	app.Name = "canarycage"
 	app.HelpName = "cage"
@@ -28,9 +28,9 @@ func main() {
 	app.Description = "A deployment tool for AWS ECS"
 	cmds := commands.NewCageCommands(cageapp.ProvideCageCli)
 	app.Commands = []*cli.Command{
-		cmds.Up(flag),
-		cmds.RollOut(flag),
-		cmds.Run(flag),
+		cmds.Up(appConf),
+		cmds.RollOut(appConf),
+		cmds.Run(appConf),
 		commands.Upgrade(upgrade.NewUpgrader(version)),
 		commands.Scan(cageapp.ProvideScanDI),
 	}
@@ -39,7 +39,7 @@ func main() {
 			Name:        "ci",
 			Usage:       "CI mode. Skip all confirmations and use default values.",
 			EnvVars:     []string{"CI"},
-			Destination: &flag.CI,
+			Destination: &appConf.CI,
 		},
 	}
 	if err := app.Run(os.Args); err != nil {

cli/cage/scan/ecs.go

@@ -3,7 +3,6 @@ package scan
 import (
 	"context"
 	"fmt"
-	"regexp"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/service/ecs"
@@ -105,9 +104,3 @@ func splitRepoTag(value string) (string, string) {
 	}
 	return repository, tag
 }
-
-var ecrURLPattern = regexp.MustCompile(`^\d{12}\.dkr\.ecr\.[a-z0-9-]+\.amazonaws\.com$`)
-
-func IsEcr(registry string) bool {
-	return ecrURLPattern.MatchString(registry)
-}

cli/cage/scan/ecs_test.go

@@ -278,13 +278,3 @@ func TestSplitRepoTag(t *testing.T) {
 		assert.Equal(t, "latest", tag)
 	})
 }
-
-func TestIsEcr(t *testing.T) {
-	t.Run("matches valid ecr registry", func(t *testing.T) {
-		assert.True(t, IsEcr("123456789012.dkr.ecr.us-west-2.amazonaws.com"))
-	})
-
-	t.Run("rejects non-ecr registry", func(t *testing.T) {
-		assert.False(t, IsEcr("example.com"))
-	})
-}

cli/cage/scan/types.go

@@ -19,9 +19,10 @@ func (i *ImageInfo) IsECRImage() bool {
 	return i.Registry == "public.ecr.aws" || i.registryHasECRSuffix()
 }
 
+var ecrURLPattern = regexp.MustCompile(`^[0-9]{12}\.dkr\.ecr\.[a-z0-9-]+\.amazonaws\.com$`)
+
 func (i *ImageInfo) registryHasECRSuffix() bool {
-	pat := regexp.MustCompile(`^[0-9]{12}\.dkr\.ecr\.[a-z0-9-]+\.amazonaws\.com$`)
-	return pat.MatchString(i.Registry)
+	return ecrURLPattern.MatchString(i.Registry)
 }
 
 type ScanResult struct {