From 7ddacb781ea5e571c93f60fbd7c4834fbf4b8399 Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Mon, 12 Jul 2021 10:50:59 -0600 Subject: [PATCH] chore(internal): fix irregular pathing (#4414) --- internal/gapicgen/cmd/genbot/Dockerfile | 11 +++++------ internal/gapicgen/generator/config.go | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/gapicgen/cmd/genbot/Dockerfile b/internal/gapicgen/cmd/genbot/Dockerfile index 4148bd26c1d..71783f4e564 100644 --- a/internal/gapicgen/cmd/genbot/Dockerfile +++ b/internal/gapicgen/cmd/genbot/Dockerfile @@ -23,12 +23,11 @@ ENV PATH /usr/local/go/bin:$PATH RUN go version # Install Go tools. -RUN GO111MODULE=on go get \ - github.com/golang/protobuf/protoc-gen-go@v1.5.2 \ - golang.org/x/lint/golint@latest \ - golang.org/x/tools/cmd/goimports@latest \ - honnef.co/go/tools/cmd/staticcheck@latest \ - github.com/googleapis/gapic-generator-go/cmd/protoc-gen-go_gapic@v0.21.7 +RUN go install github.com/golang/protobuf/protoc-gen-go@v1.5.2 && \ + go install golang.org/x/lint/golint@latest && \ + go install golang.org/x/tools/cmd/goimports@latest && \ + go install honnef.co/go/tools/cmd/staticcheck@latest && \ + go install github.com/googleapis/gapic-generator-go/cmd/protoc-gen-go_gapic@v0.21.7 ENV PATH="${PATH}:/root/go/bin" # Source: http://debuggable.com/posts/disable-strict-host-checking-for-git-clone:49896ff3-0ac0-4263-9703-1eae4834cda3 diff --git a/internal/gapicgen/generator/config.go b/internal/gapicgen/generator/config.go index f1dc7430cd9..76c153554dd 100644 --- a/internal/gapicgen/generator/config.go +++ b/internal/gapicgen/generator/config.go @@ -561,7 +561,7 @@ var microgenGapicConfigs = []*microgenConfig{ pkg: "apiv1", importPath: "cloud.google.com/go/firestore/apiv1/admin", gRPCServiceConfigPath: "firestore_admin_grpc_service_config.json", - apiServiceConfigPath: "firestore_admin_v1.yaml", + apiServiceConfigPath: "firestore_v1.yaml", releaseLevel: "ga", }, { @@ -634,8 +634,8 @@ var microgenGapicConfigs = []*microgenConfig{ inputDirectoryPath: "google/devtools/containeranalysis/v1beta1/grafeas", pkg: "containeranalysis", importPath: "cloud.google.com/go/containeranalysis/apiv1beta1", - gRPCServiceConfigPath: "containeranalysis_grpc_service_config.json", - apiServiceConfigPath: "containeranalysis_v1beta1.yaml", + gRPCServiceConfigPath: "../containeranalysis_grpc_service_config.json", + apiServiceConfigPath: "../containeranalysis_v1beta1.yaml", releaseLevel: "beta", }, { @@ -651,7 +651,7 @@ var microgenGapicConfigs = []*microgenConfig{ pkg: "videointelligence", importPath: "cloud.google.com/go/videointelligence/apiv1beta2", gRPCServiceConfigPath: "videointelligence_grpc_service_config.json", - apiServiceConfigPath: "videointelligence_v1beta2.yaml", + apiServiceConfigPath: "../videointelligence_v1beta2.yaml", releaseLevel: "beta", }, {