gapic-generator 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab653b4ab114926d58b96c5326de2a8ece5ad19d2780cb8ec5886ee83a3cb053
-  data.tar.gz: 733ccb95f513617b9fc653ac8bbc8f02a37fa8be1a8b81c5cec051299d5f7468
+  metadata.gz: 61762b2051b75312bfc67ef070e136d8cf95cad1635e1b22270ed8a5b6cfbc99
+  data.tar.gz: cd867c0065831c6b5252dc0b5097417f24a74716f4e15cd243a1371ac80e5a5d
 SHA512:
-  metadata.gz: 5ceea190fdf3424e89df06130809a21f6cc43b61255e1a9fa143413e4ca197a7f52962dcd060693091317226063ae373cb2c6cfdb55bf516ae06c4d9099d43b4
-  data.tar.gz: 7558dd6358c2a19e2e9d471270acb9ce12a94696b67980193e4d6dcafb168f79342a408b68d89408606ff208fec5f5ae5bbad35110f81e9398d2eb5a124c5f43
+  metadata.gz: b8c833fe9bbb2d35c8fb0e7b307e1f0aeb0f5774fe0f174e2505bc0460fcc13ae06bf6e2761fe1e00d7e44079327fbc761f7423b72c51e58ef23c4f4220edebb
+  data.tar.gz: 89e7871eac1c9e01d870c2e367e67e16ac5c49580259d828c922324250a88955da88014496a8da7ff22964e18941046153158df4d8a023a7fb9a158a86c06cea

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History for gapic-generator
 
+### 0.9.1 / 2021-07-07
+
+* Detect multiple resource parents for patterns used by multiple resources
+
 ### 0.9.0 / 2021-06-29
 
 * Support for configuring the service/method used for the quickstart example

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/gapic/schema/api.rb

@@ -354,9 +354,14 @@ module Gapic
       # * A mapping from resource type to resource wrapper is returned.
       def analyze_resources
         # In order to set parent_resources, we first populate a mapping from
-        # parsed pattern to resource mapping (in the patterns variable). This
-        # is done in one pass along with populating the resource type mapping.
-        # Then, we go through all resources again, get its expected parent
+        # parsed pattern to resources that use it (in the patterns variable).
+        # Note that there may be multiple resources associated with a pattern.
+        # (This is uncommon, but one example is monitoring v3 which uses
+        # "projects/*" for its workspace type as well as inheriting the common
+        # project type. We thus map each pattern to an array of resources.)
+        # Constructing the patterns mapping is done in one pass along with
+        # populating the type mapping (which maps only to single resources.)
+        # Then, we go through all resources again, get each's expected parent
         # patterns, and anything that shows up in the patterns mapping is taken
         # to be a parent.
         types = {}
@@ -367,8 +372,8 @@ module Gapic
         end
         types.each do |_type, resource|
           parents = resource.parsed_parent_patterns
-                            .map { |pat| patterns[pat] }
-                            .compact.uniq
+                            .flat_map { |pat| Array(patterns[pat]) }
+                            .uniq
           resource.parent_resources.replace parents
         end
         types
@@ -377,7 +382,7 @@ module Gapic
       def populate_resource_lookups resource, types, patterns
         types[resource.type] = resource
         resource.parsed_patterns.each do |pat|
-          patterns[pat] = resource
+          ((patterns[pat] ||= []) << resource).uniq!
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack