From 9a6139476867e3d3a894c8ae0ba7d8063c15ab9c Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Fri, 16 Aug 2019 14:42:22 -0700 Subject: [PATCH] Move common inspec file to common copy --- products/cloudbuild/inspec.yaml | 3 --- products/cloudfunctions/inspec.yaml | 3 --- products/compute/inspec.yaml | 3 --- products/container/inspec.yaml | 3 --- products/dns/inspec.yaml | 4 +--- products/pubsub/inspec.yaml | 3 --- products/resourcemanager/inspec.yaml | 3 --- provider/inspec/common~copy.yaml | 1 + 8 files changed, 2 insertions(+), 21 deletions(-) diff --git a/products/cloudbuild/inspec.yaml b/products/cloudbuild/inspec.yaml index 63c176b61ec4..28cb365e930f 100644 --- a/products/cloudbuild/inspec.yaml +++ b/products/cloudbuild/inspec.yaml @@ -13,6 +13,3 @@ --- !ruby/object:Provider::Inspec::Config overrides: !ruby/object:Overrides::ResourceOverrides -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/products/cloudfunctions/inspec.yaml b/products/cloudfunctions/inspec.yaml index 8338dff6bb02..698870465526 100644 --- a/products/cloudfunctions/inspec.yaml +++ b/products/cloudfunctions/inspec.yaml @@ -17,6 +17,3 @@ overrides: !ruby/object:Overrides::ResourceOverrides properties: trigger_http: !ruby/object:Overrides::Inspec::PropertyOverride exclude: true -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/products/compute/inspec.yaml b/products/compute/inspec.yaml index eebfd5f35066..1989940bb88a 100644 --- a/products/compute/inspec.yaml +++ b/products/compute/inspec.yaml @@ -87,6 +87,3 @@ overrides: !ruby/object:Overrides::ResourceOverrides exclude: true Zone: !ruby/object:Overrides::Inspec::ResourceOverride exclude: true -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/products/container/inspec.yaml b/products/container/inspec.yaml index 37b6c524a3d1..60e9ec51f8f2 100644 --- a/products/container/inspec.yaml +++ b/products/container/inspec.yaml @@ -30,6 +30,3 @@ overrides: !ruby/object:Overrides::ResourceOverrides properties: cluster: !ruby/object:Overrides::Inspec::PropertyOverride resource: 'RegionalCluster' -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/products/dns/inspec.yaml b/products/dns/inspec.yaml index 0612225d36cd..be5768bcbcc0 100644 --- a/products/dns/inspec.yaml +++ b/products/dns/inspec.yaml @@ -20,6 +20,4 @@ overrides: !ruby/object:Overrides::ResourceOverrides base_url: projects/{{project}}/managedZones/{{managed_zone}}/rrsets Project: !ruby/object:Overrides::Inspec::ResourceOverride exclude: true -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' + diff --git a/products/pubsub/inspec.yaml b/products/pubsub/inspec.yaml index baba3bb6275c..79cb8880f830 100644 --- a/products/pubsub/inspec.yaml +++ b/products/pubsub/inspec.yaml @@ -27,6 +27,3 @@ overrides: !ruby/object:Overrides::ResourceOverrides properties: name: !ruby/object:Overrides::Inspec::PropertyOverride name_from_self_link: true -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/products/resourcemanager/inspec.yaml b/products/resourcemanager/inspec.yaml index 943c32504da0..112630e8b10d 100644 --- a/products/resourcemanager/inspec.yaml +++ b/products/resourcemanager/inspec.yaml @@ -23,6 +23,3 @@ overrides: !ruby/object:Overrides::ResourceOverrides product_url: https://cloudresourcemanager.googleapis.com/v2/ # Creating and viewing folders requires organization level privileges privileged: true -files: !ruby/object:Provider::Config::Files - copy: - 'Gemfile': 'provider/inspec/Gemfile' diff --git a/provider/inspec/common~copy.yaml b/provider/inspec/common~copy.yaml index e42d5acc125b..20f7872f22ff 100644 --- a/provider/inspec/common~copy.yaml +++ b/provider/inspec/common~copy.yaml @@ -14,3 +14,4 @@ 'libraries/google/iam/property/iam_policy_audit_configs.rb': 'templates/inspec/iam_policy/properties/iam_policy_audit_configs.rb' 'libraries/google/iam/property/iam_policy_audit_configs_audit_log_configs.rb': 'templates/inspec/iam_policy/properties/iam_policy_audit_configs_audit_log_configs.rb' 'libraries/google/iam/property/iam_policy_bindings.rb': 'templates/inspec/iam_policy/properties/iam_policy_bindings.rb' +'Gemfile': 'provider/inspec/Gemfile'