some optimizations for cert.go #9404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ls0f <lovedboy.tk@qq.com>
Codecov Report
@@ Coverage Diff @@
## master #9404 +/- ##
==========================================
- Coverage 46.19% 45.76% -0.43%
==========================================
Files 218 220 +2
Lines 25917 26164 +247
==========================================
+ Hits 11972 11975 +3
- Misses 12290 12531 +241
- Partials 1655 1658 +3
Continue to review full report at Codecov.
|
|
@ls0f Can we add some description to the PR for the need of the change? |
ls0f
commented
May 17, 2022
| @@ -100,11 +99,10 @@ func GetTLSCertificateDataPath() string { | |||
| // filesystem. If ARGOCD_SSH_DATA_PATH environment is set, path is taken from | |||
| // there, otherwise the default will be returned. | |||
| func GetSSHKnownHostsDataPath() string { | |||
| envPath := os.Getenv(common.EnvVarSSHDataPath) | |||
| if envPath != "" { | |||
| return envPath + "/" + common.DefaultSSHKnownHostsName | |||
There was a problem hiding this comment.
use filepath.Join to get the final dst path
ls0f
commented
May 17, 2022
| @@ -332,7 +327,7 @@ func GetCertificateForConnect(serverName string) ([]string, error) { | |||
| // mount. This function makes sure that the path returned actually contain | |||
| // at least one valid certificate, and no invalid data. | |||
| func GetCertBundlePathForRepository(serverName string) (string, error) { | |||
There was a problem hiding this comment.
use filepath.Join to get the final dst path too.
ls0f
commented
May 17, 2022
| @@ -302,9 +300,6 @@ func ServerNameWithoutPort(serverName string) string { | |||
| // consider it an error and just return empty data. | |||
| func GetCertificateForConnect(serverName string) ([]string, error) { | |||
| dataPath := GetTLSCertificateDataPath() | |||
| if !strings.HasSuffix(dataPath, "/") { | |||
There was a problem hiding this comment.
since use file path to combine dir, it's unnecessary
i will update |
ls0f
commented
May 17, 2022
| @@ -88,8 +88,7 @@ func IsValidHostname(hostname string, fqdn bool) bool { | |||
| // filesystem. If ARGOCD_TLS_DATA_PATH environment is set, path is taken from | |||
| // there, otherwise the default will be returned. | |||
| func GetTLSCertificateDataPath() string { | |||
| envPath := os.Getenv(common.EnvVarTLSDataPath) | |||
| if envPath != "" { | |||
There was a problem hiding this comment.
more clean code i think
ishitasequeira
approved these changes
May 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.