rollback - Upgrade api version. (gravitational#7751)

Makefile

@@ -744,8 +744,8 @@ update-vendor:
 	go mod vendor
 	# delete the vendored api package. In its place
 	# create a symlink to the the original api package
-	rm -r vendor/github.com/gravitational/teleport/api/v7
-	ln -s -r $(shell readlink -f api) vendor/github.com/gravitational/teleport/api/v7
+	rm -r vendor/github.com/gravitational/teleport/api
+	ln -s -r $(shell readlink -f api) vendor/github.com/gravitational/teleport
 
 # update-webassets updates the minified code in the webassets repo using the latest webapps
 # repo and creates a PR in the teleport repo to update webassets submodule.

api/client/auditstreamer.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/gravitational/teleport/api/v7/client/proto"
-	"github.com/gravitational/teleport/api/v7/types/events"
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/types/events"
 
 	"github.com/gravitational/trace"
 	"github.com/gravitational/trace/trail"

api/client/client.go

@@ -26,13 +26,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/client/proto"
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/defaults"
-	"github.com/gravitational/teleport/api/v7/metadata"
-	"github.com/gravitational/teleport/api/v7/types"
-	"github.com/gravitational/teleport/api/v7/types/events"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/defaults"
+	"github.com/gravitational/teleport/api/metadata"
+	"github.com/gravitational/teleport/api/types"
+	"github.com/gravitational/teleport/api/types/events"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/gravitational/trace"

api/client/client_test.go

@@ -26,9 +26,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/client/proto"
-	"github.com/gravitational/teleport/api/v7/defaults"
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/defaults"
+	"github.com/gravitational/teleport/api/types"
 
 	"github.com/gravitational/trace"
 	"github.com/gravitational/trace/trail"

api/client/contextdialer.go

@@ -21,9 +21,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/client/webclient"
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/utils/sshutils"
+	"github.com/gravitational/teleport/api/client/webclient"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/utils/sshutils"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"

api/client/credentials.go

@@ -21,9 +21,9 @@ import (
 	"crypto/x509"
 	"io/ioutil"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/identityfile"
-	"github.com/gravitational/teleport/api/v7/profile"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/identityfile"
+	"github.com/gravitational/teleport/api/profile"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"

api/client/credentials_test.go

@@ -26,9 +26,9 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/gravitational/teleport/api/v7/identityfile"
-	"github.com/gravitational/teleport/api/v7/profile"
-	"github.com/gravitational/teleport/api/v7/utils/sshutils"
+	"github.com/gravitational/teleport/api/identityfile"
+	"github.com/gravitational/teleport/api/profile"
+	"github.com/gravitational/teleport/api/utils/sshutils"
 
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/ssh"

api/client/doc_test.go

@@ -8,8 +8,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/client"
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/client"
+	"github.com/gravitational/teleport/api/types"
 )
 
 // Below is an example of creating a new Teleport Auth client with Profile credentials,

api/client/keepaliver.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/gravitational/teleport/api/v7/client/proto"
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/types"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/gravitational/trace/trail"

api/client/proto/proto.go

@@ -18,7 +18,7 @@ limitations under the License.
 package proto
 
 import (
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/types"
 )
 
 // FromWatchKind converts the watch kind value between internal

api/client/sessions.go

@@ -19,7 +19,7 @@ package client
 import (
 	"context"
 
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/types"
 
 	"github.com/gravitational/trace"
 	"github.com/gravitational/trace/trail"

api/client/streamwatcher.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/gravitational/teleport/api/v7/client/proto"
-	"github.com/gravitational/teleport/api/v7/types"
+	"github.com/gravitational/teleport/api/client/proto"
+	"github.com/gravitational/teleport/api/types"
 
 	"github.com/gravitational/trace"
 	"github.com/gravitational/trace/trail"

api/client/webclient/webclient.go

@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gravitational/teleport/api/v7/constants"
+	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/trace"
 )
 

api/defaults/defaults.go

@@ -20,7 +20,7 @@ package defaults
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
+	"github.com/gravitational/teleport/api/constants"
 )
 
 const (

api/go.mod

@@ -1,4 +1,4 @@
-module github.com/gravitational/teleport/api/v7
+module github.com/gravitational/teleport/api
 
 go 1.15
 

api/identityfile/identityfile.go

@@ -27,8 +27,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/gravitational/teleport/api/v7/utils/keypaths"
-	"github.com/gravitational/teleport/api/v7/utils/sshutils"
+	"github.com/gravitational/teleport/api/utils/keypaths"
+	"github.com/gravitational/teleport/api/utils/sshutils"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"

api/identityfile/identityfile_test.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gravitational/teleport/api/v7/identityfile"
+	"github.com/gravitational/teleport/api/identityfile"
 	"github.com/stretchr/testify/require"
 )
 

api/metadata/metadata.go

@@ -19,7 +19,7 @@ package metadata
 import (
 	"context"
 
-	"github.com/gravitational/teleport/api/v7"
+	"github.com/gravitational/teleport/api"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )

api/profile/profile.go

@@ -27,8 +27,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gravitational/teleport/api/v7/utils/keypaths"
-	"github.com/gravitational/teleport/api/v7/utils/sshutils"
+	"github.com/gravitational/teleport/api/utils/keypaths"
+	"github.com/gravitational/teleport/api/utils/sshutils"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"

api/profile/profile_test.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gravitational/teleport/api/v7/profile"
+	"github.com/gravitational/teleport/api/profile"
 	"github.com/gravitational/trace"
 
 	"github.com/stretchr/testify/require"

api/types/access_request.go

@@ -23,7 +23,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )

api/types/audit.go

@@ -19,7 +19,7 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/defaults"
+	"github.com/gravitational/teleport/api/defaults"
 
 	"github.com/gravitational/trace"
 )

api/types/authentication.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/utils/tlsutils"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/utils/tlsutils"
 
 	"github.com/gogo/protobuf/jsonpb"
 	"github.com/gravitational/trace"

api/types/authority.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )

api/types/duration.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
+	"github.com/gravitational/teleport/api/constants"
 
 	"github.com/gravitational/trace"
 )

api/types/github.go

@@ -19,7 +19,7 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )

api/types/lock.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/google/go-cmp/cmp"

api/types/namespace.go

@@ -20,7 +20,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/defaults"
+	"github.com/gravitational/teleport/api/defaults"
 	"github.com/gravitational/trace"
 )
 

api/types/networking.go

@@ -19,7 +19,7 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/defaults"
+	"github.com/gravitational/teleport/api/defaults"
 
 	"github.com/gravitational/trace"
 )

api/types/oidc.go

@@ -19,8 +19,8 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )

api/types/presence.go

@@ -19,8 +19,8 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/defaults"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/defaults"
 
 	"github.com/gravitational/trace"
 )

api/types/provisioning.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/defaults"
+	"github.com/gravitational/teleport/api/defaults"
 
 	"github.com/gravitational/trace"
 )

api/types/resource.go

@@ -20,8 +20,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/defaults"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/defaults"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )

api/types/role.go

@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/defaults"
-	"github.com/gravitational/teleport/api/v7/types/wrappers"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/defaults"
+	"github.com/gravitational/teleport/api/types/wrappers"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/gravitational/trace"

api/types/saml.go

@@ -19,8 +19,8 @@ package types
 import (
 	"time"
 
-	"github.com/gravitational/teleport/api/v7/constants"
-	"github.com/gravitational/teleport/api/v7/utils"
+	"github.com/gravitational/teleport/api/constants"
+	"github.com/gravitational/teleport/api/utils"
 
 	"github.com/gravitational/trace"
 )