From 511a653780a4c32e59ba9f10b835c1550eb0af8e Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Tue, 27 Apr 2021 02:11:37 -0700
Subject: [PATCH] fix: specify valid go_package option

The explicitly specified package name is invalid since it identical
to one of the keywords in Go (e.g., "package" or "type").
Remove explicitly specifying the name, which will cause protoc-gen-go
to derive the package name from the last path segment.
If the name is not valid, it will automatically sanitize it
to produce a valid package identifier (e.g., "_package" or "_type").

Committer: @dsnet
PiperOrigin-RevId: 370589666

Source-Author: Google APIs <noreply@google.com>
Source-Date: Mon Apr 26 19:02:44 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: e7d77d65f0e05ce584c1a824c7ecab53b411498b
Source-Link: https://github.com/googleapis/googleapis/commit/e7d77d65f0e05ce584c1a824c7ecab53b411498b
---
 .../accesscontextmanager/type/TypeProto.java         | 12 ++++++------
 .../accesscontextmanager/type/device_resources.proto |  2 +-
 synth.metadata                                       |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/proto-google-identity-accesscontextmanager-type/src/main/java/com/google/identity/accesscontextmanager/type/TypeProto.java b/proto-google-identity-accesscontextmanager-type/src/main/java/com/google/identity/accesscontextmanager/type/TypeProto.java
index aa3ff42..b8a347f 100644
--- a/proto-google-identity-accesscontextmanager-type/src/main/java/com/google/identity/accesscontextmanager/type/TypeProto.java
+++ b/proto-google-identity-accesscontextmanager-type/src/main/java/com/google/identity/accesscontextmanager/type/TypeProto.java
@@ -46,14 +46,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\020\002\022\021\n\rDESKTOP_LINUX\020\003\022\025\n\021DESKTOP_CHROME_"
           + "OS\020\006\022\013\n\007ANDROID\020\004\022\007\n\003IOS\020\005*V\n\025DeviceMana"
           + "gementLevel\022\032\n\026MANAGEMENT_UNSPECIFIED\020\000\022"
-          + "\010\n\004NONE\020\001\022\t\n\005BASIC\020\002\022\014\n\010COMPLETE\020\003B\222\002\n-c"
+          + "\010\n\004NONE\020\001\022\t\n\005BASIC\020\002\022\014\n\010COMPLETE\020\003B\215\002\n-c"
           + "om.google.identity.accesscontextmanager."
-          + "typeB\tTypeProtoP\001ZMgoogle.golang.org/gen"
+          + "typeB\tTypeProtoP\001ZHgoogle.golang.org/gen"
           + "proto/googleapis/identity/accesscontextm"
-          + "anager/type;type\252\002)Google.Identity.Acces"
-          + "sContextManager.Type\312\002)Google\\Identity\\A"
-          + "ccessContextManager\\Type\352\002,Google::Ident"
-          + "ity::AccessContextManager::Typeb\006proto3"
+          + "anager/type\252\002)Google.Identity.AccessCont"
+          + "extManager.Type\312\002)Google\\Identity\\Access"
+          + "ContextManager\\Type\352\002,Google::Identity::"
+          + "AccessContextManager::Typeb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-identity-accesscontextmanager-type/src/main/proto/google/identity/accesscontextmanager/type/device_resources.proto b/proto-google-identity-accesscontextmanager-type/src/main/proto/google/identity/accesscontextmanager/type/device_resources.proto
index f057910..e253676 100644
--- a/proto-google-identity-accesscontextmanager-type/src/main/proto/google/identity/accesscontextmanager/type/device_resources.proto
+++ b/proto-google-identity-accesscontextmanager-type/src/main/proto/google/identity/accesscontextmanager/type/device_resources.proto
@@ -19,7 +19,7 @@ package google.identity.accesscontextmanager.type;
 import "google/api/annotations.proto";
 
 option csharp_namespace = "Google.Identity.AccessContextManager.Type";
-option go_package = "google.golang.org/genproto/googleapis/identity/accesscontextmanager/type;type";
+option go_package = "google.golang.org/genproto/googleapis/identity/accesscontextmanager/type";
 option java_package = "com.google.identity.accesscontextmanager.type";
 option java_multiple_files = true;
 option java_outer_classname = "TypeProto";
diff --git a/synth.metadata b/synth.metadata
index 1cb0719..1fc270f 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-accesscontextmanager.git",
-        "sha": "95c8d17dba7b2aa33e5efbba700cc0259bb870a9"
+        "sha": "20cf32f43985a2c4ef1a06b1eb5e8545d8656dc2"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "e7d77d65f0e05ce584c1a824c7ecab53b411498b",
+        "internalRef": "370589666"
       }
     },
     {