hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix make fmt, reformat test sources (#234)

Browse Source
This commit is contained in:
Daniel Moran
2021-08-20 15:26:00 -04:00
committed by GitHub
parent 3a6dfe7102
commit c0103e7b1b
5 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -14,8 +14,11 @@ ifdef COMMIT
endif endif
export GO_BUILD=go build -ldflags "$(LDFLAGS)" export GO_BUILD=go build -ldflags "$(LDFLAGS)"
# SOURCES are the files that affect building the main binary.
SOURCES := $(shell find . -name '*.go' -not -name '*_test.go') go.mod go.sum SOURCES := $(shell find . -name '*.go' -not -name '*_test.go') go.mod go.sum
SOURCES_NO_VENDOR := $(shell find . -path ./vendor -prune -o -name "*.go" -not -name '*_test.go' -print)
# FMT_FILES are all files that should be formatted according to our rules.
FMT_FILES := $(shell find . -path ./vendor -prune -o -name "*.go" -print)
# Allow for `go test` to be swapped out by other tooling, i.e. `gotestsum` # Allow for `go test` to be swapped out by other tooling, i.e. `gotestsum`
export GO_TEST=go test export GO_TEST=go test
@ -26,7 +29,7 @@ GO_TEST_PATHS=./...
openapi: openapi:
./etc/generate-openapi.sh ./etc/generate-openapi.sh
fmt: $(SOURCES_NO_VENDOR) fmt: $(FMT_FILES)
# Format everything, but the import-format doesn't match our desired pattern. # Format everything, but the import-format doesn't match our desired pattern.
gofmt -w -s $^ gofmt -w -s $^
# Remove unused imports. # Remove unused imports.

12
clients/secret/secret_test.go
View File

@ -50,7 +50,7 @@ func TestSecret_List(t *testing.T) {
secretApi.EXPECT().GetOrgsIDSecretsExecute(gomock.Eq(req)). secretApi.EXPECT().GetOrgsIDSecretsExecute(gomock.Eq(req)).
Return(api.SecretKeysResponse{Secrets: &[]string{fakeResults}}, nil) Return(api.SecretKeysResponse{Secrets: &[]string{fakeResults}}, nil)
}, },
expectMatcher: printHeader+fakeResults+"\t"+id.String()+"\n", expectMatcher: printHeader + fakeResults + "\t" + id.String() + "\n",
}, },
{ {
name: "default org", name: "default org",
@ -149,7 +149,7 @@ func TestSecret_Delete(t *testing.T) {
secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req) secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req)
secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil) secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
}, },
expectMatcher: printHeader+fakeKey+"\t"+id.String()+"\ttrue\n", expectMatcher: printHeader + fakeKey + "\t" + id.String() + "\ttrue\n",
}, },
{ {
// This situation cannot happen since the CLI will stop it. // This situation cannot happen since the CLI will stop it.
@ -168,7 +168,7 @@ func TestSecret_Delete(t *testing.T) {
secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req) secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req)
secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil) secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
}, },
expectMatcher: printHeader+"\t"+id.String()+"\ttrue\n", expectMatcher: printHeader + "\t" + id.String() + "\ttrue\n",
}, },
{ {
name: "delete no org", name: "delete no org",
@ -248,7 +248,7 @@ func TestSecret_Update(t *testing.T) {
secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req) secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req)
secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil) secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
}, },
expectMatcher: printHeader+fakeKey+"\t"+id.String()+"\n", expectMatcher: printHeader + fakeKey + "\t" + id.String() + "\n",
}, },
{ {
name: "update no key", name: "update no key",
@ -266,7 +266,7 @@ func TestSecret_Update(t *testing.T) {
secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req) secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req)
secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil) secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
}, },
expectMatcher: printHeader+"\t"+id.String()+"\n", expectMatcher: printHeader + "\t" + id.String() + "\n",
}, },
{ {
name: "update no value", name: "update no value",
@ -286,7 +286,7 @@ func TestSecret_Update(t *testing.T) {
secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req) secretApi.EXPECT().PatchOrgsIDSecrets(gomock.Any(), gomock.Eq(id.String())).Return(req)
secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil) secretApi.EXPECT().PatchOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
}, },
expectMatcher: printHeader+fakeKey+"\t"+id.String()+"\n", expectMatcher: printHeader + fakeKey + "\t" + id.String() + "\n",
}, },
{ {
name: "update no org", name: "update no org",