summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--awx/main/models/projects.py4
-rw-r--r--awx/main/tasks/jobs.py3
-rw-r--r--awx/playbooks/project_update.yml21
-rw-r--r--awx/ui/src/components/Lookup/CredentialLookup.js6
-rw-r--r--awx/ui/src/screens/Project/shared/ProjectForm.js20
-rw-r--r--awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js2
-rw-r--r--awxkit/awxkit/api/pages/projects.py2
7 files changed, 49 insertions, 9 deletions
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index a22973dd62..85e294aa54 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -160,8 +160,8 @@ class ProjectOptions(models.Model):
if self.scm_type == 'insights':
if cred.kind != 'insights':
raise ValidationError(_("Credential kind must be 'insights'."))
- elif cred.kind != 'scm':
- raise ValidationError(_("Credential kind must be 'scm'."))
+ elif cred.kind != 'scm' and cred.kind != 'azure_rm':
+ raise ValidationError(_("Credential kind must be 'scm' or 'azure_rm'." % cred.kind))
try:
if self.scm_type == 'insights':
self.scm_url = settings.INSIGHTS_URL_BASE
diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py
index 0a9e7f5975..4da66750b9 100644
--- a/awx/main/tasks/jobs.py
+++ b/awx/main/tasks/jobs.py
@@ -1239,6 +1239,9 @@ class RunProjectUpdate(BaseTask):
return scm_url, extra_vars
+ def build_credentials_list(self, instance):
+ return [instance.credential]
+
def build_inventory(self, instance, private_data_dir):
return 'localhost,'
diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml
index 4dce724496..3b995c21fa 100644
--- a/awx/playbooks/project_update.yml
+++ b/awx/playbooks/project_update.yml
@@ -38,6 +38,26 @@
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 }}"
@@ -47,6 +67,7 @@
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
diff --git a/awx/ui/src/components/Lookup/CredentialLookup.js b/awx/ui/src/components/Lookup/CredentialLookup.js
index 5256c20e6b..2ea0616c79 100644
--- a/awx/ui/src/components/Lookup/CredentialLookup.js
+++ b/awx/ui/src/components/Lookup/CredentialLookup.js
@@ -32,6 +32,7 @@ const QS_CONFIG = getQSConfig('credentials', {
function CredentialLookup({
autoPopulate,
credentialTypeId,
+ credentialTypeIds,
credentialTypeKind,
credentialTypeNamespace,
fieldName,
@@ -61,6 +62,9 @@ function CredentialLookup({
const typeIdParams = credentialTypeId
? { credential_type: credentialTypeId }
: {};
+ const typeIdsParams = credentialTypeIds
+ ? { credential_type__in: credentialTypeIds.join() }
+ : {};
const typeKindParams = credentialTypeKind
? { credential_type__kind: credentialTypeKind }
: {};
@@ -72,6 +76,7 @@ function CredentialLookup({
CredentialsAPI.read(
mergeParams(params, {
...typeIdParams,
+ ...typeIdsParams,
...typeKindParams,
...typeNamespaceParams,
})
@@ -101,6 +106,7 @@ function CredentialLookup({
autoPopulate,
autoPopulateLookup,
credentialTypeId,
+ credentialTypeIds,
credentialTypeKind,
credentialTypeNamespace,
history.location.search,
diff --git a/awx/ui/src/screens/Project/shared/ProjectForm.js b/awx/ui/src/screens/Project/shared/ProjectForm.js
index 88d8732eab..211a90825d 100644
--- a/awx/ui/src/screens/Project/shared/ProjectForm.js
+++ b/awx/ui/src/screens/Project/shared/ProjectForm.js
@@ -35,6 +35,11 @@ const fetchCredentials = async (credential) => {
},
{
data: {
+ results: [azurermCredentialType],
+ },
+ },
+ {
+ data: {
results: [insightsCredentialType],
},
},
@@ -45,13 +50,14 @@ 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: { typeId: scmCredentialType.id },
+ scm: { typeIds: [scmCredentialType.id, azurermCredentialType.id] },
insights: { typeId: insightsCredentialType.id },
cryptography: { typeId: cryptographyCredentialType.id },
};
@@ -60,8 +66,12 @@ const fetchCredentials = async (credential) => {
const { credential_type_id } = credential;
return {
scm: {
- typeId: scmCredentialType.id,
- value: credential_type_id === scmCredentialType.id ? credential : null,
+ typeIds: [scmCredentialType.id, azurermCredentialType.id],
+ value:
+ credential_type_id === scmCredentialType.id ||
+ credential_type_id === azurermCredentialType.id
+ ? credential
+ : null,
},
insights: {
typeId: insightsCredentialType.id,
@@ -367,13 +377,13 @@ function ProjectForm({ project, submitError, ...props }) {
});
const [scmTypeOptions, setScmTypeOptions] = useState(null);
const [credentials, setCredentials] = useState({
- scm: { typeId: null, value: null },
+ scm: { typeIds: null, value: null },
insights: { typeId: null, value: null },
cryptography: { typeId: null, value: null },
});
const [signatureValidationCredentials, setSignatureValidationCredentials] =
useState({
- scm: { typeId: null, value: null },
+ scm: { typeIds: null, value: null },
insights: { typeId: null, value: null },
cryptography: { typeId: null, value: null },
});
diff --git a/awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js b/awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js
index 1db0242bb8..42615f5631 100644
--- a/awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js
+++ b/awx/ui/src/screens/Project/shared/ProjectSubForms/SharedFields.js
@@ -52,7 +52,7 @@ export const ScmCredentialFormField = ({
return (
<CredentialLookup
- credentialTypeId={credential.typeId}
+ credentialTypeIds={credential.typeIds}
label={t`Source Control Credential`}
value={credential.value}
onChange={onCredentialChange}
diff --git a/awxkit/awxkit/api/pages/projects.py b/awxkit/awxkit/api/pages/projects.py
index 125f452637..845d112cea 100644
--- a/awxkit/awxkit/api/pages/projects.py
+++ b/awxkit/awxkit/api/pages/projects.py
@@ -50,7 +50,7 @@ class Project(HasCopy, HasCreate, HasNotifications, UnifiedJobTemplate):
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'):
+ if credential.ds.credential_type.namespace not in ('scm', 'insights', 'azure_rm'):
credential = None # ignore incompatible credential from HasCreate dependency injection
elif credential in (Credential,):
credential = (Credential, dict(credential_type=(True, dict(kind='scm'))))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 15:40:05 +0100