feat: compute file path tag (#930)

* chore: first change

* feat: add filepath of template being executed

* tag name change

* fix: add func for git origin (#931)

* fix: add func for git origin

* move test; deadcode

* timestamp

apply/apply.go

@@ -8,10 +8,12 @@ import (
 	"io/fs"
 	"net/url"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"sort"
 	"strings"
+	"text/template"
 
 	"github.com/pkg/errors"
 	"golang.org/x/exp/slices"
@@ -521,10 +523,24 @@ func removeExtension(path string) string {
 	return strings.TrimSuffix(path, filepath.Ext(path))
 }
 
+func getGitRemoteOriginURL(cwd ...string) string {
+	dir := "."
+	if len(cwd) > 0 {
+		dir = cwd[0]
+	}
+	cmd := exec.Command("git", "remote", "get-url", "--push", "origin")
+	cmd.Dir = dir
+	out, err := cmd.Output()
+	if err != nil {
+		logrus.Warnf("unable to get git output: %s", err)
+		return ""
+	}
+	return strings.TrimSpace(string(out))
+}
+
 func applyTemplate(sourceFile io.Reader, commonTemplates fs.FS, dest afero.Fs, path string, overrides interface{}) error {
-	dir, _ := filepath.Split(path)
-	ospath := filepath.FromSlash(dir)
-	err := dest.MkdirAll(ospath, 0775)
+	dir := filepath.Dir(path)
+	err := dest.MkdirAll(dir, 0775)
 	if err != nil {
 		return errs.WrapUserf(err, "couldn't create %s directory", dir)
 	}
@@ -534,7 +550,14 @@ func applyTemplate(sourceFile io.Reader, commonTemplates fs.FS, dest afero.Fs, p
 	if err != nil {
 		return errs.WrapUser(err, "unable to open file")
 	}
-	t, e := util.OpenTemplate(path, sourceFile, commonTemplates)
+	t, e := util.OpenTemplate(path, sourceFile, commonTemplates, []template.FuncMap{
+		{
+			"cwd": func() string {
+				return filepath.Dir(writer.Name())
+			},
+			"git_origin": getGitRemoteOriginURL,
+		},
+	}...)
 	if e != nil {
 		return e
 	}

apply/apply_test.go

@@ -29,6 +29,22 @@ func init() {
 	logrus.SetFormatter(formatter)
 }
 
+type testGitRemote struct {
+	path           string
+	expectedRemote string
+}
+
+func TestGetGitRemoveOriginURL(t *testing.T) {
+	r := require.New(t)
+	tests := []testGitRemote{
+		{path: ".", expectedRemote: "[email protected]:chanzuckerberg/fogg"},
+	}
+	for _, test := range tests {
+		remote := getGitRemoteOriginURL(test.path)
+		r.Equal(test.expectedRemote, remote)
+	}
+}
+
 func randomString(n int) string {
 	var letter = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 

config/v2/config.go

@@ -4,14 +4,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/chanzuckerberg/fogg/errs"
 	"github.com/chanzuckerberg/fogg/plugins"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	yaml "gopkg.in/yaml.v3"
 )
@@ -54,29 +52,10 @@ func (c *Config) Write(fs afero.Fs, path string) error {
 	return encoder.Encode(c)
 }
 
-func getGitRemoteOriginURL(cwd ...string) string {
-	dir := "."
-	if len(cwd) > 0 {
-		dir = cwd[0]
-	}
-	cmd := exec.Command("git", "remote", "get-url", "--push", "origin")
-	cmd.Dir = dir
-	out, err := cmd.Output()
-	if err != nil {
-		logrus.Warnf("unable to get git output: %s", err)
-		return ""
-	}
-	return strings.TrimSpace(string(out))
-}
-
 // TODO: write out functions to generate tag data
 func (c *Config) GenerateStamp(fs afero.Fs, configFile string) {
 	stamp := Stamp{}
-	stamp.Date = DateAsTag()
-	stamp.FilePath = fs.Name()
 	stamp.FoggUser = ""
-	stamp.GitRepository = getGitRemoteOriginURL()
-	stamp.CommitHash = ""
 	c.Stamp = stamp
 }
 
@@ -87,11 +66,7 @@ func DateAsTag() string {
 }
 
 type Stamp struct {
-	Date          string
-	FilePath      string
-	FoggUser      string
-	GitRepository string
-	CommitHash    string
+	FoggUser string
 }
 
 type Config struct {

config/v2/config_test.go

@@ -8,22 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type testGitRemote struct {
-	path           string
-	expectedRemote string
-}
-
-func TestGetGitRemoveOriginURL(t *testing.T) {
-	r := require.New(t)
-	tests := []testGitRemote{
-		{path: ".", expectedRemote: "[email protected]:chanzuckerberg/fogg"},
-	}
-	for _, test := range tests {
-		remote := getGitRemoteOriginURL(test.path)
-		r.Equal(test.expectedRemote, remote)
-	}
-}
-
 func TestReadConfig(t *testing.T) {
 	r := require.New(t)
 

plan/plan.go

@@ -1287,11 +1287,7 @@ func resolveComponentCommon(stamp v2.Stamp, commons ...v2.Common) ComponentCommo
 		TravisCI:         travisPlan,
 		CircleCI:         circlePlan,
 		GitHubActionsCI:  githubActionsPlan,
-		Date:             stamp.Date,
-		FilePath:         stamp.FilePath,
 		FoggUser:         stamp.FoggUser,
-		GitRepository:    stamp.GitRepository,
-		CommitHash:       stamp.CommitHash,
 	}
 }
 

templates/templates/component/terraform/fogg.tf.tmpl

@@ -123,17 +123,15 @@ variable "owner" {
 variable "tags" {
   type =  object({project: string, env: string, service: string, owner: string, managedBy: string})
   default = {
-    project       = "{{ .Project }}"
-    env           = "{{ .Env }}"
-    service       = "{{ .Name }}"
-    owner         = "{{ .Owner }}"
-    date          = "{{ .Date }}"
-    filePath      = "{{ .FilePath }}"
-    foggUser      = "{{ .FoggUser }}"
-    gitRepository = "{{ .GitRepository }}"
-    commitHash    = "{{ .CommitHash }}"
-    managedBy = "terraform"
-
+    project               = "{{ .Project }}"
+    env                   = "{{ .Env }}"
+    service               = "{{ .Name }}"
+    owner                 = "{{ .Owner }}"
+    terraformLastApplyTime = timestamp()
+    terraformWorkspaceDir = "{{ cwd }}"
+    foggUser              = "{{ .FoggUser }}"
+    gitRepository         = "{{ git_origin }}"
+    managedBy             = "terraform"
   }
 }