Merge branch 'main' into 7361_2-MAGIC-MODULE-apigee-Organizations__ap…

…is__revision

mmv1/products/cloudkms/api.yaml

@@ -0,0 +1,54 @@
+
+--- !ruby/object:Api::Product
+name: cloudkms
+display_name: cloudkms
+versions:
+  - !ruby/object:Api::Product::Version
+    name: ga
+    base_url: https://cloudkms.googleapis.com//v1/
+scopes:
+  - https://cloudkms.googleapis.com//auth/cloud-platform
+apis_required:
+  - !ruby/object:Api::Product::ApiReference
+    name: https://cloudkms.googleapis.com/
+    url: https://console.cloud.google.com/apis/library/cloudkms.googleapis.com/
+objects:
+
+  - !ruby/object:Api::Resource
+    name: ProjectLocationKeyRing
+    base_url: '{{parent}}/keyRings'
+    self_link: '{{name}}'
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Official Documentation':
+      api: 'https://cloud.google.com/cloudkms/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: |-
+        A KeyRing is a toplevel logical grouping of CryptoKeys.
+    properties:
+
+      - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          Output only. The resource name for the KeyRing in the format `projects/*/locations/*/keyRings/*`.
+      - !ruby/object:Api::Type::String
+        name: 'createTime'
+        description: |
+          Output only. The time at which this KeyRing was created.
+  

mmv1/products/cloudkms/inspec.yaml

@@ -0,0 +1,15 @@
+# Copyright 2017 Google Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+--- !ruby/object:Provider::Inspec::Config
+overrides: !ruby/object:Overrides::ResourceOverrides

mmv1/products/secretmanager/inspec.yaml

@@ -0,0 +1,15 @@
+# Copyright 2017 Google Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+--- !ruby/object:Provider::Inspec::Config
+overrides: !ruby/object:Overrides::ResourceOverrides

mmv1/products/servicenetworking/api.yaml

@@ -0,0 +1,55 @@
+
+--- !ruby/object:Api::Product
+name: ServiceNetworking
+display_name: ServiceNetworking
+versions:
+  - !ruby/object:Api::Product::Version
+    name: ga
+    base_url: https://servicenetworking.googleapis.com//v1/
+scopes:
+  - https://servicenetworking.googleapis.com//auth/cloud-platform
+apis_required:
+  - !ruby/object:Api::Product::ApiReference
+    name: https://servicenetworking.googleapis.com/
+    url: https://console.cloud.google.com/apis/library/servicenetworking.googleapis.com/
+objects:
+
+  - !ruby/object:Api::Resource
+    name: 'service_connection'
+    kind: 'compute#services_connections'
+    base_url: '{{parent}}/connections'
+    collection_url_key: 'items'
+    input: true
+    has_self_link: true
+    description: |
+      An instance is a virtual machine (VM) hosted on Google's infrastructure.
+    properties:
+      - !ruby/object:Api::Type::String
+        name: 'network'
+        description: |
+          The name of service consumer's VPC network
+          that's connected with service producer network
+      - !ruby/object:Api::Type::Array
+        name: 'reservedPeeringRanges'
+        description: |
+          The name of one or more allocated IP address ranges for this
+          service producer of type PEERING. Note that invoking connections.
+          create method with a different range when connection is already
+          established will not modify already provisioned service producer subnetworks.
+          If connections.create method is invoked repeatedly to reconnect when peering
+          connection had been disconnected on the consumer side, leaving this field
+          empty will restore previously allocated IP ranges.
+        item_type: Api::Type::String
+      - !ruby/object:Api::Type::String
+        name: 'peering'
+        description: |
+          The name of the VPC Network Peering connection
+          that was created by the service producer.
+        output: true
+
+      - !ruby/object:Api::Type::String
+        name: 'service'
+        description: |
+          The name of the peering service that's associated
+          with this connection, in the following format: services/{service name}.
+        output: true

mmv1/products/servicenetworking/inspec.yaml

@@ -0,0 +1,15 @@
+# Copyright 2017 Google Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+--- !ruby/object:Provider::Inspec::Config
+overrides: !ruby/object:Overrides::ResourceOverrides

mmv1/templates/inspec/examples/google_cloudkms_project_location_key_ring/google_cloudkms_project_location_key_ring.erb

@@ -0,0 +1,12 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+<% project_location_key_ring = grab_attributes(pwd)['project_location_key_ring'] -%>
+describe google_cloudkms_project_location_key_ring(name: <%= doc_generation ? "' #{project_location_key_ring['name']}'":"project_location_key_ring['name']" -%>) do
+	it { should exist }
+	its('name') { should cmp <%= doc_generation ? "'#{project_location_key_ring['name']}'" : "project_location_key_ring['name']" -%> }
+	its('create_time') { should cmp <%= doc_generation ? "'#{project_location_key_ring['create_time']}'" : "project_location_key_ring['create_time']" -%> }
+
+end
+
+describe google_cloudkms_project_location_key_ring(name: "does_not_exit") do
+	it { should_not exist }
+end

mmv1/templates/inspec/examples/google_cloudkms_project_location_key_ring/google_cloudkms_project_location_key_ring_attributes.erb

