diff --git a/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/configuration_instructions.vue b/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/configuration_instructions.vue
index cf4b38a00de5269c042eb69e1e68b1efae0a92e0..d690e49646de3c5ff0388d1c53dfc30a081572b7 100644
--- a/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/configuration_instructions.vue
+++ b/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/configuration_instructions.vue
@@ -69,28 +69,46 @@ export default {
:header-level="3"
:visible="!operating"
>
- <p>
- <gl-sprintf
- :message="
- s__(
- 'GoogleArtifactRegistry|Before you begin, %{linkStart}install the Google Cloud CLI%{linkEnd}.',
- )
- "
- >
- <template #link="{ content }">
- <gl-link
- href="https://cloud.google.com/sdk/docs/install"
- target="_blank"
- rel="noopener noreferrer"
- >{{ content }} <gl-icon name="external-link" :aria-label="__('(external link)')"
- /></gl-link>
- </template>
- </gl-sprintf>
- </p>
+ <p>{{ s__('GoogleArtifactRegistry|Before you begin:') }}</p>
+ <ul>
+ <li>
+ <gl-sprintf
+ :message="
+ s__(
+ 'GoogleArtifactRegistry|Ensure you have the %{linkStart}permissions needed%{linkEnd} in your Google Cloud project.',
+ )
+ "
+ >
+ <template #link="{ content }">
+ <gl-link
+ href="https://cloud.google.com/iam/docs/granting-changing-revoking-access#required-permissions"
+ target="_blank"
+ >
+ {{ content }}
+ <gl-icon name="external-link" :aria-label="__('(external link)')" />
+ </gl-link>
+ </template>
+ </gl-sprintf>
+ </li>
+ <li>
+ <gl-sprintf
+ :message="
+ s__('GoogleArtifactRegistry|%{linkStart}Install the Google Cloud CLI%{linkEnd}.')
+ "
+ >
+ <template #link="{ content }">
+ <gl-link href="https://cloud.google.com/sdk/docs/install" target="_blank">
+ {{ content }}
+ <gl-icon name="external-link" :aria-label="__('(external link)')" />
+ </gl-link>
+ </template>
+ </gl-sprintf>
+ </li>
+ </ul>
<p>
{{
s__(
- 'GoogleArtifactRegistry|Run the following command to setup IAM read and write policies in your Google Cloud project.',
+ 'GoogleArtifactRegistry|Run the following command to set up IAM read and write policies in your Google Cloud project.',
)
}}
</p>
@@ -109,12 +127,7 @@ export default {
<strong>{{ content }}</strong>
</template>
<template #link="{ content }">
- <gl-link
- :href="personalAccessTokensPath"
- target="_blank"
- rel="noopener noreferrer"
- >{{ content }}</gl-link
- >
+ <gl-link :href="personalAccessTokensPath" target="_blank">{{ content }}</gl-link>
</template>
</gl-sprintf>
</li>
diff --git a/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/empty_state.vue b/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/empty_state.vue
index 066a3d28f43df2ac1038e93de881497672c4f680..3d4feee87e3af494e7f62ebcef03d686e508cea9 100644
--- a/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/empty_state.vue
+++ b/ee/app/assets/javascripts/integrations/edit/components/google_artifact_management/empty_state.vue
@@ -29,7 +29,7 @@ export default {
<gl-sprintf
:message="
s__(
- 'GoogleArtifactRegistry|First, secure your usage with the %{strongStart}Google Cloud Identity and Access Management (IAM)%{strongEnd} integration. Simplify access without the need to manage accounts or keys.',
+ 'GoogleArtifactRegistry|First, secure your usage with the %{strongStart}Google Cloud IAM%{strongEnd} integration. Simplify access without the need to manage accounts or keys.',
)
"
><template #strong="{ content }">
diff --git a/ee/app/assets/javascripts/integrations/edit/components/google_cloud_iam/manual_setup.vue b/ee/app/assets/javascripts/integrations/edit/components/google_cloud_iam/manual_setup.vue
index d85937e38c5d31e783dead29937376930e0378ec..48f99bc5149a0cf92044131ab4a7c3c75d391026 100644
--- a/ee/app/assets/javascripts/integrations/edit/components/google_cloud_iam/manual_setup.vue
+++ b/ee/app/assets/javascripts/integrations/edit/components/google_cloud_iam/manual_setup.vue
@@ -75,7 +75,7 @@ export default {
<li>
{{
s__(
- 'GoogleCloud|After Google Cloud workload identity federation has been set up, enter the details in the following form.',
+ 'GoogleCloud|After the Google Cloud workload identity federation has been set up, complete the following fields.',
)
}}
</li>
diff --git a/ee/app/views/shared/integrations/google_cloud_platform_workload_identity_federation/_help.html.haml b/ee/app/views/shared/integrations/google_cloud_platform_workload_identity_federation/_help.html.haml
index 9dec07a25d6c92f43d9bd132c43067086799ec9f..3fd002dee9c5b0fcaa731180e7220b5a67709327 100644
--- a/ee/app/views/shared/integrations/google_cloud_platform_workload_identity_federation/_help.html.haml
+++ b/ee/app/views/shared/integrations/google_cloud_platform_workload_identity_federation/_help.html.haml
@@ -1,6 +1,6 @@
.info-well
.well-segment
- %p.gl-font-weight-bold
+ %p
= s_('GoogleCloud|Manage permissions for Google Cloud resources with Identity and Access Management (IAM). Simplify and secure your usage, without the need to manage accounts or keys.')
%p
- tag_pair_docs = tag_pair(link_to('', help_page_path('ci/gitlab_google_cloud_integration/index'), target: '_blank', rel: 'noopener noreferrer'), :link_start, :link_end)
diff --git a/ee/spec/frontend/integrations/edit/components/google_artifact_management/configuration_instructions_spec.js b/ee/spec/frontend/integrations/edit/components/google_artifact_management/configuration_instructions_spec.js
index a1e8095a1adc07f9cdaf24b224d5490908651f78..3355759d623aa89ceb0b5e509bef0c8107360e31 100644
--- a/ee/spec/frontend/integrations/edit/components/google_artifact_management/configuration_instructions_spec.js
+++ b/ee/spec/frontend/integrations/edit/components/google_artifact_management/configuration_instructions_spec.js
@@ -74,23 +74,31 @@ describe('ConfigurationInstructions', () => {
expect(findAccordionItem().props('visible')).toBe(true);
});
- it('renders link to Google Cloud CLI installation', () => {
+ it('renders link to Google Cloud IAM permissions', () => {
createComponent();
expect(findLinks().at(0).attributes()).toMatchObject({
+ href:
+ 'https://cloud.google.com/iam/docs/granting-changing-revoking-access#required-permissions',
+ target: '_blank',
+ });
+ });
+
+ it('renders link to Google Cloud CLI installation', () => {
+ createComponent();
+
+ expect(findLinks().at(1).attributes()).toMatchObject({
href: 'https://cloud.google.com/sdk/docs/install',
target: '_blank',
- rel: 'noopener noreferrer',
});
});
it('renders link to personal access tokens path', () => {
createComponent();
- expect(findLinks().at(1).attributes()).toMatchObject({
+ expect(findLinks().at(2).attributes()).toMatchObject({
href: '/path/to/personal/access/tokens',
target: '_blank',
- rel: 'noopener noreferrer',
});
});
diff --git a/ee/spec/frontend/integrations/edit/components/google_artifact_management/empty_state_spec.js b/ee/spec/frontend/integrations/edit/components/google_artifact_management/empty_state_spec.js
index 7ffcfa7284a690c3808af01254e66995962b8b16..7f350dfd446f0fc4d27d8baef5a770ddf9246cb2 100644
--- a/ee/spec/frontend/integrations/edit/components/google_artifact_management/empty_state_spec.js
+++ b/ee/spec/frontend/integrations/edit/components/google_artifact_management/empty_state_spec.js
@@ -39,7 +39,7 @@ describe('EmptyState', () => {
it('renders description', () => {
expect(findDescription().text()).toBe(
- 'First, secure your usage with the Google Cloud Identity and Access Management (IAM) integration. Simplify access without the need to manage accounts or keys.',
+ 'First, secure your usage with the Google Cloud IAM integration. Simplify access without the need to manage accounts or keys.',
);
});
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cb280e5ce8a85149ed7bc2437eff35c1278256d9..5090745bc864dbe0f4954302215a0d7cd28e6f1a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24065,6 +24065,9 @@ msgid_plural "GoogleArtifactRegistry|%d more tags"
msgstr[0] ""
msgstr[1] ""
+msgid "GoogleArtifactRegistry|%{linkStart}Install the Google Cloud CLI%{linkEnd}."
+msgstr ""
+
msgid "GoogleArtifactRegistry|After the policies have been created, select %{strongStart}Save changes%{strongEnd} to continue."
msgstr ""
@@ -24074,7 +24077,7 @@ msgstr ""
msgid "GoogleArtifactRegistry|An error occurred while fetching the artifacts."
msgstr ""
-msgid "GoogleArtifactRegistry|Before you begin, %{linkStart}install the Google Cloud CLI%{linkEnd}."
+msgid "GoogleArtifactRegistry|Before you begin:"
msgstr ""
msgid "GoogleArtifactRegistry|Built"
@@ -24104,7 +24107,10 @@ msgstr ""
msgid "GoogleArtifactRegistry|Digest"
msgstr ""
-msgid "GoogleArtifactRegistry|First, secure your usage with the %{strongStart}Google Cloud Identity and Access Management (IAM)%{strongEnd} integration. Simplify access without the need to manage accounts or keys."
+msgid "GoogleArtifactRegistry|Ensure you have the %{linkStart}permissions needed%{linkEnd} in your Google Cloud project."
+msgstr ""
+
+msgid "GoogleArtifactRegistry|First, secure your usage with the %{strongStart}Google Cloud IAM%{strongEnd} integration. Simplify access without the need to manage accounts or keys."
msgstr ""
msgid "GoogleArtifactRegistry|Image"
@@ -24149,7 +24155,7 @@ msgstr ""
msgid "GoogleArtifactRegistry|Repository: %{repository}"
msgstr ""
-msgid "GoogleArtifactRegistry|Run the following command to setup IAM read and write policies in your Google Cloud project."
+msgid "GoogleArtifactRegistry|Run the following command to set up IAM read and write policies in your Google Cloud project."
msgstr ""
msgid "GoogleArtifactRegistry|Set up Google Cloud IAM"
@@ -24188,10 +24194,10 @@ msgstr ""
msgid "GoogleCloud|%{link_start}Explore Google Cloud integration with GitLab%{link_end}, for CI/CD and more."
msgstr ""
-msgid "GoogleCloud|After Google Cloud workload identity federation has been set up, enter the details in the following form."
+msgid "GoogleCloud|After Google Cloud workload identity federation has been set up, select %{strongStart}Continue%{strongEnd}."
msgstr ""
-msgid "GoogleCloud|After Google Cloud workload identity federation has been set up, select %{strongStart}Continue%{strongEnd}."
+msgid "GoogleCloud|After the Google Cloud workload identity federation has been set up, complete the following fields."
msgstr ""
msgid "GoogleCloud|Before you begin, %{linkStart}install the Google Cloud CLI%{linkEnd}."