Merge pull request #326 from Venafi/vcert-5.0.0-bump

fix(vcert5.0): bumped module version to v5
Venafi · Aug 1, 2023 · b05b094 · b05b094
2 parents 7945ab8 + db8a8e2
commit b05b094
Show file tree

Hide file tree

Showing 76 changed files with 206 additions and 187 deletions.
diff --git a/client.go b/client.go
@@ -19,12 +19,13 @@ package vcert
 import (
 	"crypto/x509"
 	"fmt"
-	"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"
+
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/venafi/cloud"
+	"github.com/Venafi/vcert/v5/pkg/venafi/fake"
+	"github.com/Venafi/vcert/v5/pkg/venafi/tpp"
+	"github.com/Venafi/vcert/v5/pkg/verror"
 )
 
 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/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
 )
 
 func init() {

diff --git a/cmd/vcert/args.go b/cmd/vcert/args.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
 )
 
 const (

diff --git a/cmd/vcert/commands.go b/cmd/vcert/commands.go
@@ -31,19 +31,18 @@ import (
 	"strings"
 	"time"
 
-	"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/policy"
-	"github.com/Venafi/vcert/v4/pkg/util"
-	"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"
+	"gopkg.in/yaml.v2"
+
+	"github.com/Venafi/vcert/v5"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/policy"
+	"github.com/Venafi/vcert/v5/pkg/util"
+	"github.com/Venafi/vcert/v5/pkg/venafi/cloud"
+	"github.com/Venafi/vcert/v5/pkg/venafi/fake"
+	"github.com/Venafi/vcert/v5/pkg/venafi/tpp"
 )
 
 var (

diff --git a/cmd/vcert/config.go b/cmd/vcert/config.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/Venafi/vcert/v4"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
+	"github.com/Venafi/vcert/v5"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
 )
 
 func buildConfig(c *cli.Context, flags *commandFlags) (cfg vcert.Config, err error) {

diff --git a/cmd/vcert/generate_test.go b/cmd/vcert/generate_test.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
 )
 
 func TestGenerateCsrForCommandGenCsr(t *testing.T) {

diff --git a/cmd/vcert/main.go b/cmd/vcert/main.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/Venafi/vcert/v4"
+	"github.com/Venafi/vcert/v5"
 )
 
 var (

diff --git a/cmd/vcert/main_test.go b/cmd/vcert/main_test.go
@@ -32,8 +32,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/certificate"
-	"github.com/Venafi/vcert/v4/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
 )
 
 var testEmail = "[email protected]"

diff --git a/cmd/vcert/playbook.go b/cmd/vcert/playbook.go
@@ -27,10 +27,10 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/crypto/pkcs12"
 
-	"github.com/Venafi/vcert/v4/pkg/playbook/app/domain"
-	"github.com/Venafi/vcert/v4/pkg/playbook/app/parser"
-	"github.com/Venafi/vcert/v4/pkg/playbook/app/service"
-	"github.com/Venafi/vcert/v4/pkg/playbook/util"
+	"github.com/Venafi/vcert/v5/pkg/playbook/app/domain"
+	"github.com/Venafi/vcert/v5/pkg/playbook/app/parser"
+	"github.com/Venafi/vcert/v5/pkg/playbook/app/service"
+	"github.com/Venafi/vcert/v5/pkg/playbook/util"
 )
 
 const (

diff --git a/cmd/vcert/playbook_test.go b/cmd/vcert/playbook_test.go
@@ -14,7 +14,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/crypto/pkcs12"
 
-	"github.com/Venafi/vcert/v4/pkg/playbook/app/domain"
+	"github.com/Venafi/vcert/v5/pkg/playbook/app/domain"
 )
 
 type logLine struct {

diff --git a/cmd/vcert/result_writer.go b/cmd/vcert/result_writer.go
@@ -30,8 +30,8 @@ import (
 	"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"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/util"
 )
 
 type Config struct {

diff --git a/cmd/vcert/result_writer_test.go b/cmd/vcert/result_writer_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
 )
 
 var (

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
@@ -32,13 +32,13 @@ import (
 	"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/util"
-
+	"github.com/Venafi/vcert/v5"
 	"github.com/spf13/viper"
 	"github.com/urfave/cli/v2"
+
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/util"
 )
 
 const (

diff --git a/cmd/vcert/validators.go b/cmd/vcert/validators.go
@@ -23,9 +23,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/Venafi/vcert/v4/pkg/util"
-
-	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/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/v5/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/v5"
+	"github.com/Venafi/vcert/v5/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/v5"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/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/v5"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/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/v5"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
 )
 
 var mockConfig, cloudConfig, tppConfig *vcert.Config

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Venafi/vcert/v4
+module github.com/Venafi/vcert/v5
 
 require (
 	github.com/google/uuid v1.3.0

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/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/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/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/venafi/fake"
 )
 
 func TestConfig_NewListener(t *testing.T) {

diff --git a/pkg/certificate/certificate.go b/pkg/certificate/certificate.go
@@ -32,8 +32,8 @@ import (
 
 	"github.com/youmark/pkcs8"
 
-	"github.com/Venafi/vcert/v4/pkg/util"
-	"github.com/Venafi/vcert/v4/pkg/verror"
+	"github.com/Venafi/vcert/v5/pkg/util"
+	"github.com/Venafi/vcert/v5/pkg/verror"
 )
 
 const (

diff --git a/pkg/certificate/certificateCollection.go b/pkg/certificate/certificateCollection.go
@@ -23,7 +23,7 @@ import (
 	"encoding/pem"
 	"fmt"
 
-	"github.com/Venafi/vcert/v4/pkg/verror"
+	"github.com/Venafi/vcert/v5/pkg/verror"
 )
 
 // PEMCollection represents a collection of PEM data

diff --git a/pkg/certificate/certificate_test.go b/pkg/certificate/certificate_test.go
@@ -30,7 +30,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/util"
+	"github.com/Venafi/vcert/v5/pkg/util"
 )
 
 func getCertificateRequestForTest() *Request {

diff --git a/pkg/certificate/keyType.go b/pkg/certificate/keyType.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Venafi/vcert/v4/pkg/verror"
 	"gopkg.in/yaml.v3"
+
+	"github.com/Venafi/vcert/v5/pkg/verror"
 )
 
 // KeyType represents the types of supported keys

diff --git a/pkg/certificate/request.go b/pkg/certificate/request.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Venafi/vcert/v4/pkg/util"
-	"github.com/Venafi/vcert/v4/pkg/verror"
+	"github.com/Venafi/vcert/v5/pkg/util"
+	"github.com/Venafi/vcert/v5/pkg/verror"
 )
 
 // Request contains data needed to generate a certificate request

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/v5/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/policy"
 )
 
 const SDKName = "Venafi VCert-Go"

diff --git a/pkg/endpoint/endpoint_test.go b/pkg/endpoint/endpoint_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Venafi/vcert/v4/pkg/certificate"
+	"github.com/Venafi/vcert/v5/pkg/certificate"
 )
 
 func TestNewZoneConfiguration(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ import ( @@
     	"github.com/urfave/cli/v2"
-    	"github.com/Venafi/vcert/v4"
+    	"github.com/Venafi/vcert/v5"
     )
     var (
@@ Expand Down @@