Revert "Implement project pulling from Azure DevOps using Service Principals (ansible#14628)"

This reverts commit 2e2cd7f.

Author: TheRealHaoLiu

awx/main/models/projects.py

@@ -160,8 +160,8 @@ def clean_credential(self):
             if self.scm_type == 'insights':
                 if cred.kind != 'insights':
                     raise ValidationError(_("Credential kind must be 'insights'."))
-            elif cred.kind != 'scm' and cred.kind != 'azure_rm':
-                raise ValidationError(_("Credential kind must be 'scm' or 'azure_rm'." % cred.kind))
+            elif cred.kind != 'scm':
+                raise ValidationError(_("Credential kind must be 'scm'."))
             try:
                 if self.scm_type == 'insights':
                     self.scm_url = settings.INSIGHTS_URL_BASE

awx/main/tasks/jobs.py

@@ -1239,9 +1239,6 @@ def _build_scm_url_extra_vars(self, project_update):
 
         return scm_url, extra_vars
 
-    def build_credentials_list(self, instance):
-        return [instance.credential]
-
     def build_inventory(self, instance, private_data_dir):
         return 'localhost,'
 

awx/playbooks/project_update.yml

@@ -38,26 +38,6 @@
       tags:
         - update_git
       block:
-        - name: Get Azure access token
-          when: "lookup('ansible.builtin.env', 'AZURE_CLIENT_ID') != ''"
-          register: azure_token
-          no_log: True
-          check_mode: false
-          azure.azcollection.azure_rm_accesstoken_info:
-            scopes:
-              # This is the audience for Azure DevOps, as per
-              # https://learn.microsoft.com/en-us/rest/api/azure/devops/tokens/
-              - 499b84ac-1321-427f-aa17-267ca6975798/.default
-
-        - name: Define git environment variables
-          when: "azure_token is not skipped"
-          no_log: True
-          ansible.builtin.set_fact:
-            git_environment:
-              GIT_CONFIG_COUNT: 1
-              GIT_CONFIG_KEY_0: http.extraHeader
-              GIT_CONFIG_VALUE_0: "Authorization: Bearer {{ azure_token.access_token }}"
-
         - name: Update project using git
           ansible.builtin.git:
             dest: "{{ project_path | quote }}"
@@ -67,7 +47,6 @@
             force: "{{ scm_clean }}"
             track_submodules: "{{ scm_track_submodules | default(omit) }}"
             accept_hostkey: "{{ scm_accept_hostkey | default(omit) }}"
-          environment: "{{ git_environment | default({}) }}"
           register: git_result
 
         - name: Set the git repository version

awx/ui/src/components/Lookup/CredentialLookup.js

@@ -32,7 +32,6 @@ const QS_CONFIG = getQSConfig('credentials', {
 function CredentialLookup({
   autoPopulate,
   credentialTypeId,
-  credentialTypeIds,
   credentialTypeKind,
   credentialTypeNamespace,
   fieldName,
@@ -62,9 +61,6 @@ function CredentialLookup({
       const typeIdParams = credentialTypeId
         ? { credential_type: credentialTypeId }
         : {};
-      const typeIdsParams = credentialTypeIds
-        ? { credential_type__in: credentialTypeIds.join() }
-        : {};
       const typeKindParams = credentialTypeKind
         ? { credential_type__kind: credentialTypeKind }
         : {};
@@ -76,7 +72,6 @@ function CredentialLookup({
         CredentialsAPI.read(
           mergeParams(params, {
             ...typeIdParams,
-            ...typeIdsParams,
             ...typeKindParams,
             ...typeNamespaceParams,
           })
@@ -106,7 +101,6 @@ function CredentialLookup({
       autoPopulate,
       autoPopulateLookup,
       credentialTypeId,
-      credentialTypeIds,
       credentialTypeKind,
       credentialTypeNamespace,
       history.location.search,

awx/ui/src/screens/Project/shared/ProjectForm.js

@@ -33,11 +33,6 @@ const fetchCredentials = async (credential) => {
         results: [scmCredentialType],
       },
     },
-    {
-      data: {
-        results: [azurermCredentialType],
-      },
-    },
     {
       data: {
         results: [insightsCredentialType],
@@ -50,14 +45,13 @@ const fetchCredentials = async (credential) => {
     },
   ] = await Promise.all([
     CredentialTypesAPI.read({ kind: 'scm' }),
-    CredentialTypesAPI.read({ namespace: 'azure_rm' }),
     CredentialTypesAPI.read({ name: 'Insights' }),
     CredentialTypesAPI.read({ kind: 'cryptography' }),
   ]);
 
   if (!credential) {
     return {
-      scm: { typeIds: [scmCredentialType.id, azurermCredentialType.id] },
+      scm: { typeId: scmCredentialType.id },
       insights: { typeId: insightsCredentialType.id },
       cryptography: { typeId: cryptographyCredentialType.id },
     };
@@ -66,12 +60,8 @@ const fetchCredentials = async (credential) => {
   const { credential_type_id } = credential;
   return {
     scm: {
-      typeIds: [scmCredentialType.id, azurermCredentialType.id],
-      value:
-        credential_type_id === scmCredentialType.id ||
-        credential_type_id === azurermCredentialType.id
-          ? credential
-          : null,
+      typeId: scmCredentialType.id,
+      value: credential_type_id === scmCredentialType.id ? credential : null,
     },
     insights: {
       typeId: insightsCredentialType.id,
@@ -377,13 +367,13 @@ function ProjectForm({ project, submitError, ...props }) {
   });
   const [scmTypeOptions, setScmTypeOptions] = useState(null);
   const [credentials, setCredentials] = useState({
-    scm: { typeIds: null, value: null },
+    scm: { typeId: null, value: null },
     insights: { typeId: null, value: null },
     cryptography: { typeId: null, value: null },
   });
   const [signatureValidationCredentials, setSignatureValidationCredentials] =
     useState({
-      scm: { typeIds: null, value: null },
+      scm: { typeId: null, value: null },
       insights: { typeId: null, value: null },
       cryptography: { typeId: null, value: null },
     });

awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js

@@ -52,7 +52,7 @@ export const ScmCredentialFormField = ({
 
   return (
     <CredentialLookup
-      credentialTypeIds={credential.typeIds}
+      credentialTypeId={credential.typeId}
       label={t`Source Control Credential`}
       value={credential.value}
       onChange={onCredentialChange}

awxkit/awxkit/api/pages/projects.py

@@ -50,7 +50,7 @@ def payload(self, organization, scm_type='git', **kwargs):
     def create_payload(self, name='', description='', scm_type='git', scm_url='', scm_branch='', organization=Organization, credential=None, **kwargs):
         if credential:
             if isinstance(credential, Credential):
-                if credential.ds.credential_type.namespace not in ('scm', 'insights', 'azure_rm'):
+                if credential.ds.credential_type.namespace not in ('scm', 'insights'):
                     credential = None  # ignore incompatible credential from HasCreate dependency injection
             elif credential in (Credential,):
                 credential = (Credential, dict(credential_type=(True, dict(kind='scm'))))