You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/11/24 12:53:04 UTC
[camel-k] 16/19: fix(lint): goimport
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9e1d4cc612357ddc780e24b3a108952b07326ce8
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Tue Nov 23 00:22:11 2021 +0100
fix(lint): goimport
---
cmd/util/doc-gen/generators/traitdocgen.go | 3 ++-
cmd/util/doc-gen/generators/traitmetadatagen.go | 3 ++-
cmd/util/json-schema-gen/main.go | 3 ++-
cmd/util/license-check/main.go | 3 ++-
cmd/util/vfs-gen/main.go | 3 ++-
pkg/builder/s2i.go | 3 ++-
pkg/builder/spectrum.go | 3 ++-
pkg/client/client.go | 3 ++-
pkg/cmd/dump.go | 3 ++-
pkg/cmd/init.go | 3 ++-
pkg/cmd/util_content.go | 3 ++-
pkg/install/kamelets.go | 3 ++-
pkg/install/secret.go | 1 +
pkg/util/camel/catalog.go | 3 ++-
pkg/util/kubernetes/log/annotation_scraper.go | 3 ++-
pkg/util/kubernetes/log/pod_scraper.go | 3 ++-
pkg/util/util.go | 3 ++-
17 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go
index 9005bbc..57bdd6f 100644
--- a/cmd/util/doc-gen/generators/traitdocgen.go
+++ b/cmd/util/doc-gen/generators/traitdocgen.go
@@ -19,7 +19,6 @@ package generators
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io"
"os"
"path"
@@ -28,6 +27,8 @@ import (
"sort"
"strings"
+ "github.com/apache/camel-k/pkg/util"
+
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
diff --git a/cmd/util/doc-gen/generators/traitmetadatagen.go b/cmd/util/doc-gen/generators/traitmetadatagen.go
index 681b46a..aae0da7 100644
--- a/cmd/util/doc-gen/generators/traitmetadatagen.go
+++ b/cmd/util/doc-gen/generators/traitmetadatagen.go
@@ -19,13 +19,14 @@ package generators
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io"
"os"
"path"
"reflect"
"strings"
+ "github.com/apache/camel-k/pkg/util"
+
"gopkg.in/yaml.v2"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
diff --git a/cmd/util/json-schema-gen/main.go b/cmd/util/json-schema-gen/main.go
index 27bebd7..671bc17 100644
--- a/cmd/util/json-schema-gen/main.go
+++ b/cmd/util/json-schema-gen/main.go
@@ -20,12 +20,13 @@ package main
import (
"encoding/json"
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"os"
"reflect"
"strings"
+ "github.com/apache/camel-k/pkg/util"
+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
clientscheme "k8s.io/client-go/kubernetes/scheme"
diff --git a/cmd/util/license-check/main.go b/cmd/util/license-check/main.go
index 3b8f37a..417acc2 100644
--- a/cmd/util/license-check/main.go
+++ b/cmd/util/license-check/main.go
@@ -19,9 +19,10 @@ package main
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"os"
"strings"
+
+ "github.com/apache/camel-k/pkg/util"
)
func main() {
diff --git a/cmd/util/vfs-gen/main.go b/cmd/util/vfs-gen/main.go
index 72eed43..1fd428e 100644
--- a/cmd/util/vfs-gen/main.go
+++ b/cmd/util/vfs-gen/main.go
@@ -20,7 +20,6 @@ package main
import (
"flag"
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"log"
"net/http"
@@ -30,6 +29,8 @@ import (
"strings"
"time"
+ "github.com/apache/camel-k/pkg/util"
+
"github.com/apache/camel-k/cmd/util/vfs-gen/multifs"
"github.com/apache/camel-k/pkg/base"
"github.com/shurcooL/httpfs/filter"
diff --git a/pkg/builder/s2i.go b/pkg/builder/s2i.go
index d6e23a1..2f7f488 100644
--- a/pkg/builder/s2i.go
+++ b/pkg/builder/s2i.go
@@ -22,7 +22,6 @@ import (
"compress/gzip"
"context"
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io"
"io/ioutil"
"os"
@@ -31,6 +30,8 @@ import (
"strings"
"time"
+ "github.com/apache/camel-k/pkg/util"
+
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/builder/spectrum.go b/pkg/builder/spectrum.go
index 9202e70..a7c149e 100644
--- a/pkg/builder/spectrum.go
+++ b/pkg/builder/spectrum.go
@@ -20,7 +20,6 @@ package builder
import (
"bufio"
"context"
- "go.uber.org/multierr"
"io"
"io/ioutil"
"os"
@@ -28,6 +27,8 @@ import (
"path/filepath"
"strings"
+ "go.uber.org/multierr"
+
spectrum "github.com/container-tools/spectrum/pkg/builder"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 83c9fc0..3d34f1e 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -19,11 +19,12 @@ package client
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"os"
"path/filepath"
+ "github.com/apache/camel-k/pkg/util"
+
camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
user "github.com/mitchellh/go-homedir"
diff --git a/pkg/cmd/dump.go b/pkg/cmd/dump.go
index 71cfbca..c0d8f4e 100644
--- a/pkg/cmd/dump.go
+++ b/pkg/cmd/dump.go
@@ -21,10 +21,11 @@ import (
"bufio"
"context"
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io"
"os"
+ "github.com/apache/camel-k/pkg/util"
+
"github.com/spf13/cobra"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/init.go b/pkg/cmd/init.go
index 0a669e1..0a2f06c 100644
--- a/pkg/cmd/init.go
+++ b/pkg/cmd/init.go
@@ -19,12 +19,13 @@ package cmd
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"os"
"path/filepath"
"strings"
"text/template"
+ "github.com/apache/camel-k/pkg/util"
+
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/resources"
"github.com/spf13/cobra"
diff --git a/pkg/cmd/util_content.go b/pkg/cmd/util_content.go
index 0d73610..289621e 100644
--- a/pkg/cmd/util_content.go
+++ b/pkg/cmd/util_content.go
@@ -19,13 +19,14 @@ package cmd
import (
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"net/http"
"net/url"
"os"
"regexp"
"strings"
+
+ "github.com/apache/camel-k/pkg/util"
)
const (
diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go
index 2641003..2134a48 100644
--- a/pkg/install/kamelets.go
+++ b/pkg/install/kamelets.go
@@ -20,12 +20,13 @@ package install
import (
"context"
"fmt"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"os"
"path"
"strings"
+ "github.com/apache/camel-k/pkg/util"
+
"github.com/pkg/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
diff --git a/pkg/install/secret.go b/pkg/install/secret.go
index 016b336..c4a2f8b 100644
--- a/pkg/install/secret.go
+++ b/pkg/install/secret.go
@@ -19,6 +19,7 @@ package install
import (
"context"
+
"github.com/apache/camel-k/pkg/util"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 81dac2e..531e791 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -19,11 +19,12 @@ package camel
import (
"context"
- "github.com/apache/camel-k/pkg/util"
"io/ioutil"
"os"
"path"
+ "github.com/apache/camel-k/pkg/util"
+
yaml2 "gopkg.in/yaml.v2"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/util/kubernetes/log/annotation_scraper.go b/pkg/util/kubernetes/log/annotation_scraper.go
index ff6f166..ff5924a 100644
--- a/pkg/util/kubernetes/log/annotation_scraper.go
+++ b/pkg/util/kubernetes/log/annotation_scraper.go
@@ -20,13 +20,14 @@ package log
import (
"bufio"
"context"
- "go.uber.org/multierr"
"io"
"strconv"
"sync"
"sync/atomic"
"time"
+ "go.uber.org/multierr"
+
klog "github.com/apache/camel-k/pkg/util/log"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/util/kubernetes/log/pod_scraper.go b/pkg/util/kubernetes/log/pod_scraper.go
index 2e55c67..202c812 100644
--- a/pkg/util/kubernetes/log/pod_scraper.go
+++ b/pkg/util/kubernetes/log/pod_scraper.go
@@ -20,10 +20,11 @@ package log
import (
"bufio"
"context"
- "go.uber.org/multierr"
"io"
"time"
+ "go.uber.org/multierr"
+
klog "github.com/apache/camel-k/pkg/util/log"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 2ceb69c..36d98ce 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -22,7 +22,6 @@ import (
"encoding/json"
"encoding/xml"
"fmt"
- "go.uber.org/multierr"
"io"
"io/ioutil"
"os"
@@ -32,6 +31,8 @@ import (
"sort"
"strings"
+ "go.uber.org/multierr"
+
yaml2 "gopkg.in/yaml.v2"
"github.com/pkg/errors"