External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-09 23:12:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove insights_credential from inventory

Browse Source
This commit is contained in:
Bill Nottingham 2021-06-16 16:47:42 -04:00 committed by Shane McDonald
parent 0947d30682
commit 1e68519c99
No known key found for this signature in database
GPG Key ID: 6F374AF6E9EB9374
26 changed files with 38 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@ -144,7 +144,6 @@ SUMMARIZABLE_FK_FIELDS = {
'inventory_sources_with_failures',
'organization_id',
'kind',
'insights_credential_id',
),
'host': DEFAULT_SUMMARY_FIELDS,
'group': DEFAULT_SUMMARY_FIELDS,
@ -171,7 +170,6 @@ SUMMARIZABLE_FK_FIELDS = {
'role': ('id', 'role_field'),
'notification_template': DEFAULT_SUMMARY_FIELDS,
'instance_group': ('id', 'name', 'is_container_group'),
'insights_credential': DEFAULT_SUMMARY_FIELDS,
'source_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'),
'target_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'),
'webhook_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'),
@ -1661,7 +1659,6 @@ class InventorySerializer(BaseSerializerWithVariables):
'has_inventory_sources',
'total_inventory_sources',
'inventory_sources_with_failures',
'insights_credential',
'pending_deletion',
)
@ -1686,8 +1683,6 @@ class InventorySerializer(BaseSerializerWithVariables):
copy=self.reverse('api:inventory_copy', kwargs={'pk': obj.pk}),
)
)
if obj.insights_credential:
res['insights_credential'] = self.reverse('api:credential_detail', kwargs={'pk': obj.insights_credential.pk})
if obj.organization:
res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization.pk})
return res
@ -2636,7 +2631,6 @@ class CredentialSerializer(BaseSerializer):
if self.instance and credential_type.pk != self.instance.credential_type.pk:
for related_objects in (
'ad_hoc_commands',
'insights_inventories',
'unifiedjobs',
'unifiedjobtemplates',
'projects',

6
awx/main/access.py
View File

@ -867,13 +867,11 @@ class InventoryAccess(BaseAccess):
# If no data is specified, just checking for generic add permission?
if not data:
return Organization.accessible_objects(self.user, 'inventory_admin_role').exists()
return self.check_related('organization', Organization, data, role_field='inventory_admin_role') and self.check_related(
'insights_credential', Credential, data, role_field='use_role'
)
return self.check_related('organization', Organization, data, role_field='inventory_admin_role')
@check_superuser
def can_change(self, obj, data):
return self.can_admin(obj, data) and self.check_related('insights_credential', Credential, data, obj=obj, role_field='use_role')
return self.can_admin(obj, data)
@check_superuser
def can_admin(self, obj, data):

17
awx/main/migrations/0149_remove_inventory_insights_credential.py Normal file
View File

@ -0,0 +1,17 @@
# Generated by Django 2.2.16 on 2021-06-16 21:00
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('main', '0148_unifiedjob_receptor_unit_id'),
]
operations = [
migrations.RemoveField(
model_name='inventory',
name='insights_credential',
),
]

16
awx/main/models/inventory.py
View File