@@ -0,0 +1,3 @@
+gcp_project_id = input(:gcp_project_id, value: '<%= external_attribute(pwd, 'gcp_project_id') -%>', description: 'The GCP project identifier.')
+
+  project_location_key_ring = input('project_location_key_ring', value: <%= JSON.pretty_generate(grab_attributes(pwd)['project_location_key_ring']) -%>, description: 'project_location_key_ring description')

mmv1/templates/inspec/examples/google_cloudkms_project_location_key_ring/google_cloudkms_project_location_key_rings.erb

@@ -0,0 +1,5 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+  <% project_location_key_ring = grab_attributes(pwd)['project_location_key_ring'] -%>
+  describe google_cloudkms_project_location_key_rings() do
+    it { should exist }
+  end

mmv1/templates/inspec/examples/google_secret_manager_secret/google_secret_manager_secret.erb

@@ -0,0 +1,10 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+<% project_secret = grab_attributes(pwd)['project_secret'] -%>
+describe google_secret_manager_secret(name: <%= doc_generation ? "' #{project_secret['name']}'":"project_secret['name']" -%>) do
+	it { should exist }
+
+end
+
+describe google_secret_manager_secret(name: "does_not_exit") do
+	it { should_not exist }
+end

mmv1/templates/inspec/examples/google_secret_manager_secret/google_secret_manager_secret_attributes.erb

@@ -0,0 +1,3 @@
+gcp_project_id = input(:gcp_project_id, value: '<%= external_attribute(pwd, 'gcp_project_id') -%>', description: 'The GCP project identifier.')
+
+  project_secret = input('project_secret', value: <%= JSON.pretty_generate(grab_attributes(pwd)['project_secret']) -%>, description: 'project_secret description')

mmv1/templates/inspec/examples/google_secret_manager_secret/google_secret_manager_secrets.erb

@@ -0,0 +1,5 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+  <% project_secret = grab_attributes(pwd)['project_secret'] -%>
+  describe google_secret_manager_secrets(parent: <%= doc_generation ? "' #{project_secret['parent']}'":"project_secret['parent']" -%>) do
+    it { should exist }
+  end

mmv1/templates/inspec/examples/google_secret_manager_secret_version/google_secret_manager_secret_version.erb

@@ -0,0 +1,10 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+<% project_secret = grab_attributes(pwd)['project_secret'] -%>
+describe google_secret_manager_secret(name: <%= doc_generation ? "' #{project_secret['name']}'":"project_secret['name']" -%>) do
+	it { should exist }
+
+end
+
+describe google_secret_manager_secret(name: "does_not_exit") do
+	it { should_not exist }
+end

mmv1/templates/inspec/examples/google_secret_manager_secret_version/google_secret_manager_secret_version_attributes.erb

@@ -0,0 +1,3 @@
+gcp_project_id = input(:gcp_project_id, value: '<%= external_attribute(pwd, 'gcp_project_id') -%>', description: 'The GCP project identifier.')
+
+  project_secret = input('project_secret', value: <%= JSON.pretty_generate(grab_attributes(pwd)['project_secret']) -%>, description: 'project_secret description')

mmv1/templates/inspec/examples/google_secret_manager_secret_version/google_secret_manager_secret_versions.erb

@@ -0,0 +1,5 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+  <% project_secret = grab_attributes(pwd)['project_secret'] -%>
+  describe google_secret_manager_secrets(parent: <%= doc_generation ? "' #{project_secret['parent']}'":"project_secret['parent']" -%>) do
+    it { should exist }
+  end

mmv1/templates/inspec/examples/google_service_networking_service_connection/google_service_networking_service_connection.erb

@@ -0,0 +1,10 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+<% service_connection = grab_attributes(pwd)['service_connection'] -%>
+describe google_service_networking_service_connection() do
+	it { should exist }
+
+end
+
+describe google_service_networking_service_connection() do
+	it { should_not exist }
+end

mmv1/templates/inspec/examples/google_service_networking_service_connection/google_service_networking_service_connection_attributes.erb

@@ -0,0 +1,3 @@
+gcp_project_id = input(:gcp_project_id, value: '<%= external_attribute(pwd, 'gcp_project_id') -%>', description: 'The GCP project identifier.')
+
+  service_connection = input('service_connection', value: <%= JSON.pretty_generate(grab_attributes(pwd)['service_connection']) -%>, description: 'service_connection description')

mmv1/templates/inspec/examples/google_service_networking_service_connection/google_service_networking_service_connections.erb

@@ -0,0 +1,5 @@
+<% gcp_project_id = "#{external_attribute(pwd, 'gcp_project_id', doc_generation)}" -%>
+  <% service_connection = grab_attributes(pwd)['service_connection'] -%>
+  describe google_servicenetworking_service_connections(parent: <%= doc_generation ? "' #{service_connection['parent']}'":"service_connection['parent']" -%>) do
+    it { should exist }
+  end

mmv1/templates/inspec/tests/integration/configuration/mm-attributes.yml

@@ -946,4 +946,15 @@ project_location_environment:
 organization_api_revision:
   name : "value_name"
   content_type : "value_contenttype"
-  data : "value_data"
+  data : "value_data"
+
+project_location_key_ring:
+  name : "value_name"
+  parent : "value_parent"
+  create_time : "value_createtime"
+
+project_secret:
+  name : "value_name"
+
+service_connection:
+  parent : "value_parent"