Explicitly skip reference validation for to-catalog

Author: kpaulisse

lib/octocatalog-diff/catalog.rb

@@ -36,15 +36,16 @@ def initialize(options = {})
       # The compilation directory can be overridden, e.g. when testing
       @override_compilation_dir = options[:compilation_dir]
 
+      # Keep track of whether references have been validated yet. Allow this to be fudged for when we do
+      # not desire reference validation to happen (e.g., for the "from" catalog that is otherwise valid).
+      @references_validated = options[:references_validated] || false
+
       # Call appropriate backend for catalog generation
       @catalog_obj = backend(options)
 
       # The catalog is not built yet, except if the backend has no build method
       @built = false
       build unless @catalog_obj.respond_to?(:build)
-
-      # Keep track of whether references have been validated yet
-      @references_validated = false
     end
 
     # Build catalog - this method needs to be called to build the catalog. It is separate due to

lib/octocatalog-diff/util/catalogs.rb

@@ -157,6 +157,9 @@ def build_catalog_tasks
             args.delete(opt_key)
           end
 
+          # Skip reference validation in the from-catalog by saying we already performed it.
+          args[:references_validated] = (key == :from)
+
           # The task is a OctocatalogDiff::Util::Parallel::Task object that contains the method to execute,
           # validator method, text description, and arguments to provide when calling the method.
           task = OctocatalogDiff::Util::Parallel::Task.new(
@@ -250,10 +253,9 @@ def build_catalog(opts, logger = @logger)
       # @param logger [Logger] Logger object (presently unused)
       # @param args [Hash] Additional arguments set specifically for validator
       # @return [Boolean] Return true if catalog is valid, false otherwise
-      def catalog_validator(catalog = nil, _logger = @logger, args = {})
+      def catalog_validator(catalog = nil, _logger = @logger, _args = {})
         raise ArgumentError, "Expects a catalog, got #{catalog.class}" unless catalog.is_a?(OctocatalogDiff::Catalog)
         raise OctocatalogDiff::Errors::CatalogError, "Catalog failed: #{catalog.error_message}" unless catalog.valid?
-        catalog.validate_references if args[:task] == :to # Raises exception for broken references
         true
       end
     end

spec/octocatalog-diff/integration/reference_validation_spec.rb

@@ -336,8 +336,8 @@ def self.catalog_contains_resource(result, type, title)
       expect(@result.exitcode).to eq(-1), OctocatalogDiff::Integration.format_exception(@result)
     end
 
-    it 'should raise ReferenceValidationError' do
-      expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Errors::ReferenceValidationError)
+    it 'should raise CatalogError' do
+      expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Errors::CatalogError)
     end
 
     # rubocop:disable Metrics/LineLength
@@ -382,8 +382,8 @@ def self.catalog_contains_resource(result, type, title)
       expect(@result.exitcode).to eq(-1), @result.logs
     end
 
-    it 'should raise ReferenceValidationError' do
-      expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Errors::ReferenceValidationError)
+    it 'should raise CatalogError' do
+      expect(@result.exception).to be_a_kind_of(OctocatalogDiff::Errors::CatalogError)
     end
 
     # rubocop:disable Metrics/LineLength