Remove nextRotationTime field

Author: dargudear-google

pkg/secrets-store/nodeserver.go

@@ -124,15 +124,10 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	if ns.rotationConfig.enabled {
 		lastModificationTime, err := ns.getLastUpdateTime(targetPath)
 		if err != nil {
-			klog.Infof("could not find last modification time for %f\n", targetPath)
-		} else {
-			klog.Infof("Last modification time %s", lastModificationTime.Format("2006-01-02 15:04:05"))
-			klog.Infof("start time %s", startTime.Format("2006-01-02 15:04:05"))
-			klog.Infof("next rotation time %s", lastModificationTime.Add(ns.rotationConfig.interval).Format("2006-01-02 15:04:05"))
-			if startTime.Before(lastModificationTime.Add(ns.rotationConfig.interval)) {
-				klog.Infof("Returning empty response")
-				return &csi.NodePublishVolumeResponse{}, nil
-			}
+			klog.Infof("could not find last modification time for %s, error: %v\n", targetPath, err)
+		} else if startTime.Before(lastModificationTime.Add(ns.rotationConfig.interval)) {
+			// if next rotation is not yet, then skip the mount operation
+			return &csi.NodePublishVolumeResponse{}, nil
 		}
 	}
 

pkg/secrets-store/nodeserver_test.go

@@ -297,9 +297,8 @@ func TestNodePublishVolume(t *testing.T) {
 				},
 			},
 			rotationConfig: &RotationConfig{
-				enabled:          false,
-				nextRotationTime: time.Now(),
-				interval:         time.Minute,
+				enabled:  false,
+				interval: time.Minute,
 			},
 		},
 		{
@@ -332,9 +331,8 @@ func TestNodePublishVolume(t *testing.T) {
 				},
 			},
 			rotationConfig: &RotationConfig{
-				enabled:          true,
-				nextRotationTime: time.Now().Add(-3 * time.Minute), // so that rotation period is passed and secret will be mounted.
-				interval:         time.Minute,
+				enabled:  true,
+				interval: time.Minute,
 			},
 		},
 		{
@@ -364,9 +362,8 @@ func TestNodePublishVolume(t *testing.T) {
 				},
 			},
 			rotationConfig: &RotationConfig{
-				enabled:          true,
-				nextRotationTime: time.Now().Add(2 * time.Minute),
-				interval:         time.Minute,
+				enabled:  true,
+				interval: time.Minute,
 			},
 		},
 	}

pkg/secrets-store/secrets-store.go

@@ -40,9 +40,8 @@ type SecretsStore struct {
 
 // RotationConfig stores the informarmation required to rotate the secrets.
 type RotationConfig struct {
-	enabled          bool
-	interval         time.Duration
-	nextRotationTime time.Time
+	enabled  bool
+	interval time.Duration
 }
 
 func NewSecretsStoreDriver(driverName, nodeID, endpoint string,
@@ -92,9 +91,8 @@ func newNodeServer(nodeID string,
 
 func NewRotationConfig(enabled bool, interval time.Duration) *RotationConfig {
 	return &RotationConfig{
-		enabled:          enabled,
-		interval:         interval,
-		nextRotationTime: time.Now(),
+		enabled:  enabled,
+		interval: interval,
 	}
 }