Merge branch 'v2.2.x' into develop

Author: pskrbasu

.github/workflows/buildimage.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: Fetching Go Cache Paths
         id: go-cache-paths
@@ -67,47 +67,47 @@ jobs:
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
           key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-          
+
       - name: make clean
         run: |-
           go version
-          
+
           which pg_config
           pg_config --version
-          
+
           export PATH=$(pg_config --bindir):$PATH
           export PGXS=$(pg_config --pgxs)
-      
+
           export SERVER_LIB=$(pg_config --includedir)/server
           export INTERNAL_LIB=$(pg_config --includedir)/internal
 
           export CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
           export PG_CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
-      
+
           export LDFLAGS=$(pg_config --ldfalgs)
           export PG_LDFLAGS=$(pg_config --ldfalgs)
-        
+
           make clean
 
       - name: make
         run: |-
           go version
-          
+
           which pg_config
           pg_config --version
-          
+
           export PATH=$(pg_config --bindir):$PATH
           export PGXS=$(pg_config --pgxs)
-      
+
           export SERVER_LIB=$(pg_config --includedir)/server
           export INTERNAL_LIB=$(pg_config --includedir)/internal
 
           export CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
           export PG_CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
-      
+
           export LDFLAGS=$(pg_config --ldfalgs)
           export PG_LDFLAGS=$(pg_config --ldfalgs)
-          
+
           make
 
       - name: gzip the steampipe_postgres_fdw.so
@@ -165,7 +165,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: Fetching Go Cache Paths
         id: go-cache-paths
@@ -186,47 +186,47 @@ jobs:
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
           key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-          
+
       - name: make clean
         run: |-
           go version
-          
+
           which pg_config
           pg_config --version
-          
+
           export PATH=$(pg_config --bindir):$PATH
           export PGXS=$(pg_config --pgxs)
-      
+
           export SERVER_LIB=$(pg_config --includedir)/server
           export INTERNAL_LIB=$(pg_config --includedir)/internal
 
           export CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
           export PG_CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
-      
+
           export LDFLAGS=$(pg_config --ldfalgs)
           export PG_LDFLAGS=$(pg_config --ldfalgs)
-        
+
           make clean
 
       - name: make
         run: |-
           go version
-          
+
           which pg_config
           pg_config --version
-          
+
           export PATH=$(pg_config --bindir):$PATH
           export PGXS=$(pg_config --pgxs)
-      
+
           export SERVER_LIB=$(pg_config --includedir)/server
           export INTERNAL_LIB=$(pg_config --includedir)/internal
 
           export CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
           export PG_CFLAGS="$(pg_config --cflags) -I${SERVER_LIB} -I${INTERNAL_LIB} -g"
-      
+
           export LDFLAGS=$(pg_config --ldfalgs)
           export PG_LDFLAGS=$(pg_config --ldfalgs)
-          
+
           make
 
       - name: gzip the steampipe_postgres_fdw.so
@@ -251,7 +251,7 @@ jobs:
       - name: Setup GoLang
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: Fetching Go Cache Paths
         id: go-cache-paths
@@ -336,7 +336,7 @@ jobs:
       - name: Setup GoLang
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: Fetching Go Cache Paths
         id: go-cache-paths

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.26
+          go-version: 1.26.1
 
       - name: Checkout Steampipe
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.2.1 [2026-03-30]
+_Dependencies_
+- Update Go version to `1.26.1` to address vulnerability in `1.26`.
+
 ## v2.2.0 [2026-02-27]
 _Whats new_
 - Compiled with Go 1.26.

go.mod

@@ -1,6 +1,6 @@
 module github.com/turbot/steampipe-postgres-fdw/v2
 
-go 1.26.0
+go 1.26.1
 
 require (
 	github.com/dgraph-io/ristretto v0.2.0 // indirect