run-resourcewatch: Use observation timestamp as commit date

Author: mdbooth

pkg/resourcewatch/git/git_store.go

@@ -7,6 +7,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"k8s.io/kube-openapi/pkg/util/sets"
 
@@ -56,7 +57,7 @@ func NewGitStorage(path string) (*GitStorage, error) {
 }
 
 // handle handles different operations on git
-func (s *GitStorage) handle(gvr schema.GroupVersionResource, oldObj, obj *unstructured.Unstructured, delete bool) {
+func (s *GitStorage) handle(timestamp time.Time, gvr schema.GroupVersionResource, oldObj, obj *unstructured.Unstructured, delete bool) {
 	filePath, content, err := decodeUnstructuredObject(gvr, obj)
 	if err != nil {
 		klog.Warningf("Decoding %q failed: %v", filePath, err)
@@ -84,14 +85,14 @@ func (s *GitStorage) handle(gvr schema.GroupVersionResource, oldObj, obj *unstru
 			// Add it first before removing it.
 			if os.IsNotExist(err) {
 				klog.Info("Observed delete of file we haven't previously observed. Adding it first.")
-				s.handle(gvr, nil, obj, false)
-				s.handle(gvr, nil, obj, true)
+				s.handle(timestamp, gvr, nil, obj, false)
+				s.handle(timestamp, gvr, nil, obj, true)
 				return
 			} else {
 				klog.Errorf("Error removing %q: %v", filePath, err)
 			}
 		}
-		if err := s.commitRemove(filePath, "unknown", ocCommand); err != nil {
+		if err := s.commitRemove(timestamp, filePath, "unknown", ocCommand); err != nil {
 			klog.Error(err)
 		}
 
@@ -114,33 +115,33 @@ func (s *GitStorage) handle(gvr schema.GroupVersionResource, oldObj, obj *unstru
 	switch operation {
 	case gitOpAdded:
 		klog.Infof("Calling commitAdd for %s", filePath)
-		if err := s.commitAdd(filePath, modifyingUser, ocCommand); err != nil {
+		if err := s.commitAdd(timestamp, filePath, modifyingUser, ocCommand); err != nil {
 			klog.Error(err)
 		}
 	case gitOpModified:
 		klog.Infof("Calling commitModify for %s", filePath)
-		if err := s.commitModify(filePath, modifyingUser, ocCommand); err != nil {
+		if err := s.commitModify(timestamp, filePath, modifyingUser, ocCommand); err != nil {
 			klog.Error(err)
 		}
 	default:
 		klog.Errorf("unhandled case for %s: %d", filePath, operation)
 	}
 }
 
-func (s *GitStorage) OnAdd(gvr schema.GroupVersionResource, obj interface{}) {
+func (s *GitStorage) OnAdd(timestamp time.Time, gvr schema.GroupVersionResource, obj interface{}) {
 	objUnstructured := obj.(*unstructured.Unstructured)
 
-	s.handle(gvr, nil, objUnstructured, false)
+	s.handle(timestamp, gvr, nil, objUnstructured, false)
 }
 
-func (s *GitStorage) OnUpdate(gvr schema.GroupVersionResource, oldObj, obj interface{}) {
+func (s *GitStorage) OnUpdate(timestamp time.Time, gvr schema.GroupVersionResource, oldObj, obj interface{}) {
 	objUnstructured := obj.(*unstructured.Unstructured)
 	oldObjUnstructured := oldObj.(*unstructured.Unstructured)
 
-	s.handle(gvr, oldObjUnstructured, objUnstructured, false)
+	s.handle(timestamp, gvr, oldObjUnstructured, objUnstructured, false)
 }
 
-func (s *GitStorage) OnDelete(gvr schema.GroupVersionResource, obj interface{}) {
+func (s *GitStorage) OnDelete(timestamp time.Time, gvr schema.GroupVersionResource, obj interface{}) {
 	objUnstructured, ok := obj.(*unstructured.Unstructured)
 	if !ok {
 		tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
@@ -155,7 +156,7 @@ func (s *GitStorage) OnDelete(gvr schema.GroupVersionResource, obj interface{})
 		}
 	}
 
-	s.handle(gvr, nil, objUnstructured, true)
+	s.handle(timestamp, gvr, nil, objUnstructured, true)
 }
 
 // guessAtModifyingUsers tries to figure out who modified the resource
@@ -229,47 +230,48 @@ func (s *GitStorage) exec(command string, args ...string) error {
 	return nil
 }
 
-func (s *GitStorage) commitAdd(path, author, ocCommand string) error {
+func (s *GitStorage) commit(timestamp time.Time, path, author, commitMessage string) error {
 	authorString := fmt.Sprintf("%s <[email protected]>", author)
-	commitMessage := fmt.Sprintf("added %s", ocCommand)
+	dateString := timestamp.Format(time.RFC3339)
+
+	return s.exec("git", "commit", "--author", authorString, "--date", dateString, "-m", commitMessage)
+}
 
+func (s *GitStorage) commitAdd(timestamp time.Time, path, author, ocCommand string) error {
 	if err := s.exec("git", "add", path); err != nil {
 		return err
 	}
 
-	if err := s.exec("git", "commit", "--author", authorString, "-m", commitMessage); err != nil {
+	commitMessage := fmt.Sprintf("added %s", ocCommand)
+	if err := s.commit(timestamp, path, author, commitMessage); err != nil {
 		return err
 	}
 
 	klog.Infof("Add: %v -- %v added %v", path, author, ocCommand)
 	return nil
 }
 
-func (s *GitStorage) commitModify(path, author, ocCommand string) error {
-	authorString := fmt.Sprintf("%s <[email protected]>", author)
-	commitMessage := fmt.Sprintf("modifed %s", ocCommand)
-
+func (s *GitStorage) commitModify(timestamp time.Time, path, author, ocCommand string) error {
 	if err := s.exec("git", "add", path); err != nil {
 		return err
 	}
 
-	if err := s.exec("git", "commit", "--author", authorString, "-m", commitMessage); err != nil {
+	commitMessage := fmt.Sprintf("modifed %s", ocCommand)
+	if err := s.commit(timestamp, path, author, commitMessage); err != nil {
 		return err
 	}
 
 	klog.Infof("Modified: %v -- %v updated %v", path, author, ocCommand)
 	return nil
 }
 
-func (s *GitStorage) commitRemove(path, author, ocCommand string) error {
-	authorString := fmt.Sprintf("%s <[email protected]>", author)
-	commitMessage := fmt.Sprintf("removed %s", ocCommand)
-
+func (s *GitStorage) commitRemove(timestamp time.Time, path, author, ocCommand string) error {
 	if err := s.exec("git", "rm", path); err != nil {
 		return err
 	}
 
-	if err := s.exec("git", "commit", "--author", authorString, "-m", commitMessage); err != nil {
+	commitMessage := fmt.Sprintf("removed %s", ocCommand)
+	if err := s.commit(timestamp, path, author, commitMessage); err != nil {
 		return err
 	}
 

pkg/resourcewatch/git/sink.go

@@ -44,10 +44,10 @@ func gitWrite(gitStorage *GitStorage, observation *observe.ResourceObservation)
 	}
 	switch observation.ObservationType {
 	case observe.ObservationTypeAdd:
-		gitStorage.OnAdd(gvr, observation.Object)
+		gitStorage.OnAdd(observation.ObservationTime, gvr, observation.Object)
 	case observe.ObservationTypeUpdate:
-		gitStorage.OnUpdate(gvr, observation.OldObject, observation.Object)
+		gitStorage.OnUpdate(observation.ObservationTime, gvr, observation.OldObject, observation.Object)
 	case observe.ObservationTypeDelete:
-		gitStorage.OnDelete(gvr, observation.Object)
+		gitStorage.OnDelete(observation.ObservationTime, gvr, observation.Object)
 	}
 }