foreman_ansible_director 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ffa2aaf3273097e77c353f512ca40ce5228279410f38103047f8071bb43f15f
-  data.tar.gz: 634a14d971da5dfff74aec6db65447241f3fd88a19f84f965c051644e50116d6
+  metadata.gz: a4d8ce033fdae658dc74ed39b1e726223fd1f3f709c0912500eee63a959d1cfb
+  data.tar.gz: ff49758a3a1ab2654d8af19e4841eda385c14d3338e8fc1d925cbd53863265b2
 SHA512:
-  metadata.gz: e7efa52aef7c260f1b919bbec8331a2d7e46fa0ae8dba115bdffb8e1227668f779a37bea706d6ff5779e30673d80f39f1e27c3bed54ccac300cae011ffa233c8
-  data.tar.gz: f0e6ea032f1af335cd4e27f3b0d3b54a548b28d10838e82536100ebdea7f7b45cc0df1531b382d4db9389f6b98ce55ddbd51c652e8e508dcd908ff816ee612cc
+  metadata.gz: c65a3a229e2b3d482e3144dcfd0eb8a4c5de8e70acc1a089f09234686267ac0c597f98b9308e8b1d438be43c7e0b5301ee9e3d2ea86558656e2b52482e38897f
+  data.tar.gz: 165890d464e01ce17f4e673fe7ab88d4c391a28a34ce37f13274c1459d5fe37613c8ed8e4d3daf84ca14cc37a276a3f9400fb9647c09c0b6df11f625901bb9d3

data/README.md

@@ -3,7 +3,7 @@
 Foreman Ansible Director is a foreman plugin integrating Ansible into Foreman.
 
 ## Current Status
-> [!WARNING]  
+> [!WARNING]
 > At the time of publishing (2026-02-01), this plugin is in an intermediate state.
 > It is not ready for production use.
 
@@ -20,9 +20,9 @@ Breaking changes are expected until version 1.0.0 is reached.
   - Importing and deletion of Ansible content can be done via the Foreman web-UI
   - Ansible content can be imported from Ansible Galaxy and Git repositories
 - A dedicated lifecycle management system for Ansible content allows promotion of configurations along a path such as `Development` -> `Test` -> `Production` similar to Katello lifecycle environments.
-- Ansible and its dependencies are encapsulated in execution environments, which are used to run Ansible content.
-- Use of different ansible-core versions through execution environments.
-- Automatic provisioning of execution environments and Ansible content based on user-defined Ansible configurations.
+- Ansible and its dependencies are encapsulated in Execution Environments, which are used to run Ansible content.
+- Use of different ansible-core versions through Execution Environments.
+- Automatic provisioning of Execution Environments and Ansible content based on user-defined Ansible configurations.
 - Unified interface (REST API) for both UI and external tools.
 
 

data/app/controllers/foreman_ansible_director/api/v2/ansible_content_controller.rb

@@ -4,7 +4,7 @@ module ForemanAnsibleDirector
   module Api
     module V2
       class AnsibleContentController < AnsibleDirectorApiController
-        before_action :find_organization, only: %i[create_units destroy_units]
+        before_action :find_organization, only: %i[create_units]
         before_action :find_optional_organization, only: %i[index]
 
         # TODO: APIDOC
@@ -36,15 +36,28 @@ module ForemanAnsibleDirector
         # TODO: This needs to check and invalidate built EEs
         def destroy_units
           resolved = ::ForemanAnsibleDirector::AnsibleContent::AnsibleContentHelpers.resolve_destroy_payload(
-            params[:units]
+            destroy_params
           )
           @bulk_destroy_task =
             ForemanTasks.sync_task(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Bulk::Destroy,
               resolved_content_units: resolved, organization_id: @organization.id)
         end
 
+        def model_of_controller
+          resource_class
+        end
+
         private
 
+        def destroy_params
+          params.require(:units).map do |unit|
+            unit.permit(
+              :unit_id,
+              unit_version_ids: []
+            )
+          end
+        end
+
         def validate_requirements_payload
           # TODO: Grammar
           params.require(:requirements_file)

data/app/controllers/foreman_ansible_director/api/v2/ansible_director_api_controller.rb

@@ -5,6 +5,7 @@ module ForemanAnsibleDirector
     module V2
       class AnsibleDirectorApiController < ::Api::V2::BaseController
         include ::Api::Version2
+        include ::Foreman::Controller::AutoCompleteSearch
 
         def find_organization
           @organization = Organization.current || find_optional_organization

data/app/controllers/foreman_ansible_director/api/v2/execution_environments_controller.rb

