Skip to content
Snippets Groups Projects
Commit b5f665e8 authored by Pedro Moreira da Silva's avatar Pedro Moreira da Silva Committed by Doug Stull
Browse files

Rename Google Artifact Registry integration

According to gitlab-org/gitlab#425153 (comment 1760690997)
it should be named just “Google Artifact Registry” instead of
“Google Cloud Artifact Registry”

Changelog: changed
EE: true
parent 47c1fd14
No related branches found
No related tags found
1 merge request!145529Rename Google Artifact Registry integration
Showing
with 49 additions and 49 deletions
......@@ -388,7 +388,7 @@ Returns [`Boolean`](#boolean).
 
### `Query.googleCloudArtifactRegistryRepositoryArtifact`
 
Details about an artifact in the Google Cloud Artifact Registry.
Details about an artifact in the Google Artifact Registry.
 
DETAILS:
**Introduced** in GitLab 16.10.
......@@ -401,10 +401,10 @@ Returns [`GoogleCloudArtifactRegistryArtifactDetails`](#googlecloudartifactregis
| Name | Type | Description |
| ---- | ---- | ----------- |
| <a id="querygooglecloudartifactregistryrepositoryartifactgooglecloudprojectid"></a>`googleCloudProjectId` | [`String!`](#string) | ID of the Google Cloud project. |
| <a id="querygooglecloudartifactregistryrepositoryartifactimage"></a>`image` | [`String!`](#string) | Name of the image in the Google Cloud Artifact Registry. |
| <a id="querygooglecloudartifactregistryrepositoryartifactimage"></a>`image` | [`String!`](#string) | Name of the image in the Google Artifact Registry. |
| <a id="querygooglecloudartifactregistryrepositoryartifactlocation"></a>`location` | [`String!`](#string) | Location of the Artifact Registry repository. |
| <a id="querygooglecloudartifactregistryrepositoryartifactprojectpath"></a>`projectPath` | [`ID!`](#id) | Full project path. |
| <a id="querygooglecloudartifactregistryrepositoryartifactrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Cloud Artifact Registry. |
| <a id="querygooglecloudartifactregistryrepositoryartifactrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Artifact Registry. |
 
### `Query.group`
 
......@@ -19959,7 +19959,7 @@ four standard [pagination arguments](#pagination-arguments):
 
### `GoogleCloudArtifactRegistryDockerImage`
 
Represents a docker artifact of Google Cloud Artifact Registry.
Represents a docker artifact of Google Artifact Registry.
 
#### Fields
 
......@@ -19974,7 +19974,7 @@ Represents a docker artifact of Google Cloud Artifact Registry.
 
### `GoogleCloudArtifactRegistryDockerImageDetails`
 
Represents details about docker artifact of Google Cloud Artifact Registry.
Represents details about docker artifact of Google Artifact Registry.
 
#### Fields
 
......@@ -19989,7 +19989,7 @@ Represents details about docker artifact of Google Cloud Artifact Registry.
| <a id="googlecloudartifactregistrydockerimagedetailsmediatype"></a>`mediaType` | [`String`](#string) | Media type of the image. |
| <a id="googlecloudartifactregistrydockerimagedetailsname"></a>`name` | [`String!`](#string) | Unique image name. |
| <a id="googlecloudartifactregistrydockerimagedetailsprojectid"></a>`projectId` | [`String!`](#string) | ID of the Google Cloud project. |
| <a id="googlecloudartifactregistrydockerimagedetailsrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Cloud Artifact Registry. |
| <a id="googlecloudartifactregistrydockerimagedetailsrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Artifact Registry. |
| <a id="googlecloudartifactregistrydockerimagedetailstags"></a>`tags` | [`[String!]`](#string) | Tags attached to the image. |
| <a id="googlecloudartifactregistrydockerimagedetailsupdatetime"></a>`updateTime` | [`Time`](#time) | Time when the image was last updated. |
| <a id="googlecloudartifactregistrydockerimagedetailsuploadtime"></a>`uploadTime` | [`Time`](#time) | Time when the image was uploaded. |
......@@ -19997,7 +19997,7 @@ Represents details about docker artifact of Google Cloud Artifact Registry.
 
### `GoogleCloudArtifactRegistryRepository`
 
Represents a repository of Google Cloud Artifact Registry.
Represents a repository of Google Artifact Registry.
 
#### Fields
 
......@@ -20005,13 +20005,13 @@ Represents a repository of Google Cloud Artifact Registry.
| ---- | ---- | ----------- |
| <a id="googlecloudartifactregistryrepositoryartifactregistryrepositoryurl"></a>`artifactRegistryRepositoryUrl` | [`String!`](#string) | Google Cloud URL to access the repository. |
| <a id="googlecloudartifactregistryrepositoryprojectid"></a>`projectId` | [`String!`](#string) | ID of the Google Cloud project. |
| <a id="googlecloudartifactregistryrepositoryrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Cloud Artifact Registry. |
| <a id="googlecloudartifactregistryrepositoryrepository"></a>`repository` | [`String!`](#string) | Repository on the Google Artifact Registry. |
 
#### Fields with arguments
 
##### `GoogleCloudArtifactRegistryRepository.artifacts`
 
Google Cloud Artifact Registry repository artifacts. Returns `null` if `gcp_artifact_registry` feature flag is disabled or GitLab.com feature is unavailable.
Google Artifact Registry repository artifacts. Returns `null` if `gcp_artifact_registry` feature flag is disabled or GitLab.com feature is unavailable.
 
Returns [`GoogleCloudArtifactRegistryArtifactConnection`](#googlecloudartifactregistryartifactconnection).
 
......@@ -25261,7 +25261,7 @@ Represents vulnerability finding of a security report on the pipeline.
| <a id="projectforkingaccesslevel"></a>`forkingAccessLevel` | [`ProjectFeatureAccess`](#projectfeatureaccess) | Access level required for forking access. |
| <a id="projectforkscount"></a>`forksCount` | [`Int!`](#int) | Number of times the project has been forked. |
| <a id="projectfullpath"></a>`fullPath` | [`ID!`](#id) | Full path of the project. |
| <a id="projectgooglecloudartifactregistryrepository"></a>`googleCloudArtifactRegistryRepository` **{warning-solid}** | [`GoogleCloudArtifactRegistryRepository`](#googlecloudartifactregistryrepository) | **Introduced** in GitLab 16.10. **Status**: Experiment. Google Cloud Artifact Registry repository. Returns `null` if `gcp_artifact_registry` feature flag is disabled. |
| <a id="projectgooglecloudartifactregistryrepository"></a>`googleCloudArtifactRegistryRepository` **{warning-solid}** | [`GoogleCloudArtifactRegistryRepository`](#googlecloudartifactregistryrepository) | **Introduced** in GitLab 16.10. **Status**: Experiment. Google Artifact Registry repository. Returns `null` if `gcp_artifact_registry` feature flag is disabled. |
| <a id="projectgrafanaintegration"></a>`grafanaIntegration` | [`GrafanaIntegration`](#grafanaintegration) | Grafana integration details for the project. |
| <a id="projectgroup"></a>`group` | [`Group`](#group) | Group of the project. |
| <a id="projecthasjiravulnerabilityissuecreationenabled"></a>`hasJiraVulnerabilityIssueCreationEnabled` | [`Boolean!`](#boolean) | Indicates whether Jira issue creation from vulnerabilities is enabled. |
......@@ -34347,7 +34347,7 @@ One of:
 
#### `GoogleCloudArtifactRegistryArtifact`
 
A base type of Google Cloud Artifact Registry artifacts.
A base type of Google Artifact Registry artifacts.
 
One of:
 
......@@ -34355,7 +34355,7 @@ One of:
 
#### `GoogleCloudArtifactRegistryArtifactDetails`
 
Details type of Google Cloud Artifact Registry artifacts.
Details type of Google Artifact Registry artifacts.
 
One of:
 
......@@ -891,7 +891,7 @@ Get the Google Chat integration settings for a project.
GET /projects/:id/integrations/hangouts-chat
```
## Google Cloud Artifact Registry
## Google Artifact Registry
DETAILS:
**Offering:** GitLab.com
......@@ -902,9 +902,9 @@ DETAILS:
FLAG:
On GitLab.com and GitLab Dedicated, this feature is not available. The feature is not ready for production use.
### Set up Google Cloud Artifact Registry
### Set up Google Artifact Registry
Set up the Google Cloud Artifact Registry integration for a project.
Set up the Google Artifact Registry integration for a project.
```plaintext
PUT /projects/:id/integrations/google-cloud-platform-artifact-registry
......@@ -918,17 +918,17 @@ Parameters:
| `artifact_registry_location` | string | true | Location of the Artifact Registry repository. |
| `artifact_registry_repositories` | string | true | Repository of Artifact Registry. |
### Disable Google Cloud Artifact Registry
### Disable Google Artifact Registry
Disable the Google Cloud Artifact Registry integration for a project. Integration settings are reset.
Disable the Google Artifact Registry integration for a project. Integration settings are reset.
```plaintext
DELETE /projects/:id/integrations/google-cloud-platform-artifact-registry
```
### Get Google Cloud Artifact Registry settings
### Get Google Artifact Registry settings
Get the Google Cloud Artifact Registry integration settings for a project.
Get the Google Artifact Registry integration settings for a project.
```plaintext
GET /projects/:id/integrations/google-cloud-platform-artifact-registry
......@@ -967,9 +967,9 @@ Disable the Google Cloud Identity and Access Management integration for a projec
DELETE /projects/:id/integrations/google-cloud-platform-workload-identity-federation
```
### Get Google Cloud Artifact Identity and Access Management
### Get Google Cloud Identity and Access Management
Get the settings for the Google Cloud Artifact Identity and Access Management for a project.
Get the settings for the Google Cloud Identity and Access Management for a project.
```plaintext
GET /projects/:id/integration/google-cloud-platform-workload-identity-federation
......
......@@ -361,7 +361,7 @@ module ProjectType
::Types::GoogleCloud::ArtifactRegistry::RepositoryType,
null: true,
alpha: { milestone: '16.10' },
description: 'Google Cloud Artifact Registry repository. ' \
description: 'Google Artifact Registry repository. ' \
'Returns `null` if `gcp_artifact_registry` feature flag is disabled'
field :ai_agent, ::Types::Ai::Agents::AgentType,
......
......@@ -160,7 +160,7 @@ module QueryType
field :google_cloud_artifact_registry_repository_artifact,
::Types::GoogleCloud::ArtifactRegistry::ArtifactDetailsType,
null: true,
description: 'Details about an artifact in the Google Cloud Artifact Registry.',
description: 'Details about an artifact in the Google Artifact Registry.',
resolver: ::Resolvers::GoogleCloud::ArtifactRegistry::ArtifactResolver,
alpha: { milestone: '16.10' }
end
......
......@@ -28,12 +28,12 @@ class ArtifactResolver < BaseResolver
argument :repository,
GraphQL::Types::String,
required: true,
description: 'Repository on the Google Cloud Artifact Registry.'
description: 'Repository on the Google Artifact Registry.'
argument :image,
GraphQL::Types::String,
required: true,
description: "Name of the image in the Google Cloud Artifact Registry."
description: "Name of the image in the Google Artifact Registry."
argument :project_path,
GraphQL::Types::ID,
......
......@@ -5,7 +5,7 @@ module GoogleCloud
module ArtifactRegistry
class ArtifactDetailsType < BaseUnion
graphql_name 'GoogleCloudArtifactRegistryArtifactDetails'
description 'Details type of Google Cloud Artifact Registry artifacts'
description 'Details type of Google Artifact Registry artifacts'
possible_types ::Types::GoogleCloud::ArtifactRegistry::DockerImageDetailsType
......@@ -15,7 +15,7 @@ def self.resolve_type(object, _context)
::Types::GoogleCloud::ArtifactRegistry::DockerImageDetailsType
else
raise ::Gitlab::Graphql::Errors::BaseError,
"Unsupported Google Cloud Artifact Registry type #{object.class.name}"
"Unsupported Google Artifact Registry type #{object.class.name}"
end
end
end
......
......@@ -5,7 +5,7 @@ module GoogleCloud
module ArtifactRegistry
class ArtifactType < BaseUnion
graphql_name 'GoogleCloudArtifactRegistryArtifact'
description 'A base type of Google Cloud Artifact Registry artifacts'
description 'A base type of Google Artifact Registry artifacts'
possible_types ::Types::GoogleCloud::ArtifactRegistry::DockerImageType
......@@ -15,7 +15,7 @@ def self.resolve_type(object, _context)
::Types::GoogleCloud::ArtifactRegistry::DockerImageType
else
raise ::Gitlab::Graphql::Errors::BaseError,
"Unsupported Google Cloud Artifact Registry type #{object.class.name}"
"Unsupported Google Artifact Registry type #{object.class.name}"
end
end
end
......
......@@ -6,7 +6,7 @@ module ArtifactRegistry
# rubocop:disable Graphql/AuthorizeTypes -- authorization happens in the service, called from the resolver
class DockerImageDetailsType < DockerImageType
graphql_name 'GoogleCloudArtifactRegistryDockerImageDetails'
description 'Represents details about docker artifact of Google Cloud Artifact Registry'
description 'Represents details about docker artifact of Google Artifact Registry'
field :uri,
GraphQL::Types::String,
......@@ -38,7 +38,7 @@ class DockerImageDetailsType < DockerImageType
field :repository,
GraphQL::Types::String,
null: false,
description: 'Repository on the Google Cloud Artifact Registry.'
description: 'Repository on the Google Artifact Registry.'
field :artifact_registry_image_url,
GraphQL::Types::String,
......
......@@ -6,7 +6,7 @@ module ArtifactRegistry
# rubocop:disable Graphql/AuthorizeTypes -- authorization happens in the service, called from the resolver
class DockerImageType < BaseObject
graphql_name 'GoogleCloudArtifactRegistryDockerImage'
description 'Represents a docker artifact of Google Cloud Artifact Registry'
description 'Represents a docker artifact of Google Artifact Registry'
include ::Gitlab::Utils::StrongMemoize
......
......@@ -5,7 +5,7 @@ module GoogleCloud
module ArtifactRegistry
class RepositoryType < BaseObject
graphql_name 'GoogleCloudArtifactRegistryRepository'
description 'Represents a repository of Google Cloud Artifact Registry'
description 'Represents a repository of Google Artifact Registry'
authorize :read_google_cloud_artifact_registry
......@@ -17,7 +17,7 @@ class RepositoryType < BaseObject
field :repository,
GraphQL::Types::String,
null: false,
description: 'Repository on the Google Cloud Artifact Registry.'
description: 'Repository on the Google Artifact Registry.'
field :artifact_registry_repository_url,
GraphQL::Types::String,
......@@ -27,7 +27,7 @@ class RepositoryType < BaseObject
field :artifacts,
Types::GoogleCloud::ArtifactRegistry::ArtifactType.connection_type,
null: true,
description: 'Google Cloud Artifact Registry repository artifacts. ' \
description: 'Google Artifact Registry repository artifacts. ' \
'Returns `null` if `gcp_artifact_registry` feature flag is disabled or GitLab.com feature ' \
'is unavailable.',
resolver: ::Resolvers::GoogleCloud::ArtifactRegistry::RepositoryArtifactsResolver,
......
......@@ -46,11 +46,11 @@ class ArtifactRegistry < Integration
alias_method :artifact_registry_repository, :artifact_registry_repositories
def self.title
s_('GoogleCloudPlatformService|Google Cloud Artifact Registry')
s_('GoogleCloudPlatformService|Google Artifact Registry')
end
def self.description
s_('GoogleCloudPlatformService|Connect Google Cloud Artifact Registry to GitLab.')
s_('GoogleCloudPlatformService|Manage your artifacts in Google Artifact Registry.')
end
def self.to_param
......
......@@ -8,7 +8,7 @@ class Client < ::GoogleCloudPlatform::BaseClient
include Gitlab::Utils::StrongMemoize
DEFAULT_PAGE_SIZE = 10
ARTIFACT_REGISTRY_INTEGRATION_DISABLED = 'The Google Cloud Artifact Registry project integration is disabled'
ARTIFACT_REGISTRY_INTEGRATION_DISABLED = 'The Google Artifact Registry project integration is disabled'
# Initialize and build a new ArtifactRegistry client.
# This will use glgo and a workload identity federation instance to exchange
......
......@@ -12,7 +12,7 @@
end
it 'activates integration', :js do
visit_project_integration('Google Cloud Artifact Registry')
visit_project_integration('Google Artifact Registry')
expect(page).not_to have_link('View artifacts')
......@@ -25,7 +25,7 @@
click_save_integration
expect(page).to have_content('Google Cloud Artifact Registry settings saved and active.')
expect(page).to have_content('Google Artifact Registry settings saved and active.')
expect(page).to have_link('View artifacts')
end
......
......@@ -17,7 +17,7 @@
it 'raises the error' do
expect do
mapping
end.to raise_error(Gitlab::Graphql::Errors::BaseError, 'Unsupported Google Cloud Artifact Registry type Hash')
end.to raise_error(Gitlab::Graphql::Errors::BaseError, 'Unsupported Google Artifact Registry type Hash')
end
end
end
......
......@@ -17,7 +17,7 @@
it 'raises the error' do
expect do
mapping
end.to raise_error(Gitlab::Graphql::Errors::BaseError, 'Unsupported Google Cloud Artifact Registry type Hash')
end.to raise_error(Gitlab::Graphql::Errors::BaseError, 'Unsupported Google Artifact Registry type Hash')
end
end
end
......
......@@ -5,7 +5,7 @@
RSpec.describe GitlabSchema.types['GoogleCloudArtifactRegistryDockerImageDetails'], feature_category: :container_registry do
specify do
expect(described_class.description)
.to eq('Represents details about docker artifact of Google Cloud Artifact Registry')
.to eq('Represents details about docker artifact of Google Artifact Registry')
end
it 'includes all expected fields' do
......
......@@ -4,7 +4,7 @@
RSpec.describe GitlabSchema.types['GoogleCloudArtifactRegistryDockerImage'], feature_category: :container_registry do
specify do
expect(described_class.description).to eq('Represents a docker artifact of Google Cloud Artifact Registry')
expect(described_class.description).to eq('Represents a docker artifact of Google Artifact Registry')
end
it 'includes all expected fields' do
......
......@@ -4,7 +4,7 @@
RSpec.describe GitlabSchema.types['GoogleCloudArtifactRegistryRepository'], feature_category: :container_registry do
specify do
expect(described_class.description).to eq('Represents a repository of Google Cloud Artifact Registry')
expect(described_class.description).to eq('Represents a repository of Google Artifact Registry')
end
it 'includes all expected fields' do
......
......@@ -55,10 +55,10 @@
end
end
context 'with Google Cloud Artifact Registry integration' do
context 'with Google Artifact Registry integration' do
let_it_be_with_refind(:integration) { create(:google_cloud_platform_artifact_registry_integration, project: project) }
it 'includes Google Cloud Artifact Registry fields' do
it 'includes Google Artifact Registry fields' do
is_expected.to include(
artifact_registry_path: project_google_cloud_platform_artifact_registry_index_path(project),
operating: 'true'
......
......@@ -42,14 +42,14 @@
describe '.title' do
subject { described_class.title }
it { is_expected.to eq(s_('GoogleCloudPlatformService|Google Cloud Artifact Registry')) }
it { is_expected.to eq(s_('GoogleCloudPlatformService|Google Artifact Registry')) }
end
describe '.description' do
subject { described_class.description }
it do
is_expected.to eq(s_('GoogleCloudPlatformService|Connect Google Cloud Artifact Registry to GitLab.'))
is_expected.to eq(s_('GoogleCloudPlatformService|Manage your artifacts in Google Artifact Registry.'))
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment