Updated from main

Signed-off-by: Samir <[email protected]>

mmv1/Gemfile.lock

@@ -5,59 +5,64 @@ GEM
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.5)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.4)
-    binding_of_caller (1.0.0)
+    ast (2.4.0)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
-    debug_inspector (1.1.0)
-    diff-lcs (1.5.0)
-    drb (2.2.0)
-      ruby2_keywords
-    faraday (2.7.12)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
+    concurrent-ruby (1.1.6)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    i18n (1.14.1)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     metaclass (0.0.4)
     minitest (5.20.0)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    mutex_m (0.2.0)
-    octokit (8.0.0)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    parallel (1.23.0)
-    parser (3.2.2.4)
-      ast (~> 2.4.1)
-      racc
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    multipart-post (2.3.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.19.1)
+    parser (2.6.5.0)
+      ast (~> 2.4.0)
+    public_suffix (5.0.1)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-mocks (3.12.6)
@@ -74,18 +79,16 @@ GEM
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    ruby-progressbar (1.13.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.5)
-    sawyer (0.9.2)
+    sawyer (0.8.2)
       addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-
+      faraday (> 0.8, < 2.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
 PLATFORMS
   ruby
 

mmv1/api/resource.rb

@@ -174,7 +174,6 @@ def validate
 
       set_variables(@parameters, :__resource)
       set_variables(@properties, :__resource)
-
       check :properties, type: Array, item_type: Api::Type, required: true unless @exclude
       check :parameters, type: Array, item_type: Api::Type unless @exclude
 

mmv1/products/apigee/api.yaml

@@ -1471,3 +1471,93 @@ objects:
         description: |
           ID of the environment group attachment.
   
+
+
+
+  - !ruby/object:Api::Resource
+    name: OrganizationInstanceAttachment
+    base_url: '{{+parent}}/attachments'
+    self_link: '{{+name}}'
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Official Documentation':
+      api: 'https://cloud.google.com/apigee/docs'
+    async: !ruby/object:Api::OpAsync
+      operation: !ruby/object:Api::OpAsync::Operation
+         path: 'name'
+         base_url: '{op_id}'
+         wait_ms: 1000
+      result: !ruby/object:Api::OpAsync::Result
+         path: 'response'
+         resource_inside_response: true
+      status: !ruby/object:Api::OpAsync::Status
+        path: 'done'
+        complete: True
+        allowed:
+          - True
+          - False
+      error: !ruby/object:Api::OpAsync::Error
+        path: 'error'
+        message: 'message'
+    description: |-
+        InstanceAttachment represents the installation of an environment onto an instance.
+    properties:
+
+      - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          Output only. ID of the attachment.
+      - !ruby/object:Api::Type::String
+        name: 'environment'
+        description: |
+          ID of the attached environment.
+      - !ruby/object:Api::Type::String
+        name: 'createdAt'
+        description: |
+          Output only. Time the attachment was created in milliseconds since epoch.
+  
+
+
+
+  - !ruby/object:Api::Resource
+    name: OrganizationInstanceAttachment
+    base_url: '{{+parent}}/attachments'
+    self_link: '{{+name}}'
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Official Documentation':
+      api: 'https://cloud.google.com/apigee/docs'
+    async: !ruby/object:Api::OpAsync
+      operation: !ruby/object:Api::OpAsync::Operation
+         path: 'name'
+         base_url: '{op_id}'
+         wait_ms: 1000
+      result: !ruby/object:Api::OpAsync::Result
+         path: 'response'
+         resource_inside_response: true
+      status: !ruby/object:Api::OpAsync::Status
+        path: 'done'
+        complete: True
+        allowed:
+          - True
+          - False
+      error: !ruby/object:Api::OpAsync::Error
+        path: 'error'
+        message: 'message'
+    description: |-
+        InstanceAttachment represents the installation of an environment onto an instance.
+    properties:
+
+      - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          Output only. ID of the attachment.
+      - !ruby/object:Api::Type::String
+        name: 'environment'
+        description: |
+          ID of the attached environment.
+      - !ruby/object:Api::Type::String
+        name: 'createdAt'
+        description: |
+          Output only. Time the attachment was created in milliseconds since epoch.
+