@ -165,15 +165,6 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
'admin_role',
]
)
insights_credential = models.ForeignKey(
'Credential',
related_name='insights_inventories',
help_text=_('Credentials to be used by hosts belonging to this inventory when accessing Red Hat Insights API.'),
on_delete=models.SET_NULL,
blank=True,
null=True,
default=None,
)
pending_deletion = models.BooleanField(
default=False,
editable=False,
@ -368,13 +359,6 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
group_pks = self.groups.values_list('pk', flat=True)
return self.groups.exclude(parents__pk__in=group_pks).distinct()
def clean_insights_credential(self):
if self.kind == 'smart' and self.insights_credential:
raise ValidationError(_("Assignment not allowed for Smart Inventory"))
if self.insights_credential and self.insights_credential.credential_type.kind != 'insights':
raise ValidationError(_("Credential kind must be 'insights'."))
return self.insights_credential
@transaction.atomic
def schedule_deletion(self, user_id=None):
from awx.main.tasks import delete_inventory

3
awx/main/tests/functional/api/test_credential.py
View File

@ -5,7 +5,7 @@ import pytest
from django.utils.encoding import smart_str
from awx.main.models import AdHocCommand, Credential, CredentialType, Job, JobTemplate, Inventory, InventorySource, Project, WorkflowJobNode
from awx.main.models import AdHocCommand, Credential, CredentialType, Job, JobTemplate, InventorySource, Project, WorkflowJobNode
from awx.main.utils import decrypt_field
from awx.api.versioning import reverse
@ -857,7 +857,6 @@ def test_field_removal(put, organization, admin, credentialtype_ssh):
'relation, related_obj',
[
['ad_hoc_commands', AdHocCommand()],
['insights_inventories', Inventory()],
['unifiedjobs', Job()],
['unifiedjobtemplates', JobTemplate()],
['unifiedjobtemplates', InventorySource(source='ec2')],

20
awx/main/tests/functional/api/test_inventory.py
View File

@ -592,23 +592,3 @@ class TestControlledBySCM:
rando,
expect=403,
)
@pytest.mark.django_db
class TestInsightsCredential:
def test_insights_credential(self, patch, insights_inventory, admin_user, insights_credential):
patch(insights_inventory.get_absolute_url(), {'insights_credential': insights_credential.id}, admin_user, expect=200)
def test_insights_credential_protection(self, post, patch, insights_inventory, alice, insights_credential):
insights_inventory.organization.admin_role.members.add(alice)
insights_inventory.admin_role.members.add(alice)
post(
reverse('api:inventory_list'),
{"name": "test", "organization": insights_inventory.organization.id, "insights_credential": insights_credential.id},
alice,
expect=403,
)
patch(insights_inventory.get_absolute_url(), {'insights_credential': insights_credential.id}, alice, expect=403)
def test_non_insights_credential(self, patch, insights_inventory, admin_user, scm_credential):
patch(insights_inventory.get_absolute_url(), {'insights_credential': scm_credential.id}, admin_user, expect=400)

40
awx/main/tests/unit/models/test_inventory.py
View File

@ -1,15 +1,11 @@
import pytest
from unittest import mock
import json
from django.core.exceptions import ValidationError
from awx.main.models import (
UnifiedJob,
InventoryUpdate,
Inventory,
Credential,
CredentialType,
InventorySource,
)
@ -39,42 +35,6 @@ def test__build_job_explanation():
)
def test_valid_clean_insights_credential():
cred_type = CredentialType.defaults['insights']()
insights_cred = Credential(credential_type=cred_type)
inv = Inventory(insights_credential=insights_cred)
inv.clean_insights_credential()
def test_invalid_clean_insights_credential():
cred_type = CredentialType.defaults['scm']()
cred = Credential(credential_type=cred_type)
inv = Inventory(insights_credential=cred)
with pytest.raises(ValidationError) as e:
inv.clean_insights_credential()
assert json.dumps(str(e.value)) == json.dumps(str([u"Credential kind must be 'insights'."]))
def test_valid_kind_clean_insights_credential():
inv = Inventory(kind='smart')
inv.clean_insights_credential()
def test_invalid_kind_clean_insights_credential():
cred_type = CredentialType.defaults['insights']()
insights_cred = Credential(credential_type=cred_type)
inv = Inventory(kind='smart', insights_credential=insights_cred)
with pytest.raises(ValidationError) as e:
inv.clean_insights_credential()
assert json.dumps(str(e.value)) == json.dumps(str([u'Assignment not allowed for Smart Inventory']))
class TestControlledBySCM:
def test_clean_source_path_valid(self):
inv_src = InventorySource(source_path='/not_real/', source='scm')

2
awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx
View File

