From 2cee1caad28760c99c586f69ac0384286a4acda6 Mon Sep 17 00:00:00 2001 From: John Westcott IV Date: Tue, 25 Apr 2023 08:45:28 -0400 Subject: [PATCH] Fixing final CI error --- awx/main/migrations/0006_v320_release.py | 11 ++--------- awx/main/models/credential/__init__.py | 3 +++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index 0a851bab28..68034e75ce 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -2,9 +2,6 @@ # Python from __future__ import unicode_literals -# Psycopg2 -from psycopg import sql - # Django from django.db import connection, migrations, models, OperationalError, ProgrammingError from django.conf import settings @@ -136,12 +133,8 @@ class Migration(migrations.Migration): ), ), migrations.RunSQL( - [ - "CREATE INDEX host_ansible_facts_default_gin ON {} USING gin(ansible_facts jsonb_path_ops);".format( - sql.Identifier(Host._meta.db_table).as_string(connection.cursor()) - ) - ], - [('DROP INDEX host_ansible_facts_default_gin;', None)], + sql="CREATE INDEX host_ansible_facts_default_gin ON {} USING gin(ansible_facts jsonb_path_ops);".format(Host._meta.db_table), + reverse_sql='DROP INDEX host_ansible_facts_default_gin;', ), # SCM file-based inventories migrations.AddField( diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index 4da5d5cb51..debaf1a568 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -195,6 +195,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin): @cached_property def dynamic_input_fields(self): + # if the credential is not yet saved we can't access the input_sources + if not self.id: + return [] return [obj.input_field_name for obj in self.input_sources.all()] def _password_field_allows_ask(self, field):