feat: adding a jinja templated docker env file

Author: gilesw

.tool-versions

@@ -0,0 +1,2 @@
+# golang 1.23.2
+golang 1.20.2

build.sh

@@ -6,5 +6,6 @@ latestTag=$(git describe --tags)
 echo "latest tag: $latestTag"
 
 # Build the Go program, injecting the latest tag into the version variable
+echo go build -ldflags "-X main.version=$latestTag" -o jinjafier
 go build -ldflags "-X main.version=$latestTag" -o jinjafier
 

jinjafier.go

@@ -1,87 +1,100 @@
 package main
 
 import (
-    "bufio"
-    "fmt"
-    "io/ioutil"
-    "os"
-    "regexp"
-    "strings"
-
-    "gopkg.in/yaml.v3"
+	"bufio"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"regexp"
+	"strings"
+
+	"gopkg.in/yaml.v3"
 )
 
 var version = "dev"
 
 func main() {
 
-		if os.Args[1] == "-v" {
-				fmt.Println("Jinjafier version:", version)
-				os.Exit(0)
+	if len(os.Args) == 2 && os.Args[1] == "-v" {
+		fmt.Println("Jinjafier version:", version)
+		os.Exit(0)
+	}
+
+	if len(os.Args) != 2 {
+		fmt.Println("Usage: jinjafier <java_properties_file>")
+		os.Exit(1)
+	}
+
+	filename := os.Args[1]
+	file, err := os.Open(filename)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	jinjaTemplate := ""
+	envTemplate := ""
+	yamlMap := make(map[string]string)
+
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(line, "#") {
+			// Add comments to both templates
+			jinjaTemplate += line + "\n"
+			envTemplate += line + "\n"
+		} else if strings.Contains(line, "=") {
+			split := strings.SplitN(line, "=", 2) // Split at the first "=" only
+			key := split[0]
+			value := split[1]
+
+			// Convert key to lowercase and replace dots and camel case with underscores
+			re := regexp.MustCompile("([a-z0-9])([A-Z])")
+			key = re.ReplaceAllString(key, "${1}_${2}")
+			key = strings.ReplaceAll(key, ".", "_")
+			key = strings.ReplaceAll(key, "-", "_")
+			key = strings.ToUpper(key)
+
+			// Add to jinja template
+			jinjaTemplate += fmt.Sprintf("%s={{ %s }}\n", split[0], key)
+
+			// Add to env template
+			envTemplate += fmt.Sprintf("%s={{ %s }}\n", key, key)
+
+			// Add to yaml map
+			yamlMap[key] = value
+		} else {
+			// Add non-comment, non-key-value lines to the Jinja template
+			jinjaTemplate += line + "\n"
 		}
-
-    if len(os.Args) != 2 {
-        fmt.Println("Usage: jinjafier <java_properties_file>")
-        os.Exit(1)
-    }
-
-    filename := os.Args[1]
-    file, err := os.Open(filename)
-    if err != nil {
-        fmt.Println(err)
-        os.Exit(1)
-    }
-    defer file.Close()
-
-    scanner := bufio.NewScanner(file)
-    jinjaTemplate := ""
-    yamlMap := make(map[string]string)
-
-    for scanner.Scan() {
-        line := scanner.Text()
-        if strings.HasPrefix(line, "#") {
-            jinjaTemplate += line + "\n"
-        } else if strings.Contains(line, "=") {
-            split := strings.SplitN(line, "=", 2) // Split at the first "=" only
-            key := split[0]
-            value := split[1]
-
-            // Convert key to lowercase and replace dots and camel case with underscores
-            re := regexp.MustCompile("([a-z0-9])([A-Z])")
-            key = re.ReplaceAllString(key, "${1}_${2}")
-            key = strings.ReplaceAll(key, ".", "_")
-            key = strings.ReplaceAll(key, "-", "_")
-            key = strings.ToUpper(key)
-
-            // Add to jinja template
-            jinjaTemplate += fmt.Sprintf("%s={{ %s }}\n", split[0], key)
-
-            // Add to yaml map
-            yamlMap[key] = value
-        } else {
-            jinjaTemplate += line + "\n"
-        }
-    }
-
-    // Write jinja template to file
-    err = ioutil.WriteFile(strings.ReplaceAll(filename, ".properties", ".properties.j2"), []byte(jinjaTemplate), 0644)
-    if err != nil {
-        fmt.Println(err)
-        os.Exit(1)
-    }
-
-    // Convert yaml map to yaml
-    yamlData, err := yaml.Marshal(&yamlMap)
-    if err != nil {
-        fmt.Println(err)
-        os.Exit(1)
-    }
-
-    // Write yaml to file
-    err = ioutil.WriteFile(strings.ReplaceAll(filename, ".properties", ".properties.yml"), yamlData, 0644)
-    if err != nil {
-        fmt.Println(err)
-        os.Exit(1)
-    }
+	}
+
+	// Write jinja template to file
+	err = ioutil.WriteFile(strings.ReplaceAll(filename, ".properties", ".properties.j2"), []byte(jinjaTemplate), 0644)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Write env template to file
+	err = ioutil.WriteFile(strings.ReplaceAll(filename, ".properties", ".properties.env.j2"), []byte(envTemplate), 0644)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Convert yaml map to yaml
+	yamlData, err := yaml.Marshal(&yamlMap)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Write yaml to file
+	err = ioutil.WriteFile(strings.ReplaceAll(filename, ".properties", ".properties.yml"), yamlData, 0644)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 }
-

test.sh

@@ -7,13 +7,13 @@ go build -o jinjafier
 ./jinjafier example.properties
 
 # Check if example.properties.j2 and example.properties.yml have changed
-git diff --quiet -- example.properties.j2 example.properties.yml
+git diff --quiet -- example.properties.j2 example.properties.yml example.properties.env.j2
 
 # If git diff returns a non-zero exit code, the files have changed
 if [ $? -ne 0 ]; then
-    echo "FATAL: example.properties.j2 or example.properties.yml have changed"
+    echo "FATAL: example.properties.j2 or example.properties.yml or example.properties.env.j2 have changed"
     exit 1
 else
-    echo "No changes in example.properties.j2 or example.properties.yml"
+    echo "No changes in example.properties.j2 or example.properties.yml or example.properties.env.j2"
 fi