fix: formtareing av kode og pakkestandard på navn

nais · Jun 29, 2023 · 0b877ed · 0b877ed
1 parent 72db3c2
commit 0b877ed
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 12 deletions.
diff --git a/cmd/commands/clusterCmd/cmds.go → cmd/clustercmd/cmds.go b/cmd/commands/clusterCmd/cmds.go → cmd/clustercmd/cmds.go
@@ -1,4 +1,4 @@
-package clusterCmd
+package clustercmd
 
 import (
 	"github.com/urfave/cli/v2"

diff --git a/cmd/commands/clusterCmd/kubeconfigCmd.go → cmd/clustercmd/kubeconfigCmd.go b/cmd/commands/clusterCmd/kubeconfigCmd.go → cmd/clustercmd/kubeconfigCmd.go
@@ -1,7 +1,8 @@
-package clusterCmd
+package clustercmd
 
 import (
 	"fmt"
+
 	"github.com/nais/narcos/pkg/gcp"
 	"github.com/nais/narcos/pkg/kubeconfig"
 	"github.com/nais/narcos/pkg/naisdevice"

diff --git a/cmd/commands/clusterCmd/listCmd.go → cmd/clustercmd/listCmd.go b/cmd/commands/clusterCmd/listCmd.go → cmd/clustercmd/listCmd.go
@@ -1,7 +1,8 @@
-package clusterCmd
+package clustercmd
 
 import (
 	"fmt"
+
 	"github.com/nais/narcos/pkg/gcp"
 	"github.com/nais/narcos/pkg/naisdevice"
 	"github.com/urfave/cli/v2"

diff --git a/cmd/commands/deviceCmd/cmds.go → cmd/devicecmd/cmds.go b/cmd/commands/deviceCmd/cmds.go → cmd/devicecmd/cmds.go
@@ -1,7 +1,7 @@
-package deviceCmd
+package devicecmd
 
 import (
-	"github.com/nais/narcos/cmd/commands/deviceCmd/tenant"
+	"github.com/nais/narcos/cmd/devicecmd/tenant"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/cmd/commands/deviceCmd/tenant/cmds.go → cmd/devicecmd/tenant/cmds.go b/cmd/commands/deviceCmd/tenant/cmds.go → cmd/devicecmd/tenant/cmds.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/nais/narcos/cmd/commands/clusterCmd"
-	"github.com/nais/narcos/cmd/commands/deviceCmd"
+	"github.com/nais/narcos/cmd/clustercmd"
+	"github.com/nais/narcos/cmd/devicecmd"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,8 +16,8 @@ func main() {
 		Version:     "v0.1",
 		Description: "NAIS Administrator CLI",
 		Commands: []*cli.Command{
-			deviceCmd.Command(),
-			clusterCmd.Command(),
+			devicecmd.Command(),
+			clustercmd.Command(),
 		},
 		EnableBashCompletion: true,
 		HideHelpCommand:      true,

diff --git a/pkg/gcp/cluster.go b/pkg/gcp/cluster.go
@@ -3,9 +3,10 @@ package gcp
 import (
 	"context"
 	"encoding/json"
+	"strings"
+
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/container/v1"
-	"strings"
 )
 
 type Cluster struct {

diff --git a/pkg/gcp/project.go b/pkg/gcp/project.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"golang.org/x/oauth2"
 	"google.golang.org/api/cloudresourcemanager/v3"
 )

diff --git a/pkg/kubeconfig/cluster.go b/pkg/kubeconfig/cluster.go
@@ -3,6 +3,7 @@ package kubeconfig
 import (
 	"encoding/base64"
 	"fmt"
+
 	"github.com/nais/narcos/pkg/gcp"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )

diff --git a/pkg/kubeconfig/context.go b/pkg/kubeconfig/context.go
@@ -2,9 +2,10 @@ package kubeconfig
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/nais/narcos/pkg/gcp"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"strings"
 )
 
 func addContext(config *clientcmdapi.Config, cluster gcp.Cluster, overwrite, seperateAdmin, verbose bool, email string) {

diff --git a/pkg/kubeconfig/user.go b/pkg/kubeconfig/user.go
@@ -2,6 +2,7 @@ package kubeconfig
 
 import (
 	"fmt"
+
 	"github.com/nais/narcos/pkg/gcp"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )

diff --git a/pkg/naisdevice/naisdevice.go b/pkg/naisdevice/naisdevice.go
@@ -2,12 +2,13 @@ package naisdevice
 
 import (
 	"fmt"
+	"path/filepath"
+
 	"github.com/nais/device/pkg/config"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/status"
-	"path/filepath"
 )
 
 var (

diff --git a/pkg/naisdevice/tenant.go b/pkg/naisdevice/tenant.go
@@ -2,6 +2,7 @@ package naisdevice
 
 import (
 	"context"
+
 	"github.com/nais/device/pkg/pb"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package kubeconfig @@
     import (
     	"fmt"
     	"github.com/nais/narcos/pkg/gcp"
     	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
     )
@@ Expand Down @@