From 741f036895bf3ebc580fb61b203e25abedb189bb Mon Sep 17 00:00:00 2001
From: "Philip K. Warren" <pwarren@buf.build>
Date: Fri, 4 Nov 2022 13:01:58 -0500
Subject: [PATCH] updates

---
 .github/workflows/goreleaser.yaml    | 1 +
 .goreleaser.yaml                     | 8 ++++----
 cmd/protoc-gen-validate-cpp/main.go  | 6 +++---
 cmd/protoc-gen-validate-go/main.go   | 6 +++---
 cmd/protoc-gen-validate-java/main.go | 6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml
index cf39876c4..ad971bd28 100644
--- a/.github/workflows/goreleaser.yaml
+++ b/.github/workflows/goreleaser.yaml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: goreleaser
 
 on:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 577b8df45..3a09eace9 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,15 +1,15 @@
 builds:
   - main: .
-    id: "validate"
+    id: "protoc-gen-validate"
     binary: "protoc-gen-validate"
   - main: ./cmd/protoc-gen-validate-cpp
-    id: "validate-cpp"
+    id: "protoc-gen-validate-cpp"
     binary: "protoc-gen-validate-cpp"
   - main: ./cmd/protoc-gen-validate-go
-    id: "validate-go"
+    id: "protoc-gen-validate-go"
     binary: "protoc-gen-validate-go"
   - main: ./cmd/protoc-gen-validate-java
-    id: "validate-java"
+    id: "protoc-gen-validate-java"
     binary: "protoc-gen-validate-java"
 
 release:
diff --git a/cmd/protoc-gen-validate-cpp/main.go b/cmd/protoc-gen-validate-cpp/main.go
index 27f4ce0e1..ef9269b48 100644
--- a/cmd/protoc-gen-validate-cpp/main.go
+++ b/cmd/protoc-gen-validate-cpp/main.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/envoyproxy/protoc-gen-validate/module"
-	"github.com/lyft/protoc-gen-star"
-	"github.com/lyft/protoc-gen-star/lang/go"
+	pgs "github.com/lyft/protoc-gen-star"
+	pgsgo "github.com/lyft/protoc-gen-star/lang/go"
 	"google.golang.org/protobuf/types/pluginpb"
 )
 
@@ -11,7 +11,7 @@ func main() {
 	optional := uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
 	pgs.
 		Init(pgs.DebugEnv("DEBUG_PGV"), pgs.SupportedFeatures(&optional)).
-		RegisterModule(module.Validator()).
+		RegisterModule(module.ValidatorForLanguage("cc")).
 		RegisterPostProcessor(pgsgo.GoFmt()).
 		Render()
 }
diff --git a/cmd/protoc-gen-validate-go/main.go b/cmd/protoc-gen-validate-go/main.go
index 27f4ce0e1..24a49f5b7 100644
--- a/cmd/protoc-gen-validate-go/main.go
+++ b/cmd/protoc-gen-validate-go/main.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/envoyproxy/protoc-gen-validate/module"
-	"github.com/lyft/protoc-gen-star"
-	"github.com/lyft/protoc-gen-star/lang/go"
+	pgs "github.com/lyft/protoc-gen-star"
+	pgsgo "github.com/lyft/protoc-gen-star/lang/go"
 	"google.golang.org/protobuf/types/pluginpb"
 )
 
@@ -11,7 +11,7 @@ func main() {
 	optional := uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
 	pgs.
 		Init(pgs.DebugEnv("DEBUG_PGV"), pgs.SupportedFeatures(&optional)).
-		RegisterModule(module.Validator()).
+		RegisterModule(module.ValidatorForLanguage("go")).
 		RegisterPostProcessor(pgsgo.GoFmt()).
 		Render()
 }
diff --git a/cmd/protoc-gen-validate-java/main.go b/cmd/protoc-gen-validate-java/main.go
index 27f4ce0e1..8e54fc908 100644
--- a/cmd/protoc-gen-validate-java/main.go
+++ b/cmd/protoc-gen-validate-java/main.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/envoyproxy/protoc-gen-validate/module"
-	"github.com/lyft/protoc-gen-star"
-	"github.com/lyft/protoc-gen-star/lang/go"
+	pgs "github.com/lyft/protoc-gen-star"
+	pgsgo "github.com/lyft/protoc-gen-star/lang/go"
 	"google.golang.org/protobuf/types/pluginpb"
 )
 
@@ -11,7 +11,7 @@ func main() {
 	optional := uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
 	pgs.
 		Init(pgs.DebugEnv("DEBUG_PGV"), pgs.SupportedFeatures(&optional)).
-		RegisterModule(module.Validator()).
+		RegisterModule(module.ValidatorForLanguage("java")).
 		RegisterPostProcessor(pgsgo.GoFmt()).
 		Render()
 }