@@ -42,6 +42,10 @@ module ForemanAnsibleDirector
           ::ForemanAnsibleDirector::ExecutionEnvironmentService.destroy_execution_environment @execution_environment
         end
 
+        def model_of_controller
+          resource_class
+        end
+
         private
 
         def execution_environment_params

data/app/controllers/foreman_ansible_director/api/v2/lifecycle_environment_paths_controller.rb

@@ -49,6 +49,10 @@ module ForemanAnsibleDirector
           )
         end
 
+        def model_of_controller
+          resource_class
+        end
+
         private
 
         def lifecycle_environment_path_params

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/bulk/destroy.rb

@@ -12,9 +12,12 @@ module ForemanAnsibleDirector
 
           def plan(args)
             concurrence do
-              args[:resolved_content_units].each do |unit|
+              args[:resolved_content_units].each do |unit_id, instruction|
+                complete = instruction.delete(:complete)
                 plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Destroy,
-                  unit: unit, organization_id: args[:organization_id])
+                  unit_id: unit_id,
+                  unit_version_ids: instruction[:versions],
+                  complete: complete)
               end
             end
           end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/destroy.rb

@@ -5,84 +5,88 @@ module ForemanAnsibleDirector
     module AnsibleContentUnit
       class Destroy < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
         input_format do
-          param :unit
-          param :organization_id
+          param :unit_id
+          param :unit_version_ids # {git: [], galaxy: []}
+          param :complete, Boolean
         end
 
         def plan(args)
-          unit = args[:unit]
-          organization_id = args[:organization_id]
+          unit_id = args[:unit_id]
+          unit_version_ids = args[:unit_version_ids]
 
-          if !unit.versions.empty?
-            plan_partial_destroy(unit, organization_id)
+          complete = args[:complete]
+
+          if complete
+            plan_full_destroy(unit_id)
+            plan_self(
+              unit_id: unit_id
+            )
           else
-            plan_full_destroy(unit, organization_id)
+            plan_partial_destroy(unit_id, unit_version_ids)
           end
-          plan_self(
-            organization_id: organization_id,
-            unit_name: unit.unit_name,
-            unit_namespace: unit.unit_namespace,
-            unit_type: unit.unit_type,
-            unit_versions: unit.versions
-          )
         end
 
         def finalize
           acu = ::ForemanAnsibleDirector::ContentUnit.find_by(
-            name: input[:unit_name],
-            namespace: input[:unit_namespace],
-            organization_id: input[:organization_id]
+            id: input[:unit_id]
           )
-          if input[:unit_type] == 'collection'
-            if !input[:unit_versions].empty? # partial
-              input[:unit_versions].each do |version|
-                acu&.content_unit_versions&.find_by(version: version)&.destroy
-              end
-            else
-              acu&.destroy
-            end
-          else
-            acu&.destroy
-          end
+          acu&.destroy
         end
 
         private
 
-        # rubocop:disable Layout/LineLength
-        def plan_full_destroy(unit, organization_id)
-          acu = ::ForemanAnsibleDirector::ContentUnit.find_by(name: unit.unit_name, namespace: unit.unit_namespace, organization_id: organization_id) # find_unit
+        # I am disabling the guard-clause rule here, because I don't think it makes a lot of sense in this case.
+        # galaxy_cuvs and git_cuvs are independent of each other, so early returning is not possible.
+        # rubocop: disable Style/GuardClause
+        def plan_full_destroy(unit_id)
+          galaxy_cuvs = ::ForemanAnsibleDirector::ContentUnit
+                        .find_by(id: unit_id)
+                        .content_unit_versions
+                        .where(source_type: 'galaxy')
 
-          concurrence do
-            plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Destroy,
-              repository_href: acu.pulp_repository_href)
-            plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Distribution::Destroy,
-              distribution_href: acu.pulp_distribution_href)
+          git_cuvs = ::ForemanAnsibleDirector::ContentUnit
+                     .find_by(id: unit_id)
+                     .content_unit_versions
+                     .where(source_type: 'git')
 
-            if acu.collection?
-              plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Collection::Destroy,
-                collection_remote_href: acu.pulp_remote_href)
-            else
-              plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Role::Destroy,
-                role_remote_href: acu.pulp_remote_href)
+          unless galaxy_cuvs.empty?
+            plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::DestroyProviders::Galaxy::DestroyFull,
+              unit_id: unit_id,
+              unit_version_ids: galaxy_cuvs)
+          end
+
+          unless git_cuvs.empty?
+            git_cuvs.each do |git_cuv|
+              plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::DestroyProviders::Git::DestroyFull,
+                unit_id: unit_id,
+                unit_version_id: git_cuv)
             end
           end
         end
