run 'gci write --skip-generated -s standard -s default -s "prefix(git…

…hub.com/Venafi/vcert)" -s blank -s dot .' Signed-off-by: Tim Ramlot <[email protected]>
Venafi · Jul 13, 2023 · 9e76127 · 9e76127
1 parent b42d64e
commit 9e76127
Show file tree

Hide file tree

Showing 42 changed files with 100 additions and 80 deletions.
diff --git a/client.go b/client.go
@@ -19,12 +19,13 @@ package vcert
 import (
 	"crypto/x509"
 	"fmt"
+	"log"
+
 	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"github.com/Venafi/vcert/v4/pkg/venafi/cloud"
 	"github.com/Venafi/vcert/v4/pkg/venafi/fake"
 	"github.com/Venafi/vcert/v4/pkg/venafi/tpp"
 	"github.com/Venafi/vcert/v4/pkg/verror"
-	"log"
 )
 
 type newClientArgs struct {

diff --git a/client_test.go b/client_test.go
@@ -21,13 +21,14 @@ import (
 	"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"testing"
 	"time"
+
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
 )
 
 func init() {

diff --git a/cmd/vcert/commands.go b/cmd/vcert/commands.go
@@ -22,9 +22,6 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/venafi/cloud"
-	"github.com/Venafi/vcert/v4/pkg/venafi/fake"
-	"github.com/Venafi/vcert/v4/pkg/venafi/tpp"
 	"io/ioutil"
 	"log"
 	"net"
@@ -34,15 +31,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/policy"
-	"github.com/Venafi/vcert/v4/pkg/util"
+	"github.com/urfave/cli/v2"
+	"golang.org/x/crypto/pkcs12"
 	"gopkg.in/yaml.v2"
 
 	"github.com/Venafi/vcert/v4"
 	"github.com/Venafi/vcert/v4/pkg/certificate"
 	"github.com/Venafi/vcert/v4/pkg/endpoint"
-	"github.com/urfave/cli/v2"
-	"golang.org/x/crypto/pkcs12"
+	"github.com/Venafi/vcert/v4/pkg/policy"
+	"github.com/Venafi/vcert/v4/pkg/util"
+	"github.com/Venafi/vcert/v4/pkg/venafi/cloud"
+	"github.com/Venafi/vcert/v4/pkg/venafi/fake"
+	"github.com/Venafi/vcert/v4/pkg/venafi/tpp"
 )
 
 var (

diff --git a/cmd/vcert/main.go b/cmd/vcert/main.go
@@ -23,8 +23,9 @@ import (
 	"sort"
 	"time"
 
-	"github.com/Venafi/vcert/v4"
 	"github.com/urfave/cli/v2"
+
+	"github.com/Venafi/vcert/v4"
 )
 
 var (

diff --git a/cmd/vcert/result_writer.go b/cmd/vcert/result_writer.go
@@ -23,15 +23,16 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/util"
 	"io/ioutil"
 	"os"
 	"strings"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/certificate"
 	"github.com/pavel-v-chernykh/keystore-go/v4"
 	"software.sslmate.com/src/go-pkcs12"
+
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/util"
 )
 
 type Config struct {

diff --git a/cmd/vcert/test_utils.go b/cmd/vcert/test_utils.go
@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/urfave/cli/v2"
 	"os"
+
+	"github.com/urfave/cli/v2"
 )
 
 const (

diff --git a/cmd/vcert/utils.go b/cmd/vcert/utils.go
@@ -33,13 +33,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/spf13/viper"
+	"github.com/urfave/cli/v2"
+
 	"github.com/Venafi/vcert/v4"
 	"github.com/Venafi/vcert/v4/pkg/certificate"
 	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"github.com/Venafi/vcert/v4/pkg/util"
-
-	"github.com/spf13/viper"
-	"github.com/urfave/cli/v2"
 )
 
 const (

diff --git a/cmd/vcert/validators.go b/cmd/vcert/validators.go
@@ -19,13 +19,13 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/util"
 	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
 
 	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/util"
 )
 
 // RevocationReasonOptions is an array of strings containing reasons for certificate revocation

diff --git a/config.go b/config.go
@@ -24,8 +24,9 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"gopkg.in/ini.v1"
+
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
 )
 
 // Config is a basic structure for high level initiating connector to Trust Platform (TPP)/Venafi Cloud

diff --git a/examples/server/main.go b/examples/server/main.go
@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/Venafi/vcert/v4"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
+
+	"github.com/Venafi/vcert/v4"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
 )
 
 func main() {

diff --git a/examples/simple-cli/main.go b/examples/simple-cli/main.go
@@ -22,17 +22,18 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"github.com/Venafi/vcert/v4"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
-	"github.com/Venafi/vcert/v4/pkg/venafi/tpp"
 	"io/ioutil"
 	t "log"
 	"math/big"
 	"net"
 	"os"
 	"strings"
 	"time"
+
+	"github.com/Venafi/vcert/v4"
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
+	"github.com/Venafi/vcert/v4/pkg/venafi/tpp"
 )
 
 func main() {

diff --git a/examples/simple-cli/main_test.go b/examples/simple-cli/main_test.go
@@ -21,12 +21,13 @@ import (
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
-	"github.com/Venafi/vcert/v4"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/test"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/Venafi/vcert/v4"
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/test"
 )
 
 var effectiveConfig *vcert.Config

diff --git a/examples/simple-cli/vars.go b/examples/simple-cli/vars.go
@@ -19,11 +19,12 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/Venafi/vcert/v4"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"io/ioutil"
 	"log"
 	"os"
+
+	"github.com/Venafi/vcert/v4"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
 )
 
 var mockConfig, cloudConfig, tppConfig *vcert.Config

