From ed5dec392906078db4f7745fe4f11d34dd401ae9 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Fri, 6 Dec 2019 12:17:38 -0800
Subject: [PATCH] change common resources from message-level annotations to
 file-level annotations.

PiperOrigin-RevId: 284236794
---
 google/cloud/common_resources.proto | 56 +++++++++++------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/google/cloud/common_resources.proto b/google/cloud/common_resources.proto
index 5d795bff..56c9f800 100644
--- a/google/cloud/common_resources.proto
+++ b/google/cloud/common_resources.proto
@@ -22,47 +22,31 @@ package google.cloud;
 import "google/api/resource.proto";
 
 
-message Project {
-  option (google.api.resource) = {
-    type: "cloudresourcemanager.googleapis.com/Project"
-    pattern: "projects/{project}"
-  };
+option (google.api.resource_definition) = {
+  type: "cloudresourcemanager.googleapis.com/Project"
+  pattern: "projects/{project}"
+};
 
-  string name = 1;
-}
 
-message Organization {
-  option (google.api.resource) = {
-    type: "cloudresourcemanager.googleapis.com/Organization"
-    pattern: "organizations/{organization}"
-  };
+option (google.api.resource_definition) = {
+  type: "cloudresourcemanager.googleapis.com/Organization"
+  pattern: "organizations/{organization}"
+};
 
-  string name = 1;
-}
 
-message Folder {
-  option (google.api.resource) = {
-    type: "cloudresourcemanager.googleapis.com/Folder"
-    pattern: "folders/{folder}"
-  };
+option (google.api.resource_definition) = {
+  type: "cloudresourcemanager.googleapis.com/Folder"
+  pattern: "folders/{folder}"
+};
 
-  string name = 1;
-}
 
-message BillingAccount {
-  option (google.api.resource) = {
-    type: "cloudbilling.googleapis.com/BillingAccount"
-    pattern: "billingAccounts/{billing_account}"
-  };
+option (google.api.resource_definition) = {
+  type: "cloudbilling.googleapis.com/BillingAccount"
+  pattern: "billingAccounts/{billing_account}"
+};
 
-  string name = 1;
-}
+option (google.api.resource_definition) = {
+  type: "locations.googleapis.com/Location"
+  pattern: "projects/{project}/locations/{location}"
+};
 
-message Location {
-  option (google.api.resource) = {
-    type: "locations.googleapis.com/Location"
-    pattern: "projects/{project}/locations/{location}"
-  };
-
-  string name = 1;
-}