Skip to content

Commit

Permalink
Run gci
Browse files Browse the repository at this point in the history
  • Loading branch information
VOID404 committed Sep 19, 2024
1 parent 7eab051 commit bb9d976
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 25 deletions.
5 changes: 3 additions & 2 deletions hack/shoot-comparator/cmd/comparator/directories.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package comparator

import (
"fmt"
"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/internal/directories"
"github.com/spf13/cobra"
"log/slog"
"time"

"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/internal/directories"
"github.com/spf13/cobra"
)

func init() {
Expand Down
1 change: 1 addition & 0 deletions hack/shoot-comparator/cmd/comparator/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package comparator

import (
"fmt"

"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/internal/files"
"github.com/spf13/cobra"
)
Expand Down
3 changes: 2 additions & 1 deletion hack/shoot-comparator/internal/directories/comparator.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package directories

import (
"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/internal/files"
"os"
"path"
"slices"
"time"

"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/internal/files"
)

type Result struct {
Expand Down
6 changes: 3 additions & 3 deletions hack/shoot-comparator/internal/directories/comparator_test.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package directories

import (
"github.com/gardener/gardener/pkg/apis/core/v1beta1"
"gopkg.in/yaml.v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"os"
"path"
"testing"
"time"

"github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

const onlyLeftFilename = "onlyLeftFile.yaml"
Expand Down
3 changes: 2 additions & 1 deletion hack/shoot-comparator/internal/files/comparator.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package files

import (
"os"

"github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/kyma-project/infrastructure-manager/tools/shoot-comparator/pkg/shoot"
"os"
"sigs.k8s.io/yaml"
)

Expand Down
7 changes: 4 additions & 3 deletions hack/shoot-comparator/pkg/shoot/extensionmatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package shoot

import (
"fmt"
"github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/onsi/gomega"
"github.com/onsi/gomega/types"
"reflect"
"sort"
"strings"

"github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/onsi/gomega"
"github.com/onsi/gomega/types"
)

type ExtensionMatcher struct {
Expand Down
1 change: 1 addition & 0 deletions hack/shoot-comparator/pkg/shoot/extensionmatcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package shoot

import (
"fmt"

"github.com/gardener/gardener/pkg/apis/core/v1beta1"
. "github.com/onsi/ginkgo/v2" //nolint:revive
. "github.com/onsi/gomega" //nolint:revive
Expand Down
5 changes: 1 addition & 4 deletions internal/auditlogging/mocks/AuditLogConfigurator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/controller/runtime/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ package runtime
import (
"context"
"encoding/json"
"github.com/kyma-project/infrastructure-manager/internal/auditlogging"
v1 "k8s.io/api/autoscaling/v1"
v12 "k8s.io/api/core/v1"
"path/filepath"
"testing"
"time"

gardener_api "github.com/gardener/gardener/pkg/apis/core/v1beta1"
infrastructuremanagerv1 "github.com/kyma-project/infrastructure-manager/api/v1"
"github.com/kyma-project/infrastructure-manager/internal/auditlogging"
"github.com/kyma-project/infrastructure-manager/internal/controller/runtime/fsm"
gardener_shoot "github.com/kyma-project/infrastructure-manager/internal/gardener/shoot"
. "github.com/onsi/ginkgo/v2" //nolint:revive
. "github.com/onsi/gomega" //nolint:revive
v1 "k8s.io/api/autoscaling/v1"
v12 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
//nolint:revive
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/runtime/test_client_obj_tracker_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package runtime

import (
"testing"

gardener_api "github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"testing"
)

func TestCustomTracker_Get(t *testing.T) {
Expand Down
7 changes: 2 additions & 5 deletions internal/gardener/mocks/ShootClient.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/gardener/shoot/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewConverter(config ConverterConfig) Converter {
extender.ExtendWithAnnotations,
extender.ExtendWithLabels,
extender.NewKubernetesExtender(config.Kubernetes.DefaultVersion),
extender.NewProviderExtender(config.Provider.AWS.EnableIMDSv2, config.MachineImage.DefaultName, config.MachineImage.DefaultVersion),
extender.NewProviderExtender(config.Provider.AWS.EnableIMDSv2, config.MachineImage.DefaultName, config.MachineImage.DefaultVersion),
extender.NewDNSExtender(config.DNS.SecretName, config.DNS.DomainPrefix, config.DNS.ProviderType),
extender.ExtendWithOIDC,
extender.ExtendWithCloudProfile,
Expand Down
2 changes: 1 addition & 1 deletion internal/gardener/shoot/extender/oidc_test.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package extender

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"

gardener "github.com/gardener/gardener/pkg/apis/core/v1beta1"
imv1 "github.com/kyma-project/infrastructure-manager/api/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestOidcExtender(t *testing.T) {
Expand Down

0 comments on commit bb9d976

Please sign in to comment.