kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-04-22 06:08:26 +00:00
parent dc3735fabb
commit 675e3de0be
18 changed files with 192 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/pages/issuable.scss
View File

@ -130,6 +130,7 @@
bottom: var(--review-bar-height, 0px);
right: 0;
transition: width $sidebar-transition-duration;
background-color: $white;
z-index: 200;
overflow: hidden;

35
app/graphql/mutations/clusters/agent_tokens/delete.rb
View File

@ -1,35 +0,0 @@
# frozen_string_literal: true
module Mutations
module Clusters
module AgentTokens
class Delete < BaseMutation
graphql_name 'ClusterAgentTokenDelete'
authorize :admin_cluster
TokenID = ::Types::GlobalIDType[::Clusters::AgentToken]
argument :id, TokenID,
required: true,
description: 'Global ID of the cluster agent token that will be deleted.'
def resolve(id:)
token = authorized_find!(id: id)
token.destroy
{ errors: errors_on_object(token) }
end
private
def find_object(id:)
# TODO: remove this line when the compatibility layer is removed
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/257883
id = TokenID.coerce_isolated_input(id)
GitlabSchema.find_by_gid(id)
end
end
end
end
end

3
app/graphql/types/deprecated_mutations.rb
View File

@ -5,8 +5,7 @@ module Types
extend ActiveSupport::Concern
prepended do
mount_mutation Mutations::Clusters::AgentTokens::Delete,
deprecated: { reason: 'Tokens must be revoked with ClusterAgentTokenRevoke', milestone: '14.7' }
# placeholder for any FOSS mutations to be deprecated
end
end
end

2
app/models/clusters/platforms/kubernetes.rb
View File

@ -322,7 +322,7 @@ module Clusters
class: error.class.name,
message: error.message
},
status_code: error.error_code,
status_code: error.try(:error_code),
namespace: self.namespace,
class_name: self.class.name,
event: :kube_connection_error

46
data/whats_new/202204210001_14_10.yml Normal file
View File

