summaryrefslogtreecommitdiff
path: root/workhorse/internal/secret/secret.go
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
commit0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch)
tree7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /workhorse/internal/secret/secret.go
parent72123183a20411a36d607d70b12d57c484394c8e (diff)
downloadgitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'workhorse/internal/secret/secret.go')
-rw-r--r--workhorse/internal/secret/secret.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/workhorse/internal/secret/secret.go b/workhorse/internal/secret/secret.go
index e8c7c25393c..664f07a52c0 100644
--- a/workhorse/internal/secret/secret.go
+++ b/workhorse/internal/secret/secret.go
@@ -3,7 +3,7 @@ package secret
import (
"encoding/base64"
"fmt"
- "io/ioutil"
+ "os"
"sync"
)
@@ -57,7 +57,7 @@ func setBytes() ([]byte, error) {
return theSecret.bytes, nil
}
- base64Bytes, err := ioutil.ReadFile(theSecret.path)
+ base64Bytes, err := os.ReadFile(theSecret.path)
if err != nil {
return nil, fmt.Errorf("secret.setBytes: read %q: %v", theSecret.path, err)
}