Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not remove shared users #45

Merged
merged 1 commit into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}
- uses: actions/setup-python@v2
- uses: actions/setup-go@v2
with:
go-version: 1.17
- run: |
go get -u golang.org/x/lint/golint
- uses: pre-commit/action@v2.0.0

unit-testing:
Expand All @@ -49,10 +54,10 @@ jobs:
go mod vendor
- name: Install Ginkgo
run: |
go get github.com/onsi/ginkgo/ginkgo
go install github.com/onsi/ginkgo/v2/ginkgo@latest
- name: Run tests
run: |
ginkgo -r -cover -covermode count -randomizeAllSpecs -randomizeSuites -coverprofile coverage.out -outputdir . -nodes 2
ginkgo -r -cover -covermode count --randomize-all --randomize-suites -coverprofile coverage.out --output-dir . -nodes 2
- name: Convert Go coverage to LCOV
uses: jandelgado/gcov2lcov-action@v1.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
- id: conform
stages:
- commit-msg
- repo: git://github.com/pre-commit/pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: check-merge-conflict
Expand Down
2 changes: 1 addition & 1 deletion build/version_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package build_test
import (
"testing"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/rs/zerolog"
)
Expand Down
2 changes: 1 addition & 1 deletion build/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/particledecay/kconf/build"
Expand Down
2 changes: 1 addition & 1 deletion cmd/add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/particledecay/kconf/cmd"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"testing"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/rs/zerolog"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
kc "github.com/particledecay/kconf/pkg/kubeconfig"
Expand Down
2 changes: 1 addition & 1 deletion cmd/namespace_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
. "github.com/particledecay/kconf/test"
Expand Down
2 changes: 1 addition & 1 deletion cmd/remove_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"path"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
kc "github.com/particledecay/kconf/pkg/kubeconfig"
Expand Down
2 changes: 1 addition & 1 deletion cmd/rename_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/particledecay/kconf/cmd"
Expand Down
2 changes: 1 addition & 1 deletion cmd/root_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/use_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
kc "github.com/particledecay/kconf/pkg/kubeconfig"
Expand Down
2 changes: 1 addition & 1 deletion cmd/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/build"
"github.com/particledecay/kconf/cmd"
Expand Down
3 changes: 1 addition & 2 deletions cmd/view_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/particledecay/kconf/cmd"
. "github.com/particledecay/kconf/test"
Expand Down Expand Up @@ -48,7 +48,6 @@ var _ = Describe("Cmd/ViewCmd", func() {
os.Args = origArgs[:]

Expect(out).To(ContainSubstring("test-2"))
Expect(out).To(ContainSubstring("certificate-authority: bbbb"))
})

It("Should fail if no arguments are provided", func() {
Expand Down
39 changes: 29 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
module github.com/particledecay/kconf

go 1.13
go 1.17

require (
github.com/google/pprof v0.0.0-20220218203455-0368bd9e19a7 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/onsi/ginkgo v1.16.4
github.com/onsi/ginkgo/v2 v2.1.3 // indirect
github.com/onsi/ginkgo/v2 v2.1.3
github.com/onsi/gomega v1.18.1
github.com/rs/zerolog v1.21.0
github.com/spf13/cobra v1.0.0
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
golang.org/x/tools v0.1.9 // indirect
google.golang.org/protobuf v1.27.1 // indirect
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.5.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.17.0 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/utils v0.0.0-20200109141947-94aeca20bf09 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
Loading