Fixed linting issues

tellerops · Feb 15, 2024 · b20585e · b20585e
1 parent 14cd6ab
commit b20585e
Show file tree

Hide file tree

Showing 49 changed files with 92 additions and 112 deletions.
diff --git a/go.mod b/go.mod
@@ -130,7 +130,6 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	github.com/miekg/dns v1.1.35 // indirect
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/moby/sys/mount v0.2.0 // indirect
 	github.com/moby/sys/mountinfo v0.4.0 // indirect

diff --git a/go.sum b/go.sum
@@ -643,9 +643,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
-github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
@@ -1199,7 +1198,6 @@ golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=

diff --git a/main.go b/main.go
@@ -111,7 +111,6 @@ func main() {
 	logger.SetLevel(defaultLogLevel)
 
 	// below commands don't require a tellerfile
-	//nolint
 	switch ctx.Command() {
 	case "version":
 		fmt.Printf("Teller %v\n", version)
@@ -231,9 +230,7 @@ func main() {
 		}
 		teller.Exec()
 
-	case "graph-drift <providers>":
-		fallthrough
-	case "graph-drift":
+	case "graph-drift <providers>", "graph-drift":
 		drifts := teller.Drift(CLI.GraphDrift.Providers)
 		if len(drifts) > 0 {
 			teller.Porcelain.PrintDrift(drifts)

diff --git a/pkg/providers/ansible_vault.go b/pkg/providers/ansible_vault.go
@@ -32,8 +32,7 @@ type AnsibleVault struct {
 	client AnsibleVaultClient
 }
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInto := core.MetaInfo{
 		Description:    "Ansible Vault",
 		Name:           "ansible_vault",

diff --git a/pkg/providers/aws_secretsmanager.go b/pkg/providers/aws_secretsmanager.go
@@ -38,8 +38,7 @@ var defaultDeletionRecoveryWindowInDays int64 = 7
 
 const versionSplit = ","
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Name:           "aws_secretsmanager",
 		Description:    "AWS Secrets Manager",

diff --git a/pkg/providers/aws_ssm.go b/pkg/providers/aws_ssm.go
@@ -25,8 +25,7 @@ type AWSSSM struct {
 
 const awsssmName = "aws_ssm"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "AWS SSM (aka paramstore)",
 		Name:           awsssmName,

diff --git a/pkg/providers/azure_keyvault.go b/pkg/providers/azure_keyvault.go
@@ -31,8 +31,7 @@ type AzureKeyVault struct {
 
 const azureName = "azure_keyvault"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Azure Key Vault",
 		Name:           azureName,

diff --git a/pkg/providers/cloudflare_workers_kv.go b/pkg/providers/cloudflare_workers_kv.go
@@ -25,8 +25,7 @@ type Cloudflare struct {
 
 const cloudFlareWorkersKVName = "cloudflare_workers_kv"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Cloudflare Workers K/V",
 		Name:           cloudFlareWorkersKVName,

diff --git a/pkg/providers/cloudflare_workers_secrets.go b/pkg/providers/cloudflare_workers_secrets.go
@@ -27,8 +27,7 @@ type CloudflareSecrets struct {
 
 const CloudflareWorkersSecretName = "cloudflare_workers_secret"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Cloudflare Workers Secrets",
 		Name:           CloudflareWorkersSecretName,

diff --git a/pkg/providers/consul.go b/pkg/providers/consul.go
@@ -24,8 +24,7 @@ type Consul struct {
 
 const consulName = "consul"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInto := core.MetaInfo{
 		Description:    "Consul",
 		Name:           consulName,

diff --git a/pkg/providers/cyberark_conjur.go b/pkg/providers/cyberark_conjur.go
@@ -29,8 +29,7 @@ type CyberArkConjur struct {
 
 const ConjurName = "cyberark_conjur"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "CyberArk Conjure",
 		Name:           ConjurName,

diff --git a/pkg/providers/doppler.go b/pkg/providers/doppler.go
@@ -32,8 +32,7 @@ type Doppler struct {
 
 const DopplerName = "doppler"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description: "Doppler",
 		Name:        DopplerName,

diff --git a/pkg/providers/dotenv.go b/pkg/providers/dotenv.go
@@ -96,8 +96,7 @@ type Dotenv struct {
 	logger logging.Logger
 }
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    ".env",
 		Authentication: "",

diff --git a/pkg/providers/etcd.go b/pkg/providers/etcd.go
@@ -31,8 +31,7 @@ type Etcd struct {
 
 const EtcdName = "etcd"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Etcd",
 		Name:           EtcdName,

diff --git a/pkg/providers/filesystem.go b/pkg/providers/filesystem.go
@@ -22,8 +22,7 @@ type FileSystem struct {
 
 const FileSystemName = "FileSystem"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "File system",
 		Name:           FileSystemName,

diff --git a/pkg/providers/github.go b/pkg/providers/github.go
@@ -36,8 +36,7 @@ type GitHub struct {
 // NewGitHub create new GitHub provider
 const GithubName = "GitHub"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Github",
 		Authentication: "Requires `GITHUB_AUTH_TOKEN`",

diff --git a/pkg/providers/google_secretmanager.go b/pkg/providers/google_secretmanager.go
@@ -30,8 +30,7 @@ type GoogleSecretManager struct {
 
 const GoogleSecretManagerName = "google_secretmanager"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Google Secret Manager",
 		Name:           GoogleSecretManagerName,

diff --git a/pkg/providers/gopass.go b/pkg/providers/gopass.go
@@ -26,8 +26,7 @@ type Gopass struct {
 
 const GoPassName = "gopass"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Gopass",
 		Name:           GoPassName,

diff --git a/pkg/providers/hashicorp_vault.go b/pkg/providers/hashicorp_vault.go
@@ -20,8 +20,7 @@ type HashicorpVault struct {
 
 const HashicorpVaultName = "hashicorp_vault"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Hashicorp Vault",
 		Name:           HashicorpVaultName,

diff --git a/pkg/providers/heroku.go b/pkg/providers/heroku.go
@@ -22,8 +22,7 @@ type Heroku struct {
 
 const HerokuName = "heroku"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Heroku",
 		Name:           HerokuName,

diff --git a/pkg/providers/keeper_secretsmanager.go b/pkg/providers/keeper_secretsmanager.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	ksm "github.com/keeper-security/secrets-manager-go/core"
-	"github.com/spectralops/teller/pkg/core"
-	"github.com/spectralops/teller/pkg/logging"
+	"github.com/tellerops/teller/pkg/core"
+	"github.com/tellerops/teller/pkg/logging"
 )
 
 type KsmClient interface {
@@ -24,8 +24,7 @@ type KeeperSecretsManager struct {
 
 const keeperName = "keeper_secretsmanager"
 
-//nolint
-func init() {
+func init() { //nolint
 	metaInto := core.MetaInfo{
 		Description:    "Keeper Secrets Manager",
 		Name:           keeperName,

diff --git a/pkg/providers/keeper_secretsmanager_test.go b/pkg/providers/keeper_secretsmanager_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/alecthomas/assert"
 	"github.com/golang/mock/gomock"
 
-	"github.com/spectralops/teller/pkg/core"
-	"github.com/spectralops/teller/pkg/providers/mock_providers"
+	"github.com/tellerops/teller/pkg/core"
+	"github.com/tellerops/teller/pkg/providers/mock_providers"
 )
 
 func TestKeeperSecretsManager(t *testing.T) {

diff --git a/pkg/providers/keypass.go b/pkg/providers/keypass.go
@@ -24,8 +24,7 @@ type KeyPass struct {
 
 const KeyPassName = "KeyPass"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Keypass",
 		Name:           KeyPassName,

diff --git a/pkg/providers/lastpass.go b/pkg/providers/lastpass.go
@@ -24,8 +24,7 @@ type LastPass struct {
 
 const LastPassName = "lastpass"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description:    "Lastpass",
 		Authentication: "TODO(XXX)",

diff --git a/pkg/providers/mock_providers/keeper_secretsmanager_mock.go b/pkg/providers/mock_providers/keeper_secretsmanager_mock.go
diff --git a/pkg/providers/onepassword.go b/pkg/providers/onepassword.go
@@ -21,8 +21,7 @@ type OnePassword struct {
 
 const OnePasswordName = "1password"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Description: "1Password",
 		Name:        OnePasswordName,

diff --git a/pkg/providers/process_env.go b/pkg/providers/process_env.go
@@ -15,8 +15,7 @@ type ProcessEnv struct {
 	logger logging.Logger
 }
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInto := core.MetaInfo{
 		Description:    "ProcessEnv",
 		Name:           "process_env",

diff --git a/pkg/providers/vercel.go b/pkg/providers/vercel.go
@@ -65,8 +65,7 @@ const ProjectEndPoint = "/projects"
 
 const VercelName = "vercel"
 
-// nolint
-func init() {
+func init() { //nolint
 	metaInfo := core.MetaInfo{
 		Name:           "vercel",
 		Description:    "Vercel",

diff --git a/vendor/github.com/alecthomas/kong/context.go b/vendor/github.com/alecthomas/kong/context.go
diff --git a/vendor/github.com/alecthomas/kong/guesswidth_unix.go b/vendor/github.com/alecthomas/kong/guesswidth_unix.go
diff --git a/vendor/github.com/alecthomas/kong/kong.go b/vendor/github.com/alecthomas/kong/kong.go