Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Fix for 2 vulnerabilities #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem "climate_control", "~> 0.2.0"
# A tool for integrating Coveralls.io with Ruby apps.
gem "coveralls", "~> 0.8.13"
# Automates code review chores.
gem "danger", "~> 8.0"
gem "danger", "~> 9.0", ">= 9.0.0"
# Plugin for Danger that reports JUnit test results.
gem "danger-junit", "~> 1.0"
# A fake filesystem.
Expand Down Expand Up @@ -38,19 +38,19 @@ gem "rspec", "~> 3.10"
# Formatter for RSpec to generate JUnit compatible reports.
gem "rspec_junit_formatter", "~> 0.4.1"
# A Ruby static code analyzer and formatter.
gem "rubocop", Fastlane::RUBOCOP_REQUIREMENT
gem "rubocop", ">= 1.51.0", Fastlane::RUBOCOP_REQUIREMENT
# A collection of RuboCop cops for performance optimizations.
gem "rubocop-performance"
gem "rubocop-performance", ">= 1.11.0"
# A RuboCop extension focused on enforcing tools.
gem "rubocop-require_tools"
# Used to mock servers.
gem "sinatra", [">= 2.2.3", "< 3.0"]
# A library for stubbing and setting expectations on HTTP requests.
gem "webmock", "~> 3.18"
gem "webmock", "~> 3.19", ">= 3.19.0"
# Needed for running xcode-install related tests.
gem "xcode-install", ">= 2.6.7"
gem "xcode-install", ">= 2.7.0"
# Used for xcov's parameters generation: https://github.com/fastlane/fastlane/pull/12416
gem "xcov", "~> 1.4.1"
gem "xcov", "~> 1.5.0"
# A documentation generation tool for Ruby.
gem "yard", "~> 0.9.11"

Expand Down
2 changes: 1 addition & 1 deletion match/lib/match/nuke.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def spaceship_login
Spaceship::ConnectAPI.login(params[:username], use_portal: true, use_tunes: false, portal_team_id: params[:team_id], team_name: params[:team_name])
end

if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise")
if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise") && !params[:force_nuke_dist_certs]
UI.error("---")
UI.error("⚠️ Warning: This seems to be an Enterprise account!")
unless self.safe_remove_certs
Expand Down
5 changes: 5 additions & 0 deletions match/lib/match/options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ def self.available_options
description: "Disables confirmation prompts during nuke, answering them with yes",
type: Boolean,
default_value: false),
FastlaneCore::ConfigItem.new(key: :force_nuke_dist_certs,
env_name: "MATCH_FORCE_NUKE_DIST_CERTS",
description: "Force nuke distribution and enterprise in-house certs. This will cause apps built with these certs to stop working",
type: Boolean,
default_value: false),
FastlaneCore::ConfigItem.new(key: :safe_remove_certs,
env_name: "MATCH_SAFE_REMOVE_CERTS",
description: "Remove certs from repository during nuke without revoking them on the developer portal",
Expand Down