chore: simplify dockerfile

Signed-off-by: Vasek - Tom C <tom@quartz.technology>

Author: TomChv

docker_sdk/src/dockerfile/dockerfile.go

@@ -10,7 +10,11 @@ import (
 
 type Dockerfile struct {
 	filename string
-	content *parser.Result
+	content  *parser.Result
+
+	stages  []string
+	args    map[string]string
+	secrets []string
 }
 
 func New(filename string, file *os.File) (*Dockerfile, error) {
@@ -19,9 +23,53 @@ func New(filename string, file *os.File) (*Dockerfile, error) {
 		return nil, err
 	}
 
+	stages := []string{}
+	args := map[string]string{}
+	secrets := []string{}
+
+	for _, child := range content.AST.Children {
+		switch child.Value {
+		case "FROM":
+			args := []string{}
+			for next := child.Next; next != nil; next = next.Next {
+				args = append(args, next.Value)
+			}
+
+			// We skip if there's no stage defined
+			if len(args) != 3 {
+				continue
+			}
+
+			stages = append(stages, args[2])
+		case "ARG":
+			// Args does not handle self interpolation for simplicity.
+			// TODO: handle self interpolation (ARG XXX="XX-${XXXX}")
+			entry := strings.SplitN(child.Next.Value, "=", 2)
+			switch len(entry) {
+			case 1:
+				args[entry[0]] = ""
+			case 2:
+				args[entry[0]] = entry[1]
+			default:
+				panic(fmt.Errorf("invalid ARG: %s", child.Next.Value))
+			}
+		case "RUN":
+			for _, flag := range child.Flags {
+				if !strings.Contains(flag, "--mount=type=secret,id=") {
+					continue
+				}
+
+				secrets = append(secrets, strings.TrimPrefix(flag, "--mount=type=secret,id="))
+			}
+		}
+	}
+
 	return &Dockerfile{
 		filename: filename,
-		content: content,
+		content:  content,
+		stages:   stages,
+		args:     args,
+		secrets:  secrets,
 	}, nil
 }
 
@@ -30,71 +78,15 @@ func (d *Dockerfile) Filename() string {
 }
 
 func (d *Dockerfile) Stages() []string {
-	stages := []string{}
-
-	for _, child := range d.content.AST.Children {
-		if child.Value != "FROM" {
-			continue
-		}
-
-		args := []string{}
-		for next := child.Next; next != nil; next = next.Next {
-			args = append(args, next.Value)
-		}
-
-		// We skip if there's no stage defined
-		if len(args) != 3 {
-			continue
-		}
-
-		stages = append(stages, args[2])
-	}
-
-	return stages
+	return d.stages
 }
 
-// Args does not handle self interpolation for simplicity.
-// TODO: handle self interpolation (ARG XXX="XX-${XXXX}")
 func (d *Dockerfile) Args() map[string]string {
-	args := map[string]string{}
-
-	for _, child := range d.content.AST.Children {
-		if child.Value != "ARG" {
-			continue
-		}
-
-		entry := strings.SplitN(child.Next.Value, "=", 2)
-		switch len(entry) {
-		case 1:
-			args[entry[0]] = ""
-		case 2:
-			args[entry[0]] = entry[1]
-		default:
-			panic(fmt.Errorf("invalid ARG: %s", child.Next.Value))
-		}
-	}
-
-	return args
+	return d.args
 }
 
 func (d *Dockerfile) Secrets() []string {
-	secrets := []string{}
-
-	for _, child := range d.content.AST.Children {
-		if child.Value != "RUN" {
-			continue
-		}
-
-		for _, flag := range child.Flags {
-			if !strings.Contains(flag, "--mount=type=secret,id=") {
-				continue
-			}
-			
-			secrets = append(secrets, strings.TrimPrefix(flag, "--mount=type=secret,id="))
-		}
-	}
-
-	return secrets
+	return d.secrets
 }
 
 func (d *Dockerfile) String() string {
@@ -122,4 +114,4 @@ func (d *Dockerfile) String() string {
 	}
 
 	return result
-}
+}