foreman_acd 0.2.1 → 0.3.0

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -16,12 +16,6 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  isNewDefinition,
-  isEditDefinition,
-  isDefinition,
-  isNewInstance,
-  isEditInstance,
-  isInstance,
   filterUsedParameterTypes,
 } from './ParameterSelectionHelper';
 
@@ -35,15 +29,20 @@ import {
   PARAMETER_SELECTION_EDIT_CHANGE,
   PARAMETER_SELECTION_EDIT_CANCEL,
   PARAMETER_SELECTION_SORT,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
 } from './ParameterSelectionConstants';
 
 export const initParameterSelection = (
-  mode,
-  serviceDefinition,
+  paramType,
+  paramDefinition,
   parameters,
+  useDefaultValue,
+  allowNameAdjustment,
+  allowDescriptionAdjustment,
   sortingFormatter,
   sortableTransform,
   inlineEditFormatter,
@@ -57,20 +56,25 @@ export const initParameterSelection = (
         position: 0
     }
   };
-  initialState.serviceDefinition = serviceDefinition;
+  initialState.paramDefinition = paramDefinition;
 
   let valueLabel = 'Value';
-  if (isDefinition(mode)) {
+  if (useDefaultValue) {
     valueLabel = 'Default value';
   }
 
-  initialState.columns = [
-    {
+  initialState.columns = []
+  const addToColumns = (obj, idx) => {
+    obj.header.props.index = idx;
+    initialState.columns.push(obj);
+  }
+
+  let idx = 0;
+  addToColumns( {
       property: 'name',
       header: {
         label: 'Name',
         props: {
-          index: 0,
           sort: true,
           style: {
             width: '20%'
@@ -81,15 +85,15 @@ export const initParameterSelection = (
         customFormatters: [sortableHeaderCellFormatter]
       },
       cell: {
-        formatters: [isDefinition(mode) ? inlineEditFormatter : tableCellFormatter]
+        formatters: [allowNameAdjustment ? inlineEditFormatter : tableCellFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  addToColumns( {
       property: 'description',
       header: {
         label: 'Description',
         props: {
-          index: 1,
           sort: true,
           style: {
             width: '20%'
@@ -103,15 +107,16 @@ export const initParameterSelection = (
         props: {
           index: 1
         },
-        formatters: [isDefinition(mode) ? inlineEditFormatter : tableCellFormatter]
+        formatters: [allowDescriptionAdjustment ? inlineEditFormatter : tableCellFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  if (paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+    addToColumns( {
       property: 'type',
       header: {
         label: 'Type',
         props: {
-          index: 2,
           sort: true,
           style: {
             width: '20%'
@@ -126,13 +131,14 @@ export const initParameterSelection = (
         // the well formatted type name is shown
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+  }
+
+  addToColumns( {
       property: 'value',
       header: {
         label: valueLabel,
         props: {
-          index: 3,
           sort: true,
           style: {
             width: '20%'
@@ -145,13 +151,13 @@ export const initParameterSelection = (
       cell: {
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  addToColumns( {
       property: 'actions',
       header: {
         label: 'Actions',
         props: {
-          index: 4,
           style: {
             width: '20%'
           }
@@ -161,21 +167,11 @@ export const initParameterSelection = (
       cell: {
         formatters: [inlineEditButtonsFormatter]
       }
-    }
-  ];
+    }, idx++);
 
-  if (isNewDefinition(mode)) {
-    initialState.parameters = [];
-  } else if ((isEditDefinition(mode)) || (isInstance(mode))) {
-    initialState.parameters = parameters;
-    initialState.hostgroupId = serviceDefinition.hostgroup_id;
-  } else {
-    // FIXME: should never ever happen
-  }
+  initialState.parameters = parameters;
 
-  if (isNewDefinition(mode)) {
-    initialState.parameterTypes = PARAMETER_SELECTION_TYPES;
-  } else {
+  if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
     initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters);
   }
 
@@ -244,22 +240,23 @@ export const sortParameter = (selectedColumn, defaultSortingOrder) => ({
   },
 });
 
-export const loadForemanData = (
-  hostgroupId,
-  additionalData,
-) => dispatch => {
-  dispatch({ type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST, payload: { clearParameters: additionalData.clearParameters } });
+export const loadParamData = (attr) => dispatch => {
+  dispatch( { type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST, payload: { dataType: attr.dataType, clearParameters: attr.clearParameters } });
+
+  let realUrl = attr.url.replace("__id__", attr.paramDefinition.dataId);
 
-  const realUrl = additionalData.url.replace("__id__", hostgroupId);
+  if (attr.paramDefinition.hasOwnProperty('dataSubId')) {
+    realUrl = realUrl.replace("__subid__", attr.paramDefinition.dataSubId);
+  }
 
   return api
     .get(realUrl, {}, {})
     .then(({ data }) =>
       dispatch({
-        type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-        payload: data,
+        type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+        payload: { ...data, dataType: attr.dataType }
       })
     )
-    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE, error)));
+    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)));
 };
 

data/webpack/components/ParameterSelection/ParameterSelectionConstants.js

@@ -6,9 +6,11 @@ export const PARAMETER_SELECTION_EDIT_CONFIRM = 'PARAMETER_SELECTION_EDIT_CONFIR
 export const PARAMETER_SELECTION_EDIT_CHANGE = 'PARAMETER_SELECTION_EDIT_CHANGE';
 export const PARAMETER_SELECTION_EDIT_CANCEL = 'PARAMETER_SELECTION_EDIT_CANCEL';
 export const PARAMETER_SELECTION_SORT = 'PARAMETER_SELECTION_SORT';
-export const PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST';
-export const PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS';
-export const PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE';
+export const PARAMETER_SELECTION_PARAM_TYPE_FOREMAN = 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN';
+export const PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE = 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE';
 
 // Make sure the object is sorted by value
 //   (Compute Profile -> Partition table -> Root password)

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -2,38 +2,6 @@ import {
   cloneDeep,
 } from 'lodash';
 
-export const isNewDefinition = (mode) => {
-  if (mode == "newDefinition")
-    return true;
-  return false;
-}
-
-export const isEditDefinition = (mode) => {
-  if (mode == "editDefinition")
-    return true;
-  return false;
-}
-
-export const isDefinition = (mode) => {
-  return (isNewDefinition(mode) || isEditDefinition(mode))
-}
-
-export const isNewInstance = (mode) => {
-  if (mode == "newInstance")
-    return true;
-  return false;
-}
-
-export const isEditInstance = (mode) => {
-  if (mode == "editInstance")
-    return true;
-  return false;
-}
-
-export const isInstance = (mode) => {
-  return (isNewInstance(mode) || isEditInstance(mode))
-}
-
 export const transformForemanData = (fdata) => {
   if (fdata === undefined) {
     return "";

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -22,9 +22,11 @@ import {
   PARAMETER_SELECTION_EDIT_CHANGE,
   PARAMETER_SELECTION_EDIT_CANCEL,
   PARAMETER_SELECTION_SORT,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
 } from './ParameterSelectionConstants';
 
 import {
@@ -127,18 +129,26 @@ const parameterSelectionParameters = (state = initialState, action) => {
         })
       );
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE: {
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE: {
       return state.merge({
         error: payload.error,
         loading: false
       });
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST: {
-      const newState = {
-        foremanData: {},
-        hostgroupId: -1,
-        loading: true
-      };
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST: {
+      let newState = {};
+
+      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+        newState = {
+          paramData: {},
+          hostgroupId: -1,
+          loading: true
+        };
+      } else if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE) {
+        newState = {
+          loading: true
+        };
+      }
 
       if (payload.clearParameters === true) {
         Object.assign(newState, { parameters: [] });
@@ -146,12 +156,18 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge(newState);
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS: {
-      return state.merge({
-        loading: false,
-        foremanData: payload,
-        hostgroupId: payload.hostgroup_id,
-      });
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS: {
+      let newState = {};
+
+      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+        newState = {
+          loading: false,
+          paramData: payload,
+          hostgroupId: payload.hostgroup_id,
+        };
+      }
+
+      return state.merge(newState);
     }
     case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE: {
       const parameters = cloneDeep(state.parameters);

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -2,10 +2,10 @@ const parameterState = state => state.foremanAcd.parameterSelectionParameters;
 
 export const selectLoading = state => parameterState(state).loading;
 export const selectEditMode = state => parameterState(state).editMode;
-export const selectForemanData = state => parameterState(state).foremanData;
+export const selectParamData = state => parameterState(state).paramData;
 export const selectParameterTypes = state => parameterState(state).parameterTypes;
 export const selectParameters = state => parameterState(state).parameters;
 export const selectSortingColumns = state => parameterState(state).sortingColumns;
 export const selectColumns = state => parameterState(state).columns;
-export const selectServiceDefinition = state => parameterState(state).serviceDefinition;
+export const selectParamDefinition = state => parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;

data/webpack/components/ParameterSelection/index.js

@@ -8,23 +8,23 @@ import * as ParameterSelectionActions from './ParameterSelectionActions';
 import {
   selectLoading,
   selectEditMode,
-  selectForemanData,
+  selectParamData,
   selectParameterTypes,
   selectParameters,
   selectSortingColumns,
   selectColumns,
-  selectServiceDefinition,
+  selectParamDefinition,
 } from './ParameterSelectionSelectors';
 
 const mapStateToProps = state => ({
   loading: selectLoading(state),
   editMode: selectEditMode(state),
-  foremanData: selectForemanData(state),
+  paramData: selectParamData(state),
   parameterTypes: selectParameterTypes(state),
   parameters: selectParameters(state),
   sortingColumns: selectSortingColumns(state),
   columns: selectColumns(state),
-  serviceDefinition: selectServiceDefinition(state),
+  paramDefinition: selectParamDefinition(state),
 });
 
 const mapDispatchToProps = dispatch =>

data/webpack/components/common/DeleteTableEntry.js

@@ -23,7 +23,7 @@ const DeleteTableEntry = ({
         disabled={disabled}
         onClick={() => window.confirm("Are you sure you wish to delete this item?") && onDeleteTableEntry(additionalData) }
       >
-        <Icon type="pf" name="delete" />
+        <Icon type="pf" name="delete" title="delete entry" />
       </Button>
     </span>
   );

data/webpack/reducer.js

@@ -1,9 +1,4 @@
 import { combineReducers } from 'redux';
-import {
-  cloneDeep,
-  findIndex,
-  findLastIndex,
-} from 'lodash';
 
 import parameterSelectionParameters from './components/ParameterSelection/ParameterSelectionReducer';
 import applicationDefinitionConf from './components/ApplicationDefinition/ApplicationDefinitionReducer';
@@ -11,11 +6,13 @@ import applicationInstanceConf from './components/ApplicationInstance/Applicatio
 import applicationInstanceReport from './components/ApplicationInstanceReport/ApplicationInstanceReportReducer';
 
 import {
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
 } from './components/ApplicationDefinition/ApplicationDefinitionConstants';
 
 import {
-  APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
 } from './components/ApplicationInstance/ApplicationInstanceConstants';
 
 const rootReducer = (state = {}, action) => {
@@ -23,13 +20,19 @@ const rootReducer = (state = {}, action) => {
   const param_state = parameterSelectionParameters(state.parameterSelectionParameters, action);
   const app_ins_report_state = applicationInstanceReport(state.applicationInstanceReport, action);
 
-  if (action.type == APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE) {
-    action.payload.serviceParameterSelection = param_state.parameters;
+  if (action.type == APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE) {
+    action.payload.parameterSelection = param_state.parameters;
+  }
+  if (action.type == APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE) {
+    action.payload.parameterSelection = param_state.parameters;
   }
   const app_def_state = applicationDefinitionConf(state.applicationDefinitionConf, action);
 
-  if (action.type == APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE) {
-    action.payload.hostParameterSelection = param_state.parameters;
+  if (action.type == APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE) {
+    action.payload.parameterSelection = param_state.parameters;
+  }
+  if (action.type == APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE) {
+    action.payload.parameterSelection = param_state.parameters;
   }
   const app_ins_state = applicationInstanceConf(state.applicationInstanceConf, action);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_acd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
+- !ruby/object:Gem::Dependency
+  name: foreman_remote_execution
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 description: Foreman plugin to provide application centric deployment and self service
   portal
 email:
@@ -36,16 +50,38 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/foreman_acd/acd_dummy.js
+- app/controllers/foreman_acd/ansible_playbooks_controller.rb
+- app/controllers/foreman_acd/api/v2/ansible_playbooks_controller.rb
 - app/controllers/foreman_acd/api/v2/app_definitions_controller.rb
+- app/controllers/foreman_acd/api/v2/app_instances_controller.rb
+- app/controllers/foreman_acd/api/v2/app_playbooks_controller.rb
 - app/controllers/foreman_acd/api/v2/base_controller.rb
 - app/controllers/foreman_acd/app_definitions_controller.rb
 - app/controllers/foreman_acd/app_instances_controller.rb
 - app/controllers/foreman_acd/application_controller.rb
+- app/controllers/foreman_acd/concerns/ansible_playbook_parameters.rb
 - app/controllers/foreman_acd/concerns/app_definition_parameters.rb
 - app/controllers/foreman_acd/concerns/app_instance_parameters.rb
 - app/controllers/ui_acd_controller.rb
+- app/models/foreman_acd/ansible_playbook.rb
 - app/models/foreman_acd/app_definition.rb
 - app/models/foreman_acd/app_instance.rb
+- app/services/foreman_acd/app_configurator.rb
+- app/services/foreman_acd/app_deployer.rb
+- app/services/foreman_acd/inventory_creator.rb
+- app/views/foreman_acd/ansible_playbooks/_form.html.erb
+- app/views/foreman_acd/ansible_playbooks/edit.html.erb
+- app/views/foreman_acd/ansible_playbooks/index.html.erb
+- app/views/foreman_acd/ansible_playbooks/new.html.erb
+- app/views/foreman_acd/api/v2/ansible_playbooks/base.json.rabl
+- app/views/foreman_acd/api/v2/ansible_playbooks/index.json.rabl
+- app/views/foreman_acd/api/v2/ansible_playbooks/show.json.rabl
+- app/views/foreman_acd/api/v2/app_definitions/base.json.rabl
+- app/views/foreman_acd/api/v2/app_definitions/index.json.rabl
+- app/views/foreman_acd/api/v2/app_definitions/show.json.rabl
+- app/views/foreman_acd/api/v2/app_instances/base.json.rabl
+- app/views/foreman_acd/api/v2/app_instances/index.json.rabl
+- app/views/foreman_acd/api/v2/app_instances/show.json.rabl
 - app/views/foreman_acd/app_definitions/_form.html.erb
 - app/views/foreman_acd/app_definitions/edit.html.erb
 - app/views/foreman_acd/app_definitions/import.html.erb
@@ -57,17 +93,24 @@ files:
 - app/views/foreman_acd/app_instances/index.html.erb
 - app/views/foreman_acd/app_instances/new.html.erb
 - app/views/foreman_acd/app_instances/report.html.erb
+- app/views/templates/job/run_acd_ansible_playbook.erb
+- app/views/ui_acd/ansible_data.json.rabl
 - app/views/ui_acd/app.json.rabl
 - app/views/ui_acd/app_definition.json.rabl
 - app/views/ui_acd/computeprofile.json.rabl
 - app/views/ui_acd/domain.json.rabl
 - app/views/ui_acd/environment.json.rabl
-- app/views/ui_acd/fdata.json.rabl
+- app/views/ui_acd/foreman_data.json.rabl
 - app/views/ui_acd/lifecycle_environment.json.rabl
 - app/views/ui_acd/ptable.json.rabl
 - config/routes.rb
 - db/migrate/20190610202252_create_app_definitions.rb
 - db/migrate/20190625140305_create_app_instances.rb
+- db/migrate/20200916091018_create_ansible_playbooks.rb
+- db/migrate/20200917120220_add_ansible_playbook_id.rb
+- db/migrate/20201016002819_add_ansible_vars_all_to_app_definitions.rb
+- db/migrate/20201016104338_add_ansible_vars_all_to_app_instances.rb
+- db/seeds.d/75-job_templates.rb
 - lib/foreman_acd.rb
 - lib/foreman_acd/engine.rb
 - lib/foreman_acd/plugin.rb
@@ -90,8 +133,10 @@ files:
 - webpack/components/ApplicationDefinition/ApplicationDefinition.scss
 - webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js
 - webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js
+- webpack/components/ApplicationDefinition/ApplicationDefinitionHelper.js
 - webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js
 - webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js
+- webpack/components/ApplicationDefinition/components/AnsiblePlaybookSelector.js
 - webpack/components/ApplicationDefinition/index.js
 - webpack/components/ApplicationInstance/ApplicationInstance.js
 - webpack/components/ApplicationInstance/ApplicationInstance.scss