diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 12799e0d94..ab91385d44 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -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'),
@@ -768,6 +766,7 @@ class UnifiedJobSerializer(BaseSerializer):
'result_traceback',
'event_processing_finished',
'launched_by',
+ 'work_unit_id',
)
extra_kwargs = {
@@ -1410,11 +1409,11 @@ class ProjectOptionsSerializer(BaseSerializer):
class ExecutionEnvironmentSerializer(BaseSerializer):
show_capabilities = ['edit', 'delete', 'copy']
- managed_by_tower = serializers.ReadOnlyField()
+ managed = serializers.ReadOnlyField()
class Meta:
model = ExecutionEnvironment
- fields = ('*', 'organization', 'image', 'managed_by_tower', 'credential', 'pull')
+ fields = ('*', 'organization', 'image', 'managed', 'credential', 'pull')
def get_related(self, obj):
res = super(ExecutionEnvironmentSerializer, self).get_related(obj)
@@ -1660,7 +1659,6 @@ class InventorySerializer(BaseSerializerWithVariables):
'has_inventory_sources',
'total_inventory_sources',
'inventory_sources_with_failures',
- 'insights_credential',
'pending_deletion',
)
@@ -1685,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
@@ -2485,14 +2481,14 @@ class ResourceAccessListElementSerializer(UserSerializer):
class CredentialTypeSerializer(BaseSerializer):
show_capabilities = ['edit', 'delete']
- managed_by_tower = serializers.ReadOnlyField()
+ managed = serializers.ReadOnlyField()
class Meta:
model = CredentialType
- fields = ('*', 'kind', 'namespace', 'name', 'managed_by_tower', 'inputs', 'injectors')
+ fields = ('*', 'kind', 'namespace', 'name', 'managed', 'inputs', 'injectors')
def validate(self, attrs):
- if self.instance and self.instance.managed_by_tower:
+ if self.instance and self.instance.managed:
raise PermissionDenied(detail=_("Modifications not allowed for managed credential types"))
old_inputs = {}
@@ -2524,8 +2520,8 @@ class CredentialTypeSerializer(BaseSerializer):
def to_representation(self, data):
value = super(CredentialTypeSerializer, self).to_representation(data)
- # translate labels and help_text for credential fields "managed by Tower"
- if value.get('managed_by_tower'):
+ # translate labels and help_text for credential fields "managed"
+ if value.get('managed'):
value['name'] = _(value['name'])
for field in value.get('inputs', {}).get('fields', []):
field['label'] = _(field['label'])
@@ -2544,11 +2540,11 @@ class CredentialTypeSerializer(BaseSerializer):
class CredentialSerializer(BaseSerializer):
show_capabilities = ['edit', 'delete', 'copy', 'use']
capabilities_prefetch = ['admin', 'use']
- managed_by_tower = serializers.ReadOnlyField()
+ managed = serializers.ReadOnlyField()
class Meta:
model = Credential
- fields = ('*', 'organization', 'credential_type', 'managed_by_tower', 'inputs', 'kind', 'cloud', 'kubernetes')
+ fields = ('*', 'organization', 'credential_type', 'managed', 'inputs', 'kind', 'cloud', 'kubernetes')
extra_kwargs = {'credential_type': {'label': _('Credential Type')}}
def to_representation(self, data):
@@ -2615,7 +2611,7 @@ class CredentialSerializer(BaseSerializer):
return summary_dict
def validate(self, attrs):
- if self.instance and self.instance.managed_by_tower:
+ if self.instance and self.instance.managed:
raise PermissionDenied(detail=_("Modifications not allowed for managed credentials"))
return super(CredentialSerializer, self).validate(attrs)
@@ -2627,7 +2623,7 @@ class CredentialSerializer(BaseSerializer):
return ret
def validate_organization(self, org):
- if self.instance and self.instance.credential_type.kind == 'galaxy' and org is None:
+ if self.instance and (not self.instance.managed) and self.instance.credential_type.kind == 'galaxy' and org is None:
raise serializers.ValidationError(_("Galaxy credentials must be owned by an Organization."))
return org
@@ -2635,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',
@@ -4194,7 +4189,7 @@ class JobLaunchSerializer(BaseSerializer):
elif field_name == 'credentials':
for cred in obj.credentials.all():
cred_dict = dict(id=cred.id, name=cred.name, credential_type=cred.credential_type.pk, passwords_needed=cred.passwords_needed)
- if cred.credential_type.managed_by_tower and 'vault_id' in cred.credential_type.defined_fields:
+ if cred.credential_type.managed and 'vault_id' in cred.credential_type.defined_fields:
cred_dict['vault_id'] = cred.get_input('vault_id', default=None)
defaults_dict.setdefault(field_name, []).append(cred_dict)
else:
@@ -4993,7 +4988,7 @@ class ActivityStreamSerializer(BaseSerializer):
('notification', ('id', 'status', 'notification_type', 'notification_template_id')),
('o_auth2_access_token', ('id', 'user_id', 'description', 'application_id', 'scope')),
('o_auth2_application', ('id', 'name', 'description')),
- ('credential_type', ('id', 'name', 'description', 'kind', 'managed_by_tower')),
+ ('credential_type', ('id', 'name', 'description', 'kind', 'managed')),
('ad_hoc_command', ('id', 'name', 'status', 'limit')),
('workflow_approval', ('id', 'name', 'unified_job_id')),
]
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index d753f9cb98..678fe8317b 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -708,7 +708,7 @@ class ExecutionEnvironmentDetail(RetrieveUpdateDestroyAPIView):
def update(self, request, *args, **kwargs):
instance = self.get_object()
fields_to_check = ['name', 'description', 'organization', 'image', 'credential']
- if instance.managed_by_tower and request.user.can_access(models.ExecutionEnvironment, 'change', instance):
+ if instance.managed and request.user.can_access(models.ExecutionEnvironment, 'change', instance):
for field in fields_to_check:
left = getattr(instance, field, None)
right = request.data.get(field, None)
@@ -1306,7 +1306,7 @@ class CredentialTypeDetail(RetrieveUpdateDestroyAPIView):
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
- if instance.managed_by_tower:
+ if instance.managed:
raise PermissionDenied(detail=_("Deletion not allowed for managed credential types"))
if instance.credentials.exists():
raise PermissionDenied(detail=_("Credential types that are in use cannot be deleted"))
@@ -1421,7 +1421,7 @@ class CredentialDetail(RetrieveUpdateDestroyAPIView):
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
- if instance.managed_by_tower:
+ if instance.managed:
raise PermissionDenied(detail=_("Deletion not allowed for managed credentials"))
return super(CredentialDetail, self).destroy(request, *args, **kwargs)
diff --git a/awx/main/access.py b/awx/main/access.py
index b9a2dfa3da..c256aa63a3 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -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):
@@ -1038,7 +1036,7 @@ class InventorySourceAccess(NotificationAttachMixin, BaseAccess):
def can_add(self, data):
if not data or 'inventory' not in data:
- return Organization.accessible_objects(self.user, 'admin_role').exists()
+ return Inventory.accessible_objects(self.user, 'admin_role').exists()
if not self.check_related('source_project', Project, data, role_field='use_role'):
return False
@@ -1121,7 +1119,7 @@ class CredentialTypeAccess(BaseAccess):
I can create when:
- I'm a superuser:
I can change when:
- - I'm a superuser and the type is not "managed by Tower"
+ - I'm a superuser and the type is not "managed"
"""
model = CredentialType
@@ -1207,7 +1205,7 @@ class CredentialAccess(BaseAccess):
def get_user_capabilities(self, obj, **kwargs):
user_capabilities = super(CredentialAccess, self).get_user_capabilities(obj, **kwargs)
user_capabilities['use'] = self.can_use(obj)
- if getattr(obj, 'managed_by_tower', False) is True:
+ if getattr(obj, 'managed', False) is True:
user_capabilities['edit'] = user_capabilities['delete'] = False
return user_capabilities
@@ -1370,7 +1368,7 @@ class ExecutionEnvironmentAccess(BaseAccess):
return self.check_related('organization', Organization, data, obj=obj, mandatory=True, role_field='execution_environment_admin_role')
def can_delete(self, obj):
- if obj.managed_by_tower:
+ if obj.managed:
raise PermissionDenied
return self.can_change(obj, None)
diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py
index b71cec45d6..c9186aaf0b 100644
--- a/awx/main/analytics/collectors.py
+++ b/awx/main/analytics/collectors.py
@@ -175,12 +175,12 @@ def org_counts(since, **kwargs):
def cred_type_counts(since, **kwargs):
counts = {}
for cred_type in models.CredentialType.objects.annotate(num_credentials=Count('credentials', distinct=True)).values(
- 'name', 'id', 'managed_by_tower', 'num_credentials'
+ 'name', 'id', 'managed', 'num_credentials'
):
counts[cred_type['id']] = {
'name': cred_type['name'],
'credential_count': cred_type['num_credentials'],
- 'managed_by_tower': cred_type['managed_by_tower'],
+ 'managed': cred_type['managed'],
}
return counts
diff --git a/awx/main/constants.py b/awx/main/constants.py
index e8ac403723..f2af99d167 100644
--- a/awx/main/constants.py
+++ b/awx/main/constants.py
@@ -14,7 +14,7 @@ __all__ = [
'STANDARD_INVENTORY_UPDATE_ENV',
]
-CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'tower', 'insights')
+CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'controller', 'insights')
PRIVILEGE_ESCALATION_METHODS = [
('sudo', _('Sudo')),
('su', _('Su')),
diff --git a/awx/main/fields.py b/awx/main/fields.py
index 05fea8ca6a..95ebfbca73 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -642,7 +642,7 @@ class CredentialInputField(JSONSchemaField):
# `ssh_key_unlock` requirements are very specific and can't be
# represented without complicated JSON schema
- if model_instance.credential_type.managed_by_tower is True and 'ssh_key_unlock' in defined_fields:
+ if model_instance.credential_type.managed is True and 'ssh_key_unlock' in defined_fields:
# in order to properly test the necessity of `ssh_key_unlock`, we
# need to know the real value of `ssh_key_data`; for a payload like:
@@ -711,7 +711,7 @@ class CredentialTypeInputField(JSONSchemaField):
}
def validate(self, value, model_instance):
- if isinstance(value, dict) and 'dependencies' in value and not model_instance.managed_by_tower:
+ if isinstance(value, dict) and 'dependencies' in value and not model_instance.managed:
raise django_exceptions.ValidationError(
_("'dependencies' is not supported for custom credentials."),
code='invalid',
diff --git a/awx/main/management/commands/create_preload_data.py b/awx/main/management/commands/create_preload_data.py
index 41fa665abf..220781e0d4 100644
--- a/awx/main/management/commands/create_preload_data.py
+++ b/awx/main/management/commands/create_preload_data.py
@@ -44,7 +44,7 @@ class Command(BaseCommand):
public_galaxy_credential = Credential(
name='Ansible Galaxy',
- managed_by_tower=True,
+ managed=True,
credential_type=CredentialType.objects.get(kind='galaxy'),
inputs={'url': 'https://galaxy.ansible.com/'},
)
diff --git a/awx/main/management/commands/register_default_execution_environments.py b/awx/main/management/commands/register_default_execution_environments.py
index fdc9cca7ed..8686fe9a64 100644
--- a/awx/main/management/commands/register_default_execution_environments.py
+++ b/awx/main/management/commands/register_default_execution_environments.py
@@ -76,7 +76,7 @@ class Command(BaseCommand):
}
registry_cred, cred_created = Credential.objects.get_or_create(
name="Default Execution Environment Registry Credential",
- managed_by_tower=True,
+ managed=True,
credential_type=registry_cred_type[0],
defaults={'inputs': inputs},
)
@@ -114,7 +114,7 @@ class Command(BaseCommand):
# Create the control plane execution environment that is used for project updates and system jobs
ee = settings.CONTROL_PLANE_EXECUTION_ENVIRONMENT
_this_ee, cp_created = ExecutionEnvironment.objects.get_or_create(
- name="Control Plane Execution Environment", defaults={'image': ee, 'managed_by_tower': True, 'credential': registry_cred}
+ name="Control Plane Execution Environment", defaults={'image': ee, 'managed': True, 'credential': registry_cred}
)
if cp_created:
changed = True
diff --git a/awx/main/managers.py b/awx/main/managers.py
index 955d730213..f620555df1 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -33,7 +33,7 @@ class HostManager(models.Manager):
- Only consider results that are unique
- Return the count of this query
"""
- return self.order_by().exclude(inventory_sources__source='tower').values('name').distinct().count()
+ return self.order_by().exclude(inventory_sources__source='controller').values('name').distinct().count()
def org_active_count(self, org_id):
"""Return count of active, unique hosts used by an organization.
@@ -45,7 +45,7 @@ class HostManager(models.Manager):
- Only consider results that are unique
- Return the count of this query
"""
- return self.order_by().exclude(inventory_sources__source='tower').filter(inventory__organization=org_id).values('name').distinct().count()
+ return self.order_by().exclude(inventory_sources__source='controller').filter(inventory__organization=org_id).values('name').distinct().count()
def get_queryset(self):
"""When the parent instance of the host query set has a `kind=smart` and a `host_filter`
diff --git a/awx/main/migrations/0061_v350_track_native_credentialtype_source.py b/awx/main/migrations/0061_v350_track_native_credentialtype_source.py
index 4c624d77bf..fb76e79ade 100644
--- a/awx/main/migrations/0061_v350_track_native_credentialtype_source.py
+++ b/awx/main/migrations/0061_v350_track_native_credentialtype_source.py
@@ -10,7 +10,7 @@ from awx.main.utils.common import set_current_apps
def migrate_to_static_inputs(apps, schema_editor):
set_current_apps(apps)
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
class Migration(migrations.Migration):
diff --git a/awx/main/migrations/0067_v350_credential_plugins.py b/awx/main/migrations/0067_v350_credential_plugins.py
index 335baef2f7..7eacb18f78 100644
--- a/awx/main/migrations/0067_v350_credential_plugins.py
+++ b/awx/main/migrations/0067_v350_credential_plugins.py
@@ -14,7 +14,7 @@ from awx.main.utils.common import set_current_apps
def setup_tower_managed_defaults(apps, schema_editor):
set_current_apps(apps)
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
class Migration(migrations.Migration):
diff --git a/awx/main/migrations/0093_v360_personal_access_tokens.py b/awx/main/migrations/0093_v360_personal_access_tokens.py
index d5910f575a..3ba5b15e70 100644
--- a/awx/main/migrations/0093_v360_personal_access_tokens.py
+++ b/awx/main/migrations/0093_v360_personal_access_tokens.py
@@ -8,7 +8,7 @@ from awx.main.utils.common import set_current_apps
def setup_tower_managed_defaults(apps, schema_editor):
set_current_apps(apps)
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
class Migration(migrations.Migration):
diff --git a/awx/main/migrations/0096_v360_container_groups.py b/awx/main/migrations/0096_v360_container_groups.py
index 23f0f2279c..9fe4bad2d0 100644
--- a/awx/main/migrations/0096_v360_container_groups.py
+++ b/awx/main/migrations/0096_v360_container_groups.py
@@ -9,7 +9,7 @@ from awx.main.utils.common import set_current_apps
def create_new_credential_types(apps, schema_editor):
set_current_apps(apps)
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
class Migration(migrations.Migration):
diff --git a/awx/main/migrations/0098_v360_rename_cyberark_aim_credential_type.py b/awx/main/migrations/0098_v360_rename_cyberark_aim_credential_type.py
index de2b3dc000..02d46227a3 100644
--- a/awx/main/migrations/0098_v360_rename_cyberark_aim_credential_type.py
+++ b/awx/main/migrations/0098_v360_rename_cyberark_aim_credential_type.py
@@ -5,7 +5,7 @@ from awx.main.models import CredentialType
def update_cyberark_aim_name(apps, schema_editor):
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
aim_types = apps.get_model('main', 'CredentialType').objects.filter(namespace='aim').order_by('id')
if aim_types.count() == 2:
diff --git a/awx/main/migrations/0133_centrify_vault_credtype.py b/awx/main/migrations/0133_centrify_vault_credtype.py
index eee9507691..e4416e3680 100644
--- a/awx/main/migrations/0133_centrify_vault_credtype.py
+++ b/awx/main/migrations/0133_centrify_vault_credtype.py
@@ -6,7 +6,7 @@ from awx.main.utils.common import set_current_apps
def setup_tower_managed_defaults(apps, schema_editor):
set_current_apps(apps)
- CredentialType.setup_tower_managed_defaults()
+ CredentialType.setup_tower_managed_defaults(apps)
class Migration(migrations.Migration):
diff --git a/awx/main/migrations/0139_isolated_removal.py b/awx/main/migrations/0139_isolated_removal.py
index dc8b163008..024fd23ccb 100644
--- a/awx/main/migrations/0139_isolated_removal.py
+++ b/awx/main/migrations/0139_isolated_removal.py
@@ -1,19 +1,25 @@
# Generated by Django 2.2.16 on 2021-04-21 15:02
-from django.db import migrations, models
+from django.db import migrations, models, transaction
def remove_iso_instances(apps, schema_editor):
Instance = apps.get_model('main', 'Instance')
- Instance.objects.filter(rampart_groups__controller__isnull=False).delete()
+ with transaction.atomic():
+ Instance.objects.filter(rampart_groups__controller__isnull=False).delete()
def remove_iso_groups(apps, schema_editor):
InstanceGroup = apps.get_model('main', 'InstanceGroup')
- InstanceGroup.objects.filter(controller__isnull=False).delete()
+ UnifiedJob = apps.get_model('main', 'UnifiedJob')
+ with transaction.atomic():
+ for ig in InstanceGroup.objects.filter(controller__isnull=False):
+ UnifiedJob.objects.filter(instance_group=ig).update(instance_group=None)
+ ig.delete()
class Migration(migrations.Migration):
+ atomic = False
dependencies = [
('main', '0138_custom_inventory_scripts_removal'),
diff --git a/awx/main/migrations/0148_unifiedjob_receptor_unit_id.py b/awx/main/migrations/0148_unifiedjob_receptor_unit_id.py
new file mode 100644
index 0000000000..9938daa691
--- /dev/null
+++ b/awx/main/migrations/0148_unifiedjob_receptor_unit_id.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.16 on 2021-06-11 04:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0147_validate_ee_image_field'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='unifiedjob',
+ name='work_unit_id',
+ field=models.CharField(
+ blank=True, default=None, editable=False, help_text='The Receptor work unit ID associated with this job.', max_length=255, null=True
+ ),
+ ),
+ ]
diff --git a/awx/main/migrations/0149_remove_inventory_insights_credential.py b/awx/main/migrations/0149_remove_inventory_insights_credential.py
new file mode 100644
index 0000000000..0aeee723fd
--- /dev/null
+++ b/awx/main/migrations/0149_remove_inventory_insights_credential.py
@@ -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',
+ ),
+ ]
diff --git a/awx/main/migrations/0150_rename_inv_sources_inv_updates.py b/awx/main/migrations/0150_rename_inv_sources_inv_updates.py
new file mode 100644
index 0000000000..11c4b1b3f9
--- /dev/null
+++ b/awx/main/migrations/0150_rename_inv_sources_inv_updates.py
@@ -0,0 +1,113 @@
+# Generated by Django 2.2.16 on 2021-06-17 13:12
+import logging
+
+from django.db import migrations, models
+
+from awx.main.models.credential import ManagedCredentialType, CredentialType as ModernCredentialType
+
+
+logger = logging.getLogger(__name__)
+
+
+def forwards(apps, schema_editor):
+ InventoryUpdate = apps.get_model('main', 'InventoryUpdate')
+ InventorySource = apps.get_model('main', 'InventorySource')
+
+ r = InventoryUpdate.objects.filter(source='tower').update(source='controller')
+ if r:
+ logger.warn(f'Renamed {r} tower inventory updates to controller')
+ InventorySource.objects.filter(source='tower').update(source='controller')
+ if r:
+ logger.warn(f'Renamed {r} tower inventory sources to controller')
+
+ CredentialType = apps.get_model('main', 'CredentialType')
+
+ tower_type = CredentialType.objects.filter(managed_by_tower=True, namespace='tower').first()
+ if tower_type is not None:
+ controller_type = CredentialType.objects.filter(managed_by_tower=True, namespace='controller', kind='cloud').first()
+ if controller_type:
+ # this gets created by prior migrations in upgrade scenarios
+ controller_type.delete()
+
+ registry_type = ManagedCredentialType.registry.get('controller')
+ if not registry_type:
+ raise RuntimeError('Excpected to find controller credential, this may need to be edited in the future!')
+ logger.warn('Renaming the Ansible Tower credential type for existing install')
+ tower_type.name = registry_type.name # sensitive to translations
+ tower_type.namespace = 'controller' # if not done, will error setup_tower_managed_defaults
+ tower_type.save(update_fields=['name', 'namespace'])
+
+ ModernCredentialType.setup_tower_managed_defaults(apps)
+
+
+def backwards(apps, schema_editor):
+ InventoryUpdate = apps.get_model('main', 'InventoryUpdate')
+ InventorySource = apps.get_model('main', 'InventorySource')
+
+ r = InventoryUpdate.objects.filter(source='controller').update(source='tower')
+ if r:
+ logger.warn(f'Renamed {r} controller inventory updates to tower')
+ r = InventorySource.objects.filter(source='controller').update(source='tower')
+ if r:
+ logger.warn(f'Renamed {r} controller inventory sources to tower')
+
+ CredentialType = apps.get_model('main', 'CredentialType')
+
+ tower_type = CredentialType.objects.filter(managed_by_tower=True, namespace='controller', kind='cloud').first()
+ if tower_type is not None and not CredentialType.objects.filter(managed_by_tower=True, namespace='tower').exists():
+ logger.info('Renaming the controller credential type back')
+ tower_type.namespace = 'tower'
+ tower_type.name = 'Ansible Tower'
+ tower_type.save(update_fields=['namespace', 'name'])
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('main', '0149_remove_inventory_insights_credential'),
+ ]
+ operations = [
+ migrations.RunPython(migrations.RunPython.noop, backwards),
+ migrations.AlterField(
+ model_name='inventorysource',
+ name='source',
+ field=models.CharField(
+ choices=[
+ ('file', 'File, Directory or Script'),
+ ('scm', 'Sourced from a Project'),
+ ('ec2', 'Amazon EC2'),
+ ('gce', 'Google Compute Engine'),
+ ('azure_rm', 'Microsoft Azure Resource Manager'),
+ ('vmware', 'VMware vCenter'),
+ ('satellite6', 'Red Hat Satellite 6'),
+ ('openstack', 'OpenStack'),
+ ('rhv', 'Red Hat Virtualization'),
+ ('controller', 'Red Hat Ansible Automation Platform'),
+ ('insights', 'Red Hat Insights'),
+ ],
+ default=None,
+ max_length=32,
+ ),
+ ),
+ migrations.AlterField(
+ model_name='inventoryupdate',
+ name='source',
+ field=models.CharField(
+ choices=[
+ ('file', 'File, Directory or Script'),
+ ('scm', 'Sourced from a Project'),
+ ('ec2', 'Amazon EC2'),
+ ('gce', 'Google Compute Engine'),
+ ('azure_rm', 'Microsoft Azure Resource Manager'),
+ ('vmware', 'VMware vCenter'),
+ ('satellite6', 'Red Hat Satellite 6'),
+ ('openstack', 'OpenStack'),
+ ('rhv', 'Red Hat Virtualization'),
+ ('controller', 'Red Hat Ansible Automation Platform'),
+ ('insights', 'Red Hat Insights'),
+ ],
+ default=None,
+ max_length=32,
+ ),
+ ),
+ migrations.RunPython(forwards, migrations.RunPython.noop),
+ ]
diff --git a/awx/main/migrations/0151_rename_managed_by_tower.py b/awx/main/migrations/0151_rename_managed_by_tower.py
new file mode 100644
index 0000000000..2b993f0037
--- /dev/null
+++ b/awx/main/migrations/0151_rename_managed_by_tower.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.2.16 on 2021-06-17 18:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0150_rename_inv_sources_inv_updates'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='credential',
+ old_name='managed_by_tower',
+ new_name='managed',
+ ),
+ migrations.RenameField(
+ model_name='credentialtype',
+ old_name='managed_by_tower',
+ new_name='managed',
+ ),
+ migrations.RenameField(
+ model_name='executionenvironment',
+ old_name='managed_by_tower',
+ new_name='managed',
+ ),
+ ]
diff --git a/awx/main/migrations/_galaxy.py b/awx/main/migrations/_galaxy.py
index 9e7684cdcf..6601fb3472 100644
--- a/awx/main/migrations/_galaxy.py
+++ b/awx/main/migrations/_galaxy.py
@@ -19,7 +19,7 @@ def migrate_galaxy_settings(apps, schema_editor):
# nothing to migrate
return
set_current_apps(apps)
- ModernCredentialType.setup_tower_managed_defaults()
+ ModernCredentialType.setup_tower_managed_defaults(apps)
CredentialType = apps.get_model('main', 'CredentialType')
Credential = apps.get_model('main', 'Credential')
Setting = apps.get_model('conf', 'Setting')
@@ -34,10 +34,21 @@ def migrate_galaxy_settings(apps, schema_editor):
if public_galaxy_setting and public_galaxy_setting.value is False:
# ...UNLESS this behavior was explicitly disabled via this setting
public_galaxy_enabled = False
-
- public_galaxy_credential = Credential(
- created=now(), modified=now(), name='Ansible Galaxy', managed_by_tower=True, credential_type=galaxy_type, inputs={'url': 'https://galaxy.ansible.com/'}
- )
+ try:
+ # Needed for old migrations
+ public_galaxy_credential = Credential(
+ created=now(),
+ modified=now(),
+ name='Ansible Galaxy',
+ managed_by_tower=True,
+ credential_type=galaxy_type,
+ inputs={'url': 'https://galaxy.ansible.com/'},
+ )
+ except:
+ # Needed for new migrations, tests
+ public_galaxy_credential = Credential(
+ created=now(), modified=now(), name='Ansible Galaxy', managed=True, credential_type=galaxy_type, inputs={'url': 'https://galaxy.ansible.com/'}
+ )
public_galaxy_credential.save()
for org in Organization.objects.all():
diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py
index 0e5cac28f0..ca58106942 100644
--- a/awx/main/models/credential/__init__.py
+++ b/awx/main/models/credential/__init__.py
@@ -19,6 +19,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext_noop
from django.core.exceptions import ValidationError
from django.utils.encoding import force_text
from django.utils.functional import cached_property
+from django.utils.timezone import now
# AWX
from awx.api.versioning import reverse
@@ -92,7 +93,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
on_delete=models.CASCADE,
help_text=_('Specify the type of credential you want to create. Refer ' 'to the documentation for details on each type.'),
)
- managed_by_tower = models.BooleanField(default=False, editable=False)
+ managed = models.BooleanField(default=False, editable=False)
organization = models.ForeignKey(
'Organization',
null=True,
@@ -341,7 +342,7 @@ class CredentialType(CommonModelNameNotUnique):
)
kind = models.CharField(max_length=32, choices=KIND_CHOICES)
- managed_by_tower = models.BooleanField(default=False, editable=False)
+ managed = models.BooleanField(default=False, editable=False)
namespace = models.CharField(max_length=1024, null=True, default=None, editable=False)
inputs = CredentialTypeInputField(
blank=True, default=dict, help_text=_('Enter inputs using either JSON or YAML syntax. ' 'Refer to the documentation for example syntax.')
@@ -355,7 +356,7 @@ class CredentialType(CommonModelNameNotUnique):
@classmethod
def from_db(cls, db, field_names, values):
instance = super(CredentialType, cls).from_db(db, field_names, values)
- if instance.managed_by_tower and instance.namespace:
+ if instance.managed and instance.namespace:
native = ManagedCredentialType.registry[instance.namespace]
instance.inputs = native.inputs
instance.injectors = native.injectors
@@ -395,9 +396,13 @@ class CredentialType(CommonModelNameNotUnique):
return dict((k, functools.partial(v.create)) for k, v in ManagedCredentialType.registry.items())
@classmethod
- def setup_tower_managed_defaults(cls):
+ def setup_tower_managed_defaults(cls, apps=None):
+ if apps is not None:
+ ct_class = apps.get_model('main', 'CredentialType')
+ else:
+ ct_class = CredentialType
for default in ManagedCredentialType.registry.values():
- existing = CredentialType.objects.filter(name=default.name, kind=default.kind).first()
+ existing = ct_class.objects.filter(name=default.name, kind=default.kind).first()
if existing is not None:
existing.namespace = default.namespace
existing.inputs = {}
@@ -405,7 +410,11 @@ class CredentialType(CommonModelNameNotUnique):
existing.save()
continue
logger.debug(_("adding %s credential type" % default.name))
- created = default.create()
+ params = default.get_creation_params()
+ if 'managed' not in [f.name for f in ct_class._meta.get_fields()]:
+ params['managed_by_tower'] = params.pop('managed')
+ params['created'] = params['modified'] = now() # CreatedModifiedModel service
+ created = ct_class(**params)
created.inputs = created.injectors = {}
created.save()
@@ -439,7 +448,7 @@ class CredentialType(CommonModelNameNotUnique):
files)
"""
if not self.injectors:
- if self.managed_by_tower and credential.credential_type.namespace in dir(builtin_injectors):
+ if self.managed and credential.credential_type.namespace in dir(builtin_injectors):
injected_env = {}
getattr(builtin_injectors, credential.credential_type.namespace)(credential, injected_env, private_data_dir)
env.update(injected_env)
@@ -556,16 +565,19 @@ class ManagedCredentialType(SimpleNamespace):
)
ManagedCredentialType.registry[namespace] = self
- def create(self):
- return CredentialType(
+ def get_creation_params(self):
+ return dict(
namespace=self.namespace,
kind=self.kind,
name=self.name,
- managed_by_tower=True,
+ managed=True,
inputs=self.inputs,
injectors=self.injectors,
)
+ def create(self):
+ return CredentialType(**self.get_creation_params())
+
ManagedCredentialType(
namespace='ssh',
@@ -606,7 +618,7 @@ ManagedCredentialType(
namespace='scm',
kind='scm',
name=ugettext_noop('Source Control'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'label': ugettext_noop('Username'), 'type': 'string'},
@@ -621,7 +633,7 @@ ManagedCredentialType(
namespace='vault',
kind='vault',
name=ugettext_noop('Vault'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'vault_password', 'label': ugettext_noop('Vault Password'), 'type': 'string', 'secret': True, 'ask_at_runtime': True},
@@ -647,7 +659,7 @@ ManagedCredentialType(
namespace='net',
kind='net',
name=ugettext_noop('Network'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'label': ugettext_noop('Username'), 'type': 'string'},
@@ -687,7 +699,7 @@ ManagedCredentialType(
namespace='aws',
kind='cloud',
name=ugettext_noop('Amazon Web Services'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'label': ugettext_noop('Access Key'), 'type': 'string'},
@@ -718,7 +730,7 @@ ManagedCredentialType(
namespace='openstack',
kind='cloud',
name=ugettext_noop('OpenStack'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'label': ugettext_noop('Username'), 'type': 'string'},
@@ -776,7 +788,7 @@ ManagedCredentialType(
namespace='vmware',
kind='cloud',
name=ugettext_noop('VMware vCenter'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -801,7 +813,7 @@ ManagedCredentialType(
namespace='satellite6',
kind='cloud',
name=ugettext_noop('Red Hat Satellite 6'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -826,7 +838,7 @@ ManagedCredentialType(
namespace='gce',
kind='cloud',
name=ugettext_noop('Google Compute Engine'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -864,7 +876,7 @@ ManagedCredentialType(
namespace='azure_rm',
kind='cloud',
name=ugettext_noop('Microsoft Azure Resource Manager'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -903,7 +915,7 @@ ManagedCredentialType(
namespace='github_token',
kind='token',
name=ugettext_noop('GitHub Personal Access Token'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -922,7 +934,7 @@ ManagedCredentialType(
namespace='gitlab_token',
kind='token',
name=ugettext_noop('GitLab Personal Access Token'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
@@ -941,7 +953,7 @@ ManagedCredentialType(
namespace='insights',
kind='insights',
name=ugettext_noop('Insights'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'label': ugettext_noop('Username'), 'type': 'string'},
@@ -965,7 +977,7 @@ ManagedCredentialType(
namespace='rhv',
kind='cloud',
name=ugettext_noop('Red Hat Virtualization'),
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'host', 'label': ugettext_noop('Host (Authentication URL)'), 'type': 'string', 'help_text': ugettext_noop('The host to authenticate with.')},
@@ -1006,23 +1018,25 @@ ManagedCredentialType(
)
ManagedCredentialType(
- namespace='tower',
+ namespace='controller',
kind='cloud',
- name=ugettext_noop('Ansible Tower'),
- managed_by_tower=True,
+ name=ugettext_noop('Red Hat Ansible Automation Platform'),
+ managed=True,
inputs={
'fields': [
{
'id': 'host',
- 'label': ugettext_noop('Ansible Tower Hostname'),
+ 'label': ugettext_noop('Red Hat Ansible Automation Platform'),
'type': 'string',
- 'help_text': ugettext_noop('The Ansible Tower base URL to authenticate with.'),
+ 'help_text': ugettext_noop('Red Hat Ansible Automation Platform base URL to authenticate with.'),
},
{
'id': 'username',
'label': ugettext_noop('Username'),
'type': 'string',
- 'help_text': ugettext_noop('The Ansible Tower user to authenticate as.' 'This should not be set if an OAuth token is being used.'),
+ 'help_text': ugettext_noop(
+ 'Red Hat Ansible Automation Platform username id to authenticate as.' 'This should not be set if an OAuth token is being used.'
+ ),
},
{
'id': 'password',
@@ -1048,6 +1062,11 @@ ManagedCredentialType(
'TOWER_PASSWORD': '{{password}}',
'TOWER_VERIFY_SSL': '{{verify_ssl}}',
'TOWER_OAUTH_TOKEN': '{{oauth_token}}',
+ 'CONTROLLER_HOST': '{{host}}',
+ 'CONTROLLER_USERNAME': '{{username}}',
+ 'CONTROLLER_PASSWORD': '{{password}}',
+ 'CONTROLLER_VERIFY_SSL': '{{verify_ssl}}',
+ 'CONTROLLER_OAUTH_TOKEN': '{{oauth_token}}',
}
},
)
diff --git a/awx/main/models/execution_environments.py b/awx/main/models/execution_environments.py
index 35af930bf2..b0b3dd7579 100644
--- a/awx/main/models/execution_environments.py
+++ b/awx/main/models/execution_environments.py
@@ -34,7 +34,7 @@ class ExecutionEnvironment(CommonModel):
help_text=_("The full image location, including the container registry, image name, and version tag."),
validators=[validate_container_image_name],
)
- managed_by_tower = models.BooleanField(default=False, editable=False)
+ managed = models.BooleanField(default=False, editable=False)
credential = models.ForeignKey(
'Credential',
related_name='%(class)ss',
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index 004e43401a..63bb738779 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -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,
@@ -315,7 +306,12 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
for host in hosts:
data['_meta']['hostvars'][host.name] = host.variables_dict
if towervars:
- tower_dict = dict(remote_tower_enabled=str(host.enabled).lower(), remote_tower_id=host.id)
+ tower_dict = dict(
+ remote_tower_enabled=str(host.enabled).lower(),
+ remote_tower_id=host.id,
+ remote_host_enabled=str(host.enabled).lower(),
+ remote_host_id=host.id,
+ )
data['_meta']['hostvars'][host.name].update(tower_dict)
return data
@@ -368,13 +364,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
@@ -821,7 +810,7 @@ class InventorySourceOptions(BaseModel):
('satellite6', _('Red Hat Satellite 6')),
('openstack', _('OpenStack')),
('rhv', _('Red Hat Virtualization')),
- ('tower', _('Ansible Tower')),
+ ('controller', _('Red Hat Ansible Automation Platform')),
('insights', _('Red Hat Insights')),
]
@@ -1384,7 +1373,7 @@ class PluginFileInjector(object):
return env
def _get_shared_env(self, inventory_update, private_data_dir, private_data_files):
- """By default, we will apply the standard managed_by_tower injectors"""
+ """By default, we will apply the standard managed injectors"""
injected_env = {}
credential = inventory_update.get_cloud_credential()
# some sources may have no credential, specifically ec2
@@ -1403,7 +1392,7 @@ class PluginFileInjector(object):
args = []
credential.credential_type.inject_credential(credential, injected_env, safe_env, args, private_data_dir)
# NOTE: safe_env is handled externally to injector class by build_safe_env static method
- # that means that managed_by_tower injectors must only inject detectable env keys
+ # that means that managed injectors must only inject detectable env keys
# enforcement of this is accomplished by tests
return injected_env
@@ -1545,8 +1534,8 @@ class satellite6(PluginFileInjector):
return ret
-class tower(PluginFileInjector):
- plugin_name = 'tower'
+class controller(PluginFileInjector):
+ plugin_name = 'tower' # TODO: relying on routing for now, update after EEs pick up revised collection
base_injector = 'template'
namespace = 'awx'
collection = 'awx'
@@ -1561,13 +1550,7 @@ class insights(PluginFileInjector):
collection = 'insights'
downstream_namespace = 'redhat'
downstream_collection = 'insights'
- use_fqcn = 'true'
-
- def inventory_as_dict(self, inventory_update, private_data_dir):
- ret = super(insights, self).inventory_as_dict(inventory_update, private_data_dir)
- # this inventory plugin requires the fully qualified inventory plugin name
- ret['plugin'] = f'{self.namespace}.{self.collection}.{self.plugin_name}'
- return ret
+ use_fqcn = True
for cls in PluginFileInjector.__subclasses__():
diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py
index f15ed9a859..9ec91cfb4b 100644
--- a/awx/main/models/organization.py
+++ b/awx/main/models/organization.py
@@ -117,7 +117,7 @@ class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVi
def create_default_galaxy_credential(self):
from awx.main.models import Credential
- public_galaxy_credential = Credential.objects.filter(managed_by_tower=True, name='Ansible Galaxy').first()
+ public_galaxy_credential = Credential.objects.filter(managed=True, name='Ansible Galaxy').first()
if public_galaxy_credential not in self.galaxy_credentials.all():
self.galaxy_credentials.add(public_galaxy_credential)
diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index 2b2f05a51a..fbbede899d 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -717,6 +717,9 @@ class UnifiedJob(
editable=False,
help_text=_("The version of Ansible Core installed in the execution environment."),
)
+ work_unit_id = models.CharField(
+ max_length=255, blank=True, default=None, editable=False, null=True, help_text=_("The Receptor work unit ID associated with this job.")
+ )
def get_absolute_url(self, request=None):
RealClass = self.get_real_instance_class()
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index e2eab4c3c3..ba8a61e9dd 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -472,6 +472,33 @@ def cluster_node_heartbeat():
logger.exception('Error marking {} as lost'.format(other_inst.hostname))
+@task(queue=get_local_queuename)
+def awx_receptor_workunit_reaper():
+ """
+ When an AWX job is launched via receptor, files such as status, stdin, and stdout are created
+ in a specific receptor directory. This directory on disk is a random 8 character string, e.g. qLL2JFNT
+ This is also called the work Unit ID in receptor, and is used in various receptor commands,
+ e.g. "work results qLL2JFNT"
+ After an AWX job executes, the receptor work unit directory is cleaned up by
+ issuing the work release command. In some cases the release process might fail, or
+ if AWX crashes during a job's execution, the work release command is never issued to begin with.
+ As such, this periodic task will obtain a list of all receptor work units, and find which ones
+ belong to AWX jobs that are in a completed state (status is canceled, error, or succeeded).
+ This task will call "work release" on each of these work units to clean up the files on disk.
+ """
+ if not settings.RECEPTOR_RELEASE_WORK:
+ return
+ logger.debug("Checking for unreleased receptor work units")
+ receptor_ctl = get_receptor_ctl()
+ receptor_work_list = receptor_ctl.simple_command("work list")
+
+ unit_ids = [id for id in receptor_work_list]
+ jobs_with_unreleased_receptor_units = UnifiedJob.objects.filter(work_unit_id__in=unit_ids).exclude(status__in=ACTIVE_STATES)
+ for job in jobs_with_unreleased_receptor_units:
+ logger.debug(f"{job.log_format} is not active, reaping receptor work unit {job.work_unit_id}")
+ receptor_ctl.simple_command(f"work release {job.work_unit_id}")
+
+
@task(queue=get_local_queuename)
def awx_k8s_reaper():
if not settings.RECEPTOR_RELEASE_WORK:
@@ -729,6 +756,10 @@ def with_path_cleanup(f):
return _wrapped
+def get_receptor_ctl():
+ return ReceptorControl('/var/run/receptor/receptor.sock')
+
+
class BaseTask(object):
model = None
event_model = None
@@ -1370,8 +1401,8 @@ class BaseTask(object):
)
else:
receptor_job = AWXReceptorJob(self, params)
- self.unit_id = receptor_job.unit_id
res = receptor_job.run()
+ self.unit_id = receptor_job.unit_id
if not res:
return
@@ -2890,7 +2921,7 @@ class AWXReceptorJob:
def run(self):
# We establish a connection to the Receptor socket
- receptor_ctl = ReceptorControl('/var/run/receptor/receptor.sock')
+ receptor_ctl = get_receptor_ctl()
try:
return self._run_internal(receptor_ctl)
@@ -2912,6 +2943,7 @@ class AWXReceptorJob:
# in the right side of our socketpair for reading.
result = receptor_ctl.submit_work(worktype=self.work_type, payload=sockout.makefile('rb'), params=self.receptor_params)
self.unit_id = result['unitid']
+ self.task.update_model(self.task.instance.pk, work_unit_id=result['unitid'])
sockin.close()
sockout.close()
@@ -3026,10 +3058,6 @@ class AWXReceptorJob:
result = namedtuple('result', ['status', 'rc'])
return result('canceled', 1)
- if hasattr(self, 'unit_id') and 'RECEPTOR_UNIT_ID' not in self.task.instance.job_env:
- self.task.instance.job_env['RECEPTOR_UNIT_ID'] = self.unit_id
- self.task.update_model(self.task.instance.pk, job_env=self.task.instance.job_env)
-
time.sleep(1)
@property
diff --git a/awx/main/tests/data/inventory/plugins/controller/env.json b/awx/main/tests/data/inventory/plugins/controller/env.json
new file mode 100644
index 0000000000..cc7a5d1ffa
--- /dev/null
+++ b/awx/main/tests/data/inventory/plugins/controller/env.json
@@ -0,0 +1,13 @@
+{
+ "ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
+ "TOWER_HOST": "https://foo.invalid",
+ "TOWER_PASSWORD": "fooo",
+ "TOWER_USERNAME": "fooo",
+ "TOWER_OAUTH_TOKEN": "",
+ "TOWER_VERIFY_SSL": "False",
+ "CONTROLLER_HOST": "https://foo.invalid",
+ "CONTROLLER_PASSWORD": "fooo",
+ "CONTROLLER_USERNAME": "fooo",
+ "CONTROLLER_OAUTH_TOKEN": "",
+ "CONTROLLER_VERIFY_SSL": "False"
+}
\ No newline at end of file
diff --git a/awx/main/tests/data/inventory/plugins/tower/env.json b/awx/main/tests/data/inventory/plugins/tower/env.json
deleted file mode 100644
index 9ce3d90f95..0000000000
--- a/awx/main/tests/data/inventory/plugins/tower/env.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
- "TOWER_HOST": "https://foo.invalid",
- "TOWER_PASSWORD": "fooo",
- "TOWER_USERNAME": "fooo",
- "TOWER_OAUTH_TOKEN": "",
- "TOWER_VERIFY_SSL": "False"
-}
\ No newline at end of file
diff --git a/awx/main/tests/functional/api/test_credential.py b/awx/main/tests/functional/api/test_credential.py
index 9fe6328633..3d277049ab 100644
--- a/awx/main/tests/functional/api/test_credential.py
+++ b/awx/main/tests/functional/api/test_credential.py
@@ -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')],
diff --git a/awx/main/tests/functional/api/test_credential_type.py b/awx/main/tests/functional/api/test_credential_type.py
index bdc9630a97..ed0f1e9f28 100644
--- a/awx/main/tests/functional/api/test_credential_type.py
+++ b/awx/main/tests/functional/api/test_credential_type.py
@@ -75,7 +75,7 @@ def test_update_as_unauthorized_xfail(patch, delete):
@pytest.mark.django_db
-def test_update_managed_by_tower_xfail(patch, delete, admin):
+def test_update_managed_xfail(patch, delete, admin):
ssh = CredentialType.defaults['ssh']()
ssh.save()
url = reverse('api:credential_type_detail', kwargs={'pk': ssh.pk})
@@ -161,19 +161,19 @@ def test_create_as_admin(get, post, admin):
assert response.data['results'][0]['name'] == 'Custom Credential Type'
assert response.data['results'][0]['inputs'] == {}
assert response.data['results'][0]['injectors'] == {}
- assert response.data['results'][0]['managed_by_tower'] is False
+ assert response.data['results'][0]['managed'] is False
@pytest.mark.django_db
-def test_create_managed_by_tower_readonly(get, post, admin):
+def test_create_managed_readonly(get, post, admin):
response = post(
- reverse('api:credential_type_list'), {'kind': 'cloud', 'name': 'Custom Credential Type', 'inputs': {}, 'injectors': {}, 'managed_by_tower': True}, admin
+ reverse('api:credential_type_list'), {'kind': 'cloud', 'name': 'Custom Credential Type', 'inputs': {}, 'injectors': {}, 'managed': True}, admin
)
assert response.status_code == 201
response = get(reverse('api:credential_type_list'), admin)
assert response.data['count'] == 1
- assert response.data['results'][0]['managed_by_tower'] is False
+ assert response.data['results'][0]['managed'] is False
@pytest.mark.django_db
diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py
index 5aa6fb8992..fb4cc19cda 100644
--- a/awx/main/tests/functional/api/test_inventory.py
+++ b/awx/main/tests/functional/api/test_inventory.py
@@ -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)
diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py
index a37f34f919..b86edb90ec 100644
--- a/awx/main/tests/functional/conftest.py
+++ b/awx/main/tests/functional/conftest.py
@@ -266,7 +266,7 @@ def credentialtype_external():
with mock.patch('awx.main.models.credential.CredentialType.plugin', new_callable=PropertyMock) as mock_plugin:
mock_plugin.return_value = MockPlugin()
- external_type = CredentialType(kind='external', managed_by_tower=True, name='External Service', inputs=external_type_inputs)
+ external_type = CredentialType(kind='external', managed=True, name='External Service', inputs=external_type_inputs)
external_type.save()
yield external_type
@@ -825,9 +825,9 @@ def slice_job_factory(slice_jt_factory):
@pytest.fixture
def control_plane_execution_environment():
- return ExecutionEnvironment.objects.create(name="Control Plane EE", managed_by_tower=True)
+ return ExecutionEnvironment.objects.create(name="Control Plane EE", managed=True)
@pytest.fixture
def default_job_execution_environment():
- return ExecutionEnvironment.objects.create(name="Default Job EE", managed_by_tower=False)
+ return ExecutionEnvironment.objects.create(name="Default Job EE", managed=False)
diff --git a/awx/main/tests/functional/models/test_activity_stream.py b/awx/main/tests/functional/models/test_activity_stream.py
index 9399077940..bc6c3e8c51 100644
--- a/awx/main/tests/functional/models/test_activity_stream.py
+++ b/awx/main/tests/functional/models/test_activity_stream.py
@@ -121,7 +121,7 @@ def somecloud_type():
return CredentialType.objects.create(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string', 'secret': True}]},
injectors={'env': {'MY_CLOUD_API_TOKEN': '{{api_token.foo()}}'}},
)
@@ -271,10 +271,10 @@ def test_cluster_node_long_node_name(inventory, project):
@pytest.mark.django_db
def test_credential_defaults_idempotency():
CredentialType.setup_tower_managed_defaults()
- old_inputs = CredentialType.objects.get(name='Ansible Tower', kind='cloud').inputs
+ old_inputs = CredentialType.objects.get(name='Red Hat Ansible Automation Platform', kind='cloud').inputs
prior_count = ActivityStream.objects.count()
# this is commonly re-ran in migrations, and no changes should be shown
# because inputs and injectors are not actually tracked in the database
CredentialType.setup_tower_managed_defaults()
- assert CredentialType.objects.get(name='Ansible Tower', kind='cloud').inputs == old_inputs
+ assert CredentialType.objects.get(name='Red Hat Ansible Automation Platform', kind='cloud').inputs == old_inputs
assert ActivityStream.objects.count() == prior_count
diff --git a/awx/main/tests/functional/models/test_inventory.py b/awx/main/tests/functional/models/test_inventory.py
index c7303367b3..40620fd0a3 100644
--- a/awx/main/tests/functional/models/test_inventory.py
+++ b/awx/main/tests/functional/models/test_inventory.py
@@ -22,6 +22,8 @@ class TestInventoryScript:
assert inventory.get_script_data(hostvars=True, towervars=True)['_meta']['hostvars']['ahost'] == {
'remote_tower_enabled': 'true',
'remote_tower_id': host.id,
+ 'remote_host_enabled': 'true',
+ 'remote_host_id': host.id,
}
def test_all_group(self, inventory):
@@ -104,7 +106,7 @@ class TestActiveCount:
def test_active_count_minus_tower(self, inventory):
inventory.hosts.create(name='locally-managed-host')
- source = inventory.inventory_sources.create(name='tower-source', source='tower')
+ source = inventory.inventory_sources.create(name='tower-source', source='controller')
source.hosts.create(name='remotely-managed-host', inventory=inventory)
assert Host.objects.active_count() == 1
@@ -210,7 +212,7 @@ class TestInventorySourceInjectors:
('rhv', 'ovirt.ovirt.ovirt'),
('satellite6', 'theforeman.foreman.foreman'),
('insights', 'redhatinsights.insights.insights'),
- ('tower', 'awx.awx.tower'),
+ ('controller', 'awx.awx.tower'),
],
)
def test_plugin_proper_names(self, source, proper_name):
diff --git a/awx/main/tests/functional/test_credential.py b/awx/main/tests/functional/test_credential.py
index b36603275c..b3c8dca5db 100644
--- a/awx/main/tests/functional/test_credential.py
+++ b/awx/main/tests/functional/test_credential.py
@@ -81,6 +81,7 @@ def test_default_cred_types():
'azure_rm',
'centrify_vault_kv',
'conjur',
+ 'controller',
'galaxy_api_token',
'gce',
'github_token',
@@ -97,19 +98,19 @@ def test_default_cred_types():
'scm',
'ssh',
'thycotic_dsv',
- 'tower',
'vault',
'vmware',
]
+
for type_ in CredentialType.defaults.values():
- assert type_().managed_by_tower is True
+ assert type_().managed is True
@pytest.mark.django_db
def test_credential_creation(organization_factory):
org = organization_factory('test').organization
type_ = CredentialType(
- kind='cloud', name='SomeCloud', managed_by_tower=True, inputs={'fields': [{'id': 'username', 'label': 'Username for SomeCloud', 'type': 'string'}]}
+ kind='cloud', name='SomeCloud', managed=True, inputs={'fields': [{'id': 'username', 'label': 'Username for SomeCloud', 'type': 'string'}]}
)
type_.save()
@@ -286,7 +287,7 @@ def test_credential_get_input(organization_factory):
type_ = CredentialType(
kind='vault',
name='somevault',
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{
diff --git a/awx/main/tests/functional/test_galaxy_credential_migration.py b/awx/main/tests/functional/test_galaxy_credential_migration.py
deleted file mode 100644
index f825874ef0..0000000000
--- a/awx/main/tests/functional/test_galaxy_credential_migration.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import importlib
-
-from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
-import pytest
-
-from awx.main.models import Credential, Organization
-from awx.conf.models import Setting
-from awx.main.migrations import _galaxy as galaxy
-
-
-class FakeApps(object):
- def get_model(self, app, model):
- if app == 'contenttypes':
- return ContentType
- return getattr(importlib.import_module(f'awx.{app}.models'), model)
-
-
-apps = FakeApps()
-
-
-@pytest.mark.django_db
-def test_default_public_galaxy():
- org = Organization.objects.create()
- assert org.galaxy_credentials.count() == 0
- galaxy.migrate_galaxy_settings(apps, None)
- assert org.galaxy_credentials.count() == 1
- creds = org.galaxy_credentials.all()
- assert creds[0].name == 'Ansible Galaxy'
- assert creds[0].inputs['url'] == 'https://galaxy.ansible.com/'
-
-
-@pytest.mark.django_db
-def test_public_galaxy_disabled():
- Setting.objects.create(key='PUBLIC_GALAXY_ENABLED', value=False)
- org = Organization.objects.create()
- assert org.galaxy_credentials.count() == 0
- galaxy.migrate_galaxy_settings(apps, None)
- assert org.galaxy_credentials.count() == 0
-
-
-@pytest.mark.django_db
-def test_rh_automation_hub():
- Setting.objects.create(key='PRIMARY_GALAXY_URL', value='https://cloud.redhat.com/api/automation-hub/')
- Setting.objects.create(key='PRIMARY_GALAXY_TOKEN', value='secret123')
- org = Organization.objects.create()
- assert org.galaxy_credentials.count() == 0
- galaxy.migrate_galaxy_settings(apps, None)
- assert org.galaxy_credentials.count() == 2
- assert org.galaxy_credentials.first().name == 'Ansible Automation Hub (https://cloud.redhat.com/api/automation-hub/)' # noqa
-
-
-@pytest.mark.django_db
-def test_multiple_galaxies():
- for i in range(5):
- Organization.objects.create(name=f'Org {i}')
-
- Setting.objects.create(key='PRIMARY_GALAXY_URL', value='https://example.org/')
- Setting.objects.create(key='PRIMARY_GALAXY_AUTH_URL', value='https://auth.example.org/')
- Setting.objects.create(key='PRIMARY_GALAXY_USERNAME', value='user')
- Setting.objects.create(key='PRIMARY_GALAXY_PASSWORD', value='pass')
- Setting.objects.create(key='PRIMARY_GALAXY_TOKEN', value='secret123')
-
- for org in Organization.objects.all():
- assert org.galaxy_credentials.count() == 0
-
- galaxy.migrate_galaxy_settings(apps, None)
-
- for org in Organization.objects.all():
- assert org.galaxy_credentials.count() == 2
- creds = org.galaxy_credentials.all()
- assert creds[0].name == 'Private Galaxy (https://example.org/)'
- assert creds[0].inputs['url'] == 'https://example.org/'
- assert creds[0].inputs['auth_url'] == 'https://auth.example.org/'
- assert creds[0].inputs['token'].startswith('$encrypted$')
- assert creds[0].get_input('token') == 'secret123'
-
- assert creds[1].name == 'Ansible Galaxy'
- assert creds[1].inputs['url'] == 'https://galaxy.ansible.com/'
-
- public_galaxy_creds = Credential.objects.filter(name='Ansible Galaxy')
- assert public_galaxy_creds.count() == 1
- assert public_galaxy_creds.first().managed_by_tower is True
-
-
-@pytest.mark.django_db
-def test_fallback_galaxies():
- org = Organization.objects.create()
- assert org.galaxy_credentials.count() == 0
- Setting.objects.create(key='PRIMARY_GALAXY_URL', value='https://example.org/')
- Setting.objects.create(key='PRIMARY_GALAXY_AUTH_URL', value='https://auth.example.org/')
- Setting.objects.create(key='PRIMARY_GALAXY_TOKEN', value='secret123')
- try:
- settings.FALLBACK_GALAXY_SERVERS = [
- {
- 'id': 'abc123',
- 'url': 'https://some-other-galaxy.example.org/',
- 'auth_url': 'https://some-other-galaxy.sso.example.org/',
- 'username': 'user',
- 'password': 'pass',
- 'token': 'fallback123',
- }
- ]
- galaxy.migrate_galaxy_settings(apps, None)
- finally:
- settings.FALLBACK_GALAXY_SERVERS = []
- assert org.galaxy_credentials.count() == 3
- creds = org.galaxy_credentials.all()
- assert creds[0].name == 'Private Galaxy (https://example.org/)'
- assert creds[0].inputs['url'] == 'https://example.org/'
- assert creds[1].name == 'Ansible Galaxy (https://some-other-galaxy.example.org/)'
- assert creds[1].inputs['url'] == 'https://some-other-galaxy.example.org/'
- assert creds[1].inputs['auth_url'] == 'https://some-other-galaxy.sso.example.org/'
- assert creds[1].inputs['token'].startswith('$encrypted$')
- assert creds[1].get_input('token') == 'fallback123'
- assert creds[2].name == 'Ansible Galaxy'
- assert creds[2].inputs['url'] == 'https://galaxy.ansible.com/'
diff --git a/awx/main/tests/functional/test_inventory_source_injectors.py b/awx/main/tests/functional/test_inventory_source_injectors.py
index f011e51104..aa84534c16 100644
--- a/awx/main/tests/functional/test_inventory_source_injectors.py
+++ b/awx/main/tests/functional/test_inventory_source_injectors.py
@@ -62,7 +62,7 @@ def fake_credential_factory():
for var in var_specs.keys():
inputs[var] = generate_fake_var(var_specs[var])
- if source == 'tower':
+ if source == 'controller':
inputs.pop('oauth_token') # mutually exclusive with user/pass
return Credential.objects.create(credential_type=ct, inputs=inputs)
@@ -182,8 +182,8 @@ def create_reference_data(source_dir, env, content):
@pytest.mark.django_db
@pytest.mark.parametrize('this_kind', CLOUD_PROVIDERS)
def test_inventory_update_injected_content(this_kind, inventory, fake_credential_factory):
- ExecutionEnvironment.objects.create(name='Control Plane EE', managed_by_tower=True)
- ExecutionEnvironment.objects.create(name='Default Job EE', managed_by_tower=False)
+ ExecutionEnvironment.objects.create(name='Control Plane EE', managed=True)
+ ExecutionEnvironment.objects.create(name='Default Job EE', managed=False)
injector = InventorySource.injectors[this_kind]
if injector.plugin_name is None:
diff --git a/awx/main/tests/functional/test_inventory_source_migration.py b/awx/main/tests/functional/test_inventory_source_migration.py
index b8858614e0..812b4b45b9 100644
--- a/awx/main/tests/functional/test_inventory_source_migration.py
+++ b/awx/main/tests/functional/test_inventory_source_migration.py
@@ -37,7 +37,7 @@ def test_cloudforms_inventory_removal(inventory):
name='Red Hat CloudForms',
namespace='cloudforms',
kind='cloud',
- managed_by_tower=True,
+ managed=True,
inputs={},
)
CredentialType.defaults['cloudforms']().save()
diff --git a/awx/main/tests/unit/conftest.py b/awx/main/tests/unit/conftest.py
index 901308be70..65c3731bdd 100644
--- a/awx/main/tests/unit/conftest.py
+++ b/awx/main/tests/unit/conftest.py
@@ -12,7 +12,7 @@ from django.urls import URLResolver, URLPattern
@pytest.fixture()
def execution_environment():
- return ExecutionEnvironment(name="test-ee", description="test-ee", managed_by_tower=True)
+ return ExecutionEnvironment(name="test-ee", description="test-ee", managed=True)
@pytest.fixture(autouse=True)
diff --git a/awx/main/tests/unit/models/test_inventory.py b/awx/main/tests/unit/models/test_inventory.py
index 04e20e2f03..34a8000665 100644
--- a/awx/main/tests/unit/models/test_inventory.py
+++ b/awx/main/tests/unit/models/test_inventory.py
@@ -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')
diff --git a/awx/main/tests/unit/test_fields.py b/awx/main/tests/unit/test_fields.py
index 56c6a3befc..8c00a95194 100644
--- a/awx/main/tests/unit/test_fields.py
+++ b/awx/main/tests/unit/test_fields.py
@@ -93,7 +93,7 @@ def test_custom_error_messages(schema, given, message):
],
)
def test_cred_type_input_schema_validity(input_, valid):
- type_ = CredentialType(kind='cloud', name='SomeCloud', managed_by_tower=True, inputs=input_)
+ type_ = CredentialType(kind='cloud', name='SomeCloud', managed=True, inputs=input_)
field = CredentialType._meta.get_field('inputs')
if valid is False:
with pytest.raises(ValidationError):
@@ -151,7 +151,7 @@ def test_cred_type_injectors_schema(injectors, valid):
type_ = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [
{'id': 'username', 'type': 'string', 'label': '_'},
@@ -190,7 +190,7 @@ def test_credential_creation_validation_failure(inputs):
type_ = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=True,
+ managed=True,
inputs={
'fields': [{'id': 'username', 'label': 'Username for SomeCloud', 'type': 'string'}, {'id': 'flag', 'label': 'Some Boolean Flag', 'type': 'boolean'}]
},
diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py
index fe563e39cf..15aeb86504 100644
--- a/awx/main/tests/unit/test_tasks.py
+++ b/awx/main/tests/unit/test_tasks.py
@@ -588,8 +588,8 @@ class TestGenericRun:
@pytest.mark.django_db
class TestAdhocRun(TestJobExecution):
def test_options_jinja_usage(self, adhoc_job, adhoc_update_model_wrapper):
- ExecutionEnvironment.objects.create(name='Control Plane EE', managed_by_tower=True)
- ExecutionEnvironment.objects.create(name='Default Job EE', managed_by_tower=False)
+ ExecutionEnvironment.objects.create(name='Control Plane EE', managed=True)
+ ExecutionEnvironment.objects.create(name='Default Job EE', managed=False)
adhoc_job.module_args = '{{ ansible_ssh_pass }}'
adhoc_job.websocket_emit_status = mock.Mock()
@@ -1095,7 +1095,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string'}]},
injectors={'env': {'MY_CLOUD_API_TOKEN': '{{api_token.foo()}}'}},
)
@@ -1108,7 +1108,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string'}]},
injectors={'env': {'MY_CLOUD_API_TOKEN': '{{api_token}}'}},
)
@@ -1123,7 +1123,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'turbo_button', 'label': 'Turbo Button', 'type': 'boolean'}]},
injectors={'env': {'TURBO_BUTTON': '{{turbo_button}}'}},
)
@@ -1140,7 +1140,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string'}]},
injectors={'env': {'JOB_ID': 'reserved'}},
)
@@ -1155,7 +1155,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'password', 'label': 'Password', 'type': 'string', 'secret': True}]},
injectors={'env': {'MY_CLOUD_PRIVATE_VAR': '{{password}}'}},
)
@@ -1175,7 +1175,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string'}]},
injectors={'extra_vars': {'api_token': '{{api_token}}'}},
)
@@ -1194,7 +1194,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'turbo_button', 'label': 'Turbo Button', 'type': 'boolean'}]},
injectors={'extra_vars': {'turbo_button': '{{turbo_button}}'}},
)
@@ -1213,7 +1213,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'turbo_button', 'label': 'Turbo Button', 'type': 'boolean'}]},
injectors={'extra_vars': {'turbo_button': '{% if turbo_button %}FAST!{% else %}SLOW!{% endif %}'}},
)
@@ -1234,7 +1234,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'password', 'label': 'Password', 'type': 'string', 'secret': True}]},
injectors={'extra_vars': {'password': '{{password}}'}},
)
@@ -1252,7 +1252,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'api_token', 'label': 'API Token', 'type': 'string'}]},
injectors={'file': {'template': '[mycloud]\n{{api_token}}'}, 'env': {'MY_CLOUD_INI_FILE': '{{tower.filename}}'}},
)
@@ -1269,7 +1269,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': []},
injectors={'file': {'template': value}, 'env': {'MY_CLOUD_INI_FILE': '{{tower.filename}}'}},
)
@@ -1288,7 +1288,7 @@ class TestJobCredentials(TestJobExecution):
some_cloud = CredentialType(
kind='cloud',
name='SomeCloud',
- managed_by_tower=False,
+ managed=False,
inputs={'fields': [{'id': 'cert', 'label': 'Certificate', 'type': 'string'}, {'id': 'key', 'label': 'Key', 'type': 'string'}]},
injectors={
'file': {'template.cert': '[mycert]\n{{cert}}', 'template.key': '[mykey]\n{{key}}'},
@@ -1778,8 +1778,8 @@ class TestInventoryUpdateCredentials(TestJobExecution):
def test_tower_source(self, verify, inventory_update, private_data_dir, mocker):
task = tasks.RunInventoryUpdate()
task.instance = inventory_update
- tower = CredentialType.defaults['tower']()
- inventory_update.source = 'tower'
+ tower = CredentialType.defaults['controller']()
+ inventory_update.source = 'controller'
inputs = {'host': 'https://tower.example.org', 'username': 'bob', 'password': 'secret', 'verify_ssl': verify}
def get_cred():
@@ -1794,20 +1794,20 @@ class TestInventoryUpdateCredentials(TestJobExecution):
safe_env = build_safe_env(env)
- assert env['TOWER_HOST'] == 'https://tower.example.org'
- assert env['TOWER_USERNAME'] == 'bob'
- assert env['TOWER_PASSWORD'] == 'secret'
+ assert env['CONTROLLER_HOST'] == 'https://tower.example.org'
+ assert env['CONTROLLER_USERNAME'] == 'bob'
+ assert env['CONTROLLER_PASSWORD'] == 'secret'
if verify:
- assert env['TOWER_VERIFY_SSL'] == 'True'
+ assert env['CONTROLLER_VERIFY_SSL'] == 'True'
else:
- assert env['TOWER_VERIFY_SSL'] == 'False'
- assert safe_env['TOWER_PASSWORD'] == tasks.HIDDEN_PASSWORD
+ assert env['CONTROLLER_VERIFY_SSL'] == 'False'
+ assert safe_env['CONTROLLER_PASSWORD'] == tasks.HIDDEN_PASSWORD
def test_tower_source_ssl_verify_empty(self, inventory_update, private_data_dir, mocker):
task = tasks.RunInventoryUpdate()
task.instance = inventory_update
- tower = CredentialType.defaults['tower']()
- inventory_update.source = 'tower'
+ tower = CredentialType.defaults['controller']()
+ inventory_update.source = 'controller'
inputs = {
'host': 'https://tower.example.org',
'username': 'bob',
@@ -1921,7 +1921,7 @@ def test_aquire_lock_acquisition_fail_logged(fcntl_lockf, logging_getLogger, os_
def test_managed_injector_redaction(injector_cls):
"""See awx.main.models.inventory.PluginFileInjector._get_shared_env
The ordering within awx.main.tasks.BaseTask and contract with build_env
- requires that all managed_by_tower injectors are safely redacted by the
+ requires that all managed injectors are safely redacted by the
static method build_safe_env without having to employ the safe namespace
as in inject_credential
diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py
index 2492b9a87a..6a962c6ce5 100644
--- a/awx/main/utils/common.py
+++ b/awx/main/utils/common.py
@@ -366,7 +366,7 @@ def get_allowed_fields(obj, serializer_mapping):
fields_excluded = ACTIVITY_STREAM_FIELD_EXCLUSIONS.get(model_name, [])
# see definition of from_db for CredentialType
# injection logic of any managed types are incompatible with activity stream
- if model_name == 'credentialtype' and obj.managed_by_tower and obj.namespace:
+ if model_name == 'credentialtype' and obj.managed and obj.namespace:
fields_excluded.extend(['inputs', 'injectors'])
if fields_excluded:
allowed_fields = [f for f in allowed_fields if f not in fields_excluded]
diff --git a/awx/main/utils/execution_environments.py b/awx/main/utils/execution_environments.py
index c218c72802..11aa41edc8 100644
--- a/awx/main/utils/execution_environments.py
+++ b/awx/main/utils/execution_environments.py
@@ -7,18 +7,18 @@ from awx.main.models.execution_environments import ExecutionEnvironment
def get_control_plane_execution_environment():
- return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=True).first()
+ return ExecutionEnvironment.objects.filter(organization=None, managed=True).first()
def get_default_execution_environment():
if settings.DEFAULT_EXECUTION_ENVIRONMENT is not None:
return settings.DEFAULT_EXECUTION_ENVIRONMENT
installed_default = ExecutionEnvironment.objects.filter(
- image__in=[ee['image'] for ee in settings.GLOBAL_JOB_EXECUTION_ENVIRONMENTS], organization=None, managed_by_tower=False
+ image__in=[ee['image'] for ee in settings.GLOBAL_JOB_EXECUTION_ENVIRONMENTS], organization=None, managed=False
).first()
if installed_default:
return installed_default
- return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=False).first()
+ return ExecutionEnvironment.objects.filter(organization=None, managed=False).first()
def get_default_pod_spec():
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index d1b38a2c1e..a6422ef733 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -185,7 +185,7 @@ DEFAULT_EXECUTION_ENVIRONMENT = None
GLOBAL_JOB_EXECUTION_ENVIRONMENTS = [{'name': 'AWX EE 0.3.0', 'image': 'quay.io/ansible/awx-ee:0.3.0'}]
# This setting controls which EE will be used for project updates.
# The awx-manage register_default_execution_environments command reads this setting and registers the EE
-# This image is distinguished from others by having "managed_by_tower" set to True and users have limited
+# This image is distinguished from others by having "managed" set to True and users have limited
# ability to modify it through the API.
# If a registry credential is needed to pull the image, that can be provided to the awx-manage command
CONTROL_PLANE_EXECUTION_ENVIRONMENT = 'quay.io/ansible/awx-ee:0.3.0'
@@ -427,6 +427,7 @@ CELERYBEAT_SCHEDULE = {
'gather_analytics': {'task': 'awx.main.tasks.gather_analytics', 'schedule': timedelta(minutes=5)},
'task_manager': {'task': 'awx.main.scheduler.tasks.run_task_manager', 'schedule': timedelta(seconds=20), 'options': {'expires': 20}},
'k8s_reaper': {'task': 'awx.main.tasks.awx_k8s_reaper', 'schedule': timedelta(seconds=60), 'options': {'expires': 50}},
+ 'receptor_reaper': {'task': 'awx.main.tasks.awx_receptor_workunit_reaper', 'schedule': timedelta(seconds=60)},
'send_subsystem_metrics': {'task': 'awx.main.analytics.analytics_tasks.send_subsystem_metrics', 'schedule': timedelta(seconds=20)},
'cleanup_images': {'task': 'awx.main.tasks.cleanup_execution_environment_images', 'schedule': timedelta(hours=3)},
}
@@ -677,12 +678,12 @@ RHV_EXCLUDE_EMPTY_GROUPS = True
RHV_INSTANCE_ID_VAR = 'id'
# ---------------------
-# ----- Tower -----
+# ----- Controller -----
# ---------------------
-TOWER_ENABLED_VAR = 'remote_tower_enabled'
-TOWER_ENABLED_VALUE = 'true'
-TOWER_EXCLUDE_EMPTY_GROUPS = True
-TOWER_INSTANCE_ID_VAR = 'remote_tower_id'
+CONTROLLER_ENABLED_VAR = 'remote_tower_enabled'
+CONTROLLER_ENABLED_VALUE = 'true'
+CONTROLLER_EXCLUDE_EMPTY_GROUPS = True
+CONTROLLER_INSTANCE_ID_VAR = 'remote_tower_id'
# ---------------------
# ----- Foreman -----
diff --git a/awx/sso/tests/functional/test_pipeline.py b/awx/sso/tests/functional/test_pipeline.py
index 36247c4b11..5a4307a0fa 100644
--- a/awx/sso/tests/functional/test_pipeline.py
+++ b/awx/sso/tests/functional/test_pipeline.py
@@ -13,7 +13,7 @@ from awx.main.models import User, Team, Organization, Credential, CredentialType
def galaxy_credential():
galaxy_type = CredentialType.objects.create(kind='galaxy')
cred = Credential(
- created=now(), modified=now(), name='Ansible Galaxy', managed_by_tower=True, credential_type=galaxy_type, inputs={'url': 'https://galaxy.ansible.com/'}
+ created=now(), modified=now(), name='Ansible Galaxy', managed=True, credential_type=galaxy_type, inputs={'url': 'https://galaxy.ansible.com/'}
)
cred.save()
diff --git a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
index 58d16923ea..8f5b97ae19 100644
--- a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
+++ b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
@@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect, Fragment } from 'react';
import { t } from '@lingui/macro';
import PropTypes from 'prop-types';
import { Dropdown, DropdownPosition } from '@patternfly/react-core';
-import { ToolbarAddButton } from '../PaginatedDataList';
+import { ToolbarAddButton } from '../PaginatedTable';
import { useKebabifiedMenu } from '../../contexts/Kebabified';
function AddDropDownButton({ dropdownItems, ouiaId }) {
diff --git a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
index 2c63abf9e8..7fe6865f44 100644
--- a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
+++ b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
@@ -15,7 +15,6 @@ import { FormSelect, FormSelectOption } from '@patternfly/react-core';
function AnsibleSelect({
id,
data,
-
isValid,
onBlur,
value,
diff --git a/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx b/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
index c76d9af0d1..9671157f73 100644
--- a/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
+++ b/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
@@ -1,3 +1,4 @@
+import 'styled-components/macro';
import React from 'react';
import PropTypes from 'prop-types';
import { t } from '@lingui/macro';
@@ -28,6 +29,7 @@ const CheckboxListItem = ({
ouiaId={`list-item-${itemId}`}
id={`list-item-${itemId}`}
onClick={handleRowClick}
+ css="cursor: default"
>
{vals.map(v => (
- {v}
+ {v}
))}
diff --git a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
index 5a123ebe49..7a1f26724c 100644
--- a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
+++ b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
@@ -1,21 +1,29 @@
import React from 'react';
import { bool, string } from 'prop-types';
import { Link } from 'react-router-dom';
-
-import { t } from '@lingui/macro';
-import { Tooltip } from '@patternfly/react-core';
+import { t, Trans } from '@lingui/macro';
+import { Popover, Tooltip } from '@patternfly/react-core';
import styled from 'styled-components';
-
import { ExclamationTriangleIcon as PFExclamationTriangleIcon } from '@patternfly/react-icons';
-
import { Detail } from '../DetailList';
import { ExecutionEnvironment } from '../../types';
+import getDocsBaseUrl from '../../util/getDocsBaseUrl';
+import { useConfig } from '../../contexts/Config';
const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100);
margin-left: 18px;
+ cursor: pointer;
`;
+const ExclamationTrianglePopover = styled(PFExclamationTriangleIcon)`
+ color: var(--pf-global--warning-color--100);
+ margin-left: 18px;
+ cursor: pointer;
+`;
+
+ExclamationTrianglePopover.displayName = 'ExclamationTrianglePopover';
+
function ExecutionEnvironmentDetail({
executionEnvironment,
isDefaultEnvironment,
@@ -23,6 +31,10 @@ function ExecutionEnvironmentDetail({
verifyMissingVirtualEnv,
helpText,
}) {
+ const config = useConfig();
+ const docsLink = `${getDocsBaseUrl(
+ config
+ )}/html/upgrade-migration-guide/upgrade_to_ees.html`;
const label = isDefaultEnvironment
? t`Default Execution Environment`
: t`Execution Environment`;
@@ -51,12 +63,29 @@ function ExecutionEnvironmentDetail({
<>
{t`Missing resource`}
- {t`Execution Environment Missing`}}
+ bodyContent={
+
+
+ Custom virtual environment {virtualEnvironment} must be
+ replaced by an execution environment. For more information
+ about migrating to execution environments see{' '}
+
+ the documentation.
+
+
+
+
}
diff --git a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.test.jsx b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.test.jsx
index b98a8e324d..a0e84e686b 100644
--- a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.test.jsx
+++ b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.test.jsx
@@ -57,9 +57,8 @@ describe(' {
+ item.name = `${item.id} - ${item.name}`;
+ return item;
+ })}
pluralizedItemName={t`Jobs`}
cannotDelete={item =>
isJobRunning(item.status) ||
diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
index 15e7e76f6e..16430d803c 100644
--- a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
+++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
@@ -37,7 +37,6 @@ function LaunchButton({ resource, children, history }) {
const [launchConfig, setLaunchConfig] = useState(null);
const [surveyConfig, setSurveyConfig] = useState(null);
const [isLaunching, setIsLaunching] = useState(false);
- const [resourceCredentials, setResourceCredentials] = useState([]);
const [error, setError] = useState(null);
const handleLaunch = async () => {
@@ -60,17 +59,6 @@ function LaunchButton({ resource, children, history }) {
setSurveyConfig(data);
}
- if (
- launch.ask_credential_on_launch &&
- resource.type === 'workflow_job_template'
- ) {
- const {
- data: { results: jobTemplateCredentials },
- } = await JobTemplatesAPI.readCredentials(resource.id);
-
- setResourceCredentials(jobTemplateCredentials);
- }
-
if (canLaunchWithoutPrompt(launch)) {
launchWithParams({});
} else {
@@ -184,7 +172,6 @@ function LaunchButton({ resource, children, history }) {
resource={resource}
onLaunch={launchWithParams}
onCancel={() => setShowLaunchPrompt(false)}
- resourceDefaultCredentials={resourceCredentials}
/>
)}
diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
index 15f530ec63..9dc05b3ca8 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
@@ -16,7 +16,6 @@ function PromptModalForm({
onSubmit,
resource,
surveyConfig,
- resourceDefaultCredentials,
}) {
const { setFieldTouched, values } = useFormikContext();
const [showDescription, setShowDescription] = useState(false);
@@ -28,12 +27,7 @@ function PromptModalForm({
visitStep,
visitAllSteps,
contentError,
- } = useLaunchSteps(
- launchConfig,
- surveyConfig,
- resource,
- resourceDefaultCredentials
- );
+ } = useLaunchSteps(launchConfig, surveyConfig, resource);
const handleSubmit = () => {
const postValues = {};
@@ -58,6 +52,7 @@ function PromptModalForm({
: resource.extra_vars;
setValue('extra_vars', mergeExtraVars(extraVars, surveyValues));
setValue('scm_branch', values.scm_branch);
+ setValue('verbosity', values.verbosity);
onSubmit(postValues);
};
diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
index 4e5547242c..366437fdf7 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
@@ -7,6 +7,7 @@ import {
import LaunchPrompt from './LaunchPrompt';
import InventoryStep from './steps/InventoryStep';
import CredentialsStep from './steps/CredentialsStep';
+import CredentialPasswordsStep from './steps/CredentialPasswordsStep';
import OtherPromptsStep from './steps/OtherPromptsStep';
import PreviewStep from './steps/PreviewStep';
import {
@@ -27,6 +28,18 @@ const resource = {
description: 'Foo Description',
name: 'Foobar',
type: 'job_template',
+ summary_fields: {
+ credentials: [
+ {
+ id: 5,
+ name: 'cred that prompts',
+ credential_type: 1,
+ inputs: {
+ password: 'ASK',
+ },
+ },
+ ],
+ },
};
const noop = () => {};
@@ -101,7 +114,12 @@ describe('LaunchPrompt', () => {
summary_fields: {
credentials: [
{
- id: 1,
+ id: 5,
+ name: 'cred that prompts',
+ credential_type: 1,
+ inputs: {
+ password: 'ASK',
+ },
},
],
},
@@ -126,16 +144,6 @@ describe('LaunchPrompt', () => {
},
],
}}
- resourceDefaultCredentials={[
- {
- id: 5,
- name: 'cred that prompts',
- credential_type: 1,
- inputs: {
- password: 'ASK',
- },
- },
- ]}
/>
);
});
@@ -197,10 +205,13 @@ describe('LaunchPrompt', () => {
const wizard = await waitForElement(wrapper, 'Wizard');
const steps = wizard.prop('steps');
- expect(steps).toHaveLength(2);
+ expect(steps).toHaveLength(3);
expect(steps[0].name.props.children).toEqual('Credentials');
expect(isElementOfType(steps[0].component, CredentialsStep)).toEqual(true);
- expect(isElementOfType(steps[1].component, PreviewStep)).toEqual(true);
+ expect(
+ isElementOfType(steps[1].component, CredentialPasswordsStep)
+ ).toEqual(true);
+ expect(isElementOfType(steps[2].component, PreviewStep)).toEqual(true);
});
test('should add other prompts step', async () => {
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
index e4d0782218..07d96b335d 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
@@ -1,5 +1,4 @@
import React, { useState } from 'react';
-
import { t } from '@lingui/macro';
import { useField } from 'formik';
import {
@@ -10,7 +9,6 @@ import {
SelectVariant,
} from '@patternfly/react-core';
import FormField from '../../FormField';
-import AnsibleSelect from '../../AnsibleSelect';
import Popover from '../../Popover';
import {
required,
@@ -92,12 +90,22 @@ function NumberField({ question }) {
}
function MultipleChoiceField({ question }) {
- const [field, meta] = useField({
+ const [field, meta, helpers] = useField({
name: `survey_${question.variable}`,
validate: question.required ? required(null) : null,
});
+ const [isOpen, setIsOpen] = useState(false);
const id = `survey-question-${question.variable}`;
const isValid = !(meta.touched && meta.error);
+
+ let options = [];
+
+ if (typeof question.choices === 'string') {
+ options = question.choices.split('\n');
+ } else if (Array.isArray(question.choices)) {
+ options = [...question.choices];
+ }
+
return (
{
+ helpers.setValue(option);
+ setIsOpen(false);
+ }}
+ selections={field.value}
+ variant={SelectVariant.single}
id={id}
- isValid={isValid}
- {...field}
- data={question.choices.split('\n').map(opt => ({
- key: opt,
- value: opt,
- label: opt,
- }))}
- />
+ isOpen={isOpen}
+ placeholderText={t`Select an option`}
+ onClear={() => {
+ helpers.setTouched(true);
+ helpers.setValue('');
+ }}
+ >
+ {options.map(opt => (
+ {
if (field?.value?.includes(option)) {
@@ -161,7 +188,7 @@ function MultiSelectField({ question }) {
helpers.setValue([]);
}}
>
- {question.choices.split('\n').map(opt => (
+ {options.map(opt => (
+
+ );
+ });
+
+ await act(async () => {
+ wrapper.find('SelectToggle').simulate('click');
+ });
+ wrapper.update();
+ const selectOptions = wrapper.find('SelectOption');
+ expect(selectOptions.at(0).prop('value')).toEqual('1');
+ expect(selectOptions.at(1).prop('value')).toEqual('2');
+ expect(selectOptions.at(2).prop('value')).toEqual('3');
+ expect(selectOptions.at(3).prop('value')).toEqual('4');
+ expect(selectOptions.at(4).prop('value')).toEqual('5');
+ expect(selectOptions.at(5).prop('value')).toEqual('6');
+ });
+ test('should handle choices as an array', async () => {
+ let wrapper;
+ await act(async () => {
+ wrapper = mountWithContexts(
+
+
+ );
+ });
+
+ await act(async () => {
+ wrapper.find('SelectToggle').simulate('click');
+ });
+ wrapper.update();
+ const selectOptions = wrapper.find('SelectOption');
+ expect(selectOptions.at(0).prop('value')).toEqual('1');
+ expect(selectOptions.at(1).prop('value')).toEqual('2');
+ expect(selectOptions.at(2).prop('value')).toEqual('3');
+ expect(selectOptions.at(3).prop('value')).toEqual('4');
+ expect(selectOptions.at(4).prop('value')).toEqual('5');
+ expect(selectOptions.at(5).prop('value')).toEqual('6');
+ });
+});
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
index 98d0b0aed4..9105c8ea31 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
@@ -17,19 +17,18 @@ export default function credentialsValidator(
if (
!selectedCredentials.find(selectedCredential => {
return (
- (selectedCredential.credential_type ===
- defaultCredential.credential_type &&
- !selectedCredential.inputs.vault_id &&
- !defaultCredential.inputs.vault_id) ||
- (selectedCredential.inputs.vault_id &&
- defaultCredential.inputs.vault_id &&
- selectedCredential.inputs.vault_id ===
- defaultCredential.inputs.vault_id)
+ (selectedCredential?.credential_type ===
+ defaultCredential?.credential_type &&
+ !selectedCredential.inputs?.vault_id &&
+ !defaultCredential.inputs?.vault_id) ||
+ (defaultCredential.inputs?.vault_id &&
+ selectedCredential.inputs?.vault_id ===
+ defaultCredential.inputs?.vault_id)
);
})
) {
missingCredentialTypes.push(
- defaultCredential.inputs.vault_id
+ defaultCredential.inputs?.vault_id
? `${defaultCredential.summary_fields.credential_type.name} | ${defaultCredential.inputs.vault_id}`
: defaultCredential.summary_fields.credential_type.name
);
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
index 6b05b27b78..51ca81be44 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
@@ -11,7 +11,6 @@ export default function useCredentialsStep(
launchConfig,
resource,
resourceDefaultCredentials,
-
allowCredentialsWithPasswords = false
) {
const [field, meta, helpers] = useField('credentials');
@@ -22,7 +21,6 @@ export default function useCredentialsStep(
return {
step: getStep(
launchConfig,
-
allowCredentialsWithPasswords,
formError,
resourceDefaultCredentials
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
index ab535fa8ab..19187d5429 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
@@ -71,9 +71,6 @@ function getInitialValues(launchConfig, surveyConfig, resource) {
values[`survey_${question.variable}`] = question.default
? question.default.split('\n')
: [];
- } else if (question.type === 'multiplechoice') {
- values[`survey_${question.variable}`] =
- question.default || question.choices.split('\n')[0];
} else {
values[`survey_${question.variable}`] = question.default || '';
}
diff --git a/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js b/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
index e8b0b82c5f..e2c5e5a3d7 100644
--- a/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
+++ b/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
@@ -39,12 +39,7 @@ function showCredentialPasswordsStep(credentials = [], launchConfig) {
return credentialPasswordStepRequired;
}
-export default function useLaunchSteps(
- launchConfig,
- surveyConfig,
- resource,
- resourceDefaultCredentials
-) {
+export default function useLaunchSteps(launchConfig, surveyConfig, resource) {
const [visited, setVisited] = useState({});
const [isReady, setIsReady] = useState(false);
const { touched, values: formikValues } = useFormikContext();
@@ -53,7 +48,7 @@ export default function useLaunchSteps(
useCredentialsStep(
launchConfig,
resource,
- resourceDefaultCredentials,
+ resource.summary_fields.credentials || [],
true
),
useCredentialPasswordsStep(
diff --git a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
index a353cb2ae1..a5f6a54dd8 100644
--- a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
@@ -18,7 +18,7 @@ import ChipGroup from '../ChipGroup';
import Popover from '../Popover';
import DataListToolbar from '../DataListToolbar';
import LookupErrorMessage from './shared/LookupErrorMessage';
-import PaginatedDataList from '../PaginatedDataList';
+import PaginatedTable, { HeaderCell, HeaderRow } from '../PaginatedTable';
import HostListItem from './HostListItem';
import { HostsAPI } from '../../api';
import { getQSConfig, mergeParams, parseQueryString } from '../../util/qs';
@@ -352,20 +352,20 @@ function HostFilterLookup({
]}
>
- {}}
pluralizedItemName={t`hosts`}
qsConfig={QS_CONFIG}
- renderItem={item => (
-
+ {t`Name`}
+ {t`Inventory`}
+
+ }
+ renderRow={item =>
-
-
-
- {item.name}
-
-
- ,
-
- {item.summary_fields.inventory.name}
- ,
- ]}
- />
-
-
+
+ {item.name}
+ {item.summary_fields.inventory.name}
+
);
}
diff --git a/awx/ui_next/src/components/Lookup/HostListItem.test.jsx b/awx/ui_next/src/components/Lookup/HostListItem.test.jsx
index 7e6fdbb16b..1d18fbdbe5 100644
--- a/awx/ui_next/src/components/Lookup/HostListItem.test.jsx
+++ b/awx/ui_next/src/components/Lookup/HostListItem.test.jsx
@@ -15,11 +15,25 @@ describe('HostListItem', () => {
},
};
test('initially renders successfully', () => {
- wrapper = mountWithContexts( handleListItemSelect(id)}
- >
- {items.map(renderItem)}
-
-
- );
- }
-
- const ToolbarPagination = (
-
-
- );
-}
-
-const Item = PropTypes.shape({
- id: PropTypes.number.isRequired,
- url: PropTypes.string.isRequired,
- name: PropTypes.string,
-});
-
-PaginatedDataList.propTypes = {
- items: PropTypes.arrayOf(Item).isRequired,
- itemCount: PropTypes.number.isRequired,
- pluralizedItemName: PropTypes.string,
- qsConfig: QSConfig.isRequired,
- renderItem: PropTypes.func,
- toolbarSearchColumns: SearchColumns,
- toolbarSearchableKeys: PropTypes.arrayOf(PropTypes.string),
- toolbarRelatedSearchableKeys: PropTypes.arrayOf(PropTypes.string),
- toolbarSortColumns: SortColumns,
- showPageSizeOptions: PropTypes.bool,
- renderToolbar: PropTypes.func,
- hasContentLoading: PropTypes.bool,
- contentError: PropTypes.shape(),
- onRowClick: PropTypes.func,
-};
-
-PaginatedDataList.defaultProps = {
- hasContentLoading: false,
- contentError: null,
- toolbarSearchColumns: [],
- toolbarSearchableKeys: [],
- toolbarRelatedSearchableKeys: [],
- toolbarSortColumns: [],
- pluralizedItemName: 'Items',
- showPageSizeOptions: true,
- renderItem: ({ id, ...rest }) => (
-
-
-
-
- {item.name}
-
-
- ,
- ]}
- />
-
-
- );
-}
diff --git a/awx/ui_next/src/components/PaginatedDataList/index.js b/awx/ui_next/src/components/PaginatedDataList/index.js
deleted file mode 100644
index 1a14967a71..0000000000
--- a/awx/ui_next/src/components/PaginatedDataList/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default } from './PaginatedDataList';
-export { default as PaginatedDataListItem } from './PaginatedDataListItem';
-export { default as ToolbarDeleteButton } from './ToolbarDeleteButton';
-export { default as ToolbarAddButton } from './ToolbarAddButton';
diff --git a/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx b/awx/ui_next/src/components/PaginatedTable/ToolbarAddButton.jsx
similarity index 100%
rename from awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx
rename to awx/ui_next/src/components/PaginatedTable/ToolbarAddButton.jsx
diff --git a/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.test.jsx b/awx/ui_next/src/components/PaginatedTable/ToolbarAddButton.test.jsx
similarity index 100%
rename from awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.test.jsx
rename to awx/ui_next/src/components/PaginatedTable/ToolbarAddButton.test.jsx
diff --git a/awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.jsx b/awx/ui_next/src/components/PaginatedTable/ToolbarDeleteButton.jsx
similarity index 100%
rename from awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.jsx
rename to awx/ui_next/src/components/PaginatedTable/ToolbarDeleteButton.jsx
diff --git a/awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.test.jsx b/awx/ui_next/src/components/PaginatedTable/ToolbarDeleteButton.test.jsx
similarity index 100%
rename from awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.test.jsx
rename to awx/ui_next/src/components/PaginatedTable/ToolbarDeleteButton.test.jsx
diff --git a/awx/ui_next/src/components/PaginatedTable/index.js b/awx/ui_next/src/components/PaginatedTable/index.js
index f4b1804d9a..93a5529090 100644
--- a/awx/ui_next/src/components/PaginatedTable/index.js
+++ b/awx/ui_next/src/components/PaginatedTable/index.js
@@ -2,3 +2,5 @@ export { default } from './PaginatedTable';
export { default as ActionsTd } from './ActionsTd';
export { default as HeaderRow, HeaderCell } from './HeaderRow';
export { default as ActionItem } from './ActionItem';
+export { default as ToolbarDeleteButton } from './ToolbarDeleteButton';
+export { default as ToolbarAddButton } from './ToolbarAddButton';
diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
index 50cf3a2cf4..df8060aff1 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
@@ -5,8 +5,11 @@ import { RolesAPI, TeamsAPI, UsersAPI } from '../../api';
import AddResourceRole from '../AddRole/AddResourceRole';
import AlertModal from '../AlertModal';
import DataListToolbar from '../DataListToolbar';
-import PaginatedTable, { HeaderRow, HeaderCell } from '../PaginatedTable';
-import { ToolbarAddButton } from '../PaginatedDataList';
+import PaginatedTable, {
+ HeaderRow,
+ HeaderCell,
+ ToolbarAddButton,
+} from '../PaginatedTable';
import { getQSConfig, parseQueryString } from '../../util/qs';
import useRequest, { useDeleteItems } from '../../util/useRequest';
import DeleteRoleConfirmationModal from './DeleteRoleConfirmationModal';
diff --git a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
index 4a1a28e509..3ed3db2a44 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
@@ -6,9 +6,13 @@ import { t } from '@lingui/macro';
import { SchedulesAPI } from '../../../api';
import AlertModal from '../../AlertModal';
import ErrorDetail from '../../ErrorDetail';
-import PaginatedTable, { HeaderRow, HeaderCell } from '../../PaginatedTable';
+import PaginatedTable, {
+ HeaderRow,
+ HeaderCell,
+ ToolbarAddButton,
+ ToolbarDeleteButton,
+} from '../../PaginatedTable';
import DataListToolbar from '../../DataListToolbar';
-import { ToolbarAddButton, ToolbarDeleteButton } from '../../PaginatedDataList';
import useRequest, { useDeleteItems } from '../../../util/useRequest';
import useSelected from '../../../util/useSelected';
import { getQSConfig, parseQueryString } from '../../../util/qs';
diff --git a/awx/ui_next/src/components/TemplateList/TemplateList.jsx b/awx/ui_next/src/components/TemplateList/TemplateList.jsx
index 69a0e6b7f6..51bfcfd065 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateList.jsx
+++ b/awx/ui_next/src/components/TemplateList/TemplateList.jsx
@@ -10,8 +10,11 @@ import {
import AlertModal from '../AlertModal';
import DatalistToolbar from '../DataListToolbar';
import ErrorDetail from '../ErrorDetail';
-import { ToolbarDeleteButton } from '../PaginatedDataList';
-import PaginatedTable, { HeaderRow, HeaderCell } from '../PaginatedTable';
+import PaginatedTable, {
+ HeaderRow,
+ HeaderCell,
+ ToolbarDeleteButton,
+} from '../PaginatedTable';
import useRequest, { useDeleteItems } from '../../util/useRequest';
import useSelected from '../../util/useSelected';
import { getQSConfig, parseQueryString } from '../../util/qs';
diff --git a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
index 9ae919a624..57c25073da 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
+++ b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
@@ -1,10 +1,9 @@
import 'styled-components/macro';
import React, { useState, useCallback } from 'react';
import { Link } from 'react-router-dom';
-import { Button, Tooltip, Chip } from '@patternfly/react-core';
+import { Button, Popover, Tooltip, Chip } from '@patternfly/react-core';
import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
-import { t } from '@lingui/macro';
-
+import { t, Trans } from '@lingui/macro';
import {
ExclamationTriangleIcon,
PencilAltIcon,
@@ -12,25 +11,28 @@ import {
RocketIcon,
} from '@patternfly/react-icons';
import styled from 'styled-components';
-
import { ActionsTd, ActionItem } from '../PaginatedTable';
import { DetailList, Detail, DeletedDetail } from '../DetailList';
import ChipGroup from '../ChipGroup';
import CredentialChip from '../CredentialChip';
import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
import { timeOfDay, formatDateString } from '../../util/dates';
-
import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../api';
import { LaunchButton } from '../LaunchButton';
import Sparkline from '../Sparkline';
import { toTitleCase } from '../../util/strings';
import CopyButton from '../CopyButton';
+import getDocsBaseUrl from '../../util/getDocsBaseUrl';
+import { useConfig } from '../../contexts/Config';
const ExclamationTriangleIconWarning = styled(ExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100);
margin-left: 18px;
+ cursor: pointer;
`;
+ExclamationTriangleIconWarning.displayName = 'ExclamationTriangleIconWarning';
+
function TemplateListItem({
template,
isSelected,
@@ -39,10 +41,15 @@ function TemplateListItem({
fetchTemplates,
rowIndex,
}) {
+ const config = useConfig();
const [isExpanded, setIsExpanded] = useState(false);
const [isDisabled, setIsDisabled] = useState(false);
const labelId = `check-action-${template.id}`;
+ const docsLink = `${getDocsBaseUrl(
+ config
+ )}/html/upgrade-migration-guide/upgrade_to_ees.html`;
+
const copyTemplate = useCallback(async () => {
if (template.type === 'job_template') {
await JobTemplatesAPI.copy(template.id, {
@@ -139,13 +146,29 @@ function TemplateListItem({
)}
{missingExecutionEnvironment && (
- {t`Execution Environment Missing`}}
+ bodyContent={
+
+
+ Custom virtual environment {template.custom_virtualenv}{' '}
+ must be replaced by an execution environment. For more
+ information about migrating to execution environments see{' '}
+
+ the documentation.
+
+
+
+
)}
@@ -274,10 +297,12 @@ function TemplateListItem({
dataCy={`template-${template.id}-project`}
/>
)}
- (
@@ -139,9 +123,7 @@ function ApplicationTokenList() {
{...props}
showSelectAll
isAllSelected={isAllSelected}
- onSelectAll={isSelected =>
- setSelected(isSelected ? [...tokens] : [])
- }
+ onSelectAll={selectAll}
qsConfig={QS_CONFIG}
additionalControls={[
+ {t`Name`}
+ {t`Scope`}
+ {t`Expires`}
+
+ }
+ renderRow={(token, index) => (
handleSelect(token)}
isSelected={selected.some(row => row.id === token.id)}
+ rowIndex={index}
/>
)}
/>
diff --git a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.test.jsx b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.test.jsx
index ccc9c5f4cc..67d7d2e4c7 100644
--- a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.test.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.test.jsx
@@ -1,10 +1,7 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
-import {
- mountWithContexts,
- waitForElement,
-} from '../../../../testUtils/enzymeHelpers';
+import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
import { ApplicationsAPI, TokensAPI } from '../../../api';
import ApplicationTokenList from './ApplicationTokenList';
@@ -100,14 +97,16 @@ describe('
-
-
- {token.summary_fields.user.username}
-
- ,
-
- {t`Scope`}
- {toTitleCase(token.scope)}
- ,
-
- {t`Expiration`}
- {formatDateString(token.expires)}
- ,
- ]}
- />
-
-
+
+
+
+ {toTitleCase(token.scope)}
+ {formatDateString(token.expires)}
+
);
}
@@ -58,6 +39,7 @@ ApplicationTokenListItem.propTypes = {
detailUrl: string.isRequired,
isSelected: bool.isRequired,
onSelect: func.isRequired,
+ rowIndex: number.isRequired,
};
export default ApplicationTokenListItem;
diff --git a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.test.jsx b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.test.jsx
index 94d0355951..78c0fe1d14 100644
--- a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.test.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.test.jsx
@@ -42,49 +42,79 @@ describe(' {}}
- />
+
+
+ {}}
+ rowIndex={1}
+ />
+
+
);
});
expect(wrapper.find('ApplicationTokenListItem').length).toBe(1);
});
+
test('should render the proper data', async () => {
await act(async () => {
wrapper = mountWithContexts(
- {}}
- />
+
+
+ {}}
+ rowIndex={1}
+ />
+
+
);
});
- expect(wrapper.find('DataListCell[aria-label="token name"]').text()).toBe(
- 'admin'
- );
- expect(wrapper.find('DataListCell[aria-label="scope"]').text()).toBe(
- 'ScopeRead'
- );
- expect(wrapper.find('DataListCell[aria-label="expiration"]').text()).toBe(
- 'Expiration10/25/3019, 7:56:38 PM'
- );
- expect(wrapper.find('input#select-token-2').prop('checked')).toBe(false);
+ expect(
+ wrapper
+ .find('Td')
+ .at(1)
+ .text()
+ ).toBe('admin');
+ expect(
+ wrapper
+ .find('Td')
+ .at(2)
+ .text()
+ ).toBe('Read');
+ expect(
+ wrapper
+ .find('Td')
+ .at(3)
+ .text()
+ ).toBe('10/25/3019, 7:56:38 PM');
});
+
test('should be checked', async () => {
await act(async () => {
wrapper = mountWithContexts(
- {}}
- />
+
+
+ {}}
+ rowIndex={1}
+ />
+
+
);
});
- expect(wrapper.find('input#select-token-2').prop('checked')).toBe(true);
+ expect(
+ wrapper
+ .find('Td')
+ .at(0)
+ .prop('select').isSelected
+ ).toBe(true);
});
});
diff --git a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
index e9cb51e8f7..6b65664f9f 100644
--- a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
@@ -14,11 +14,9 @@ import { ApplicationsAPI } from '../../../api';
import PaginatedTable, {
HeaderRow,
HeaderCell,
-} from '../../../components/PaginatedTable';
-import {
ToolbarDeleteButton,
ToolbarAddButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import useSelected from '../../../util/useSelected';
import ApplicationListItem from './ApplicationListItem';
diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
index 486a7dc3b3..5318a3b7cf 100644
--- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
@@ -38,7 +38,7 @@ const mockCredentialResults = {
description: '',
kind: 'ssh',
namespace: 'ssh',
- managed_by_tower: true,
+ managed: true,
inputs: {
fields: [
{
diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
index 0d32e6ec44..9126f339da 100644
--- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
@@ -63,7 +63,7 @@ function CredentialDetail({ credential }) {
useCallback(async () => {
const [
{
- data: { inputs: credentialTypeInputs, managed_by_tower },
+ data: { inputs: credentialTypeInputs, managed },
},
{
data: { results: loadedInputSources },
@@ -74,7 +74,7 @@ function CredentialDetail({ credential }) {
]);
return {
fields: credentialTypeInputs.fields || [],
- managedByTower: managed_by_tower,
+ managedByTower: managed,
inputSources: loadedInputSources.reduce(
(inputSourcesMap, inputSource) => {
inputSourcesMap[inputSource.input_field_name] = inputSource;
diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx
index 14e48a3569..5418f1f8da 100644
--- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx
@@ -67,7 +67,7 @@ describe('
+
{RevertReplaceButton}
);
}
@@ -104,6 +106,7 @@ function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
isLoading={fileIsUploading}
allowEditingUploadedText
validated={isValid ? 'default' : 'error'}
+ isDisabled={false}
/>
);
}
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
index caea121978..952eeb214a 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
-
+import { useLocation, useHistory } from 'react-router-dom';
import { t } from '@lingui/macro';
import { useField } from 'formik';
import {
@@ -23,6 +23,8 @@ function CredentialPluginInput(props) {
const [showPluginWizard, setShowPluginWizard] = useState(false);
const [inputField, meta, helpers] = useField(`inputs.${fieldOptions.id}`);
const [passwordPromptField] = useField(`passwordPrompts.${fieldOptions.id}`);
+ const location = useLocation();
+ const history = useHistory();
const disableFieldAndButtons =
!!passwordPromptField.value ||
@@ -32,6 +34,11 @@ function CredentialPluginInput(props) {
meta.value === meta.initialValue
);
+ const handlePluginWizardClose = () => {
+ setShowPluginWizard(false);
+ history.push(location.pathname);
+ };
+
return (
<>
{inputField?.value?.credential ? (
@@ -73,7 +80,7 @@ function CredentialPluginInput(props) {
initialValues={
typeof inputField.value === 'object' ? inputField.value : {}
}
- onClose={() => setShowPluginWizard(false)}
+ onClose={() => handlePluginWizardClose()}
onSubmit={val => {
val.touched = true;
helpers.setValue(val);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
index 9b36b8f076..bf4804d11c 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
@@ -47,7 +47,7 @@ const mockCredentialTypeDetail = {
description: '',
kind: 'external',
namespace: 'conjur',
- managed_by_tower: true,
+ managed: true,
inputs: {
fields: [
{ id: 'url', label: 'Conjur URL', type: 'string', format: 'url' },
diff --git a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
index 7e38183330..e30cc08888 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
@@ -19,7 +19,7 @@
"description": "",
"kind": "cloud",
"namespace": "aws",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -65,7 +65,7 @@
"description": "",
"kind": "cloud",
"namespace": "tower",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -130,7 +130,7 @@
"description": "",
"kind": "cloud",
"namespace": "gce",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -179,7 +179,7 @@
"description": "",
"kind": "cloud",
"namespace": "azure_rm",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -246,7 +246,7 @@
"description": "",
"kind": "cloud",
"namespace": "openstack",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -318,7 +318,7 @@
"description": "",
"kind": "cloud",
"namespace": "satellite6",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -363,7 +363,7 @@
"description": "",
"kind": "cloud",
"namespace": "rhv",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -424,7 +424,7 @@
"description": "",
"kind": "cloud",
"namespace": "vmware",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -469,7 +469,7 @@
"description": "",
"kind": "external",
"namespace": "aim",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -550,7 +550,7 @@
"description": "",
"kind": "external",
"namespace": "conjur",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -620,7 +620,7 @@
"description": "",
"kind": "external",
"namespace": "hashivault_kv",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -723,7 +723,7 @@
"description": "",
"kind": "external",
"namespace": "hashivault_ssh",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -819,7 +819,7 @@
"description": "",
"kind": "external",
"namespace": "azure_kv",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -895,7 +895,7 @@
"description": "",
"kind": "insights",
"namespace": "insights",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -939,7 +939,7 @@
"description": "",
"kind": "kubernetes",
"namespace": "kubernetes_bearer_token",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -992,7 +992,7 @@
"description": "",
"kind": "net",
"namespace": "net",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1059,7 +1059,7 @@
"description": "",
"kind": "scm",
"namespace": "scm",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1111,7 +1111,7 @@
"description": "",
"kind": "ssh",
"namespace": "ssh",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1190,7 +1190,7 @@
"description": "",
"kind": "token",
"namespace": "github_token",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1225,7 +1225,7 @@
"description": "",
"kind": "token",
"namespace": "gitlab_token",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1260,7 +1260,7 @@
"description": "",
"kind": "vault",
"namespace": "vault",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
@@ -1302,7 +1302,7 @@
"description": "",
"kind": "galaxy",
"namespace": "galaxy_api_token",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
diff --git a/awx/ui_next/src/screens/Credential/shared/data.credential_type.json b/awx/ui_next/src/screens/Credential/shared/data.credential_type.json
index 93adfcdf38..de6d0ac9cc 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.credential_type.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.credential_type.json
@@ -19,7 +19,7 @@
"description": "",
"kind": "ssh",
"namespace": "ssh",
- "managed_by_tower": true,
+ "managed": true,
"inputs": {
"fields": [
{
diff --git a/awx/ui_next/src/screens/Credential/shared/data.galaxyCredential.json b/awx/ui_next/src/screens/Credential/shared/data.galaxyCredential.json
index a8c7184548..09c2d0c59a 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.galaxyCredential.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.galaxyCredential.json
@@ -78,7 +78,7 @@
"description": "Bar",
"organization": 1,
"credential_type": 42,
- "managed_by_tower": false,
+ "managed": false,
"inputs": {
"url": "https://localhost.com",
"auth_url": ""
diff --git a/awx/ui_next/src/screens/Credential/shared/data.towerCredential.json b/awx/ui_next/src/screens/Credential/shared/data.towerCredential.json
index bfa544a5ed..5291682800 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.towerCredential.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.towerCredential.json
@@ -73,7 +73,7 @@
"description": "",
"organization": null,
"credential_type": 16,
- "managed_by_tower": false,
+ "managed": false,
"inputs": {
"host": "https://localhost",
"username": "",
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx
index 4b93b28438..fb79fed0ed 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx
@@ -8,13 +8,11 @@ import { CredentialTypesAPI } from '../../../api';
import { getQSConfig, parseQueryString } from '../../../util/qs';
import useRequest, { useDeleteItems } from '../../../util/useRequest';
import useSelected from '../../../util/useSelected';
-import {
- ToolbarDeleteButton,
- ToolbarAddButton,
-} from '../../../components/PaginatedDataList';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarDeleteButton,
+ ToolbarAddButton,
} from '../../../components/PaginatedTable';
import ErrorDetail from '../../../components/ErrorDetail';
import AlertModal from '../../../components/AlertModal';
@@ -25,7 +23,7 @@ import CredentialTypeListItem from './CredentialTypeListItem';
const QS_CONFIG = getQSConfig('credential-type', {
page: 1,
page_size: 20,
- managed_by_tower: false,
+ managed: false,
});
function CredentialTypeList() {
diff --git a/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.test.jsx b/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.test.jsx
index be9b6d5353..4adb2f6919 100644
--- a/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.test.jsx
+++ b/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.test.jsx
@@ -34,7 +34,7 @@ const credentialType = {
description: 'Jenkins Credential',
kind: 'cloud',
namespace: null,
- managed_by_tower: false,
+ managed: false,
inputs: JSON.stringify({
fields: [
{
diff --git a/awx/ui_next/src/screens/CredentialType/shared/data.json b/awx/ui_next/src/screens/CredentialType/shared/data.json
index 7fa00723ae..54f5c78e6c 100644
--- a/awx/ui_next/src/screens/CredentialType/shared/data.json
+++ b/awx/ui_next/src/screens/CredentialType/shared/data.json
@@ -33,7 +33,7 @@
"description": "Jenkins Credential",
"kind": "cloud",
"namespace": null,
- "managed_by_tower": false,
+ "managed": false,
"inputs": {
"fields": [
{
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
index 56792f56a7..5351fcead3 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
@@ -27,7 +27,7 @@ function ExecutionEnvironmentDetails({ executionEnvironment }) {
pull,
organization,
summary_fields,
- managed_by_tower: managedByTower,
+ managed: managedByTower,
} = executionEnvironment;
const {
@@ -64,7 +64,7 @@ function ExecutionEnvironmentDetails({ executionEnvironment }) {
dataCy="execution-environment-detail-description"
/>
@@ -155,7 +155,7 @@ describe('
- (
+ {t`Name`}
+ {t`Type`}
+
+ }
+ renderRow={template => (
-
-
- {template.name}
-
- ,
-
- {template.type === 'job_template'
- ? t`Job Template`
- : t`Workflow Job Template`}
- ,
- ]}
- />
-
-
+
+
+
+
+ {template.type === 'job_template'
+ ? t`Job Template`
+ : t`Workflow Job Template`}
+
+
);
}
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.test.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.test.jsx
index 9c107ab19b..ce14f2e35e 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.test.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.test.jsx
@@ -16,33 +16,50 @@ describe('
-
-
- {group.name}
-
- ,
- ]}
- />
-
+
+ {' '}
+ {group.name}
+
+
+
+
- {group.summary_fields.user_capabilities.edit && (
-
-
-
-
- )}
-
-
-
+
+
+
+
+
);
}
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.test.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.test.jsx
index 65946f4e08..467436f5a7 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.test.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.test.jsx
@@ -18,12 +18,16 @@ describe(' {}}
- />
+
);
});
@@ -40,12 +44,16 @@ describe(' {}}
- />
+
);
expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
});
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
index 07780dee72..4d32c9a212 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
@@ -11,9 +11,11 @@ import useSelected from '../../../util/useSelected';
import { HostsAPI, InventoriesAPI } from '../../../api';
import AlertModal from '../../../components/AlertModal';
import ErrorDetail from '../../../components/ErrorDetail';
-import PaginatedDataList, {
+import PaginatedTable, {
+ HeaderCell,
+ HeaderRow,
ToolbarAddButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import AssociateModal from '../../../components/AssociateModal';
import DisassociateButton from '../../../components/DisassociateButton';
import DataListToolbar from '../../../components/DataListToolbar';
@@ -82,9 +84,13 @@ function HostGroupsList({ host }) {
fetchGroups();
}, [fetchGroups]);
- const { selected, isAllSelected, handleSelect, setSelected } = useSelected(
- groups
- );
+ const {
+ selected,
+ isAllSelected,
+ handleSelect,
+ clearSelected,
+ selectAll,
+ } = useSelected(groups);
const {
isLoading: isDisassociateLoading,
@@ -105,7 +111,7 @@ function HostGroupsList({ host }) {
const handleDisassociate = async () => {
await disassociateHosts();
- setSelected([]);
+ clearSelected();
};
const fetchGroupsToAssociate = useCallback(
@@ -146,13 +152,13 @@ function HostGroupsList({ host }) {
return (
<>
- (
+ headerRow={
+
+ {t`Name`}
+ {t`Actions`}
+
+ }
+ renderRow={(item, index) => (
row.id === item.id)}
onSelect={() => handleSelect(item)}
+ rowIndex={index}
/>
)}
renderToolbar={props => (
@@ -191,9 +198,7 @@ function HostGroupsList({ host }) {
{...props}
showSelectAll
isAllSelected={isAllSelected}
- onSelectAll={isSelected =>
- setSelected(isSelected ? [...groups] : [])
- }
+ onSelectAll={selectAll}
qsConfig={QS_CONFIG}
additionalControls={[
...(canAdd
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.test.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.test.jsx
index 4720de35ed..65cf233717 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.test.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.test.jsx
@@ -122,46 +122,63 @@ describe('
@@ -78,7 +48,6 @@ function InventoryAdd() {
{}}
- rowIndex={0}
- />
+
+
+ {}}
+ rowIndex={0}
+ />
+
+
);
});
@@ -42,14 +46,18 @@ describe(' {}}
- rowIndex={0}
- />
+
+
+ {}}
+ rowIndex={0}
+ />
+
+
);
expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
});
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
index 1c680f9050..28981c9be9 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
@@ -10,12 +10,10 @@ import DataListToolbar from '../../../components/DataListToolbar';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarAddButton,
} from '../../../components/PaginatedTable';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
-
import InventoryGroupItem from './InventoryGroupItem';
import InventoryGroupsDeleteModal from '../shared/InventoryGroupsDeleteModal';
-
import AdHocCommands from '../../../components/AdHocCommands/AdHocCommands';
const QS_CONFIG = getQSConfig('group', {
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
index e493fb2197..5ef6625ae5 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
@@ -15,8 +15,8 @@ import ErrorDetail from '../../../components/ErrorDetail';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarAddButton,
} from '../../../components/PaginatedTable';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
import AssociateModal from '../../../components/AssociateModal';
import DisassociateButton from '../../../components/DisassociateButton';
import AdHocCommands from '../../../components/AdHocCommands/AdHocCommands';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
index 80c614f27c..536b4d01e8 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
@@ -10,11 +10,9 @@ import ErrorDetail from '../../../components/ErrorDetail';
import PaginatedTable, {
HeaderRow,
HeaderCell,
-} from '../../../components/PaginatedTable';
-import {
ToolbarAddButton,
ToolbarDeleteButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import useSelected from '../../../util/useSelected';
import AdHocCommands from '../../../components/AdHocCommands/AdHocCommands';
import InventoryHostItem from './InventoryHostItem';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index 1ca1b7511a..b31f32e097 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -8,10 +8,10 @@ import useSelected from '../../../util/useSelected';
import AlertModal from '../../../components/AlertModal';
import DatalistToolbar from '../../../components/DataListToolbar';
import ErrorDetail from '../../../components/ErrorDetail';
-import { ToolbarDeleteButton } from '../../../components/PaginatedDataList';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarDeleteButton,
} from '../../../components/PaginatedTable';
import { getQSConfig, parseQueryString } from '../../../util/qs';
import useWsInventories from './useWsInventories';
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
index 6d4f9734a4..f33cb993d2 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.test.jsx
@@ -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,
},
];
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.jsx b/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.jsx
index a1bb8ac627..d9d0705b84 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.jsx
@@ -57,7 +57,7 @@ describe(' (
- setSelected(isSelected ? [...hosts] : [])
- }
+ onSelectAll={selectAll}
qsConfig={QS_CONFIG}
additionalControls={
inventory?.summary_fields?.user_capabilities?.adhoc
@@ -105,13 +104,21 @@ function SmartInventoryHostList({ inventory }) {
}
/>
)}
- renderItem={host => (
+ headerRow={
+
+ {t`Name`}
+ {t`Recent jobs`}
+ {t`Inventory`}
+
+ }
+ renderRow={(host, index) => (
row.id === host.id)}
onSelect={() => handleSelect(host)}
+ rowIndex={index}
/>
)}
/>
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
index d416529513..fe9dfa022b 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
@@ -50,18 +50,19 @@ describe('
-
-
- {host.name}
-
- ,
-
- ,
-
- <>
- {t`Inventory`}
- ,
- ]}
- />
-
-
+
+
+
+
+
+
+
+
);
}
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.test.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.test.jsx
index 9a33460fcb..6c525d13d9 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.test.jsx
@@ -24,12 +24,16 @@ describe(' {}}
- />
+
);
});
@@ -38,10 +42,10 @@ describe(' {
@@ -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(),
};
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.test.jsx b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.test.jsx
index ffc8f59f4d..adcadc7b05 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.test.jsx
@@ -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('
+ {configuration.use_ssl && (
+
+ {t`Use SSL`}
+
+ )}
+ {configuration.use_tls && (
+
+ {t`Use TLS`}
+
+ )}
+
+ );
+
const { request: deleteTemplate, isLoading, error: deleteError } = useRequest(
useCallback(async () => {
await NotificationTemplatesAPI.destroy(template.id);
@@ -104,11 +126,9 @@ function NotificationTemplateDetail({ template, defaultMessages }) {
value={configuration.timeout}
dataCy="nt-detail-timeout"
/>
- Use SSL , Use TLS ])
+ ).toEqual(true);
+ });
+});
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
index a927ab77ca..b3abf09f1e 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
@@ -13,11 +13,9 @@ import { NotificationTemplatesAPI } from '../../../api';
import PaginatedTable, {
HeaderRow,
HeaderCell,
-} from '../../../components/PaginatedTable';
-import {
ToolbarAddButton,
ToolbarDeleteButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import AlertModal from '../../../components/AlertModal';
import ErrorDetail from '../../../components/ErrorDetail';
import DataListToolbar from '../../../components/DataListToolbar';
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 6edaa4e97d..dc3535526f 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -118,10 +118,6 @@ function NotificationTemplateForm({
);
};
- let emailOptions = '';
- if (template.notification_type === 'email') {
- emailOptions = template.notification_configuration?.use_ssl ? 'ssl' : 'tls';
- }
const messages = template.messages || { workflow_approval: {} };
const defs = defaultMessages[template.notification_type || 'email'];
const mergeDefaultMessages = (templ = {}, def) => {
@@ -144,7 +140,6 @@ function NotificationTemplateForm({
...template.notification_configuration,
headers: headers ? JSON.stringify(headers, null, 2) : null,
},
- emailOptions,
organization: template.summary_fields?.organization,
messages: {
started: { ...mergeDefaultMessages(messages.started, defs.started) },
@@ -235,10 +230,6 @@ function normalizeTypeFields(values) {
stripped[fieldName] = values.notification_configuration[fieldName];
}
});
- if (values.notification_type === 'email') {
- stripped.use_ssl = values.emailOptions === 'ssl';
- stripped.use_tls = !stripped.use_ssl;
- }
if (values.notification_type === 'webhook') {
stripped.headers = stripped.headers ? JSON.parse(stripped.headers) : {};
}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx
index 5b90fd5e8d..5d5825a110 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx
@@ -4,6 +4,7 @@ import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
import NotificationTemplateForm from './NotificationTemplateForm';
jest.mock('../../../api/models/NotificationTemplates');
+jest.mock('../../../api/models/Organizations');
const template = {
id: 3,
@@ -50,16 +51,19 @@ const defaultMessages = {
};
describe(' {
+ await act(async () => {
+ wrapper = mountWithContexts(
+
-
+
+
);
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/notification-template-default-messages.json b/awx/ui_next/src/screens/NotificationTemplate/shared/notification-template-default-messages.json
new file mode 100644
index 0000000000..e2bd0ccaed
--- /dev/null
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/notification-template-default-messages.json
@@ -0,0 +1,302 @@
+{
+ "type": "json",
+ "required": false,
+ "label": "Messages",
+ "help_text": "Optional custom messages for notification template.",
+ "filterable": true,
+ "default": {
+ "started": null,
+ "success": null,
+ "error": null,
+ "workflow_approval": null
+ },
+ "email": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_friendly_name }} #{{ job.id }} had status {{ job.status }}, view details at {{ url }}\n\n{{ job_metadata }}"
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_friendly_name }} #{{ job.id }} had status {{ job.status }}, view details at {{ url }}\n\n{{ job_metadata }}"
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_friendly_name }} #{{ job.id }} had status {{ job.status }}, view details at {{ url }}\n\n{{ job_metadata }}"
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" needs review. This approval node can be viewed at: {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}\n\n{{ job_metadata }}"
+ }
+ }
+ },
+ "slack": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": null
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": null
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": null
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": null
+ }
+ }
+ },
+ "twilio": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": null
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": null
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": null
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": null
+ }
+ }
+ },
+ "pagerduty": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_metadata }}"
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_metadata }}"
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": "{{ job_metadata }}"
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" needs review. This approval node can be viewed at: {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}\n\n{{ job_metadata }}"
+ }
+ }
+ },
+ "grafana": {
+ "started": {
+ "body": "{{ job_metadata }}",
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}"
+ },
+ "success": {
+ "body": "{{ job_metadata }}",
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}"
+ },
+ "error": {
+ "body": "{{ job_metadata }}",
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}"
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" needs review. This approval node can be viewed at: {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}\n\n{{ job_metadata }}"
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}\n\n{{ job_metadata }}"
+ }
+ }
+ },
+ "webhook": {
+ "started": {
+ "body": "{{ job_metadata }}"
+ },
+ "success": {
+ "body": "{{ job_metadata }}"
+ },
+ "error": {
+ "body": "{{ job_metadata }}"
+ },
+ "workflow_approval": {
+ "running": {
+ "body": {
+ "body": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}"
+ }
+ },
+ "approved": {
+ "body": {
+ "body": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}"
+ }
+ },
+ "timed_out": {
+ "body": {
+ "body": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}"
+ }
+ },
+ "denied": {
+ "body": {
+ "body": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}"
+ }
+ }
+ }
+ },
+ "mattermost": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": null
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": null
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": null
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": null
+ }
+ }
+ },
+ "rocketchat": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": null
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": null
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": null
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": null
+ }
+ }
+ },
+ "irc": {
+ "started": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "success": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "error": {
+ "message": "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}",
+ "body": null
+ },
+ "workflow_approval": {
+ "running": {
+ "message": "The approval node \"{{ approval_node_name }}\" needs review. This node can be viewed at: {{ workflow_url }}",
+ "body": null
+ },
+ "approved": {
+ "message": "The approval node \"{{ approval_node_name }}\" was approved. {{ workflow_url }}",
+ "body": null
+ },
+ "timed_out": {
+ "message": "The approval node \"{{ approval_node_name }}\" has timed out. {{ workflow_url }}",
+ "body": null
+ },
+ "denied": {
+ "message": "The approval node \"{{ approval_node_name }}\" was denied. {{ workflow_url }}",
+ "body": null
+ }
+ }
+ }
+}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
index 4dd991cfa9..6d4d3046a6 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
@@ -7,6 +7,8 @@ const typeFieldNames = {
'sender',
'port',
'timeout',
+ 'use_ssl',
+ 'use_tls',
],
grafana: [
'grafana_url',
diff --git a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx
index 1d811fb425..6b821ac875 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx
@@ -23,7 +23,7 @@ function OrganizationAdd() {
data: { results },
} = await CredentialsAPI.read({
credential_type__kind: 'galaxy',
- managed_by_tower: true,
+ managed: true,
});
return results[0] || null;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.test.jsx b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.test.jsx
index c88fef90bc..5fced4aa9d 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.test.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.test.jsx
@@ -20,7 +20,7 @@ describe('
@@ -118,9 +124,11 @@ function OrganizationDetail({ organization }) {
value={
{instanceGroups.map(ig => (
-
- {ig.name}
-
+
+ {ig.name}
+
+
))}
}
diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
index 7ab2a0ef4d..63f1fa241a 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
@@ -7,7 +7,10 @@ import { Card } from '@patternfly/react-core';
import { OrganizationsAPI } from '../../../api';
import { getQSConfig, parseQueryString } from '../../../util/qs';
import useRequest from '../../../util/useRequest';
-import PaginatedDataList from '../../../components/PaginatedDataList';
+import PaginatedTable, {
+ HeaderRow,
+ HeaderCell,
+} from '../../../components/PaginatedTable';
import DatalistToolbar from '../../../components/DataListToolbar';
import OrganizationExecEnvListItem from './OrganizationExecEnvListItem';
@@ -69,7 +72,7 @@ function OrganizationExecEnvList({ organization }) {
return (
<>
- (
+ {t`Name`}
+ {t`Image`}
+
+ }
+ renderRow={(executionEnvironment, index) => (
-
-
- {executionEnvironment.name}
-
- ,
-
- {executionEnvironment.image}
- ,
- ]}
- />
-
-
+
+
+
+ {executionEnvironment.image}
+
);
}
diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx
index 29181f4ec3..da8a548d30 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.test.jsx
@@ -19,10 +19,14 @@ describe(' (
+ headerRow={
+
+ {t`Name`}
+ {t`Actions`}
+
+ }
+ renderRow={item => (
-
-
-
- {team.name}
-
-
- ,
- ]}
- />
-
+
+
+
+
- {team.summary_fields.user_capabilities.edit && (
-
-
-
-
- )}
-
-
-
+
+
+
+
+
);
}
diff --git a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrgnizationTeamListItem.test.jsx b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrgnizationTeamListItem.test.jsx
index 8758ebf946..c3f7fdc7ba 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrgnizationTeamListItem.test.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrgnizationTeamListItem.test.jsx
@@ -17,7 +17,11 @@ describe('
- (
@@ -163,9 +143,7 @@ function ProjectJobTemplatesList() {
{...props}
showSelectAll
isAllSelected={isAllSelected}
- onSelectAll={isSelected =>
- setSelected(isSelected ? [...jobTemplates] : [])
- }
+ onSelectAll={selectAll}
qsConfig={QS_CONFIG}
additionalControls={[
...(canAddJT ? [addButton] : []),
@@ -178,7 +156,15 @@ function ProjectJobTemplatesList() {
]}
/>
)}
- renderItem={template => (
+ headerRow={
+
+ {t`Name`}
+ {t`Type`}
+ {t`Recent jobs`}
+ {t`Actions`}
+
+ }
+ renderRow={(template, index) => (
handleSelect(template)}
isSelected={selected.some(row => row.id === template.id)}
+ rowIndex={index}
/>
)}
emptyStateControls={canAddJT && addButton}
diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
index 388a65cbc7..455d83fedb 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
@@ -1,36 +1,21 @@
import 'styled-components/macro';
import React from 'react';
import { Link } from 'react-router-dom';
-import {
- Button,
- DataListAction as _DataListAction,
- DataListCheck,
- DataListItem,
- DataListItemRow,
- DataListItemCells,
- Tooltip,
-} from '@patternfly/react-core';
-import { t } from '@lingui/macro';
-
+import { Button, Tooltip } from '@patternfly/react-core';
+import { Tr, Td } from '@patternfly/react-table';
import {
ExclamationTriangleIcon,
PencilAltIcon,
RocketIcon,
} from '@patternfly/react-icons';
+import { t } from '@lingui/macro';
import styled from 'styled-components';
-import DataListCell from '../../../components/DataListCell';
+import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
import { LaunchButton } from '../../../components/LaunchButton';
import Sparkline from '../../../components/Sparkline';
import { toTitleCase } from '../../../util/strings';
-const DataListAction = styled(_DataListAction)`
- align-items: center;
- display: grid;
- grid-gap: 16px;
- grid-template-columns: repeat(2, 40px);
-`;
-
const ExclamationTriangleIconWarning = styled(ExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100);
margin-left: 18px;
@@ -41,8 +26,8 @@ function ProjectJobTemplateListItem({
isSelected,
onSelect,
detailUrl,
+ rowIndex,
}) {
- const labelId = `check-action-${template.id}`;
const canLaunch = template.summary_fields.user_capabilities.start;
const missingResourceIcon =
@@ -57,90 +42,75 @@ function ProjectJobTemplateListItem({
!template.execution_environment;
return (
-
-
-
-
- {template.name}
-
-
- {missingResourceIcon && (
-
-
-
-
- )}
- {missingExecutionEnvironment && (
-
-
-
-
- )}
- ,
-
- {toTitleCase(template.type)}
- ,
-
- ,
- ]}
- />
-
+
+
+
+ )}
+ {missingExecutionEnvironment && (
+
+
+ )}
+
+
+ {toTitleCase(template.type)}
+
+
+
+
- {canLaunch && template.type === 'job_template' && (
-
-
- {({ handleLaunch, isLaunching }) => (
-
-
- )}
-
-
- )}
- {template.summary_fields.user_capabilities.edit && (
-
+
+ {({ handleLaunch, isLaunching }) => (
-
-
- )}
-
-
-
+ )}
+
+
+
+
+
+
+
+
);
}
diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.test.jsx b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.test.jsx
index 895d76a807..d61ed8f720 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.test.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.test.jsx
@@ -7,157 +7,195 @@ import ProjectJobTemplatesListItem from './ProjectJobTemplatesListItem';
describe('
);
- expect(
- wrapper.find('.missing-execution-environment').prop('content')
- ).toEqual(
- 'Custom virtual environment /var/lib/awx/env must be replaced by an execution environment.'
- );
+ expect(wrapper.find('ExclamationTrianglePopover').length).toBe(1);
});
test('launch button hidden from users without start capabilities', () => {
diff --git a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
index fd403b67f8..b1b8d8e8bc 100644
--- a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
import { t } from '@lingui/macro';
import { Formik } from 'formik';
-import { Button, Form, Tooltip } from '@patternfly/react-core';
+import { Form } from '@patternfly/react-core';
import { CardBody } from '../../../../components/Card';
import ContentError from '../../../../components/ContentError';
import ContentLoading from '../../../../components/ContentLoading';
@@ -18,10 +18,9 @@ import {
ObjectField,
RevertAllAlert,
RevertFormActionGroup,
- LoggingTestAlert,
} from '../../shared';
import useModal from '../../../../util/useModal';
-import useRequest, { useDismissableError } from '../../../../util/useRequest';
+import useRequest from '../../../../util/useRequest';
import { formatJson } from '../../shared/settingUtils';
import { SettingsAPI } from '../../../../api';
@@ -90,33 +89,6 @@ function LoggingEdit() {
history.push('/settings/logging/details');
};
- const {
- error: testLoggingError,
- request: testLogging,
- result: testSuccess,
- setValue: setTestLogging,
- } = useRequest(
- useCallback(async () => {
- const result = await SettingsAPI.createTest('logging', {});
- return result;
- }, []),
- null
- );
-
- const {
- error: testError,
- dismissError: dismissTestError,
- } = useDismissableError(testLoggingError);
-
- const handleTest = async () => {
- await testLogging();
- };
-
- const handleCloseAlert = () => {
- setTestLogging(null);
- dismissTestError();
- };
-
const handleCancel = () => {
history.push('/settings/logging/details');
};
@@ -231,33 +203,7 @@ function LoggingEdit() {
onCancel={handleCancel}
onSubmit={formik.handleSubmit}
onRevert={toggleModal}
- >
-
-
-
- {t`Test`}
-
-
-
-
+ />
{isModalOpen && (
- {testMessage && (
- {testMessage}
- {errorData}
-
- )}
-
- );
-}
-
-LoggingTestAlert.propTypes = {
- successResponse: shape({}),
- errorResponse: shape({}),
- onClose: func,
-};
-
-LoggingTestAlert.defaultProps = {
- successResponse: null,
- errorResponse: null,
- onClose: () => {},
-};
-
-export default LoggingTestAlert;
diff --git a/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.test.jsx b/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.test.jsx
deleted file mode 100644
index 105cfe7382..0000000000
--- a/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.test.jsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
-import LoggingTestAlert from './LoggingTestAlert';
-
-describe('LoggingTestAlert', () => {
- let wrapper;
-
- afterEach(() => {
- wrapper.unmount();
- jest.clearAllMocks();
- });
-
- test('renders expected content when test is successful', () => {
- wrapper = mountWithContexts(
- {}}
- />
- );
- expect(wrapper.find('b#test-message').text()).toBe(
- 'Log aggregator test sent successfully.'
- );
- });
-
- test('renders expected content when test is unsuccessful', () => {
- wrapper = mountWithContexts(
- {}}
- />
- );
- expect(wrapper.find('b#test-message').text()).toBe('Bad Response: 400');
- expect(wrapper.find('p#test-error').text()).toBe(
- 'Name or service not known'
- );
- });
-
- test('close button should call "onClose"', () => {
- const onClose = jest.fn();
- expect(onClose).toHaveBeenCalledTimes(0);
- wrapper = mountWithContexts(
-
+ {t`Type answer then click checkbox on right to select answer as
+ default.`}
+
}
helperTextInvalid={formattedChoicesMeta.error}
onBlur={e => {
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
index ff86fa7b7d..5eca719652 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
@@ -14,7 +14,7 @@ import { CubesIcon } from '@patternfly/react-icons';
import styled from 'styled-components';
import ContentLoading from '../../../components/ContentLoading';
import AlertModal from '../../../components/AlertModal';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
+import { ToolbarAddButton } from '../../../components/PaginatedTable';
import SurveyListItem from './SurveyListItem';
import SurveyToolbar from './SurveyToolbar';
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
index ae4d47bc0f..5dc2a97797 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
@@ -13,7 +13,7 @@ import {
ToolbarGroup,
ToolbarItem,
} from '@patternfly/react-core';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
+import { ToolbarAddButton } from '../../../components/PaginatedTable';
const Toolbar = styled(_Toolbar)`
margin-left: 52px;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.jsx
index e47e1fcf95..20ee28295e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.jsx
@@ -37,10 +37,7 @@ function WorkflowJobTemplateAdd() {
try {
const {
data: { id },
- } = await WorkflowJobTemplatesAPI.create({
- ...templatePayload,
- execution_environment: values.execution_environment?.id,
- });
+ } = await WorkflowJobTemplatesAPI.create(templatePayload);
await Promise.all(await submitLabels(id, labels, organizationId));
history.push(`/templates/workflow_job_template/${id}/visualizer`);
} catch (err) {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
index ddd2b09f80..0788c74431 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx
@@ -6,7 +6,6 @@ import {
WorkflowJobTemplatesAPI,
OrganizationsAPI,
LabelsAPI,
- ExecutionEnvironmentsAPI,
UsersAPI,
} from '../../../api';
import {
@@ -38,10 +37,6 @@ describe('
- {summary_fields.execution_environment.name}
-
- }
- />
- )}
executionEnvironmentHelpers.setTouched()}
- value={executionEnvironmentField.value}
- onChange={handleExecutionEnvironmentUpdate}
- tooltip={t`Select the default execution environment for this organization to run on.`}
- globallyAvailable
- organizationId={organizationField.value?.id}
- />
{
diff --git a/awx/ui_next/src/screens/User/User.jsx b/awx/ui_next/src/screens/User/User.jsx
index ee3b00b8d7..a9c5a24820 100644
--- a/awx/ui_next/src/screens/User/User.jsx
+++ b/awx/ui_next/src/screens/User/User.jsx
@@ -80,7 +80,7 @@ function User({ setBreadcrumb, me }) {
let showCardHeader = true;
if (
- ['edit', 'add', 'tokens'].some(name => location.pathname.includes(name))
+ ['edit', 'add', 'tokens/'].some(name => location.pathname.includes(name))
) {
showCardHeader = false;
}
diff --git a/awx/ui_next/src/screens/User/UserList/UserList.jsx b/awx/ui_next/src/screens/User/UserList/UserList.jsx
index b1ee126edd..8f6f99d5c8 100644
--- a/awx/ui_next/src/screens/User/UserList/UserList.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserList.jsx
@@ -10,11 +10,9 @@ import ErrorDetail from '../../../components/ErrorDetail';
import PaginatedTable, {
HeaderRow,
HeaderCell,
-} from '../../../components/PaginatedTable';
-import {
ToolbarAddButton,
ToolbarDeleteButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import useRequest, { useDeleteItems } from '../../../util/useRequest';
import useSelected from '../../../util/useSelected';
import { getQSConfig, parseQueryString } from '../../../util/qs';
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
index ec0b748cb9..ad13ca6568 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
@@ -15,10 +15,10 @@ import useRequest, { useDeleteItems } from '../../../util/useRequest';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarAddButton,
} from '../../../components/PaginatedTable';
import ErrorDetail from '../../../components/ErrorDetail';
import AlertModal from '../../../components/AlertModal';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
import DatalistToolbar from '../../../components/DataListToolbar';
import UserRolesListItem from './UserRolesListItem';
import UserAndTeamAccessAdd from '../../../components/UserAndTeamAccessAdd/UserAndTeamAccessAdd';
diff --git a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
index d65c0383c5..7328d64c6a 100644
--- a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
+++ b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
@@ -5,8 +5,8 @@ import { t } from '@lingui/macro';
import PaginatedTable, {
HeaderRow,
HeaderCell,
+ ToolbarAddButton,
} from '../../../components/PaginatedTable';
-import { ToolbarAddButton } from '../../../components/PaginatedDataList';
import DataListToolbar from '../../../components/DataListToolbar';
import DisassociateButton from '../../../components/DisassociateButton';
import AssociateModal from '../../../components/AssociateModal';
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
index 2c111d9be3..8bdd5db015 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
@@ -3,10 +3,12 @@ import { useLocation, useParams } from 'react-router-dom';
import { t } from '@lingui/macro';
import { getQSConfig, parseQueryString } from '../../../util/qs';
-import PaginatedDataList, {
+import PaginatedTable, {
+ HeaderRow,
+ HeaderCell,
ToolbarAddButton,
ToolbarDeleteButton,
-} from '../../../components/PaginatedDataList';
+} from '../../../components/PaginatedTable';
import useSelected from '../../../util/useSelected';
import useRequest, { useDeleteItems } from '../../../util/useRequest';
import { UsersAPI, TokensAPI } from '../../../api';
@@ -68,9 +70,13 @@ function UserTokenList() {
fetchTokens();
}, [fetchTokens]);
- const { selected, isAllSelected, handleSelect, setSelected } = useSelected(
- tokens
- );
+ const {
+ selected,
+ isAllSelected,
+ handleSelect,
+ clearSelected,
+ selectAll,
+ } = useSelected(tokens);
const {
isLoading: isDeleteLoading,
@@ -91,21 +97,21 @@ function UserTokenList() {
);
const handleDelete = async () => {
await deleteTokens();
- setSelected([]);
+ clearSelected();
};
const canAdd = true;
return (
<>
-
- setSelected(isSelected ? [...tokens] : [])
- }
+ onSelectAll={selectAll}
additionalControls={[
...(canAdd
? [
@@ -168,7 +172,14 @@ function UserTokenList() {
]}
/>
)}
- renderItem={token => (
+ headerRow={
+
+ {t`Name`}
+ {t`Scope`}
+ {t`Expires`}
+
+ }
+ renderRow={(token, index) => (
row.id === token.id)}
+ rowIndex={index}
/>
)}
emptyStateControls={
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.test.jsx b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.test.jsx
index 2b05d2ef35..983df13629 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.test.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.test.jsx
@@ -143,32 +143,6 @@ describe('
-
-
-
- {token.summary_fields?.application && (
-
- {t`Application`}
-
- )}
- ,
-
- {t`Scope`}
- {toTitleCase(token.scope)}
- ,
-
- {t`Expires`}
- {formatDateString(token.expires)}
- ,
- ]}
- />
-
-
+
+
+
+ {toTitleCase(token.scope)}
+ {formatDateString(token.expires)}
+
);
}
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.test.jsx b/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.test.jsx
index 87bc06401c..9d36114e90 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.test.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.test.jsx
@@ -39,7 +39,13 @@ describe(' --conf.client_secret
@@ -55,7 +55,7 @@ a read-only token, specify ``--scope read``:
.. code:: bash
- TOWER_USERNAME=alice TOWER_PASSWORD=secret \
+ CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret \
awx login --conf.scope read
Session Authentication
@@ -65,5 +65,5 @@ specify your username and password on every invocation:
.. code:: bash
- TOWER_USERNAME=alice TOWER_PASSWORD=secret awx jobs list
+ CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret awx jobs list
awx --conf.username alice --conf.password secret jobs list
diff --git a/awxkit/awxkit/cli/docs/source/output.rst b/awxkit/awxkit/cli/docs/source/output.rst
index 6cba583bdc..251983c63b 100644
--- a/awxkit/awxkit/cli/docs/source/output.rst
+++ b/awxkit/awxkit/cli/docs/source/output.rst
@@ -54,4 +54,4 @@ Colorized Output
By default, |prog| prints colorized output using ANSI color codes. To disable
this functionality, specify ``--conf.color f`` or set the environment variable
-``TOWER_COLOR=f``.
+``CONTROLLER_COLOR=f``.
diff --git a/awxkit/awxkit/cli/docs/source/usage.rst b/awxkit/awxkit/cli/docs/source/usage.rst
index b22e3c7dbb..c877019bc6 100644
--- a/awxkit/awxkit/cli/docs/source/usage.rst
+++ b/awxkit/awxkit/cli/docs/source/usage.rst
@@ -77,17 +77,17 @@ A few of the most important ones are:
``-f, --conf.format``
used to specify a custom output format (the default is json)
-``--conf.host, TOWER_HOST``
+``--conf.host, CONTROLLER_HOST``
the full URL of the AWX/|RHAT| host (i.e., https://my.awx.example.org)
-``-k, --conf.insecure, TOWER_VERIFY_SSL``
+``-k, --conf.insecure, CONTROLLER_VERIFY_SSL``
allows insecure server connections when using SSL
-``--conf.username, TOWER_USERNAME``
+``--conf.username, CONTROLLER_USERNAME``
the AWX username to use for authentication
-``--conf.password, TOWER_PASSWORD``
+``--conf.password, CONTROLLER_PASSWORD``
the AWX password to use for authentication
-``--conf.token, TOWER_OAUTH_TOKEN``
+``--conf.token, CONTROLLER_OAUTH_TOKEN``
an OAuth2.0 token to use for authentication
diff --git a/awxkit/awxkit/cli/format.py b/awxkit/awxkit/cli/format.py
index adf61337a4..0277e6869a 100644
--- a/awxkit/awxkit/cli/format.py
+++ b/awxkit/awxkit/cli/format.py
@@ -11,30 +11,30 @@ def add_authentication_arguments(parser, env):
auth = parser.add_argument_group('authentication')
auth.add_argument(
'--conf.host',
- default=env.get('TOWER_HOST', 'https://127.0.0.1:443'),
+ default=env.get('CONTROLLER_HOST', env.get('TOWER_HOST', 'https://127.0.0.1:443')),
metavar='https://example.awx.org',
)
auth.add_argument(
'--conf.token',
- default=env.get('TOWER_OAUTH_TOKEN', env.get('TOWER_TOKEN', '')),
+ default=env.get('CONTROLLER_OAUTH_TOKEN', env.get('CONTROLLER_TOKEN', env.get('TOWER_OAUTH_TOKEN', env.get('TOWER_TOKEN', '')))),
help='an OAuth2.0 token (get one by using `awx login`)',
metavar='TEXT',
)
auth.add_argument(
'--conf.username',
- default=env.get('TOWER_USERNAME', 'admin'),
+ default=env.get('CONTROLLER_USERNAME', env.get('TOWER_USERNAME', 'admin')),
metavar='TEXT',
)
auth.add_argument(
'--conf.password',
- default=env.get('TOWER_PASSWORD', 'password'),
+ default=env.get('CONTROLLER_PASSWORD', env.get('TOWER_PASSWORD', 'password')),
metavar='TEXT',
)
auth.add_argument(
'-k',
'--conf.insecure',
help='Allow insecure server connections when using SSL',
- default=not strtobool(env.get('TOWER_VERIFY_SSL', 'True')),
+ default=not strtobool(env.get('CONTROLLER_VERIFY_SSL', env.get('TOWER_VERIFY_SSL', 'True'))),
action='store_true',
)
@@ -47,7 +47,7 @@ def add_output_formatting_arguments(parser, env):
'--conf.format',
dest='conf.format',
choices=FORMATTERS.keys(),
- default=env.get('TOWER_FORMAT', 'json'),
+ default=env.get('CONTROLLER_FORMAT', env.get('TOWER_FORMAT', 'json')),
help=('specify a format for the input and output'),
)
formatting.add_argument(
@@ -61,7 +61,7 @@ def add_output_formatting_arguments(parser, env):
'--conf.color',
metavar='BOOLEAN',
help='Display colorized output. Defaults to True',
- default=env.get('TOWER_COLOR', 't'),
+ default=env.get('CONTROLLER_COLOR', env.get('TOWER_COLOR', 't')),
type=strtobool,
)
formatting.add_argument(
@@ -69,7 +69,7 @@ def add_output_formatting_arguments(parser, env):
'--verbose',
dest='conf.verbose',
help='print debug-level logs, including requests made',
- default=strtobool(env.get('TOWER_VERBOSE', 'f')),
+ default=strtobool(env.get('CONTROLLER_VERBOSE', env.get('TOWER_VERBOSE', 'f'))),
action="store_true",
)
diff --git a/awxkit/awxkit/cli/options.py b/awxkit/awxkit/cli/options.py
index d5ad777feb..6253c28d19 100644
--- a/awxkit/awxkit/cli/options.py
+++ b/awxkit/awxkit/cli/options.py
@@ -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 _ 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)
diff --git a/awxkit/awxkit/cli/resource.py b/awxkit/awxkit/cli/resource.py
index 0038b96a7d..b4b8a8e2ae 100644
--- a/awxkit/awxkit/cli/resource.py
+++ b/awxkit/awxkit/cli/resource.py
@@ -99,7 +99,7 @@ class Login(CustomCommand):
else:
fmt = client.get_config('format')
if fmt == 'human':
- print('export TOWER_OAUTH_TOKEN={}'.format(token))
+ print('export CONTROLLER_OAUTH_TOKEN={}'.format(token))
else:
print(to_str(FORMATTERS[fmt]({'token': token}, '.')).strip())
diff --git a/awxkit/awxkit/cli/sphinx.py b/awxkit/awxkit/cli/sphinx.py
index dc76c5e7a0..bb5e36ce76 100644
--- a/awxkit/awxkit/cli/sphinx.py
+++ b/awxkit/awxkit/cli/sphinx.py
@@ -43,9 +43,13 @@ def render():
# The return value of this function is an argparse.ArgumentParser, which
# the sphinxcontrib.autoprogram plugin crawls and generates an indexed
# Sphinx document from.
- for e in ('TOWER_HOST', 'TOWER_USERNAME', 'TOWER_PASSWORD'):
- if not os.environ.get(e):
- raise SystemExit('Please specify a valid {} for a real (running) installation.'.format(e)) # noqa
+ for e in (
+ ('CONTROLLER_HOST', 'TOWER_HOST'),
+ ('CONTROLLER_USERNAME', 'TOWER_USERNAME'),
+ ('CONTROLLER_PASSWORD', 'TOWER_PASSWORD'),
+ ):
+ if not os.environ.get(e[0]) and not os.environ.get(e[1]):
+ raise SystemExit('Please specify a valid {} for a real (running) installation.'.format(e[0])) # noqa
cli = CLI()
cli.parse_args(['awx', '--help'])
cli.connect()
diff --git a/awxkit/test/cli/test_config.py b/awxkit/test/cli/test_config.py
index 61b6b4c54d..6998cb88ab 100644
--- a/awxkit/test/cli/test_config.py
+++ b/awxkit/test/cli/test_config.py
@@ -7,7 +7,7 @@ from awxkit import config
def test_host_from_environment():
cli = CLI()
- cli.parse_args(['awx'], env={'TOWER_HOST': 'https://xyz.local'})
+ cli.parse_args(['awx'], env={'CONTROLLER_HOST': 'https://xyz.local'})
with pytest.raises(ConnectionError):
cli.connect()
assert config.base_url == 'https://xyz.local'
@@ -23,7 +23,7 @@ def test_host_from_argv():
def test_username_and_password_from_environment():
cli = CLI()
- cli.parse_args(['awx'], env={'TOWER_USERNAME': 'mary', 'TOWER_PASSWORD': 'secret'})
+ cli.parse_args(['awx'], env={'CONTROLLER_USERNAME': 'mary', 'CONTROLLER_PASSWORD': 'secret'})
with pytest.raises(ConnectionError):
cli.connect()
@@ -43,7 +43,7 @@ def test_username_and_password_argv():
def test_config_precedence():
cli = CLI()
- cli.parse_args(['awx', '--conf.username', 'mary', '--conf.password', 'secret'], env={'TOWER_USERNAME': 'IGNORE', 'TOWER_PASSWORD': 'IGNORE'})
+ cli.parse_args(['awx', '--conf.username', 'mary', '--conf.password', 'secret'], env={'CONTROLLER_USERNAME': 'IGNORE', 'CONTROLLER_PASSWORD': 'IGNORE'})
with pytest.raises(ConnectionError):
cli.connect()
diff --git a/awxkit/test/test_credentials.py b/awxkit/test/test_credentials.py
index 6adc5e9332..f2eff6a505 100644
--- a/awxkit/test/test_credentials.py
+++ b/awxkit/test/test_credentials.py
@@ -16,10 +16,10 @@ def set_config_cred_to_desired(config, location):
class MockCredentialType(object):
- def __init__(self, name, kind, managed_by_tower=True):
+ def __init__(self, name, kind, managed=True):
self.name = name
self.kind = kind
- self.managed_by_tower = managed_by_tower
+ self.managed = managed
@pytest.mark.parametrize(
diff --git a/docs/inventory/inventory_plugins.md b/docs/inventory/inventory_plugins.md
index 9241765ab7..8bf738bb42 100644
--- a/docs/inventory/inventory_plugins.md
+++ b/docs/inventory/inventory_plugins.md
@@ -14,6 +14,6 @@ The CLI entry point `ansible-inventory` was introduced in Ansible 2.4. Inventory
## Writing Your Own Inventory File
-You can add an SCM inventory source that points to your own yaml file which specifies an inventory plugin. You can also apply a credential of a `managed_by_tower` type to that inventory source that matches the credential you are using. For example, you could have an inventory file for the `amazon.aws.aws_ec2` plugin and use the build-in `aws` credential type.
+You can add an SCM inventory source that points to your own yaml file which specifies an inventory plugin. You can also apply a credential of a `managed` type to that inventory source that matches the credential you are using. For example, you could have an inventory file for the `amazon.aws.aws_ec2` plugin and use the build-in `aws` credential type.
All built-in sources provide _secrets_ via environment variables. These can be re-used for SCM-based inventory, and your inventory file can be used to specify non-sensitive configuration details such as the `keyed_groups` (to provide) or `hostvars` (to construct).
diff --git a/docs/tasks.md b/docs/tasks.md
index 7ff5847052..584ea243a1 100644
--- a/docs/tasks.md
+++ b/docs/tasks.md
@@ -156,6 +156,11 @@ One of the most important tasks in a clustered AWX installation is the periodic
If a node in an AWX cluster discovers that one of its peers has not updated its heartbeat within a certain grace period, it is assumed to be offline, and its capacity is set to zero to avoid scheduling new tasks on that node. Additionally, jobs allegedly running or scheduled to run on that node are assumed to be lost, and "reaped", or marked as failed.
+## Reaping Receptor Work Units
+When an AWX job is launched via receptor, files such as status, stdin, and stdout are created in a specific receptor directory. This directory on disk is a random 8 character string, e.g. qLL2JFNT
+This is also called the work Unit ID in receptor, and is used in various receptor commands, e.g. "work results qLL2JFNT"
+After an AWX job executes, the receptor work unit directory is cleaned up by issuing the work release command. In some cases the release process might fail, or if AWX crashes during a job's execution, the work release command is never issued to begin with.
+As such, there is a periodic task that will obtain a list of all receptor work units, and find which ones belong to AWX jobs that are in a completed state (status is canceled, error, or succeeded). This task will call "work release" on each of these work units to clean up the files on disk.
## AWX Jobs
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index 38a7931d58..186df82e1f 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -153,7 +153,7 @@ RUN dnf --enablerepo=debuginfo -y install python3-debuginfo || :
{% if build_dev|bool %}
RUN dnf install -y podman
-RUN echo -e '[engine]\ncgroup_manager = "cgroupfs"\nevents_logger = "file"' > /etc/containers/containers.conf
+RUN echo -e '[engine]\ncgroup_manager = "cgroupfs"\nevents_logger = "file"\nruntime = "crun"' > /etc/containers/containers.conf
{% endif %}
# Ensure we must use fully qualified image names
diff --git a/tools/sosreport/tower.py b/tools/sosreport/tower.py
index 4d1b1e118e..a8f29f3b45 100644
--- a/tools/sosreport/tower.py
+++ b/tools/sosreport/tower.py
@@ -1,7 +1,10 @@
# Copyright (c) 2016 Ansible, Inc.
# All Rights Reserved.
-from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
+try:
+ from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
+except ImportError:
+ from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin
SOSREPORT_TOWER_COMMANDS = [
"awx-manage --version", # tower version