Skip to content

spline #906 Admin: Remove deprecated '-k', '--insecure' keys #950

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.

Sign up for GitHub

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

Merged
wajda merged 1 commit into from
Sep 1, 2021
Merged

spline #906 Admin: Remove deprecated '-k', '--insecure' keys #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions admin/src/main/scala/za/co/absa/spline/admin/AdminCLI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ class AdminCLI(dbManagerFactory: ArangoManagerFactory) {
action ((str, conf) => conf.copy(logLevel = Level.valueOf(str))))
}

// FIXME: Deprecated since Spline 0.6.1. To be removed in Spline 1.0.0 - https://github.com/AbsaOSS/spline/issues/906
(opt[Unit]('k', "insecure")
text s"Deprecated. See --disable-ssl-validation"
action { case (_, conf) => conf.copy(disableSslValidation = true) })

(opt[Unit]("disable-ssl-validation")
text s"Disable validation of self-signed SSL certificates. (Don't use on production)."
action { case (_, conf) => conf.copy(disableSslValidation = true) })
Expand Down
6 changes: 3 additions & 3 deletions admin/src/test/scala/za/co/absa/spline/admin/AdminCLISpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ class AdminCLISpec
} should include("--help")
}

it should "when called with option -k, create a non-validating SSLContext" in {
cli.exec(Array("db-exec", "arangodbs://foo/bar", "-k"))
it should "when called with option --disable-ssl-validation, create a non-validating SSLContext" in {
cli.exec(Array("db-exec", "arangodbs://foo/bar", "--disable-ssl-validation"))
sslCtxCaptor.getValue.nonEmpty should be(true)
sslCtxCaptor.getValue.get should be(TLSUtils.TrustingAllSSLContext)
}

it should "when called without option -k, do not create any custom SSLContext (leave default one)" in {
it should "not create any custom SSLContext (leave the default one) by default" in {
cli.exec(Array("db-exec", "arangodbs://foo/bar"))
sslCtxCaptor.getValue.isEmpty should be(true)
}
Expand Down