Throw an error on a duplicate copy, expand website

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'

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'

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'

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'

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'
+

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'

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'

provider/core.rb

@@ -119,12 +119,20 @@ def copy_common_files(output_folder, version_name = 'ga', provider_name = nil)
     # rubocop:enable Lint/UnusedMethodArgument
 
     def copy_file_list(output_folder, files)
+      puts "start_time is #{@start_time}"
       files.map do |target, source|
         Thread.new do
           target_file = File.join(output_folder, target)
           target_dir = File.dirname(target_file)
           Google::LOGGER.debug "Copying #{source} => #{target}"
           FileUtils.mkpath target_dir unless Dir.exist?(target_dir)
+
+          # If we've modified a file since starting an MM run, it's a reasonable
+          # assumption that it was this run that modified it.
+          if File.exist?(target_file) && File.mtime(target_file) > @start_time
+            raise "#{target_file} was already modified during this run. #{File.mtime(target_file)}"
+          end
+
           FileUtils.copy_entry source, target_file
         end
       end.map(&:join)

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'

provider/terraform/common~copy.yaml

@@ -49,5 +49,9 @@
 '<%= fname -%>': '<%= file_path -%>'
 <% end -%>
 '<%= dir -%>/test-fixtures/': 'third_party/terraform/utils/test-fixtures'
-'website': 'third_party/terraform/website'
+<%  Dir["third_party/terraform/website/**/*.*"].each do |file_path|
+    fname = file_path.split('/', 4)[3]
+-%>
+'website/<%= fname -%>': 'third_party/terraform/website/<%= fname -%>'
+<% end -%>
 'version': 'third_party/terraform/version'