Feat/enigma env (#25)

* feat: Added logic to use enigma env file based on name * feat: changed to Dockerfile in image * feat: Added enigma file name in args * feat: modified action.yml * feat: passed required true in Enigma Env file name * fix: modified action.yml * feat: added description * feat: corrected action.yml
clouddrove · Sep 26, 2024 · 802280f · 802280f
1 parent a30744d
commit 802280f
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 66 deletions.
diff --git a/action.yml b/action.yml
@@ -5,6 +5,9 @@ inputs:
   command:
     description: 'Command to run (bake or publish)'
     required: true
+  enigma_file:
+    description: 'env file to set values in workflow'
+    required: true
   DOCKER_IMAGE:
     description: 'Docker image name'
     required: true
@@ -70,10 +73,10 @@ inputs:
     description: 'Whether to publish the image'
     required: false
     default: 'false'
-  
+
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/clouddrove/enigma:v0.0.12'
+  image: 'docker://ghcr.io/clouddrove/enigma:v0.0.13'
   env:
     DOCKER_IMAGE: ${{ inputs.DOCKER_IMAGE }}
     DOCKER_TAG: ${{ inputs.DOCKER_TAG }}
@@ -96,4 +99,5 @@ runs:
     NO_CACHE: ${{ inputs.NO_CACHE }}
     PUBLISH: ${{ inputs.PUBLISH }}
   args:
-    - ${{ inputs.command }}
+    - '-enigma=${{ inputs.enigma_file }}'
+    - ${{ inputs.command }}
diff --git a/main.go b/main.go
@@ -1,67 +1,70 @@
 package main
 
 import (
-    "fmt"
-    "log"
-    "os"
+	"flag"
+	"fmt"
+	"log"
+	"os"
 
-    "github.com/clouddrove/enigma/generate"
-    "github.com/clouddrove/enigma/modules/docker"
-    "github.com/joho/godotenv"
+	"github.com/clouddrove/enigma/generate"
+	"github.com/clouddrove/enigma/modules/docker"
+	"github.com/joho/godotenv"
 )
 
-func loadDockerEnv() {
-    isCICD := os.Getenv("CI") != "" || os.Getenv("GITHUB_ACTIONS") != ""
-
-    if !isCICD {
-        err := godotenv.Load(".enigma")
-        if err != nil {
-            log.Fatalf("Error loading .enigma file: %v", err)
-        }
-    } else {
-        fmt.Println("Running in CI/CD environment; skipping .enigma file load.")
-    }
+func loadDockerEnv(enigmaFile string) {
+	isCICD := os.Getenv("CI") != "" || os.Getenv("GITHUB_ACTIONS") != ""
+	if !isCICD {
+		err := godotenv.Load(enigmaFile)
+		if err != nil {
+			log.Fatalf("Error loading %s file: %v", enigmaFile, err)
+		}
+	} else {
+		fmt.Println("Running in CI/CD environment; skipping .enigma file load.")
+	}
 }
 
 func main() {
-    if len(os.Args) < 2 {
-        fmt.Println("Usage: enigma <command>")
-        fmt.Println("Commands: init, bake, publish, build-publish")
-        os.Exit(1)
-    }
+	enigmaFile := flag.String("enigma", ".enigma", "Path to the .enigma file")
+	flag.Parse()
 
-    command := os.Args[1]
+	if len(flag.Args()) < 1 {
+		fmt.Println("Usage: enigma [-enigma=<file>] <command>")
+		fmt.Println("Commands: init, bake, publish, build-publish")
+		os.Exit(1)
+	}
 
-    switch command {
-    case "init":
-        err := generate.GenerateEnigmaFile("modules/docker", ".enigma")
-        if err != nil {
-            fmt.Printf("Error generating .enigma file: %v\n", err)
-            os.Exit(1)
-        }
-    case "bake":
-        loadDockerEnv()
-        docker.InstallBinfmt()
-        docker.BuildDockerImage()
-        docker.ScanDockerImage()
-    case "publish":
-        loadDockerEnv()
-        docker.InstallBinfmt()
-        docker.TagDockerImage()
-        docker.PushDockerImage()
-    case "build-publish":
-        docker.LoadEnvFromEnigma()
-        docker.InstallBinfmt()
-        docker.BuildDockerImage()
-        docker.ScanDockerImage()
-        if os.Getenv("PUBLISH") == "true" {
-            docker.TagDockerImage()
-            docker.PushDockerImage()
-        } else {
-            fmt.Println("Publish is set to false. Skipping publish step.")
-        }
-    default:
-        fmt.Println("Unknown command:", command)
-        fmt.Println("Commands: init, bake, publish, build-publish")
-    }
-}
+	command := flag.Args()[0]
+
+	switch command {
+	case "init":
+		err := generate.GenerateEnigmaFile("modules/docker", *enigmaFile)
+		if err != nil {
+			fmt.Printf("Error generating %s file: %v\n", *enigmaFile, err)
+			os.Exit(1)
+		}
+	case "bake":
+		loadDockerEnv(*enigmaFile)
+		docker.InstallBinfmt()
+		docker.BuildDockerImage()
+		docker.ScanDockerImage()
+	case "publish":
+		loadDockerEnv(*enigmaFile)
+		docker.InstallBinfmt()
+		docker.TagDockerImage()
+		docker.PushDockerImage()
+	case "build-publish":
+		docker.LoadEnvFromEnigma(*enigmaFile)
+		docker.InstallBinfmt()
+		docker.BuildDockerImage()
+		docker.ScanDockerImage()
+		if os.Getenv("PUBLISH") == "true" {
+			docker.TagDockerImage()
+			docker.PushDockerImage()
+		} else {
+			fmt.Println("Publish is set to false. Skipping publish step.")
+		}
+	default:
+		fmt.Println("Unknown command:", command)
+		fmt.Println("Commands: init, bake, publish, build-publish")
+	}
+}
diff --git a/modules/docker/docker.go b/modules/docker/docker.go
@@ -182,15 +182,15 @@ func InstallBinfmt() {
 }
 
 // LoadEnvFromEnigma loads environment variables from the .enigma file.
-func LoadEnvFromEnigma() {
-    if _, err := os.Stat(".enigma"); os.IsNotExist(err) {
-        fmt.Println(".enigma file not found. No variables set.")
+func LoadEnvFromEnigma(filename string) {
+    if _, err := os.Stat(filename); os.IsNotExist(err) {
+        fmt.Printf("%s file not found. No variables set.\n", filename)
         return
     }
 
-    file, err := os.Open(".enigma")
+    file, err := os.Open(filename)
     if err != nil {
-        log.Fatalf("Error opening .enigma file: %v", err)
+        log.Fatalf("Error opening %s file: %v", filename, err)
     }
     defer file.Close()
 

diff --git a/modules/docker/readme.md b/modules/docker/readme.md
@@ -58,7 +58,7 @@ jobs:
     steps:
 
       - name: Build Docker Image
-        uses: clouddrove/enigma@v0.0.12
+        uses: clouddrove/enigma@v0.0.13
         with:
           command: bake
           DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
@@ -68,7 +68,7 @@ jobs:
           BUILD_ARCHITECTURE: ${{ inputs.BUILD_ARCHITECTURE }}
 
       - name: Publish Docker Image
-        uses: clouddrove/enigma@v0.0.12
+        uses: clouddrove/enigma@v0.0.13
         with:
           command: publish
           DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}