Skip to content

Commit

Permalink
Remove some simple puppet/chef stuff no longer in use. (#1180)
Browse files Browse the repository at this point in the history
Merged PR #1180.
  • Loading branch information
nat-henderson authored and modular-magician committed Jan 9, 2019
1 parent 303da63 commit 599e4a5
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 41 deletions.
5 changes: 0 additions & 5 deletions products/compute/inspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,3 @@ overrides: !ruby/object:Provider::ResourceOverrides
files: !ruby/object:Provider::Config::Files
copy:
'Gemfile': 'provider/inspec/Gemfile'
changelog:
- !ruby/object:Provider::Config::Changelog
version: '0.1.0'
date: 2017-10-04T10:00:00-0700
general: 'Initial release'
3 changes: 0 additions & 3 deletions provider/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ class Config < Api::Object

# Overrides for datasources
attr_reader :datasources
attr_reader :properties # TODO(nelsonjr): Remove this once bug 193 is fixed.
attr_reader :tests
attr_reader :files
attr_reader :changelog
# Product names are complicated in MagicModules. They are given by
# product.prefix, which is in the format 'g<nameofproduct>', e.g.
# gcompute or gresourcemanager. This is munged in many places.
Expand Down
14 changes: 0 additions & 14 deletions provider/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def generate(output_folder, types, version_name, product_path, dump_yaml)
generate_objects(output_folder, types, version_name)
copy_files(output_folder) \
unless @config.files.nil? || @config.files.copy.nil?
compile_changelog(output_folder) unless @config.changelog.nil?
# Compilation has to be the last step, as some files (e.g.
# CONTRIBUTING.md) may depend on the list of all files previously copied
# or compiled.
Expand Down Expand Up @@ -129,17 +128,6 @@ def compile_examples(output_folder)
)
end

# Generate the CHANGELOG.md file with the history of the module.
def compile_changelog(output_folder)
FileUtils.mkpath output_folder
generate_file(
changes: @config.changelog,
template: 'templates/CHANGELOG.md.erb',
output_folder: output_folder,
out_file: File.join(output_folder, 'CHANGELOG.md')
)
end

def compile_file_list(output_folder, files, data = {})
files.each do |target, source|
Google::LOGGER.debug "Compiling #{source} => #{target}"
Expand Down Expand Up @@ -232,8 +220,6 @@ def build_object_data(object, output_folder, version)
{
name: object.out_name,
object: object,
tests: (@config.tests || {}).select { |o, _v| o == object.name }
.fetch(object.name, {}),
output_folder: output_folder,
product_name: object.__product.prefix[1..-1],
version: version
Expand Down
19 changes: 0 additions & 19 deletions templates/CHANGELOG.md.erb

This file was deleted.

0 comments on commit 599e4a5

Please sign in to comment.