chore: fix formatting of imports

This PR cleans up the formatting for various package imports as they
were causing the linter to throw errors.

Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
This commit is contained in:
Spencer Smith
2020-03-19 14:26:19 -04:00
committed by Spencer Smith
parent 1cbbf9cd5a
commit fa82454be4
11 changed files with 21 additions and 12 deletions

View File

@@ -15,7 +15,7 @@ RUN ["/toolchain/bin/ln", "-svf", "/toolchain/etc/ssl", "/etc/ssl"]
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b /toolchain/bin v1.23.6 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b /toolchain/bin v1.23.6
RUN cd $(mktemp -d) \ RUN cd $(mktemp -d) \
&& go mod init tmp \ && go mod init tmp \
&& go get mvdan.cc/gofumpt/gofumports \ && go get mvdan.cc/gofumpt/gofumports@aaa7156f4122b1055c466e26e77812fa32bac1d9 \
&& mv /go/bin/gofumports /toolchain/go/bin/gofumports && mv /go/bin/gofumports /toolchain/go/bin/gofumports
RUN curl -sfL https://github.com/uber/prototool/releases/download/v1.8.0/prototool-Linux-x86_64.tar.gz | tar -xz --strip-components=2 -C /toolchain/bin prototool/bin/prototool RUN curl -sfL https://github.com/uber/prototool/releases/download/v1.8.0/prototool-Linux-x86_64.tar.gz | tar -xz --strip-components=2 -C /toolchain/bin prototool/bin/prototool
COPY ./hack/docgen /go/src/github.com/talos-systems/docgen COPY ./hack/docgen /go/src/github.com/talos-systems/docgen

View File

@@ -5,7 +5,6 @@
package cmd package cmd
import ( import (
stdlibx509 "crypto/x509"
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@@ -14,6 +13,8 @@ import (
"strings" "strings"
"time" "time"
stdlibx509 "crypto/x509"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers"

View File

@@ -6,8 +6,9 @@
package provider package provider
import ( import (
stdlibtls "crypto/tls"
"fmt" "fmt"
stdlibtls "crypto/tls"
stdlibnet "net" stdlibnet "net"
"github.com/talos-systems/talos/internal/pkg/runtime" "github.com/talos-systems/talos/internal/pkg/runtime"

View File

@@ -8,9 +8,10 @@ import (
"errors" "errors"
"fmt" "fmt"
"log" "log"
goruntime "runtime"
"time" "time"
goruntime "runtime"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/talos-systems/talos/internal/pkg/kmsg" "github.com/talos-systems/talos/internal/pkg/kmsg"

View File

@@ -9,9 +9,10 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
stdlibruntime "runtime"
"sync" "sync"
stdlibruntime "runtime"
"github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/events"
"github.com/talos-systems/talos/internal/app/machined/pkg/system/log" "github.com/talos-systems/talos/internal/app/machined/pkg/system/log"
"github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner"

View File

@@ -6,17 +6,18 @@ package services
import ( import (
"context" "context"
stdlibx509 "crypto/x509"
"encoding/pem" "encoding/pem"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
stdlibnet "net"
"os" "os"
"strings" "strings"
"time" "time"
stdlibx509 "crypto/x509"
stdlibnet "net"
containerdapi "github.com/containerd/containerd" containerdapi "github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"

View File

@@ -7,6 +7,7 @@ package main
import ( import (
"flag" "flag"
"log" "log"
stdlibnet "net" stdlibnet "net"
"google.golang.org/grpc" "google.golang.org/grpc"

View File

@@ -6,10 +6,11 @@ package machine
import ( import (
"crypto/tls" "crypto/tls"
stdx509 "crypto/x509"
"fmt" "fmt"
"os" "os"
stdx509 "crypto/x509"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/crypto/x509"

View File

@@ -7,13 +7,14 @@ package generate
import ( import (
"bufio" "bufio"
"crypto/rand" "crypto/rand"
stdlibx509 "crypto/x509"
"encoding/pem" "encoding/pem"
"errors" "errors"
"net" "net"
"net/url" "net/url"
"time" "time"
stdlibx509 "crypto/x509"
"github.com/talos-systems/talos/internal/pkg/cis" "github.com/talos-systems/talos/internal/pkg/cis"
"github.com/talos-systems/talos/pkg/config/machine" "github.com/talos-systems/talos/pkg/config/machine"
v1alpha1 "github.com/talos-systems/talos/pkg/config/types/v1alpha1" v1alpha1 "github.com/talos-systems/talos/pkg/config/types/v1alpha1"

View File

@@ -5,7 +5,6 @@
package kubernetes package kubernetes
import ( import (
stdlibx509 "crypto/x509"
"encoding/json" "encoding/json"
"encoding/pem" "encoding/pem"
"errors" "errors"
@@ -15,6 +14,8 @@ import (
"sync" "sync"
"time" "time"
stdlibx509 "crypto/x509"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
policy "k8s.io/api/policy/v1beta1" policy "k8s.io/api/policy/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"

View File

@@ -5,11 +5,11 @@
package startup package startup
import ( import (
"encoding/binary"
"fmt" "fmt"
"math/rand"
cryptorand "crypto/rand" cryptorand "crypto/rand"
"encoding/binary"
"math/rand"
) )
// RandSeed default math/rand PRNG. // RandSeed default math/rand PRNG.