feat: deploy modules to different namespaces

Signed-off-by: hanshal101 <[email protected]>
buildsafedev · Jul 8, 2024 · 392f667 · 392f667
1 parent e299b67
commit 392f667
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/cmd/build/build.go b/cmd/build/build.go
@@ -48,7 +48,7 @@ var BuildCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = generate.Generate(fh, sc)
+		err = generate.Generate(fh, sc, nil)
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("error: ", err.Error()))
 			os.Exit(1)

diff --git a/cmd/develop/develop.go b/cmd/develop/develop.go
@@ -26,7 +26,7 @@ var DevCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = generate.Generate(fh, sc)
+		err = generate.Generate(fh, sc, nil)
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("error: ", err.Error()))
 			os.Exit(1)

diff --git a/cmd/dockerfile/df.go b/cmd/dockerfile/df.go
@@ -53,7 +53,7 @@ var DFCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = generate.Generate(fh, sc)
+		err = generate.Generate(fh, sc, nil)
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("error: ", err.Error()))
 			os.Exit(1)

diff --git a/cmd/init/model.go b/cmd/init/model.go
@@ -128,7 +128,7 @@ func (m *model) processStages(stage int) error {
 			return err
 		}
 
-		err = generate.Generate(fh, m.sc)
+		err = generate.Generate(fh, m.sc, nil)
 		if err != nil {
 			m.stageMsg = errorStyle(err.Error())
 			return err

diff --git a/cmd/nixgenerate/model.go b/cmd/nixgenerate/model.go
@@ -92,7 +92,7 @@ func (m *model) processStages(stage int) error {
 		defer fh.FlakeFile.Close()
 		defer fh.DefFlakeFile.Close()
 
-		err = generate.Generate(fh, m.sc)
+		err = generate.Generate(fh, m.sc, nil)
 		if err != nil {
 			m.stageMsg = errorStyle("Failed to generate files: ", err.Error())
 			return err

diff --git a/cmd/oci/oci.go b/cmd/oci/oci.go
@@ -61,22 +61,26 @@ var OCICmd = &cobra.Command{
 			os.Exit(1)
 		}
 		platform = p
+		nameMap := make(map[string]string)
+		originalName := artifact.Name
+		newName := artifact.Name
 
 		if tag != "" {
 			if strings.Contains(artifact.Name, ":") {
 				parts := strings.Split(artifact.Name, ":")
-				artifact.Name = fmt.Sprintf("%s:%s", parts[0], tag)
+				newName = fmt.Sprintf("%s:%s", parts[0], tag)
 			} else {
-				artifact.Name = fmt.Sprintf("%s:%s", artifact.Name, tag)
+				newName = fmt.Sprintf("%s:%s", artifact.Name, tag)
 			}
 		}
+		nameMap[originalName] = newName
 
 		sc, fh, err := binit.GetBSFInitializers()
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("error: ", err.Error()))
 			os.Exit(1)
 		}
-		err = generate.Generate(fh, sc)
+		err = generate.Generate(fh, sc, nameMap)
 
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("error: ", err.Error()))

diff --git a/cmd/update/update.go b/cmd/update/update.go
@@ -98,7 +98,7 @@ var UpdateCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = generate.Generate(fh, sc)
+		err = generate.Generate(fh, sc, nil)
 		if err != nil {
 			fmt.Println(styles.ErrorStyle.Render("Error generating files: %s", err.Error()))
 			os.Exit(1)

diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go
@@ -17,7 +17,7 @@ import (
 )
 
 // Generate reads bsf.hcl, resolves dependencies and generates bsf.lock, bsf/flake.nix, bsf/default.nix, etc.
-func Generate(fh *hcl2nix.FileHandlers, sc buildsafev1.SearchServiceClient) error {
+func Generate(fh *hcl2nix.FileHandlers, sc buildsafev1.SearchServiceClient, nameMap map[string]string) error {
 	data, err := os.ReadFile("bsf.hcl")
 	if err != nil {
 		return err
@@ -29,6 +29,14 @@ func Generate(fh *hcl2nix.FileHandlers, sc buildsafev1.SearchServiceClient) erro
 		return fmt.Errorf("%v", &dstErr)
 	}
 
+	if len(nameMap) > 0 {
+		for _, artifact := range conf.OCIArtifact {
+			if newName, ok := nameMap[artifact.Name]; ok {
+				artifact.Name = newName
+			}
+		}
+	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second)
 	defer cancel()