@ -0,0 +1,46 @@
- title: "Compliance report individual violation reporting"
body: |
The compliance report now reports every individual merge request violation for the projects within a group. This is a huge improvement over the previous version, which only showed the latest MR that had one or more violations. The new version allows you to see history and patterns of violations over time.
stage: manage
self-managed: true
gitlab-com: true
packages: [Ultimate]
url: 'https://docs.gitlab.com/ee/user/compliance/compliance_report/'
image_url: 'https://about.gitlab.com/images/14_10/manage_compliance_report_individual_violation.png'
published_at: 2022-04-22
release: 14.10
- title: "Improved pipeline variables inheritance"
body: |
Previously, it was possible to pass some CI/CD variables to a downstream pipeline through a trigger job, but variables added in manual pipeline runs or by using the API could not be forwarded.
In this release we've added a new `trigger:forward` keyword to control what things you forward to downstream parent-child pipelines or multi-project pipelines, which provides a flexible way to handle variable inheritance in downstream pipelines.
stage: verify
self-managed: true
gitlab-com: true
packages: [Free, Premium, Ultimate]
url: 'https://docs.gitlab.com/ee/ci/yaml/#triggerforward'
image_url: 'https://about.gitlab.com/images/growth/verify.png'
published_at: 2022-04-22
release: 14.10
- title: "Escalating manually created incidents"
body: |
In GitLab 13.10, we [released](https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/-/issues/6) the GitLab Runner Operator for the Red Hat OpenShift container platform for Kubernetes. That release provided OpenShift users with the automation and management capabilities of the Operator Framework and simplified the ongoing management of runners in an OpenShift Kubernetes cluster. Available starting in 14.10 is a GitLab Runner Operator v1.7.0 that you can use in non-OpenShift Kubernetes clusters. This GitLab Runner Operator is available on [OperatorHub.io](https://operatorhub.io/operator/gitlab-runner-operator).
stage: monitor
self-managed: true
gitlab-com: true
packages: [Premium, Ultimate]
url: 'https://docs.gitlab.com/ee/operations/incident_management/paging.html#escalating-an-incident'
image_url: 'https://about.gitlab.com/images/14_10/manually_escalated_incident.png'
published_at: 2022-04-22
release: 14.10
- title: "Expanded view of group runners"
body: |
Group runners are now displayed in an expanded view, where you can more easily administer and manage the runners associated with the namespace. To view the new UI, on the left sidebar, select **CI/CD**. This view includes the number of online, offline, and stale runners associated with the group and subgroups.
stage: verify
self-managed: true
gitlab-com: true
packages: [Free, Premium, Ultimate]
url: 'https://docs.gitlab.com/ee/ci/runners/runners_scope.html#group-runners'
image_url: 'https://about.gitlab.com/images/14_10/group-runners-view-new-3.pn'
published_at: 2022-04-22
release: 14.10

54
db/fixtures/development/34_uploads.rb Normal file
View File

@ -0,0 +1,54 @@
# frozen_string_literal: true
# This seeder seeds comments as well, because uploads are not relevant by
# themselves
Gitlab::Seeder.quiet do
upload_seed_total_limit = 50
upload_seed_individual_limit = upload_seed_total_limit / 10
Issue.limit(upload_seed_individual_limit).find_each do |issue|
project = issue.project
project.team.users.limit(upload_seed_individual_limit).each do |user|
file = CarrierWaveStringFile.new_file(
file_content: "seeded upload file in project #{project.full_path}, issue #{issue.iid}",
filename: 'seeded_upload.txt',
content_type: 'text/plain'
)
uploader = UploadService.new(project, file, FileUploader).execute
note_params = {
noteable_type: 'Issue',
noteable_id: issue.id,
note: "Seeded upload: #{uploader.to_h[:markdown]}",
}
Notes::CreateService.new(project, user, note_params).execute
print '.'
end
end
MergeRequest.limit(upload_seed_individual_limit).find_each do |mr|
project = mr.project
project.team.users.limit(upload_seed_individual_limit).each do |user|
file = CarrierWaveStringFile.new_file(
file_content: "seeded upload file in project #{project.full_path}, MR #{mr.iid}",
filename: 'seeded_upload.txt',
content_type: 'text/plain'
)
uploader = UploadService.new(project, file, FileUploader).execute
note_params = {
noteable_type: 'MergeRequest',
noteable_id: mr.id,
note: "Seeded upload: #{uploader.to_h[:markdown]}",
}
Notes::CreateService.new(project, user, note_params).execute
print '.'
end
end
end

11
db/migrate/20220406133049_add_delayed_group_deletion_to_application_settings.rb Normal file
View File

@ -0,0 +1,11 @@
# frozen_string_literal: true
class AddDelayedGroupDeletionToApplicationSettings < Gitlab::Database::Migration[1.0]
def up
add_column :application_settings, :delayed_group_deletion, :boolean, default: true, null: false
end
def down
remove_column :application_settings, :delayed_group_deletion
end
end

21
db/migrate/20220413054910_backfill_delayed_group_deletion.rb Normal file
View File

@ -0,0 +1,21 @@
# frozen_string_literal: true
class BackfillDelayedGroupDeletion < Gitlab::Database::Migration[1.0]
class ApplicationSetting < ActiveRecord::Base
self.table_name = 'application_settings'
end
def up
ApplicationSetting.reset_column_information
ApplicationSetting.find_each do |application_setting|
application_setting.update!(delayed_group_deletion: application_setting.deletion_adjourned_period > 0)
end
end
def down
ApplicationSetting.reset_column_information
ApplicationSetting.update_all(delayed_group_deletion: true)
end
end

1
db/schema_migrations/20220406133049 Normal file
View File

@ -0,0 +1 @@
bfd9afc3245a311f905548c18535a2d4216b3973b505b1e3217037e4c0a39a2e

1
db/schema_migrations/20220413054910 Normal file
View File

@ -0,0 +1 @@
5d386a9eb1602afcaf44442c5696e03721a265cf104564258f4adee60b70b0f2

1
db/structure.sql
View File

@ -11274,6 +11274,7 @@ CREATE TABLE application_settings (
inactive_projects_delete_after_months integer DEFAULT 2 NOT NULL,
inactive_projects_min_size_mb integer DEFAULT 0 NOT NULL,
inactive_projects_send_warning_email_after_months integer DEFAULT 1 NOT NULL,
delayed_group_deletion boolean DEFAULT true NOT NULL,
CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
CONSTRAINT app_settings_ext_pipeline_validation_service_url_text_limit CHECK ((char_length(external_pipeline_validation_service_url) <= 255)),

22
doc/api/graphql/reference/index.md
View File

@ -973,28 +973,6 @@ Input type: `ClusterAgentTokenCreateInput`
| <a id="mutationclusteragenttokencreatesecret"></a>`secret` | [`String`](#string) | Token secret value. Make sure you save it - you won't be able to access it again. |
| <a id="mutationclusteragenttokencreatetoken"></a>`token` | [`ClusterAgentToken`](#clusteragenttoken) | Token created after mutation. |
### `Mutation.clusterAgentTokenDelete`
WARNING:
**Deprecated** in 14.7.
Tokens must be revoked with ClusterAgentTokenRevoke.
Input type: `ClusterAgentTokenDeleteInput`
#### Arguments
| Name | Type | Description |
| ---- | ---- | ----------- |
| <a id="mutationclusteragenttokendeleteclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
| <a id="mutationclusteragenttokendeleteid"></a>`id` | [`ClustersAgentTokenID!`](#clustersagenttokenid) | Global ID of the cluster agent token that will be deleted. |
#### Fields
| Name | Type | Description |
| ---- | ---- | ----------- |
| <a id="mutationclusteragenttokendeleteclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
| <a id="mutationclusteragenttokendeleteerrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
### `Mutation.clusterAgentTokenRevoke`
Input type: `ClusterAgentTokenRevokeInput`

10
doc/api/graphql/removed_items.md
View File

@ -10,6 +10,16 @@ GraphQL is a versionless API, unlike the REST API.
Occasionally, items have to be updated or removed from the GraphQL API.
According to our [process for removing items](index.md#deprecation-and-removal-process), here are the items that have been removed.
## GitLab 15.0
Fields [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85382) in GitLab 15.0:
### GraphQL Mutations
| Argument name | Mutation | Deprecated in | Use instead |
| -------------------- | -------------------- | ------------- | -------------------------- |
| - | `clusterAgentTokenDelete`| 14.7 | `clusterAgentTokenRevoke` |
## GitLab 14.0
Fields [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63293) in GitLab 14.0:

9
doc/api/settings.md
View File

@ -103,7 +103,7 @@ Example response:
```
Users on [GitLab Premium or Ultimate](https://about.gitlab.com/pricing/) may also see
the `file_template_project_id`, `delayed_project_deletion`, `deletion_adjourned_period`, or the `geo_node_allowed_ips` parameters:
the `file_template_project_id`, `delayed_project_deletion`, `delayed_group_deletion`, `deletion_adjourned_period`, or the `geo_node_allowed_ips` parameters:
```json
{
@ -112,6 +112,7 @@ the `file_template_project_id`, `delayed_project_deletion`, `deletion_adjourned_
"file_template_project_id": 1,
"geo_node_allowed_ips": "0.0.0.0/0, ::/0",
"delayed_project_deletion": false,
"delayed_group_deletion": false,
"deletion_adjourned_period": 7,
...
}
@ -216,7 +217,8 @@ these parameters:
- `file_template_project_id`
- `geo_node_allowed_ips`
- `geo_status_timeout`
- `delayed_project_delection`
- `delayed_project_deletion`
- `delayed_group_deletion`
- `deletion_adjourned_period`
Example responses: **(PREMIUM SELF)**
@ -274,8 +276,9 @@ listed in the descriptions of the relevant settings.
| `default_projects_limit` | integer | no | Project limit per user. Default is `100000`. |
| `default_snippet_visibility` | string | no | What visibility level new snippets receive. Can take `private`, `internal` and `public` as a parameter. Default is `private`. |
| `delayed_project_deletion` **(PREMIUM SELF)** | boolean | no | Enable delayed project deletion by default in new groups. Default is `false`. |
| `delayed_group_deletion` **(PREMIUM SELF)** | boolean | no | Enable delayed group deletion by default in new groups. Requires both `delayed_group_deletion` to be true and `deletion_adjourned_period` to be greater than 0. Default is `true`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352959) in GitLab 15.0. |
| `delete_inactive_projects` | boolean | no | Enable inactive project deletion feature. Default is `false`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. |
| `deletion_adjourned_period` **(PREMIUM SELF)** | integer | no | The number of days to wait before deleting a project or group that is marked for deletion. Value must be between 0 and 90.
| `deletion_adjourned_period` **(PREMIUM SELF)** | integer | no | The number of days to wait before deleting a project or group that is marked for deletion. Value must be between 0 and 90. On every update, a hook on `deletion_adjourned_period` sets the value of `delayed_group_deletion` to `true` if `deletion_adjourned_period` is greater than 0 and `false` if `deletion_adjourned_period` is 0.
| `diff_max_patch_bytes` | integer | no | Maximum [diff patch size](../user/admin_area/diff_limits.md), in bytes. |
| `diff_max_files` | integer | no | Maximum [files in a diff](../user/admin_area/diff_limits.md). |
| `diff_max_lines` | integer | no | Maximum [lines in a diff](../user/admin_area/diff_limits.md). |

8
doc/user/clusters/agent/repository.md
View File

@ -128,7 +128,7 @@ To remove an agent from the UI:
}
```
1. Remove an agent record with GraphQL by deleting the `clusterAgentToken`.
1. Remove an agent record with GraphQL by deleting the `clusterAgent`.
```graphql
mutation deleteAgent {
@ -136,12 +136,6 @@ To remove an agent from the UI:
errors
}
}
mutation deleteToken {
clusterAgentTokenDelete(input: { id: "<cluster-agent-token-id>" }) {
errors
}
}
```
1. Verify whether the removal occurred successfully. If the output in the Pod logs includes `unauthenticated`, it means that the agent was successfully removed:

52
spec/graphql/mutations/clusters/agent_tokens/delete_spec.rb
View File

@ -1,52 +0,0 @@
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Mutations::Clusters::AgentTokens::Delete do
let(:token) { create(:cluster_agent_token) }
let(:user) { create(:user) }
let(:mutation) do
described_class.new(
object: double,
context: { current_user: user },
field: double
)
end
it { expect(described_class.graphql_name).to eq('ClusterAgentTokenDelete') }
it { expect(described_class).to require_graphql_authorizations(:admin_cluster) }
describe '#resolve' do
let(:global_id) { token.to_global_id }
subject { mutation.resolve(id: global_id) }
context 'without user permissions' do
it 'fails to delete the cluster agent', :aggregate_failures do
expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
expect { token.reload }.not_to raise_error
end
end
context 'with user permissions' do
before do
token.agent.project.add_maintainer(user)
end
it 'deletes a cluster agent', :aggregate_failures do
expect { subject }.to change { ::Clusters::AgentToken.count }.by(-1)
expect { token.reload }.to raise_error(ActiveRecord::RecordNotFound)
end
end
context 'with invalid params' do
let(:global_id) { token.id }
it 'raises an error if the cluster agent id is invalid', :aggregate_failures do
expect { subject }.to raise_error(::GraphQL::CoercionError)
expect { token.reload }.not_to raise_error
end
end
end
end

8
spec/graphql/types/mutation_type_spec.rb
View File

@ -7,14 +7,6 @@ RSpec.describe Types::MutationType do
expect(described_class).to have_graphql_mutation(Mutations::MergeRequests::SetDraft)
end
describe 'deprecated mutations' do
describe 'clusterAgentTokenDelete' do
let(:field) { get_field('clusterAgentTokenDelete') }
it { expect(field.deprecation_reason).to eq('Tokens must be revoked with ClusterAgentTokenRevoke. Deprecated in 14.7.') }
end
end
def get_field(name)
described_class.fields[GraphqlHelpers.fieldnamerize(name)]
end

52
spec/models/clusters/platforms/kubernetes_spec.rb
View File

@ -450,6 +450,42 @@ RSpec.describe Clusters::Platforms::Kubernetes do
it { is_expected.to be_nil }
end
context 'when there are ignored K8s connections errors' do
described_class::IGNORED_CONNECTION_EXCEPTIONS.each do |exception|
context "#{exception}" do
before do
exception_args = ['arg1']
exception_args.push('arg2', 'arg3') if exception.name == 'Kubeclient::HttpError'
exception_instance = exception.new(*exception_args)
allow_next_instance_of(Gitlab::Kubernetes::KubeClient) do |kube_client|
allow(kube_client).to receive(:get_pods).with(namespace: namespace).and_raise(exception_instance)
allow(kube_client).to receive(:get_deployments).with(namespace: namespace).and_raise(exception_instance)
allow(kube_client).to receive(:get_ingresses).with(namespace: namespace).and_raise(exception_instance)
end
end
it 'does not raise error' do
expect { subject }.not_to raise_error
end
it 'returns empty array for the K8s component keys' do
expect(subject).to include({ pods: [], deployments: [], ingresses: [] })
end
it 'logs the error' do
expect_next_instance_of(Gitlab::Kubernetes::Logger) do |logger|
expect(logger).to receive(:error)
.with(hash_including(event: :kube_connection_error))
.and_call_original
end
subject
end
end
end
end
context 'when kubernetes responds with 500s' do
before do
stub_kubeclient_pods(namespace, status: 500)
@ -457,23 +493,9 @@ RSpec.describe Clusters::Platforms::Kubernetes do
stub_kubeclient_ingresses(namespace, status: 500)
end
it 'does not raise error' do
it 'does not raise kubeclient http error' do
expect { subject }.not_to raise_error(Kubeclient::HttpError)
end
it 'logs the error' do
expect_next_instance_of(Gitlab::Kubernetes::Logger) do |logger|
expect(logger).to receive(:error)
.with(hash_including(event: :kube_connection_error))
.and_call_original
end
subject
end
it 'returns empty array for the k8s component keys' do
expect(subject).to include({ pods: [], deployments: [], ingresses: [] })
end
end
context 'when kubernetes responds with 404s' do