Merge pull request 'fix(file): change owner for real' (#5) from fix-tkt-04 into dev

Reviewed-on: #5

.gitignore

@@ -13,5 +13,5 @@
 *.out
 
 # Dependency directories (remove the comment below to include it)
-# vendor/
+vendor/
 bin/

data/config/loki-stack-helm.json

@@ -1,49 +0,0 @@
-{
-  "Globals": {
-    "Vars": {
-      "PrometheusPort": "9090"
-    }
-  },
-  "Name": "loki-stack",
-  "Services": {
-    "Loki-Stack": {
-      "ConfigFiles": [],
-      "Daemons": {},
-      "Users": {},
-      "Repositories": {
-        "Grafana": {
-          "enabled": true,
-          "name": "grafana",
-          "type": "helm",
-          "url": "https://grafana.github.io/helm-charts"
-        }
-      },
-      "Packages": {
-        "loki": {
-          "type" : "helm",
-          "action": "install",
-          "name": "loki",
-          "repository": "grafana"
-        }
-      },
-      "Vars": {
-        "AlertManagerURL": "http://localhost:9092",
-        "AuthEnabled": false,
-        "GRPCPort": "9095",
-        "Group": "grafana",
-        "HTTPPort": "3099",
-        "LogLevel": "error",
-        "ObjectStore": "filesystem",
-        "S2": {
-          "APIKey": "",
-          "APISecretKey": "",
-          "BucketName": "",
-          "URL": ""
-        },
-        "SharedStore": "filesystem",
-        "StorageRoot": "/var/loki",
-        "User": "loki"
-      }
-    }
-  }
-}

pkg/templater/files.go

@@ -7,6 +7,7 @@ import (
 
 	"fmt"
 	"os"
+	"os/user"
 
 	"forge.cadoles.com/pcaseiro/templatefile/pkg/utils"
 )
@@ -25,8 +26,32 @@ type ConfigFile struct {
 // Generate the configuration file from the template (hcl or json)
 func (cf *ConfigFile) Generate(root string, templateDir string, values []byte) error {
 	var template string
+
+	if utils.DryRun {
+		return nil
+	}
+
 	cf.TemplateDir = templateDir
 	dest := filepath.Join(root, cf.Destination)
+
+	// Get owner and group UID and GID
+	owner, err := user.Lookup(cf.Owner)
+	if err != nil {
+		return fmt.Errorf("Process templates failed with error: %v", err)
+	}
+	group, err := user.LookupGroup(cf.Group)
+	if err != nil {
+		return fmt.Errorf("Process templates failed with error: %v", err)
+	}
+	uid, err := strconv.Atoi(owner.Uid)
+	if err != nil {
+		return fmt.Errorf("Process templates failed with error: %v", err)
+	}
+	gid, err := strconv.Atoi(group.Gid)
+	if err != nil {
+		return fmt.Errorf("Process templates failed with error: %v", err)
+	}
+
 	intMod, err := strconv.ParseInt(cf.Mode, 8, 64)
 	if err != nil {
 		return (err)
@@ -45,6 +70,10 @@ func (cf *ConfigFile) Generate(root string, templateDir string, values []byte) e
 	if err != nil {
 		return fmt.Errorf("Process templates failed with error: %v", err)
 	}
+	if err = os.Chown(dest, uid, gid); err != nil {
+		return fmt.Errorf("Process templates failed with error: %v", err)
+	}
+
 	log.Printf("\tFile %s generated\n", dest)
 	return nil
 }

pkg/templater/packages.go

@@ -14,22 +14,9 @@ type SystemPackage struct {
 	Action       string `json:"action"`
 	OS           string `json:"os"`
 	Distribution string `json:"distribution"`
-	NameSpace    string `json:"namespace"`
-	Repository   string `json:"repository"`
-	URL          string `json:"url"`
 }
 
 func (p *SystemPackage) SetDistribution() error {
-
-	// If the package type is helm or kubectl we set distribution to k8s
-	if p.Type == "helm" || p.Type == "kubectl" {
-		p.Distribution = p.Type
-		if len(p.NameSpace) == 0 {
-			p.NameSpace = p.Name
-		}
-		return nil
-	}
-
 	OSConfig, err := utils.ReadOSRelease()
 	if err != nil {
 		return err
@@ -69,12 +56,6 @@ func (p *SystemPackage) Manage() error {
 		_, stdErr, pkErr = utils.RunSystemCommand("yum", "install", "-y", p.Name)
 	case "arch":
 		_, stdErr, pkErr = utils.RunSystemCommand("pacman", "-Suy", p.Name)
-	case "helm":
-		toInstall := fmt.Sprintf("%s/%s", p.Repository, p.Name)
-		nameSpaceOPT := fmt.Sprintf("--namespace=%s", p.NameSpace)
-		_, stdErr, pkErr = utils.RunSystemCommand("helm", "upgrade", "--install", p.Name, nameSpaceOPT, toInstall)
-	case "kubectl":
-		_, stdErr, pkErr = utils.RunSystemCommand("kubectl", "apply", p.URL)
 	default:
 		pkErr = fmt.Errorf("Unsupported OS %s [%s]", p.OS, stdErr)
 	}

pkg/templater/repo-helm.go

@@ -1,54 +1,11 @@
 package templater
 
-import (
-	"encoding/json"
-	"fmt"
-
-	"forge.cadoles.com/pcaseiro/templatefile/pkg/utils"
-)
-
 type HelmRepository struct {
 	Repository
 }
 
-func (hr *HelmRepository) repoExists() (bool, error) {
-	var repos []HelmRepository
-
-	stdOut, stdErr, err := utils.RunSystemCommand("helm", "repo", "list", "-o", "json")
-	if err != nil {
-		return false, fmt.Errorf("%s %v", stdErr, err)
-	}
-	err = json.Unmarshal(stdOut, &repos)
-	if err != nil {
-		return false, err
-	}
-
-	for _, repo := range repos {
-		if repo.Name == hr.Name {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
 func (hr *HelmRepository) Add() error {
-
-	repoExists, err := hr.repoExists()
-	if err != nil {
-		return err
-	}
-
-	if repoExists {
 	return nil
-	} else {
-		_, stdErr, err := utils.RunSystemCommand("helm", "repo", "add", hr.Name, hr.URL)
-		if err != nil {
-			return fmt.Errorf("%s %v", stdErr, err)
-		}
-	}
-
-	return nil
-
 }
 
 func (hr *HelmRepository) Update() error {

pkg/templater/system_users.go

@@ -3,6 +3,7 @@ package templater
 import (
 	"fmt"
 	"log"
+	"os/user"
 
 	"forge.cadoles.com/pcaseiro/templatefile/pkg/utils"
 )
@@ -14,17 +15,9 @@ type SystemUser struct {
 	Shell    string `json:"shell"`
 }
 
-func (su *SystemUser) exists() (bool, error) {
-	_, _, err := utils.RunSystemCommand("getent", "passwd", su.UserName)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
 func (su *SystemUser) Manage() error {
-	exist, _ := su.exists()
+	_, err := user.Lookup(su.UserName)
-	if exist {
+	if err == nil {
 		log.Printf("\tUser %s already exists", su.UserName)
 		return nil
 	}