chore: remove gensample (#731)

.github/workflows/ci.yaml

@@ -21,14 +21,14 @@ jobs:
       run: go get -u golang.org/x/lint/golint
       if: ${{ always() }}
     - name: Lint
-      # Exclude all gensample code and the grpc_service_config package (it is generated).
-      run: golint -set_exit_status $(go list ./... | grep -v 'sample\|grpc_service_config') > golint.txt
+      # Exclude all of the grpc_service_config package (it is generated).
+      run: golint -set_exit_status $(go list ./... | grep -v 'grpc_service_config') > golint.txt
       if: ${{ always() }}
     - name: Vet
       # The mod download is there to prevent go vet from logging mod downloads
       # which would mess up the empty vetting results check.
-      # Exclude all gensample code and the grpc_service_config package (it is generated).
-      run: go mod download && go vet $(go list ./... | grep -v 'sample\|grpc_service_config') > govet.txt && ! [ -s govet.txt ]
+      # Exclude all of the grpc_service_config package (it is generated).
+      run: go mod download && go vet $(go list ./... | grep -v 'grpc_service_config') > govet.txt && ! [ -s govet.txt ]
       if: ${{ always() }}
     - name: Check license
       run: go run ./util/cmd/license

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Test everything and run Showcase integration tests:
     make test
 
 When opening a PR, please prefix the title with the main component the change effects,
-separated from the message with a colon. This chould be one of `gapic`, `gencli`, `samples`,
+separated from the message with a colon. This chould be one of `gapic`, `gencli`,
 `bazel`, or `chore`. For example:
 
     gapic: strip reference links in comments

README.md

@@ -93,12 +93,6 @@ The configuration supported by the plugin option includes:
   * `api-service-config`: the path the service YAML file.
     * This is used for service-level client documentation.
 
-  * `sample`: path to sample configuration files.
-    * This is used for sample generation. Refer to [sample generation guide](./cmd/gen-go-sample/README.md) for more details.
-
-  * `gapic`: path to the legacy gapic configuration file.
-    * This is used for sample generation only. Both gapic config itself and this option will be deprecated soon. Refer to [sample generation guide](./cmd/gen-go-sample/README.md) for more details.
-
 Bazel
 -----
 
@@ -152,14 +146,6 @@ following attributes:
   * `service_yaml`: a label for a service YAML file.
     * _Note: This option will eventually be deprecated._
 
-  * `samples`: a path to a sample config file. There 
-  can exist multiples of this.
-
-  * `gapic_yaml`: path to a gapic configuration file.
-    * _Note: This config is only used to generate samples._
-
-  * `sample_only`: if present, directs the generator to forgo client generation and generate only samples.
-
   * `metadata`: if `True`, [GapicMetadata](https://github.com/googleapis/googleapis/blob/master/gapic/metadata/gapic_metadata.proto) will be generated in JSON form. The default is `False`.
 
 Docker Wrapper

cmd/protoc-gen-go_cli/BUILD.bazel

@@ -8,8 +8,8 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//internal/gencli",
-        "@com_github_golang_protobuf//proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
+        "@org_golang_google_protobuf//proto",
     ],
 )
 

cmd/protoc-gen-go_cli/main.go

@@ -19,9 +19,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/golang/protobuf/proto"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/googleapis/gapic-generator-go/internal/gencli"
+	"google.golang.org/protobuf/proto"
 )
 
 func main() {

cmd/protoc-gen-go_gapic/BUILD

@@ -8,9 +8,8 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//internal/gengapic",
-        "//internal/gensample",
-        "@com_github_golang_protobuf//proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
+        "@org_golang_google_protobuf//proto",
     ],
 )
 

cmd/protoc-gen-go_gapic/main.go

@@ -19,10 +19,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/golang/protobuf/proto"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/googleapis/gapic-generator-go/internal/gengapic"
-	"github.com/googleapis/gapic-generator-go/internal/gensample"
+	"google.golang.org/protobuf/proto"
 )
 
 func main() {
@@ -40,12 +39,6 @@ func main() {
 		genResp.Error = proto.String(err.Error())
 	}
 
-	sampleResp, err := gensample.PluginEntry(&genReq)
-	if err != nil {
-		sampleResp.Error = proto.String(err.Error())
-	}
-
-	genResp = merge(genResp, sampleResp)
 	genResp.SupportedFeatures = proto.Uint64(uint64(plugin.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL))
 
 	outBytes, err := proto.Marshal(genResp)
@@ -56,16 +49,3 @@ func main() {
 		log.Fatal(err)
 	}
 }
-
-func merge(gapicResp, sampleResp *plugin.CodeGeneratorResponse) *plugin.CodeGeneratorResponse {
-	if gapicResp.GetError() != "" {
-		return gapicResp
-	}
-	if sampleResp.GetError() != "" {
-		return sampleResp
-	}
-	resp := plugin.CodeGeneratorResponse{}
-	resp.File = append(resp.File, gapicResp.GetFile()...)
-	resp.File = append(resp.File, sampleResp.GetFile()...)
-	return &resp
-}