Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/octocatalog-diff/catalog-util/fileresources.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ def self._convert_file_resources(resources, compilation_dir, environment = 'prod
# @return [Boolean] True of resource is convertible, false if not
def self.resource_convertible?(resource)
return true if resource['type'] == 'File' && \
!resource['parameters'].nil? && \
resource['parameters'].key?('source') && \
!resource['parameters'].key?('content') && \
resource['parameters']['source'] =~ %r{^puppet:///modules/([^/]+)/(.+)}
Expand Down
5 changes: 5 additions & 0 deletions spec/octocatalog-diff/fixtures/repos/regressions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# regressions repo fixture

We occasionally encounter edge cases that don't deserve their entire fixture.

We'll add them here.
9 changes: 9 additions & 0 deletions spec/octocatalog-diff/fixtures/repos/regressions/hiera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
:backends:
- yaml
:yaml:
:datadir: /var/lib/puppet/environments/%{::environment}/hieradata
:hierarchy:
- common
:merge_behavior: deeper
:logger: console
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
classes:
- file_no_parameters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node default {
hiera_include('classes')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# https://github.com/github/octocatalog-diff/pull/122

class file_no_parameters {
file { '/tmp/foo': }
}
27 changes: 27 additions & 0 deletions spec/octocatalog-diff/integration/regressions_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Miscellaneous regressions
#
# - file resource with no parameters
# Inspired by https://github.com/github/octocatalog-diff/pull/122

# frozen_string_literal: true

require_relative 'integration_helper'

describe 'miscellaneous regressions' do
before(:all) do
@result = OctocatalogDiff::Integration.integration(
spec_repo: 'regressions',
spec_fact_file: 'facts.yaml',
argv: [
'--hiera-config', 'environments/production/hiera.yaml',
'--hiera-path-strip', '/var/lib/puppet'
]
)
end

it 'should run without an error' do
expect(@result[:exitcode]).not_to eq(-1), "Internal error: #{OctocatalogDiff::Integration.format_exception(@result)}"
expect(@result[:exitcode]).to eq(0), "Runtime error: #{@result[:logs]}"
expect(@result[:diffs].size).to eq(0), @result[:diffs].map(&:inspect).join("\n")
end
end