diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-07 09:09:19 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-07 10:03:45 +0300 |
| commit | 45576774a0d96624902c7a17943ce85054fb495f (patch) | |
| tree | e87dfb03a48f194cfe7c70214af745b623797419 | |
| parent | 678ce9a9acc6ef4aa0d56d24c41caec8c6fec219 (diff) | |
gitaly/config: Remove deprecated `self_signed_cert` configurationpks-upgrade-gitlab-shell-v14
Remove the deprecated `self_signed_certs` configuration that was used by
gitlab-shell. The project had already gone through the deprecation flow,
and we have no way of passing that parameter to it anymore. So let's
remove it without replacement.
| -rw-r--r-- | internal/git/smudge/config_test.go | 4 | ||||
| -rw-r--r-- | internal/gitaly/config/config.go | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/internal/git/smudge/config_test.go b/internal/git/smudge/config_test.go index e2299b763..0266066ff 100644 --- a/internal/git/smudge/config_test.go +++ b/internal/git/smudge/config_test.go @@ -18,7 +18,6 @@ func TestConfigFromEnvironment(t *testing.T) { Password: "correcthorsebatterystaple", CAFile: "/ca/file", CAPath: "/ca/path", - SelfSigned: true, }, SecretFile: "/secret/path", } @@ -157,7 +156,6 @@ func TestConfig_Environment(t *testing.T) { Password: "correcthorsebatterystaple", CAFile: "/ca/file", CAPath: "/ca/path", - SelfSigned: true, }, SecretFile: "/secret/path", }, @@ -169,5 +167,5 @@ func TestConfig_Environment(t *testing.T) { env, err := cfg.Environment() require.NoError(t, err) - require.Equal(t, `GITALY_LFS_SMUDGE_CONFIG={"gl_repository":"repo","gitlab":{"url":"https://example.com","relative_url_root":"gitlab","http_settings":{"read_timeout":1,"user":"user","password":"correcthorsebatterystaple","ca_file":"/ca/file","ca_path":"/ca/path","self_signed_cert":true},"secret_file":"/secret/path"},"tls":{"cert_path":"/cert/path","key_path":"/key/path"},"driver_type":0}`, env) + require.Equal(t, `GITALY_LFS_SMUDGE_CONFIG={"gl_repository":"repo","gitlab":{"url":"https://example.com","relative_url_root":"gitlab","http_settings":{"read_timeout":1,"user":"user","password":"correcthorsebatterystaple","ca_file":"/ca/file","ca_path":"/ca/path"},"secret_file":"/secret/path"},"tls":{"cert_path":"/cert/path","key_path":"/key/path"},"driver_type":0}`, env) } diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index 29718876f..bb930d906 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -98,7 +98,6 @@ type HTTPSettings struct { Password string `toml:"password" json:"password"` CAFile string `toml:"ca_file" json:"ca_file"` CAPath string `toml:"ca_path" json:"ca_path"` - SelfSigned bool `toml:"self_signed_cert" json:"self_signed_cert"` } // Git contains the settings for the Git executable |