Skip to content

Commit 436e068

Browse files
committed
remove unused changes
1 parent 5f131b2 commit 436e068

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
go-version-file: ${{ github.workspace }}/go.mod
4848

49-
- name: Install jq tool
49+
- name: Install kerberos development libraries
5050
run: |
5151
sudo apt-get update
5252
sudo apt-get install libkrb5-dev

docker/kerberos-exporter.dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

docker/scripts/setup-krb5-server.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
mongohost=`getent hosts ${MONGO_HOST} | awk '{ print $1 }'`
44
kerberos_host=`getent hosts ${KERBEROS_HOST} | awk '{ print $1 }'`
5-
gateway_ip=`ip route | grep default | awk '{print $3}'`
65

76
cat > /krb5/krb5.conf <<EOL
87
[libdefaults]

exporter/exporter_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ func TestMongoS(t *testing.T) {
199199
}
200200
}
201201

202-
func generateKerberosConfigFile(t *testing.T) (*os.File, error) {
203-
kerberosHost, err := tu.IpForContainer("kerberos")
202+
func generateKerberosConfigFile(t *testing.T) *os.File {
203+
t.Helper()
204+
kerberosHost, err := tu.IPForContainer("kerberos")
204205
require.NoError(t, err)
205206

206207
config := fmt.Sprintf(`
@@ -227,17 +228,17 @@ func generateKerberosConfigFile(t *testing.T) (*os.File, error) {
227228
_, err = configFile.WriteString(config)
228229
require.NoError(t, err)
229230

230-
return configFile, nil
231+
return configFile
231232
}
232233

233234
func TestGSSAPIAuth(t *testing.T) {
234235
logger := logrus.New()
235236
logger.SetReportCaller(true)
236237

237-
mongoHost, err := tu.IpForContainer("psmdb-kerberos")
238+
mongoHost, err := tu.IPForContainer("psmdb-kerberos")
238239
require.NoError(t, err)
239240

240-
configFile, err := generateKerberosConfigFile(t)
241+
configFile := generateKerberosConfigFile(t)
241242
require.NoError(t, err)
242243
defer func() {
243244
_ = configFile.Close()

internal/tu/testutils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ func PortForContainer(name string) (string, error) {
199199
return ports[0].HostPort, nil
200200
}
201201

202-
// IpForContainer returns the IP address of a running container.
203-
func IpForContainer(name string) (string, error) {
202+
// IPForContainer returns the IP address of a running container.
203+
func IPForContainer(name string) (string, error) {
204204
di, err := InspectContainer(name)
205205
if err != nil {
206206
return "", errors.Wrapf(err, "cannot get error for container %q", name)

0 commit comments

Comments
 (0)