Skip to content

Commit

Permalink
Reordered imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@vvondruska
vvondruska committed Nov 15, 2023
1 parent 700801d commit 2532231
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion internal/controller/cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package controller

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"time"

"github.com/giantswarm/microerror"
Expand All @@ -28,6 +27,7 @@ import (
capi "sigs.k8s.io/cluster-api/api/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/teleport"

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/cluster_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package controller
import (
"context"
"errors"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"testing"
"time"

Expand All @@ -17,6 +16,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/teleport"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
Expand Down
4 changes: 3 additions & 1 deletion internal/pkg/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package config
import (
"context"
"fmt"

"github.com/giantswarm/microerror"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/teleport-operator/internal/pkg/key"
)

type Config struct {
Expand Down
8 changes: 5 additions & 3 deletions internal/pkg/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package config

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
"testing"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"testing"

"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
)

func Test_GetConfigFromSecret(t *testing.T) {
Expand Down
6 changes: 4 additions & 2 deletions internal/pkg/config/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import (
"crypto/sha512"
"encoding/hex"
"fmt"
"time"

"github.com/giantswarm/microerror"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"time"

"github.com/giantswarm/teleport-operator/internal/pkg/key"
)

type IdentityConfig struct {
Expand Down
8 changes: 5 additions & 3 deletions internal/pkg/config/identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package config

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
"testing"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"testing"

"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
)

func Test_GetIdentityConfigFromSecret(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/teleport/configmap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package teleport

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"testing"

corev1 "k8s.io/api/core/v1"
Expand All @@ -12,6 +11,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
"github.com/giantswarm/teleport-operator/internal/pkg/token"
Expand Down
1 change: 1 addition & 0 deletions internal/pkg/teleport/secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package teleport
import (
"context"
"fmt"

"github.com/giantswarm/microerror"
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/teleport/secret_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package teleport

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"testing"

corev1 "k8s.io/api/core/v1"
Expand All @@ -12,6 +11,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
"github.com/giantswarm/teleport-operator/internal/pkg/token"
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/teleport/token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package teleport

import (
"context"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"testing"

"github.com/gravitational/teleport/api/types"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/key"
"github.com/giantswarm/teleport-operator/internal/pkg/test"
"github.com/giantswarm/teleport-operator/internal/pkg/token"
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package main
import (
"context"
"flag"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"os"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
Expand All @@ -40,6 +39,7 @@ import (
capi "sigs.k8s.io/cluster-api/api/v1beta1"

"github.com/giantswarm/teleport-operator/internal/controller"
"github.com/giantswarm/teleport-operator/internal/pkg/config"
"github.com/giantswarm/teleport-operator/internal/pkg/teleport"
"github.com/giantswarm/teleport-operator/internal/pkg/token"
//+kubebuilder:scaffold:imports
Expand Down

0 comments on commit 2532231

Please sign in to comment.