Merge pull request #267 from buildkite/toote_orb_jobs

Orb jobs

Author: toote

app/examples/circleci/orb-jobs.yml

@@ -0,0 +1,14 @@
+version: '2.1'
+setup: true
+orbs:
+  path-filtering: circleci/path-filtering@0.1.7
+workflows:
+  generate-config:
+    jobs:
+      - path-filtering/filter:
+          base-revision: main
+          config-path: .circleci/continue_config.yml
+          mapping: |
+            src/.* build-code true
+            doc/.* build-docs true
+            src/tests/.* string-parameter "value"

app/lib/bk/compat/parsers/circleci.rb

@@ -35,10 +35,12 @@ def load_orb(key, _config)
       def self.matches?(text)
         # sorting is important
         config = YAML.safe_load(text, aliases: true)
-        mandatory_keys = %w[jobs version workflows].freeze
+        mandatory_keys = %w[version workflows].freeze
+        has_mandatory = (mandatory_keys & config.keys == mandatory_keys)
+        at_least_one_of = %w[jobs orbs].any? { |k| config.include?(k) }
 
         return false if config.is_a?(String)
-        return true if mandatory_keys & config.keys == mandatory_keys
+        return true if has_mandatory && at_least_one_of
 
         # legacy format support
         config.fetch('version', 2.1) == 2 && config['jobs'].include?('build')

app/lib/bk/compat/parsers/circleci/orbs.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'orbs/docker'
+require_relative '../../models/steps/circleci'
 
 module BK
   module Compat
@@ -15,10 +16,13 @@ def matcher?(orb, _conf)
           orb.start_with?("#{@prefix}/")
         end
 
-        def translator(action, _config)
-          [
-            "# #{action} is part of orb #{@prefix} which is not supported and should be translated by hand"
-          ]
+        def translator(action, config)
+          BK::Compat::CircleCIStep.new(
+            key: config['name'] || action,
+            commands: [
+              "# #{action} is part of orb #{@prefix} which is not supported and should be translated by hand"
+            ]
+          )
         end
       end
     end

app/lib/bk/compat/parsers/circleci/workflows.rb

@@ -31,9 +31,10 @@ def process_workflow_job(job)
           BK::Compat::BlockStep.new(key: key, depends_on: config.fetch('requires', []))
         elsif @commands_by_key.include?(key)
           process_job(key, config)
+        elsif key.include?('/') # orb jobs will not be defined in commands_by_key
+          @translator.translate_step(key, config)
         else
-          raise BK::Compat::Error::ConfigurationError,
-                "Job '#{key}' is not defined"
+          raise BK::Compat::Error::ConfigurationError, "Job '#{key}' is not defined"
         end
       end
 

app/spec/lib/bk/compat/snapshots/examples/circleci/orb-jobs.yml.snap

@@ -0,0 +1,6 @@
+---
+steps:
+- commands:
+  - "# path-filtering/filter is part of orb path-filtering which is not supported
+    and should be translated by hand"
+  key: path-filtering/filter