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

Add migration and restore Credential logic

Browse Source
This commit is contained in:
Wayne Witzel III
2017-05-02 22:30:12 -04:00
parent 11eb99820d
commit dd52e2be30
2 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
awx/main/migrations/0038_v320_release.py
View File

@@ -159,4 +159,69 @@ class Migration(migrations.Migration):
name='allow_simultaneous', name='allow_simultaneous',
field=models.BooleanField(default=False), field=models.BooleanField(default=False),
), ),
# Permission and Deprecated Field Removal
migrations.RemoveField(
model_name='permission',
name='created_by',
),
migrations.RemoveField(
model_name='permission',
name='inventory',
),
migrations.RemoveField(
model_name='permission',
name='modified_by',
),
migrations.RemoveField(
model_name='permission',
name='project',
),
migrations.RemoveField(
model_name='permission',
name='tags',
),
migrations.RemoveField(
model_name='permission',
name='team',
),
migrations.RemoveField(
model_name='permission',
name='user',
),
migrations.RemoveField(
model_name='activitystream',
name='permission',
),
migrations.RemoveField(
model_name='credential',
name='deprecated_team',
),
migrations.RemoveField(
model_name='credential',
name='deprecated_user',
),
migrations.RemoveField(
model_name='organization',
name='deprecated_admins',
),
migrations.RemoveField(
model_name='organization',
name='deprecated_projects',
),
migrations.RemoveField(
model_name='organization',
name='deprecated_users',
),
migrations.RemoveField(
model_name='team',
name='deprecated_projects',
),
migrations.RemoveField(
model_name='team',
name='deprecated_users',
),
migrations.DeleteModel(
name='Permission',
),
] ]

5
awx/main/models/credential.py
View File

@@ -379,12 +379,11 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
return field in self.credential_type.askable_fields return field in self.credential_type.askable_fields
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
inputs_before = {}
# If update_fields has been specified, add our field names to it,
# if hit hasn't been specified, then we're just doing a normal save.
self.PASSWORD_FIELDS = self.credential_type.secret_fields self.PASSWORD_FIELDS = self.credential_type.secret_fields
if self.pk: if self.pk:
cred_before = Credential.objects.get(pk=self.pk)
inputs_before = cred_before.inputs
# Look up the currently persisted value so that we can replace # Look up the currently persisted value so that we can replace
# $encrypted$ with the actual DB-backed value # $encrypted$ with the actual DB-backed value
for field in self.PASSWORD_FIELDS: for field in self.PASSWORD_FIELDS: