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

Merge pull request #10185 from jakemcdermott/fix-10170

Browse Source 
Drop the word 'name' from image field, add examples

for #10170
We call this field "Image" in other places, so we want it to match. Also, "Image name" can be confusing because people may think they just need to provide the image name instead of the full image location, which includes registry and tag version.
cc @gamuniz @nixocio @beeankha @tiagodread

Reviewed-by: Kersom <None>
Reviewed-by: Bianca Henderson <beeankha@gmail.com>
Reviewed-by: Julen Landa Alustiza <None>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-05-13 14:44:38 +00:00 committed by GitHub
commit bb47bdbc43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/migrations/0142_update_ee_image_field_description.py Normal file
View File

@ -0,0 +1,22 @@
# Generated by Django 2.2.16 on 2021-05-12 20:08
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0141_remove_isolated_instances'),
]
operations = [
migrations.AlterField(
model_name='executionenvironment',
name='image',
field=models.CharField(
help_text='The full image location, including the container registry, image name, and version tag.',
max_length=1024,
verbose_name='image location',
),
),
]

2
awx/main/models/execution_environments.py
View File

@ -30,7 +30,7 @@ class ExecutionEnvironment(CommonModel):
image = models.CharField(
max_length=1024,
verbose_name=_('image location'),
help_text=_("The registry location where the container is stored."),
help_text=_("The full image location, including the container registry, image name, and version tag."),
)
managed_by_tower = models.BooleanField(default=False, editable=False)
credential = models.ForeignKey(

19
awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx
View File

@ -95,12 +95,27 @@ function ExecutionEnvironmentFormFields({
/>
<FormField
id="execution-environment-image"
label={t`Image name`}
label={t`Image`}
name="image"
type="text"
validate={required(null)}
isRequired
tooltip={t`The registry location where the container is stored.`}
tooltip={
<span>
{t`The full image location, including the container registry, image name, and version tag.`}
<br />
<br />
{t`Examples:`}
<ul css="margin: 10px 0 10px 20px">
<li>
<code>quay.io/ansible/awx-ee:latest</code>
</li>
<li>
<code>repo/project/image-name:tag</code>
</li>
</ul>
</span>
}
/>
<FormGroup
fieldId="execution-environment-container-options"

2
awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.test.jsx
View File

@ -152,7 +152,7 @@ describe('<ExecutionEnvironmentForm/>', () => {
});
test('should display form fields properly', () => {
expect(wrapper.find('FormGroup[label="Image name"]').length).toBe(1);
expect(wrapper.find('FormGroup[label="Image"]').length).toBe(1);
expect(wrapper.find('FormGroup[label="Description"]').length).toBe(1);
expect(wrapper.find('CredentialLookup').length).toBe(1);
});