summaryrefslogtreecommitdiff
path: root/cmd/gitlab-shell
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-04-27 13:01:10 +0400
committerIgor Drozdov <idrozdov@gitlab.com>2022-05-05 19:40:30 +0400
commita139de096400f6054f76fd7c9466407ee2e7fc53 (patch)
tree4ff4e9cd4fa9c0c050827a5608a9a2a5d1880005 /cmd/gitlab-shell
parentc8ba21bd0c40e29cd40c7ed513c5d8a4e308a6dd (diff)
downloadgitlab-shell-a139de096400f6054f76fd7c9466407ee2e7fc53.tar.gz
Use labkit for FIPS check
New version of LabKit provides FIPS checks that we can use instead of the custom code
Diffstat (limited to 'cmd/gitlab-shell')
-rw-r--r--cmd/gitlab-shell/main.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go
index 61d2e1c..82d24bf 100644
--- a/cmd/gitlab-shell/main.go
+++ b/cmd/gitlab-shell/main.go
@@ -8,10 +8,10 @@ import (
grpccodes "google.golang.org/grpc/codes"
grpcstatus "google.golang.org/grpc/status"
+ "gitlab.com/gitlab-org/labkit/fips"
"gitlab.com/gitlab-org/labkit/log"
shellCmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/boring"
"gitlab.com/gitlab-org/gitlab-shell/internal/command"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
@@ -74,7 +74,7 @@ func main() {
cmdName := reflect.TypeOf(cmd).String()
ctxlog := log.ContextLogger(ctx)
ctxlog.WithFields(log.Fields{"env": env, "command": cmdName}).Info("gitlab-shell: main: executing command")
- boring.CheckBoring()
+ fips.Check()
if err := cmd.Execute(ctx); err != nil {
ctxlog.WithError(err).Warn("gitlab-shell: main: command execution failed")