diff --git a/app/graphql/types/release_type.rb b/app/graphql/types/release_type.rb index 26b47c191ca30413bd642ffbe6e57e34aa96169f..632351be5d325fe1c02f65dd864dbcc0cbb5d601 100644 --- a/app/graphql/types/release_type.rb +++ b/app/graphql/types/release_type.rb @@ -19,8 +19,6 @@ class ReleaseType < BaseObject markdown_field :description_html, null: true field :name, GraphQL::STRING_TYPE, null: true, description: 'Name of the release' - field :evidence_sha, GraphQL::STRING_TYPE, null: true, - description: "SHA of the release's evidence" field :created_at, Types::TimeType, null: true, description: 'Timestamp of when the release was created' field :released_at, Types::TimeType, null: true, diff --git a/app/models/release.rb b/app/models/release.rb index 403087a2cadec395f684014347ffd418b7faa0fd..20f34e9286f40adc809624e6ec9532d2d324f414 100644 --- a/app/models/release.rb +++ b/app/models/release.rb @@ -81,14 +81,6 @@ def milestone_titles self.milestones.map {|m| m.title }.sort.join(", ") end - def evidence_sha - evidences.first&.summary_sha - end - - def evidence_summary - evidences.first&.summary || {} - end - private def actual_sha diff --git a/app/presenters/release_presenter.rb b/app/presenters/release_presenter.rb index 3db89df1cc8ea7e6d41bf559bd0ac3b133e06fcc..ea46f0a234b62b6e362ef41d536dce65e5e4afb6 100644 --- a/app/presenters/release_presenter.rb +++ b/app/presenters/release_presenter.rb @@ -43,13 +43,6 @@ def edit_url edit_project_release_url(project, release) end - def evidence_file_path - evidence = release.evidences.first - return unless evidence - - project_evidence_url(project, release, evidence, format: :json) - end - private def can_download_code? diff --git a/changelogs/unreleased/213678-remove-deprecated-release-evidence-endpoints.yml b/changelogs/unreleased/213678-remove-deprecated-release-evidence-endpoints.yml new file mode 100644 index 0000000000000000000000000000000000000000..80bb68c4e85c771e1075634567c513a109017935 --- /dev/null +++ b/changelogs/unreleased/213678-remove-deprecated-release-evidence-endpoints.yml @@ -0,0 +1,5 @@ +--- +title: Remove deprecated Release Evidence endpoints +merge_request: 30975 +author: +type: removed diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 7188a65651602aa84008b1aeb75baaf00a0414dd..baa3db6d15ee0653078cfc9066552a8aff903608 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -8376,11 +8376,6 @@ type Release { """ descriptionHtml: String - """ - SHA of the release's evidence - """ - evidenceSha: String - """ Milestones associated to the release """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index c8771091249d1c63a2d86677e949c67d9c8fc219..9955ff48608043e6f470194e4547b49d43eca92f 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -24597,20 +24597,6 @@ "isDeprecated": false, "deprecationReason": null }, - { - "name": "evidenceSha", - "description": "SHA of the release's evidence", - "args": [ - - ], - "type": { - "kind": "SCALAR", - "name": "String", - "ofType": null - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "milestones", "description": "Milestones associated to the release", diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index cd7737ea0a95a40938ff11f9b91ed2689faa0b3f..c8eb8253dd4858a9fe796fb90f61bb754c2461bd 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1166,7 +1166,6 @@ Information about pagination in a connection. | `createdAt` | Time | Timestamp of when the release was created | | `description` | String | Description (also known as "release notes") of the release | | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` | -| `evidenceSha` | String | SHA of the release's evidence | | `name` | String | Name of the release | | `releasedAt` | Time | Timestamp of when the release was released | | `tagName` | String! | Name of the tag associated with the release | diff --git a/lib/api/entities/release.rb b/lib/api/entities/release.rb index edcd9bc6505f2361d36e96e2423c7bc5b3a21082..99fa496d368664179bb7a1bc9df23f0fd4c9db0e 100644 --- a/lib/api/entities/release.rb +++ b/lib/api/entities/release.rb @@ -21,7 +21,6 @@ class Release < Grape::Entity expose :milestones, using: Entities::MilestoneWithStats, if: -> (release, _) { release.milestones.present? && can_read_milestone? } expose :commit_path, expose_nil: false expose :tag_path, expose_nil: false - expose :evidence_sha, expose_nil: false, if: ->(_, _) { can_download_code? } expose :assets do expose :assets_count, as: :count do |release, _| @@ -32,7 +31,6 @@ class Release < Grape::Entity expose :links, using: Entities::Releases::Link do |release, options| release.links.sorted end - expose :evidence_file_path, expose_nil: false, if: ->(_, _) { can_download_code? } end expose :evidences, using: Entities::Releases::Evidence, expose_nil: false, if: ->(_, _) { can_download_code? } expose :_links do diff --git a/spec/graphql/types/release_type_spec.rb b/spec/graphql/types/release_type_spec.rb index e68b8cd549db3f1e3c82e96fe44b33190d50d1ed..d22a0b4f0fac003cf6d679fb7dd38c899481a46d 100644 --- a/spec/graphql/types/release_type_spec.rb +++ b/spec/graphql/types/release_type_spec.rb @@ -9,7 +9,7 @@ expected_fields = %w[ tag_name tag_path description description_html - name evidence_sha milestones author commit + name milestones author commit created_at released_at ] diff --git a/spec/models/release_spec.rb b/spec/models/release_spec.rb index 8b1b738ab58b16ff5080ce2f6a33bd404562dcea..0d87c27b6351d694c1c7cb4fa86d60017889b333 100644 --- a/spec/models/release_spec.rb +++ b/spec/models/release_spec.rb @@ -143,38 +143,6 @@ end end - describe '#evidence_sha' do - subject { release.evidence_sha } - - context 'when a release was created before evidence collection existed' do - let!(:release) { create(:release) } - - it { is_expected.to be_nil } - end - - context 'when a release was created with evidence collection' do - let!(:release) { create(:release, :with_evidence) } - - it { is_expected.to eq(release.evidences.first.summary_sha) } - end - end - - describe '#evidence_summary' do - subject { release.evidence_summary } - - context 'when a release was created before evidence collection existed' do - let!(:release) { create(:release) } - - it { is_expected.to eq({}) } - end - - context 'when a release was created with evidence collection' do - let!(:release) { create(:release, :with_evidence) } - - it { is_expected.to eq(release.evidences.first.summary) } - end - end - describe '#milestone_titles' do let(:release) { create(:release, :with_milestones) }