Skip to content

Commit

Permalink
Merge branch 'v5.10.x' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pskrbasu committed Aug 29, 2024
2 parents dafd478 + 2342401 commit 1c4814e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/acceptance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22

- name: golangci-lint
uses: golangci/golangci-lint-action@v5
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22

- name: Checkout
uses: actions/checkout@v4
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
_What's new?_
* Add support for pushing down sort order. ([#596](https://github.com/turbot/steampipe-plugin-sdk/issues/596))

## v5.10.4 [2024-08-29]
_What's new?_
* Updated `hashicorp/go-getter` dependency to v1.7.5.

## v5.10.3 [2024-08-13]
_What's new?_
* Compiled with Go 1.22. ([#811](https://github.com/turbot/steampipe-plugin-sdk/issues/811))

## v5.10.2 [2024-08-02]
_Bug fixes_
* Remove unnecessary INFO log statements in Memoize func. This fixes logging in the plugin export tools. ([#813](https://github.com/turbot/steampipe-plugin-sdk/issues/813))

## v5.10.1 [2024-05-09]
_Bug fixes_
* Ensure QueryData passed to ConnectionKeyColumns value callback is populated with ConnectionManager. ([#797](https://github.com/turbot/steampipe-plugin-sdk/issues/797))
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/turbot/steampipe-plugin-sdk/v5

go 1.21.0

toolchain go1.21.3
go 1.22.4

//replace github.com/turbot/pipe-fittings => ../pipe-fittings

Expand Down
3 changes: 0 additions & 3 deletions plugin/hydrate_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func (f HydrateFunc) Memoize(opts ...MemoizeOption) HydrateFunc {
if isMemoized(f) {
log.Printf("[WARN] Memoize %s - already memoized", helpers.GetFunctionName(f))
}
log.Printf("[INFO] Memoize %s", helpers.GetFunctionName(f))

config := newMemoizeConfiguration(f)
for _, o := range opts {
Expand Down Expand Up @@ -130,8 +129,6 @@ func (f HydrateFunc) Memoize(opts ...MemoizeOption) HydrateFunc {
return callAndCacheHydrate(ctx, d, h, f, cacheKey, ttl)
}

log.Printf("[INFO] Memoize %p %s", f, helpers.GetFunctionName(f))

if memoizedFuncPtr == 0 {
memoizedFuncPtr = reflect.ValueOf(memoizedFunc).Pointer()
}
Expand Down

0 comments on commit 1c4814e

Please sign in to comment.