diff --git a/listener.go b/listener.go
@@ -4,12 +4,13 @@ import (
 	"crypto/tls"
 	"crypto/x509/pkix"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
-	"github.com/Venafi/vcert/v4/pkg/util"
 	"log"
 	"net"
 	"time"
+
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
+	"github.com/Venafi/vcert/v4/pkg/util"
 )
 
 // NewListener returns a net.Listener that listens on the first port

diff --git a/listener_test.go b/listener_test.go
@@ -4,12 +4,13 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
-	"github.com/Venafi/vcert/v4/pkg/venafi/fake"
 	"io/ioutil"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
+	"github.com/Venafi/vcert/v4/pkg/venafi/fake"
 )
 
 func TestConfig_NewListener(t *testing.T) {

diff --git a/pkg/certificate/certificate.go b/pkg/certificate/certificate.go
@@ -29,15 +29,14 @@ import (
 	"fmt"
 	"net"
 	"net/url"
+	"reflect"
+	"sort"
 	"strings"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/util"
 	"github.com/youmark/pkcs8"
 
-	"reflect"
-	"sort"
-
+	"github.com/Venafi/vcert/v4/pkg/util"
 	"github.com/Venafi/vcert/v4/pkg/verror"
 )
 

diff --git a/pkg/certificate/certificateCollection.go b/pkg/certificate/certificateCollection.go
@@ -22,8 +22,9 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/verror"
 	"strings"
+
+	"github.com/Venafi/vcert/v4/pkg/verror"
 )
 
 // ChainOption represents the options to be used with the certificate chain

diff --git a/pkg/endpoint/endpoint.go b/pkg/endpoint/endpoint.go
@@ -29,9 +29,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/policy"
-
 	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/policy"
 )
 
 const SDKName = "Venafi VCert-Go"

diff --git a/pkg/endpoint/endpoint_validator_test.go b/pkg/endpoint/endpoint_validator_test.go
@@ -2,8 +2,9 @@ package endpoint
 
 import (
 	"crypto/x509/pkix"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
 	"testing"
+
+	"github.com/Venafi/vcert/v4/pkg/certificate"
 )
 
 var any = []string{`.*`}

diff --git a/pkg/policy/policySpecification_test.go b/pkg/policy/policySpecification_test.go
@@ -3,12 +3,13 @@ package policy
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/smartystreets/assertions"
-	"gopkg.in/yaml.v2"
 	t "log"
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/smartystreets/assertions"
+	"gopkg.in/yaml.v2"
 )
 
 func getPolicySpecificationFromFile(f string) *PolicySpecification {

diff --git a/pkg/policy/policyUtils.go b/pkg/policy/policyUtils.go
@@ -3,12 +3,13 @@ package policy
 import (
 	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
+
+	"gopkg.in/yaml.v2"
 )
 
 // there is no way for creating an array as constant, so creating a variable

diff --git a/pkg/util/sshKeyGenerator.go b/pkg/util/sshKeyGenerator.go
@@ -6,10 +6,10 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"github.com/youmark/pkcs8"
 	"log"
 	"strings"
 
+	"github.com/youmark/pkcs8"
 	"golang.org/x/crypto/ssh"
 )
 

diff --git a/pkg/util/sshKeyGenerator_test.go b/pkg/util/sshKeyGenerator_test.go
@@ -2,8 +2,9 @@ package util
 
 import (
 	"fmt"
-	"github.com/smartystreets/assertions"
 	"testing"
+
+	"github.com/smartystreets/assertions"
 )
 
 func TestGenerateSshKeyPair(t *testing.T) {

diff --git a/pkg/util/utils.go b/pkg/util/utils.go
@@ -8,8 +8,9 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/youmark/pkcs8"
 	"time"
+
+	"github.com/youmark/pkcs8"
 )
 
 const LegacyPem = "legacy-pem"

diff --git a/pkg/venafi/cloud/cloud.go b/pkg/venafi/cloud/cloud.go
@@ -32,13 +32,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/endpoint"
 	"github.com/Venafi/vcert/v4/pkg/policy"
 	"github.com/Venafi/vcert/v4/pkg/util"
-
 	"github.com/Venafi/vcert/v4/pkg/verror"
-
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
 )
 
 type apiKey struct {

diff --git a/pkg/venafi/cloud/cloudUtil.go b/pkg/venafi/cloud/cloudUtil.go
@@ -3,10 +3,11 @@ package cloud
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/util"
 	"net/http"
 	"regexp"
+
+	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v4/pkg/util"
 )
 
 func parseCertificateInfo(httpStatusCode int, httpStatus string, body []byte) (*managedCertificate, error) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,8 +23,9 @@ import ( @@
     	"sort"
     	"time"
-    	"github.com/Venafi/vcert/v4"
     	"github.com/urfave/cli/v2"
+    	"github.com/Venafi/vcert/v4"
     )
     var (
@@ Expand Down @@