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

revert change to serializer and use get_or_create

Browse Source 
still need to fix up the handling of the verify-ssl bool, since
it is not being respected
This commit is contained in:
Elijah DeLee
2021-06-02 16:16:36 -04:00
parent 7818b2008f
commit e740cfcb52
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2603,6 +2603,8 @@ class CredentialSerializer(BaseSerializer):
return summary_dict return summary_dict
def validate(self, attrs): def validate(self, attrs):
if self.instance and self.instance.managed_by_tower:
raise PermissionDenied(detail=_("Modifications not allowed for managed credentials"))
return super(CredentialSerializer, self).validate(attrs) return super(CredentialSerializer, self).validate(attrs)
def get_validation_exclusions(self, obj=None): def get_validation_exclusions(self, obj=None):

22
awx/main/management/commands/register_default_execution_environments.py
View File

@@ -53,26 +53,30 @@ class Command(BaseCommand):
if not options.get("registry_url"): if not options.get("registry_url"):
sys.stderr.write("Registry url must be provided when providing registry username\n") sys.stderr.write("Registry url must be provided when providing registry username\n")
sys.exit(1) sys.exit(1)
registry_cred_inputs = {
"host": options.get("registry_url"),
"password": options.get("registry_password"),
"username": options.get("registry_username"),
"verify_ssl": options.get("verify_ssl"),
}
registry_cred_type = CredentialType.objects.filter(kind="registry") registry_cred_type = CredentialType.objects.filter(kind="registry")
if not registry_cred_type.exists(): if not registry_cred_type.exists():
sys.stderr.write("No registry credential type found") sys.stderr.write("No registry credential type found")
sys.exit(1) sys.exit(1)
registry_cred, created = Credential.objects.update_or_create( registry_cred, created = Credential.objects.get_or_create(
name="Default Execution Environment Registry Credential", name="Default Execution Environment Registry Credential",
managed_by_tower=True, managed_by_tower=True,
credential_type=registry_cred_type[0], credential_type=registry_cred_type[0],
defaults={ defaults={"inputs": registry_cred_inputs},
"inputs": {
"host": options.get("registry_url"),
"password": options.get("registry_password"),
"username": options.get("registry_username"),
"verify_ssl": options.get("verify_ssl"),
},
},
) )
if created: if created:
changed = True changed = True
print("Default Execution Environment Credential registered.") print("Default Execution Environment Credential registered.")
elif registry_cred.inputs != registry_cred_inputs:
registry_cred.inputs = registry_cred_inputs
registry_cred.save()
changed = True
print("Default Execution Environment Credential updated.")
for ee in reversed(settings.DEFAULT_EXECUTION_ENVIRONMENTS): for ee in reversed(settings.DEFAULT_EXECUTION_ENVIRONMENTS):
_, created = ExecutionEnvironment.objects.update_or_create( _, created = ExecutionEnvironment.objects.update_or_create(