Merge branch 'main' into chore/issue-100

assets/knative/service.yaml.tmpl

@@ -6,6 +6,10 @@ metadata:
 spec:
   template:
     spec:
+      imagePullSecrets:
+      {{ range .ImagePullSecrets  }}
+        - name: {{ . }}
+      {{ end }}
       containers:
         - image: {{ .RemoteTag }}
           imagePullPolicy: Always

src/cli/cli.go

@@ -23,7 +23,7 @@ type icli struct {
 	CWD           string
 	DockerService docker.DockerService
 	Logger        *log.Logger
-	project       project.Project
+	project       *project.Project
 	dockerImage   docker.DockerImage
 	flags         flags
 	Writer        io.Writer
@@ -68,6 +68,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 	projectDirectory := cCtx.String(projectDirectoryFlag)
 	absProjectDirectory, err := filepath.Abs(cCtx.String(projectDirectoryFlag))
 	registry := cCtx.String(repoNameFlag)
+	imagePullSecrets := cCtx.StringSlice(imagePullSecretsFlag)
 	dockerFileName := cCtx.String(dockerFileNameFlag)
 
 	if dockerFileName == "" {
@@ -85,6 +86,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 		projectDirectory,
 		cCtx.String(runtimeVersionFlag),
 		version,
+		imagePullSecrets,
 		c.Resources,
 	)
 
@@ -111,18 +113,18 @@ func (c *icli) init(cCtx *cli.Context) error {
 
 	c.DockerService = dockerService
 	c.dockerImage = dockerImage
-	c.project = project
+	c.project = &project
 	return nil
 }
 
 func (c *icli) getProject(cCtx *cli.Context) (*project.Project, error) {
-	if (c.project == project.Project{}) {
+	if c.project == nil {
 		err := c.init(cCtx)
 		if err != nil {
 			return nil, err
 		}
 	}
-	return &c.project, nil
+	return c.project, nil
 }
 
 func (c icli) Run(args []string) error {
@@ -145,10 +147,7 @@ func (c icli) Run(args []string) error {
 				return err
 			}
 
-			if err := c.checkRequiredFlags(ctx, []string{}); err != nil {
-				return err
-			}
-			return nil
+			return c.checkRequiredFlags(ctx, []string{})
 		},
 	}
 

src/cli/flags.go

@@ -43,6 +43,7 @@ const (
 	dockerFileNameFlag    string = "dockerfile-name"
 	configFileFlag        string = "config-file"
 	namespaceFlag         string = "namespace"
+	imagePullSecretsFlag  string = "image-pull-secrets"
 	stopOnBuildFlag       string = "stop-on-build"
 	stopOnPushFlag        string = "stop-on-push"
 	envVarFileFlag        string = "env-var-file"
@@ -102,6 +103,13 @@ func InitFlags() flags {
 					Required: true,
 					Category: "deploy",
 				},
+				&cli.StringSliceFlag{
+					Name:     imagePullSecretsFlag,
+					Usage:    "Define one or more (repeating the flag or in csv format for the environment variable) image pull secrets",
+					EnvVars:  []string{"INITIUM_IMAGE_PULL_SECRETS"},
+					Required: false,
+					Category: "deploy",
+				},
 				&cli.StringFlag{
 					Name:     envVarFileFlag,
 					Value:    defaults.EnvVarFile,
@@ -191,12 +199,14 @@ func InitFlags() flags {
 	// this is an hack to go around that issue, we should remove it once urfave v3 is released
 	for _, vs := range f.all {
 		for _, flag := range vs {
-			stringFlag := flag.(*cli.StringFlag)
-			if stringFlag.Required {
-				f.requiredFlags = append(f.requiredFlags, stringFlag.Name)
-				stringFlag.Required = false
+			switch flag.(type) {
+			case *cli.StringFlag:
+				stringFlag := flag.(*cli.StringFlag)
+				if stringFlag.Required {
+					f.requiredFlags = append(f.requiredFlags, stringFlag.Name)
+					stringFlag.Required = false
+				}
 			}
-
 		}
 	}
 
@@ -209,7 +219,6 @@ func (c icli) checkRequiredFlags(ctx *cli.Context, ignoredFlags []string) error
 
 	for _, v := range ctx.Command.Flags {
 		name := v.Names()[0]
-		c.Logger.Debugf("%s is set to %s", name, ctx.String(name))
 		if slices.Contains(requiredFlags, name) && !slices.Contains(ignoredFlags, name) && !ctx.IsSet(name) {
 			missingFlags = append(missingFlags, name)
 		}
@@ -240,14 +249,16 @@ func (c icli) loadFlagsFromConfig(ctx *cli.Context) error {
 		return fmt.Errorf("cannot parse config file %s, not a valid yaml", cfgFile)
 	}
 
+	excludedFlags := excludedFlagsFromConfig()
+
+	c.Logger.Debugf("Loading flags %v", ctx.Command)
 	for _, v := range ctx.Command.Flags {
 		mainName := v.Names()[0]
 		for _, name := range v.Names() {
-			c.Logger.Debugf("%s is set to %s", name, ctx.String(name))
-			if name != "help" && !ctx.IsSet(mainName) {
-				if config[name] != nil {
-					c.Logger.Debugf("Loading %s as %s", name, config[name])
-					ctx.Set(mainName, config[name].(string))
+			c.Logger.Debugf("%s is set = %v", name, ctx.IsSet(name))
+			if name != "help" && !slices.Contains(excludedFlags, name) && config[name] != nil && !ctx.IsSet(mainName) {
+				if err := ctx.Set(mainName, config[name].(string)); err != nil {
+					return err
 				}
 			}
 		}

src/cli/init.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 
 	"github.com/charmbracelet/log"
 	"k8s.io/utils/strings/slices"
@@ -41,8 +42,8 @@ func (c icli) InitGithubCMD(cCtx *cli.Context) error {
 	return nil
 }
 
-func (c icli) InitConfigCMD(ctx *cli.Context) error {
-	excludedFlags := []string{
+func excludedFlagsFromConfig() []string {
+	return []string{
 		"help",
 		appVersionFlag,
 		namespaceFlag,
@@ -53,35 +54,45 @@ func (c icli) InitConfigCMD(ctx *cli.Context) error {
 		tokenFlag,
 		registryPasswordFlag,
 		caCRTFlag,
+		registryUserFlag,
+		endpointFlag,
 	}
+}
+
+func (c icli) InitConfigCMD(ctx *cli.Context) error {
+	excludedFlags := excludedFlagsFromConfig()
 
 	f := []cli.Flag{}
 	for _, vs := range c.flags.all {
 		f = append(f, vs...)
 	}
 
 	sort.Sort(cli.FlagsByName(f))
-
+	var n, v string
 	config := ""
 	for _, flag := range f {
-		stringFlag := flag.(*cli.StringFlag)
-		if slices.Contains(excludedFlags, stringFlag.Name) {
-			continue
-		}
-
-		value := ctx.String(stringFlag.Name)
-		if value == "" {
-			value = stringFlag.Value
+		switch flag.(type) {
+		case *cli.StringFlag:
+			stringFlag := flag.(*cli.StringFlag)
+			if slices.Contains(excludedFlags, stringFlag.Name) {
+				continue
+			}
+
+			n = stringFlag.Name
+			v = ctx.String(stringFlag.Name)
+		case *cli.StringSliceFlag:
+			stringSliceFlag := flag.(*cli.StringSliceFlag)
+			if slices.Contains(excludedFlags, stringSliceFlag.Name) {
+				continue
+			}
+			n = stringSliceFlag.Name
+			v = strings.Join(ctx.StringSlice(stringSliceFlag.Name), ",")
 		}
 
-		next := ""
-		if value == "" {
-			next = fmt.Sprintf("%s: null\n", stringFlag.Name)
-		} else {
-			next = fmt.Sprintf("%s: %s\n", stringFlag.Name, value)
+		if v == "" {
+			v = "null"
 		}
-
-		config = config + next
+		config = config + fmt.Sprintf("%s: %s\n", n, v)
 	}
 
 	if ctx.Bool(persistFlag) {
@@ -103,7 +114,16 @@ func (c icli) InitServiceAccountCMD(ctx *cli.Context) error {
 }
 
 func (c icli) InitCMD() *cli.Command {
-	configFlags := c.CommandFlags([]FlagsType{Shared})
+	ef := excludedFlagsFromConfig()
+	configFlags := []cli.Flag{}
+	for _, vs := range c.flags.all {
+		for _, flag := range vs {
+			if !slices.Contains(ef, flag.Names()[0]) {
+				configFlags = append(configFlags, flag)
+			}
+		}
+	}
+
 	configFlags = append(configFlags, &cli.BoolFlag{
 		Name:  persistFlag,
 		Value: false,
@@ -126,7 +146,15 @@ func (c icli) InitCMD() *cli.Command {
 				Usage:  "create a config file with all available flags set to null",
 				Flags:  configFlags,
 				Action: c.InitConfigCMD,
-				Before: c.baseBeforeFunc,
+				Before: func(ctx *cli.Context) error {
+					if err := c.loadFlagsFromConfig(ctx); err != nil {
+						return err
+					}
+
+					ignoredFlags := excludedFlagsFromConfig()
+
+					return c.checkRequiredFlags(ctx, ignoredFlags)
+				},
 			},
 			{
 				Name:   "service-account",

src/cli/init_test.go

@@ -15,12 +15,11 @@ import (
 
 func compareConfig(t *testing.T, appName string, registry string, writer io.Writer) {
 	configTemplate := fmt.Sprintf(`app-name: %s
-cluster-endpoint: null
 container-registry: %s
 default-branch: main
 dockerfile-name: null
 env-var-file: .env.initium
-registry-user: null
+image-pull-secrets: null
 runtime-version: null
 `,
 		appName,

src/services/k8s/knative.go

@@ -53,9 +53,15 @@ func loadManifest(namespace string, commitSha string, project *project.Project,
 		return nil, fmt.Errorf("error reading the knative service yaml: %v", err)
 	}
 
+	templateParams := map[string]interface{}{
+		"Name": dockerImage.Name,
+		"RemoteTag": dockerImage.RemoteTag(),
+		"ImagePullSecrets": project.ImagePullSecrets,
+	}
+
 	output := &bytes.Buffer{}
 	// TODO replace map[string]string{} with proper values
-	if err = template.Execute(output, dockerImage); err != nil {
+	if err = template.Execute(output, templateParams); err != nil {
 		return nil, err
 	}
 

src/services/k8s/knative_test.go

@@ -3,11 +3,12 @@ package k8s
 import (
 	"encoding/base64"
 	"fmt"
-	"gotest.tools/v3/assert"
 	"os"
 	"path"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/nearform/initium-cli/src/services/docker"
 	"github.com/nearform/initium-cli/src/services/project"
 )
@@ -57,10 +58,12 @@ func TestConfig(t *testing.T) {
 func TestLoadManifest(t *testing.T) {
 	namespace := "custom"
 	commitSha := "93f4be93"
+	imagePullSecrets := []string{"secretPassword123"}
 
 	proj := &project.Project{Name: "knative_test",
-		Directory: path.Join(root, "example"),
-		Resources: os.DirFS(root),
+		Directory:        path.Join(root, "example"),
+		Resources:        os.DirFS(root),
+		ImagePullSecrets: imagePullSecrets,
 	}
 
 	dockerImage := docker.DockerImage{
@@ -77,7 +80,8 @@ func TestLoadManifest(t *testing.T) {
 	}
 
 	annotations := serviceManifest.Spec.Template.ObjectMeta.Annotations
+	pullSecret := serviceManifest.Spec.Template.Spec.ImagePullSecrets[0].Name
 	assert.Assert(t, annotations[UpdateTimestampAnnotationName] != "", "Missing %s annotation", UpdateTimestampAnnotationName)
 	assert.Assert(t, annotations[UpdateShaAnnotationName] == commitSha, "Expected %s SHA, got %s", commitSha, annotations[UpdateShaAnnotationName])
+	assert.Assert(t, pullSecret == imagePullSecrets[0], "Expected secret value to be %s, got %s", imagePullSecrets, pullSecret)
 }
-

src/services/project/project.go

@@ -26,6 +26,7 @@ type Project struct {
 	Directory             string
 	RuntimeVersion        string
 	DefaultRuntimeVersion string
+	ImagePullSecrets      []string
 	Resources             fs.FS
 }
 
@@ -44,12 +45,13 @@ func GuessAppName() *string {
 	return &name
 }
 
-func New(name string, language string, directory string, runtimeVersion string, version string, resources fs.FS) Project {
+func New(name string, language string, directory string, runtimeVersion string, version string, imagePullSecrets []string, resources fs.FS) Project {
 	return Project{
 		Name:           name,
 		Language:       language,
 		Directory:      directory,
 		RuntimeVersion: runtimeVersion,
+    ImagePullSecrets: imagePullSecrets,
 		Resources:      resources,
 		Version:        version,
 	}