Merge branch 'v1.12.x' into develop

Author: pskrbasu

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.12.1 [2024-11-20]
+_Bug fixes_
+* Fix issue where steampipe interactive metacommand `.cache clear` was not clearing the cache. ([#520](https://github.com/turbot/steampipe-postgres-fdw/issues/520))
+
 ## v1.12.0 [2024-10-22]
 _Whats new_
 * Build FDW for Steampipe v1.0.0. ([#515](https://github.com/turbot/steampipe-postgres-fdw/issues/515))

hub/hub_base.go

@@ -3,23 +3,20 @@ package hub
 import (
 	"context"
 	"fmt"
-	"log"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/turbot/steampipe/pkg/query/queryresult"
-
 	"github.com/turbot/go-kit/helpers"
 	"github.com/turbot/steampipe-plugin-sdk/v5/grpc"
 	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
 	"github.com/turbot/steampipe-plugin-sdk/v5/telemetry"
 	"github.com/turbot/steampipe-postgres-fdw/settings"
 	"github.com/turbot/steampipe-postgres-fdw/types"
 	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/query/queryresult"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
+	"log"
+	"strings"
+	"sync"
 )
 
 type hubBase struct {
@@ -520,20 +517,6 @@ func (h *hubBase) HandleLegacyCacheCommand(command string) error {
 	return nil
 }
 
-func (h *hubBase) cacheTTL(connectionName string) time.Duration {
-	log.Printf("[INFO] cacheTTL 1")
-	// if the cache ttl has been overridden, then enforce the value
-	if h.cacheSettings.Ttl != nil {
-		return *h.cacheSettings.Ttl
-	}
-	log.Printf("[INFO] cacheTTL 2")
-
-	const defaultTtl = 300 * time.Second
-
-	log.Printf("[INFO] default cacheTTL %v", defaultTtl)
-	return defaultTtl
-}
-
 // GetSortableFields
 func (h *hubBase) GetSortableFields(tableName, connectionName string) map[string]proto.SortOrder {
 	return nil

hub/hub_remote.go

@@ -300,16 +300,19 @@ func (h *RemoteHub) cacheEnabled(connectionName string) bool {
 }
 
 func (h *RemoteHub) cacheTTL(connectionName string) time.Duration {
+	// initialise to default
+	ttl := 300 * time.Second
 	// if the cache ttl has been overridden, then enforce the value
 	if h.cacheSettings.Ttl != nil {
-		return *h.cacheSettings.Ttl
+		ttl = *h.cacheSettings.Ttl
+	}
+	// would this give data earlier than the cacheClearTime
+	now := time.Now()
+	if now.Add(-ttl).Before(h.cacheSettings.ClearTime) {
+		ttl = now.Sub(h.cacheSettings.ClearTime)
 	}
 
-	// default ttl is 300 secs
-	const defaultTTL = 300 * time.Second
-
-	log.Printf("[INFO] default cacheTTL returning %v", defaultTTL)
-	return defaultTTL
+	return ttl
 }
 
 // resolve the server cache enabled property

version/version.go

@@ -11,7 +11,7 @@ import (
 )
 
 // The main version number that is being run at the moment.
-var fdwVersion = "1.12.0"
+var fdwVersion = "1.12.1"
 
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release