+        # rubocop: enable Style/GuardClause
 
-        def plan_partial_destroy(unit, organization_id)
-          acu = ::ForemanAnsibleDirector::AnsibleCollection.find_by(name: unit.unit_name, namespace: unit.unit_namespace, organization_id: organization_id) # Only collections
+        # Same as above
+        # rubocop: disable Style/GuardClause
+        def plan_partial_destroy(unit_id, unit_version_ids)
+          galaxy_cuvs = unit_version_ids[:galaxy]
+          git_cuvs = unit_version_ids[:git]
+
+          unless galaxy_cuvs.empty?
+            plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::DestroyProviders::Galaxy::DestroyPartial,
+              unit_id: unit_id,
+              unit_version_ids: galaxy_cuvs)
+          end
+
+          unless git_cuvs.empty?
+            git_cuvs.each do |git_cuv|
+              plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::DestroyProviders::Git::DestroyPartial,
+                unit_id: unit_id,
+                unit_version_id: git_cuv)
+            end
 
-          sequence do
-            _remote_update_action = plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Collection::Update,
-              collection_remote_href: acu.pulp_remote_href,
-              requirements: acu.requirements_file(unit, subtractive: true))
-            _snyc_action = plan_action(
-              ::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Sync,
-              repository_href: acu.pulp_repository_href,
-              remote_href: acu.pulp_remote_href
-            )
           end
         end
-        # rubocop:enable Layout/LineLength
+        # rubocop: enable Style/GuardClause
       end
     end
   end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/destroy_providers/galaxy/destroy_full.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Actions
+    module AnsibleContentUnit
+      module DestroyProviders
+        module Galaxy
+          class DestroyFull < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+            input_format do
+              param :unit_id
+              param :unit_version_ids
+            end
+
+            def plan(args)
+              unit_id = args[:unit_id]
+
+              # Since Pulp objects are the same for content imported from Galaxy, any CUV will do
+              cuv = ::ForemanAnsibleDirector::ContentUnitVersion.where(
+                versionable_id: unit_id,
+                source_type: 'galaxy'
+              ).includes(:versionable).first
+
+              concurrence do
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Destroy,
+                  repository_href: cuv.pulp_repository_href)
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Distribution::Destroy,
+                  distribution_href: cuv.pulp_distribution_href)
+
+                if cuv.versionable.collection?
+                  plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Collection::Destroy,
+                    collection_remote_href: cuv.pulp_remote_href)
+                else
+                  plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Role::Destroy,
+                    role_remote_href: cuv.pulp_remote_href)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/destroy_providers/galaxy/destroy_partial.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Actions
+    module AnsibleContentUnit
+      module DestroyProviders
+        module Galaxy
+          class DestroyPartial < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+            input_format do
+              param :unit_id
+              param :unit_version_ids # []
+            end
+
+            def plan(args)
+              unit_version_ids = args[:unit_version_ids]
+
+              cuvs = ::ForemanAnsibleDirector::ContentUnitVersion.where(id: unit_version_ids)
+
+              versions_to_remove = cuvs.pluck(:version)
+              partial_scu = Struct.new(:versions).new(versions_to_remove)
+
+              # Shared between all versions_to_remove
+              cuv = cuvs[0]
+              acu = cuv.versionable
+
+              new_requirements = acu.requirements_file(partial_scu, subtractive: true)
+              remote_href = cuv.pulp_remote_href
+              repository_href = cuv.pulp_repository_href
+
+              _remote_update_action = plan_action(
+                ::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Collection::Update,
+                collection_remote_href: remote_href,
+                requirements: new_requirements
+              )
+              _snyc_action = plan_action(
+                ::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Sync,
+                repository_href: repository_href,
+                remote_href: remote_href
+              )
+
+              plan_self(unit_version_ids: unit_version_ids)
+            end
+
+            def finalize
+              unit_version_ids = input[:unit_version_ids]
+              ::ForemanAnsibleDirector::ContentUnitVersion.where(id: unit_version_ids).destroy_all
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/destroy_providers/git/destroy_full.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Actions
+    module AnsibleContentUnit
+      module DestroyProviders
+        module Git
+          class DestroyFull < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+            input_format do
+              param :unit_id
+              param :unit_version_id
+            end
+
+            def plan(args)
+              unit_version_id = args[:unit_version_id]
+
+              cuv = ::ForemanAnsibleDirector::ContentUnitVersion.find_by(id: unit_version_id)
+
+              concurrence do
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Destroy,
+                  repository_href: cuv.pulp_repository_href)
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Distribution::Destroy,
+                  distribution_href: cuv.pulp_distribution_href)
+
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Git::Destroy,
+                  git_remote_href: cuv.pulp_remote_href)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/destroy_providers/git/destroy_partial.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Actions
+    module AnsibleContentUnit
+      module DestroyProviders
+        module Git
+          class DestroyPartial < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+            input_format do
+              param :unit_id
+              param :unit_version_id
+            end
+
+            def plan(args)
+              unit_version_id = args[:unit_version_id]
+
+              cuv = ::ForemanAnsibleDirector::ContentUnitVersion.find_by(id: unit_version_id)
+
+              concurrence do
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Repository::Destroy,
+                  repository_href: cuv.pulp_repository_href)
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Distribution::Destroy,
+                  distribution_href: cuv.pulp_distribution_href)
+
+                plan_action(::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Git::Destroy,
+                  git_remote_href: cuv.pulp_remote_href)
+              end
+
+              plan_self(unit_version_id: unit_version_id)
+            end
+
+            def finalize
+              unit_version_id = input[:unit_version_id]
+              ::ForemanAnsibleDirector::ContentUnitVersion.find_by(id: unit_version_id)&.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/extract_variables.rb

@@ -83,13 +83,32 @@ module ForemanAnsibleDirector
           roles.transform_values! do |v|
             all_defaults = {}
             v[:defaults].each do |defaults_yaml_str|
-              if (loaded = YAML.safe_load(defaults_yaml_str))
-                all_defaults.merge!(loaded)
-              end
+              next unless (loaded = YAML.safe_load(defaults_yaml_str))
+              all_defaults.merge!(loaded.transform_values do |variable|
+                                    {
+                                      value: variable,
+                                      type: key_type(variable),
+                                    }
+                                  end)
             end
             all_defaults
           end
         end
+
+        def key_type(variable)
+          case variable
+          when TrueClass || FalseClass
+            'boolean'
+          when String
+            'string'
+          when Integer
+            'integer'
+          when Float
+            'float'
+          else
+            'yaml'
+          end
+        end
       end
     end
   end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/import.rb

@@ -12,7 +12,9 @@ module ForemanAnsibleDirector
         def plan(args)
           unit = args[:unit]
           organization_id = args[:organization_id]
-          op_type = operation_type unit
+          existing_unit = ::ForemanAnsibleDirector::ContentUnit.find_by(namespace: unit.unit_namespace,
+            name: unit.unit_name)
+          op_type = operation_type existing_unit, unit
 
           case op_type
           when :import
@@ -35,6 +37,7 @@ module ForemanAnsibleDirector
             when :galaxy
               plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::ImportProviders::Galaxy::Update,
                 unit: unit,
+                content_unit_id: existing_unit.id,
                 organization_id: organization_id)
             else
               raise NotImplementedError
@@ -58,11 +61,9 @@ module ForemanAnsibleDirector
         # | 1 | 1 | 0 | NOOP    |
         # | 1 | 1 | 1 | :update |
         # TODO: Unit test this
-        def operation_type(unit)
+        def operation_type(existing_unit, unit)
           force_override = Setting[:ad_content_import_override]
 
-          existing_unit = ::ForemanAnsibleDirector::ContentUnit.find_by(namespace: unit.unit_namespace,
-            name: unit.unit_name)
           return :import unless existing_unit
 
           existing_unit_versions = existing_unit.content_unit_versions.select do |x|

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/import_providers/galaxy/update.rb

@@ -8,6 +8,7 @@ module ForemanAnsibleDirector
           class Update < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
             input_format do
               param :unit, Object, required: true # SimpleAnsibleContentUnit
+              param :content_unit_id, String, required: true
               param :organization_id, required: true
             end
 
@@ -17,6 +18,7 @@ module ForemanAnsibleDirector
               plan_action(
                 ::ForemanAnsibleDirector::Actions::AnsibleContentUnit::ImportProviders::Galaxy::UpdateCollection,
                 unit: unit,
+                content_unit_id: args[:content_unit_id],
                 organization_id: args[:organization_id]
               )
             end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/import_providers/galaxy/update_collection.rb

@@ -8,28 +8,25 @@ module ForemanAnsibleDirector
           class UpdateCollection < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
             input_format do
               param :unit, Object, required: true # SimpleAnsibleContentUnit
+              param :content_unit_id, String, required: true
               param :organization_id, required: true
             end
 
             def plan(args)
-              unit = args[:unit]
+              existing_unit = ::ForemanAnsibleDirector::AnsibleCollection.find_by(id: args[:content_unit_id])
+              new_unit = args[:unit]
               organization_id = args[:organization_id]
 
-              existing_unit = ::ForemanAnsibleDirector::AnsibleCollection.find_by(
-                namespace: unit.unit_namespace,
-                name: unit.unit_name,
-                organization_id: organization_id
-              )
-
-              repository_href = existing_unit.pulp_repository_href
-              remote_href = existing_unit.pulp_remote_href
-              distribution_href = existing_unit.pulp_distribution_href
+              # For collections coming from Ansible Galaxy, we can reuse the existing Pulp objects
+              repository_href = existing_unit.content_unit_versions.first.pulp_repository_href
+              remote_href = existing_unit.content_unit_versions.first.pulp_remote_href
+              distribution_href = existing_unit.content_unit_versions.first.pulp_distribution_href
 
               sequence do
                 _remote_update_action = plan_action(
                   ::ForemanAnsibleDirector::Actions::Pulp3::Ansible::Remote::Collection::Update,
                   collection_remote_href: remote_href,
-                  requirements: existing_unit.requirements_file(unit)
+                  requirements: existing_unit.requirements_file(new_unit)
                 )
 
                 _snyc_action = plan_action(
@@ -44,10 +41,11 @@ module ForemanAnsibleDirector
                   repository_href: repository_href,
                   remote_href: remote_href,
                   distribution_href: distribution_href,
-                  content_unit_type: unit.unit_type,
-                  content_unit_source: unit.source,
-                  unit_name: unit.unit_name,
-                  unit_namespace: unit.unit_namespace,
+                  content_unit_type: new_unit.unit_type,
+                  content_unit_source: new_unit.source,
+                  content_unit_id: args[:content_unit_id],
+                  unit_name: new_unit.unit_name,
+                  unit_namespace: new_unit.unit_namespace,
                   organization_id: organization_id
                 )
               end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/index/dynamic/index_git_collection.rb

@@ -104,11 +104,11 @@ module ForemanAnsibleDirector
                 next if cr_variables.nil?
 
                 ActiveRecord::Base.transaction do
-                  cr_variables.each do |variable_name, variable_value|
+                  cr_variables.each do |variable_name, variable|
                     ::ForemanAnsibleDirector::VariableService.create_variable(
                       key: variable_name,
-                      type: 'yaml',
-                      default_value: variable_value,
+                      type: variable[:type],
+                      default_value: variable[:value],
                       owner: collection_role_record
                     )
                   end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/index/index_git_collection.rb

@@ -86,13 +86,6 @@ module ForemanAnsibleDirector
             unit_record = ::ForemanAnsibleDirector::ContentService.create_ansible_collection(
               name: input[:unit_name],
               namespace: input[:unit_namespace],
-              source: input[:unit_source],
-              source_type: 'git',
-              latest_version_href:
-                input[:repository_show_action_output][:repository_show_response][:latest_version_href],
-              pulp_repository_href: input[:repository_href],
-              pulp_remote_href: input[:remote_href],
-              pulp_distribution_href: input[:distribution_href],
               organization_id: input[:organization_id]
             )
 
@@ -100,9 +93,16 @@ module ForemanAnsibleDirector
 
             version = input[:indexed_unit_versions][0]
 
-            collection_version = ::ForemanAnsibleDirector::ContentService.create_ansible_collection_version(
-              collection: unit_record,
+            collection_version = ::ForemanAnsibleDirector::ContentService.create_ansible_content_unit_version(
+              versionable: unit_record,
               version: input[:unit_version],
+              source: input[:unit_source],
+              source_type: 'git',
+              latest_version_href:
+                input[:repository_show_action_output][:repository_show_response][:latest_version_href],
+              pulp_repository_href: input[:repository_href],
+              pulp_remote_href: input[:remote_href],
+              pulp_distribution_href: input[:distribution_href],
               dynamic: input[:dynamic_reference]
             )
 
@@ -116,11 +116,11 @@ module ForemanAnsibleDirector
               next if cr_variables.nil?
 
               ActiveRecord::Base.transaction do
-                cr_variables.each do |variable_name, variable_value|
+                cr_variables.each do |variable_name, variable|
                   ::ForemanAnsibleDirector::VariableService.create_variable(
                     key: variable_name,
-                    type: 'yaml',
-                    default_value: variable_value,
+                    type: variable[:type],
+                    default_value: variable[:value],
                     owner: collection_role_record
                   )
                 end