@ -67,7 +67,7 @@ describe('<CredentialDetail />', () => {
test('should have proper number of delete detail requests', () => {
expect(
wrapper.find('DeleteButton').prop('deleteDetailsRequests')
).toHaveLength(6);
).toHaveLength(5);
});
test('should render details', () => {

2
awx/ui_next/src/screens/Credential/CredentialList/CredentialList.test.jsx
View File

@ -43,7 +43,7 @@ describe('<CredentialList />', () => {
test('should have proper number of delete detail requests', () => {
expect(
wrapper.find('ToolbarDeleteButton').prop('deleteDetailsRequests')
).toHaveLength(6);
).toHaveLength(5);
});
test('should fetch credentials from api and render the in the list', () => {

37
awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx
View File

@ -1,53 +1,26 @@
import React, { useState, useEffect } from 'react';
import React, { useState } from 'react';
import { useHistory } from 'react-router-dom';
import { PageSection, Card } from '@patternfly/react-core';
import { CardBody } from '../../../components/Card';
import ContentLoading from '../../../components/ContentLoading';
import { InventoriesAPI, CredentialTypesAPI } from '../../../api';
import { InventoriesAPI } from '../../../api';
import InventoryForm from '../shared/InventoryForm';
function InventoryAdd() {
const [error, setError] = useState(null);
const [isLoading, setIsLoading] = useState(true);
const [credentialTypeId, setCredentialTypeId] = useState(null);
const history = useHistory();
useEffect(() => {
const loadData = async () => {
try {
const {
data: { results: loadedCredentialTypeId },
} = await CredentialTypesAPI.read({ kind: 'insights' });
setCredentialTypeId(loadedCredentialTypeId[0].id);
} catch (err) {
setError(err);
} finally {
setIsLoading(false);
}
};
loadData();
}, [isLoading, credentialTypeId]);
const handleCancel = () => {
history.push('/inventories');
};
const handleSubmit = async values => {
const {
instanceGroups,
organization,
insights_credential,
...remainingValues
} = values;
const { instanceGroups, organization, ...remainingValues } = values;
try {
const {
data: { id: inventoryId },
} = await InventoriesAPI.create({
organization: organization.id,
insights_credential: insights_credential
? insights_credential.id
: null,
...remainingValues,
});
if (instanceGroups) {
@ -68,9 +41,6 @@ function InventoryAdd() {
}
};
if (isLoading) {
return <ContentLoading />;
}
return (
<PageSection>
<Card>
@ -78,7 +48,6 @@ function InventoryAdd() {
<InventoryForm
onCancel={handleCancel}
onSubmit={handleSubmit}
credentialTypeId={credentialTypeId}
submitError={error}
/>
</CardBody>

14
awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx
View File

@ -7,7 +7,7 @@ import {
} from '../../../../testUtils/enzymeHelpers';
import { sleep } from '../../../../testUtils/testUtils';
import { InventoriesAPI, CredentialTypesAPI } from '../../../api';
import { InventoriesAPI } from '../../../api';
import InventoryAdd from './InventoryAdd';
jest.mock('../../../api');
@ -18,16 +18,6 @@ describe('<InventoryAdd />', () => {
beforeEach(async () => {
history = createMemoryHistory({ initialEntries: ['/inventories'] });
CredentialTypesAPI.read.mockResolvedValue({
data: {
results: [
{
id: 14,
name: 'insights',
},
],
},
});
InventoriesAPI.create.mockResolvedValue({ data: { id: 13 } });
await act(async () => {
wrapper = mountWithContexts(<InventoryAdd />, {
@ -50,7 +40,6 @@ describe('<InventoryAdd />', () => {
wrapper.find('InventoryForm').prop('onSubmit')({
name: 'new Foo',
organization: { id: 2 },
insights_credential: { id: 47 },
instanceGroups,
});
});
@ -58,7 +47,6 @@ describe('<InventoryAdd />', () => {
expect(InventoriesAPI.create).toHaveBeenCalledWith({
name: 'new Foo',
organization: 2,
insights_credential: 47,
});
instanceGroups.map(IG =>
expect(InventoriesAPI.associateInstanceGroup).toHaveBeenCalledWith(

5
awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx
View File

@ -22,10 +22,6 @@ const mockInventory = {
copy: true,
adhoc: true,
},
insights_credential: {
id: 1,
name: 'Foo',
},
},
created: '2019-10-04T16:56:48.025455Z',
modified: '2019-10-04T16:56:48.025468Z',
@ -43,7 +39,6 @@ const mockInventory = {
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
};

33
awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.jsx
View File

@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
import { object } from 'prop-types';
import { CardBody } from '../../../components/Card';
import { InventoriesAPI, CredentialTypesAPI } from '../../../api';
import { InventoriesAPI } from '../../../api';
import ContentLoading from '../../../components/ContentLoading';
import InventoryForm from '../shared/InventoryForm';
import { getAddedAndRemoved } from '../../../util/lists';
@ -13,31 +13,19 @@ function InventoryEdit({ inventory }) {
const [error, setError] = useState(null);
const [associatedInstanceGroups, setInstanceGroups] = useState(null);
const [contentLoading, setContentLoading] = useState(true);
const [credentialTypeId, setCredentialTypeId] = useState(null);
const history = useHistory();
const isMounted = useIsMounted();
useEffect(() => {
const loadData = async () => {
try {
const [
{
data: { results: loadedInstanceGroups },
},
{
data: { results: loadedCredentialTypeId },
},
] = await Promise.all([
InventoriesAPI.readInstanceGroups(inventory.id),
CredentialTypesAPI.read({
kind: 'insights',
}),
]);
const {
data: { results: loadedInstanceGroups },
} = await InventoriesAPI.readInstanceGroups(inventory.id);
if (!isMounted.current) {
return;
}
setInstanceGroups(loadedInstanceGroups);
setCredentialTypeId(loadedCredentialTypeId[0].id);
} catch (err) {
setError(err);
} finally {
@ -48,7 +36,7 @@ function InventoryEdit({ inventory }) {
};
loadData();
/* eslint-disable-next-line react-hooks/exhaustive-deps */
}, [inventory.id, contentLoading, inventory, credentialTypeId]);
}, [inventory.id, contentLoading, inventory]);
const handleCancel = () => {
const url =
@ -60,17 +48,9 @@ function InventoryEdit({ inventory }) {
};
const handleSubmit = async values => {
const {
instanceGroups,
insights_credential,
organization,
...remainingValues
} = values;
const { instanceGroups, organization, ...remainingValues } = values;
try {
await InventoriesAPI.update(inventory.id, {
insights_credential: insights_credential
? insights_credential.id
: null,
organization: organization.id,
...remainingValues,
});
@ -109,7 +89,6 @@ function InventoryEdit({ inventory }) {
onSubmit={handleSubmit}
inventory={inventory}
instanceGroups={associatedInstanceGroups}
credentialTypeId={credentialTypeId}
submitError={error}
/>
</CardBody>

18
awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.test.jsx
View File

@ -7,7 +7,7 @@ import {
} from '../../../../testUtils/enzymeHelpers';
import { sleep } from '../../../../testUtils/testUtils';
import { InventoriesAPI, CredentialTypesAPI } from '../../../api';
import { InventoriesAPI } from '../../../api';
import InventoryEdit from './InventoryEdit';
jest.mock('../../../api');
@ -28,10 +28,6 @@ const mockInventory = {
copy: true,
adhoc: true,
},
insights_credential: {
id: 1,
name: 'Foo',
},
},
created: '2019-10-04T16:56:48.025455Z',
modified: '2019-10-04T16:56:48.025468Z',
@ -49,7 +45,6 @@ const mockInventory = {
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
};
@ -65,16 +60,6 @@ describe('<InventoryEdit />', () => {
let history;
beforeEach(async () => {
CredentialTypesAPI.read.mockResolvedValue({
data: {
results: [
{
id: 14,
name: 'insights',
},
],
},
});
InventoriesAPI.readInstanceGroups.mockResolvedValue({
data: {
results: associatedInstanceGroups,
@ -117,7 +102,6 @@ describe('<InventoryEdit />', () => {
name: 'Foo',
id: 13,
organization: { id: 1 },
insights_credential: { id: 13 },
instanceGroups,
});
});

3
awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
View File

@ -47,7 +47,6 @@ const mockInventories = [
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
},
{
@ -83,7 +82,6 @@ const mockInventories = [
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
},
{
@ -119,7 +117,6 @@ const mockInventories = [
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
},
];

32
awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
View File

@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import { Formik, useField, useFormikContext } from 'formik';
import { t } from '@lingui/macro';
import { func, number, shape } from 'prop-types';
import { func, shape } from 'prop-types';
import { Form } from '@patternfly/react-core';
import { VariablesField } from '../../../components/CodeEditor';
import FormField, { FormSubmitError } from '../../../components/FormField';
@ -9,13 +9,12 @@ import FormActionGroup from '../../../components/FormActionGroup';
import { required } from '../../../util/validators';
import InstanceGroupsLookup from '../../../components/Lookup/InstanceGroupsLookup';
import OrganizationLookup from '../../../components/Lookup/OrganizationLookup';
import CredentialLookup from '../../../components/Lookup/CredentialLookup';
import {
FormColumnLayout,
FormFullWidthLayout,
} from '../../../components/FormLayout';
function InventoryFormFields({ credentialTypeId, inventory }) {
function InventoryFormFields({ inventory }) {
const { setFieldValue, setFieldTouched } = useFormikContext();
const [organizationField, organizationMeta, organizationHelpers] = useField(
'organization'
@ -23,9 +22,6 @@ function InventoryFormFields({ credentialTypeId, inventory }) {
const [instanceGroupsField, , instanceGroupsHelpers] = useField(
'instanceGroups'
);
const [insightsCredentialField, insightsCredentialMeta] = useField(
'insights_credential'
);
const handleOrganizationUpdate = useCallback(
value => {
setFieldValue('organization', value);
@ -34,14 +30,6 @@ function InventoryFormFields({ credentialTypeId, inventory }) {
[setFieldValue, setFieldTouched]
);
const handleCredentialUpdate = useCallback(
value => {
setFieldValue('insights_credential', value);
setFieldTouched('insights_credential', true, false);
},
[setFieldValue, setFieldTouched]
);
return (
<>
<FormField
@ -70,17 +58,6 @@ function InventoryFormFields({ credentialTypeId, inventory }) {
autoPopulate={!inventory?.id}
validate={required(t`Select a value for this field`)}
/>
<CredentialLookup
helperTextInvalid={insightsCredentialMeta.error}
isValid={
!insightsCredentialMeta.touched || !insightsCredentialMeta.error
}
label={t`Insights Credential`}
credentialTypeId={credentialTypeId}
onChange={handleCredentialUpdate}
value={insightsCredentialField.value}
fieldName="insights_credential"
/>
<InstanceGroupsLookup
value={instanceGroupsField.value}
onChange={value => {
@ -116,10 +93,6 @@ function InventoryForm({
(inventory.summary_fields && inventory.summary_fields.organization) ||
null,
instanceGroups: instanceGroups || [],
insights_credential:
(inventory.summary_fields &&
inventory.summary_fields.insights_credential) ||
null,
};
return (
@ -150,7 +123,6 @@ InventoryForm.propType = {
handleCancel: func.isRequired,
instanceGroups: shape(),
inventory: shape(),
credentialTypeId: number.isRequired,
submitError: shape(),
};

18
awx/ui_next/src/screens/Inventory/shared/InventoryForm.test.jsx
View File

@ -25,10 +25,6 @@ const inventory = {
copy: true,
adhoc: true,
},
insights_credential: {
id: 1,
name: 'Foo',
},
},
created: '2019-10-04T16:56:48.025455Z',
modified: '2019-10-04T16:56:48.025468Z',
@ -46,7 +42,6 @@ const inventory = {
has_inventory_sources: false,
total_inventory_sources: 0,
inventory_sources_with_failures: 0,
insights_credential: null,
pending_deletion: false,
};
@ -89,9 +84,6 @@ describe('<InventoryForm />', () => {
expect(wrapper.find('FormGroup[label="Description"]').length).toBe(1);
expect(wrapper.find('FormGroup[label="Organization"]').length).toBe(1);
expect(wrapper.find('FormGroup[label="Instance Groups"]').length).toBe(1);
expect(wrapper.find('FormGroup[label="Insights Credential"]').length).toBe(
1
);
expect(wrapper.find('VariablesField[label="Variables"]').length).toBe(1);
expect(wrapper.find('CodeEditor').prop('value')).toEqual('---');
});
@ -107,12 +99,6 @@ describe('<InventoryForm />', () => {
wrapper.find('input#inventory-name').simulate('change', {
target: { value: 'new Foo', name: 'name' },
});
wrapper.find('CredentialLookup').invoke('onBlur')();
wrapper.find('CredentialLookup').invoke('onChange')({
id: 10,
name: 'credential',
});
});
wrapper.update();
expect(wrapper.find('OrganizationLookup').prop('value')).toEqual({
@ -122,10 +108,6 @@ describe('<InventoryForm />', () => {
expect(wrapper.find('input#inventory-name').prop('value')).toEqual(
'new Foo'
);
expect(wrapper.find('CredentialLookup').prop('value')).toEqual({
id: 10,
name: 'credential',
});
});
test('should call handleCancel when Cancel button is clicked', async () => {

1
awx/ui_next/src/screens/Inventory/shared/data.inventory.json
View File

@ -91,6 +91,5 @@
"has_inventory_sources": false,
"total_inventory_sources": 0,
"inventory_sources_with_failures": 0,
"insights_credential": null,
"pending_deletion": false
}

1
awx/ui_next/src/screens/Inventory/shared/data.smart_inventory.json
View File

@ -90,6 +90,5 @@
"has_inventory_sources": false,
"total_inventory_sources": 0,
"inventory_sources_with_failures": 0,
"insights_credential": null,
"pending_deletion": false
}

3
awx/ui_next/src/util/getRelatedResouceDeleteDetails.test.js
View File

@ -33,9 +33,6 @@ describe('delete details', () => {
getRelatedResourceDeleteCounts(
relatedResourceDeleteRequests.credential({ id: 1 })
);
expect(InventoriesAPI.read).toBeCalledWith({
insights_credential: 1,
});
expect(InventorySourcesAPI.read).toBeCalledWith({
credentials__id: 1,
});

7
awx/ui_next/src/util/getRelatedResourceDeleteDetails.js
View File

@ -58,13 +58,6 @@ export const relatedResourceDeleteRequests = {
request: () => ProjectsAPI.read({ credentials: selected.id }),
label: t`Projects`,
},
{
request: () =>
InventoriesAPI.read({
insights_credential: selected.id,
}),
label: t`Inventories`,
},
{
request: () =>
InventorySourcesAPI.read({

8
awx_collection/plugins/modules/inventory.py
View File

@ -57,10 +57,6 @@ options:
description:
- The host_filter field. Only useful when C(kind=smart).
type: str
insights_credential:
description:
- Credentials to be used by hosts belonging to this inventory when accessing Red Hat Insights API.
type: str
instance_groups:
description:
- list of Instance Groups for this Organization to run on.
@ -110,7 +106,6 @@ def main():
kind=dict(choices=['', 'smart'], default=''),
host_filter=dict(),
instance_groups=dict(type="list", elements='str'),
insights_credential=dict(),
state=dict(choices=['present', 'absent'], default='present'),
)
@ -126,7 +121,6 @@ def main():
state = module.params.get('state')
kind = module.params.get('kind')
host_filter = module.params.get('host_filter')
insights_credential = module.params.get('insights_credential')
# Attempt to look up the related items the user specified (these will fail the module if not found)
org_id = module.resolve_name_to_id('organizations', organization)
@ -161,8 +155,6 @@ def main():
inventory_fields['description'] = description
if variables is not None:
inventory_fields['variables'] = json.dumps(variables)
if insights_credential is not None:
inventory_fields['insights_credential'] = module.resolve_name_to_id('credentials', insights_credential)
association_fields = {}

5
awx_collection/test/awx/test_inventory.py
View File

@ -5,11 +5,10 @@ __metaclass__ = type
import pytest
from awx.main.models import Inventory, Credential
from awx.main.tests.functional.conftest import insights_credential, credentialtype_insights
@pytest.mark.django_db
def test_inventory_create(run_module, admin_user, organization, insights_credential):
def test_inventory_create(run_module, admin_user, organization):
# Create an insights credential
result = run_module(
@ -18,7 +17,6 @@ def test_inventory_create(run_module, admin_user, organization, insights_credent
'name': 'foo-inventory',
'organization': organization.name,
'variables': {'foo': 'bar', 'another-foo': {'barz': 'bar2'}},
'insights_credential': insights_credential.name,
'state': 'present',
},
admin_user,
@ -27,7 +25,6 @@ def test_inventory_create(run_module, admin_user, organization, insights_credent
inv = Inventory.objects.get(name='foo-inventory')
assert inv.variables == '{"foo": "bar", "another-foo": {"barz": "bar2"}}'
assert inv.insights_credential.name == insights_credential.name
result.pop('module_args', None)
result.pop('invocation', None)

2
awx_collection/tests/integration/targets/inventory/tasks/main.yml
View File

@ -41,7 +41,6 @@
inventory:
name: "{{ inv_name1 }}"
organization: Default
insights_credential: "{{ result.id }}"
instance_groups:
- "{{ group_name1 }}"
state: present
@ -55,7 +54,6 @@
inventory:
name: "{{ result.id }}"
organization: Default
insights_credential: "{{ cred_name1 }}"
state: present
register: result

4
awxkit/awxkit/api/pages/inventory.py
View File

@ -59,14 +59,12 @@ class Inventory(HasCopy, HasCreate, HasInstanceGroups, HasVariables, base.Base):
organization=organization.id,
)
optional_fields = ('host_filter', 'insights_credential', 'kind', 'variables')
optional_fields = ('host_filter', 'kind', 'variables')
update_payload(payload, optional_fields, kwargs)
if 'variables' in payload and isinstance(payload.variables, dict):
payload.variables = json.dumps(payload.variables)
if 'insights_credential' in payload and isinstance(payload.insights_credential, Credential):
payload.insights_credential = payload.insights_credential.id
return payload

2
awxkit/awxkit/cli/options.py
View File

@ -45,7 +45,7 @@ def pk_or_name(v2, model_name, value, page=None):
identity = UNIQUENESS_RULES[model_name][-1]
# certain related fields follow a pattern of <foo>_<model> e.g.,
# insights_credential, target_credential etc...
# target_credential etc...
if not page and '_' in model_name:
return pk_or_name(v2, model_name.split('_')[-1], value, page)