From 0f41cb774fa39d5d7e4a59bf3d54e995064e3137 Mon Sep 17 00:00:00 2001 From: Cody Oss Date: Mon, 19 Aug 2024 15:37:30 -0500 Subject: [PATCH] chore(datastore): add owlbot config for protos Also, clean up some old genproto do no longer allowlist datastore or bigtable proto generation in genproto. --- .github/.OwlBot.yaml | 4 ++++ internal/gapicgen/generator/genproto.go | 5 ----- internal/postprocessor/config.yaml | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 28a18aea01ae..50c317010da7 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -99,6 +99,7 @@ deep-remove-regex: - /dataproc/apiv1/ - /dataqna/apiv1alpha/ - /datastore/admin/apiv1/ + - /datastore/apiv1/ - /datastream/apiv1/ - /datastream/apiv1alpha1/ # - /debugger/apiv2/ @@ -802,6 +803,9 @@ deep-copy-regex: dest: / - source: /google/datastore/admin/v1/cloud.google.com/go dest: / + # Just copy the datastore protos for now + - source: /google/datastore/v1/cloud.google.com/go/datastore/apiv1/datastorepb + dest: /datastore/apiv1/datastorepb - source: /google/cloud/datastream/v1/cloud.google.com/go dest: / - source: /google/cloud/datastream/v1alpha1/cloud.google.com/go diff --git a/internal/gapicgen/generator/genproto.go b/internal/gapicgen/generator/genproto.go index e0583aa80f0a..0762f3f39c39 100644 --- a/internal/gapicgen/generator/genproto.go +++ b/internal/gapicgen/generator/genproto.go @@ -116,11 +116,9 @@ var generateList = []string{ "google.golang.org/genproto/googleapis/apps/drive/labels/v2", "google.golang.org/genproto/googleapis/example/library/v1", "google.golang.org/genproto/googleapis/api/label", - "google.golang.org/genproto/googleapis/bigtable/admin/v2", "google.golang.org/genproto/googleapis/api/httpbody", "google.golang.org/genproto/googleapis/partner/aistreams/v1alpha1", "google.golang.org/genproto/googleapis/apps/script/type/drive", - "google.golang.org/genproto/googleapis/bigtable/v2", "google.golang.org/genproto/googleapis/search/partnerdataingestion/logging/v1", "google.golang.org/genproto/googleapis/apps/script/type/calendar", "google.golang.org/genproto/googleapis/rpc/context/attribute_context", @@ -133,9 +131,6 @@ var generateList = []string{ "google.golang.org/genproto/googleapis/type/postaladdress", "google.golang.org/genproto/googleapis/firebase/fcm/connection/v1alpha1", "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2", - "google.golang.org/genproto/googleapis/datastore/v1", - "google.golang.org/genproto/googleapis/datastore/admin/v1", - "google.golang.org/genproto/googleapis/datastore/admin/v1beta1", "google.golang.org/genproto/googleapis/apps/card/v1", } diff --git a/internal/postprocessor/config.yaml b/internal/postprocessor/config.yaml index 6ca140c39912..d7b4c2521306 100644 --- a/internal/postprocessor/config.yaml +++ b/internal/postprocessor/config.yaml @@ -1040,6 +1040,9 @@ service-configs: - input-directory: google/datastore/admin/v1 service-config: datastore_v1.yaml import-path: cloud.google.com/go/datastore/admin/apiv1 + - input-directory: google/datastore/v1 + service-config: datastore_v1.yaml + import-path: cloud.google.com/go/datastore/apiv1 - input-directory: google/devtools/artifactregistry/v1 service-config: artifactregistry_v1.yaml import-path: cloud.google.com/go/artifactregistry/apiv1