Merge branch 'v2.1.x' into develop

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.1.1 [2025-08-14]
+
+_Bug fixes_
+- **v2+ Plugin Version Support**: Fixed import path generation in templates to correctly handle v2+ plugin versions. The build process now properly appends the major version to the module path (e.g., `github.com/turbot/steampipe-plugin-aws/v2` for v2.x.x plugins) instead of using the base path which was causing build failures.
+
+
 ## v2.1.0 [2025-07-09]
 _Whats new_
 - Bump module to v2 and update Go version to 1.24.

Makefile

@@ -28,8 +28,14 @@ standalone: validate_plugin validate_version prebuild.go
 	cd work && \
 	go run generate/generator.go templates . $(plugin) $(plugin_version) $(plugin_github_url) && \
 	if [ ! -z "$(plugin_version)" ]; then \
-		echo "go get $(plugin_github_url)@$(plugin_version)" && \
-		go get $(plugin_github_url)@$(plugin_version); \
+		MAJOR_VERSION=$$(echo $(plugin_version) | grep -o '^v[0-9]\+' || echo "v1") && \
+		if [ "$$MAJOR_VERSION" = "v1" ] || [ "$$MAJOR_VERSION" = "v0" ]; then \
+			echo "go get $(plugin_github_url)@$(plugin_version)" && \
+			go get $(plugin_github_url)@$(plugin_version); \
+		else \
+			echo "go get $(plugin_github_url)/$$MAJOR_VERSION@$(plugin_version)" && \
+			go get $(plugin_github_url)/$$MAJOR_VERSION@$(plugin_version); \
+		fi; \
 	fi && \
 	go mod tidy && \
 	$(MAKE) -C ./fdw clean && \
@@ -61,8 +67,14 @@ render: validate_plugin validate_version prebuild.go
 	cd work && \
 	go run generate/generator.go templates . $(plugin) $(plugin_version) $(plugin_github_url) && \
 	if [ ! -z "$(plugin_version)" ]; then \
-		echo "go get $(plugin_github_url)@$(plugin_version)" && \
-		go get $(plugin_github_url)@$(plugin_version); \
+		MAJOR_VERSION=$$(echo $(plugin_version) | grep -o '^v[0-9]\+' || echo "v1") && \
+		if [ "$$MAJOR_VERSION" = "v1" ] || [ "$$MAJOR_VERSION" = "v0" ]; then \
+			echo "go get $(plugin_github_url)@$(plugin_version)" && \
+			go get $(plugin_github_url)@$(plugin_version); \
+		else \
+			echo "go get $(plugin_github_url)/$$MAJOR_VERSION@$(plugin_version)" && \
+			go get $(plugin_github_url)/$$MAJOR_VERSION@$(plugin_version); \
+		fi; \
 	fi && \
 	go mod tidy
 

templates/hub/hub_local_plugin.go.tmpl

@@ -1,7 +1,7 @@
 package hub
 
 import (
-	{{.Plugin}} "{{.PluginGithubUrl}}/{{.Plugin}}"
+	{{.Plugin}} "{{.PluginGithubUrl}}{{if .PluginVersion}}{{if not (or (eq (slice .PluginVersion 0 2) "v1") (eq (slice .PluginVersion 0 2) "v0"))}}/{{slice .PluginVersion 0 2}}{{end}}{{end}}/{{.Plugin}}"
 	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
 )
 

version/version.go

@@ -11,7 +11,7 @@ import (
 )
 
 // The main version number that is being run at the moment.
-var fdwVersion = "2.1.0"
+var fdwVersion = "2.1.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