Merge pull request #285 from Jefftree/proto-upgrade

Change references of googleapis/gnostic -> google/gnostic
kubernetes · Mar 14, 2022 · c7e0de3 · c7e0de3
2 parents 3f90b8c + 86aaf54
commit c7e0de3
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 12 deletions.
diff --git a/cmd/openapi2smd/openapi2smd.go b/cmd/openapi2smd/openapi2smd.go
@@ -21,7 +21,7 @@ import (
 	"log"
 	"os"
 
-	openapi_v2 "github.com/googleapis/gnostic/openapiv2"
+	openapi_v2 "github.com/google/gnostic/openapiv2"
 	yaml "gopkg.in/yaml.v2"
 
 	"k8s.io/kube-openapi/pkg/schemaconv"

diff --git a/go.mod b/go.mod
@@ -11,19 +11,17 @@ require (
 	github.com/go-openapi/jsonreference v0.19.3
 	github.com/go-openapi/swag v0.19.5
 	github.com/golang/protobuf v1.5.2
+	github.com/google/gnostic v0.6.6
 	github.com/google/go-cmp v0.5.5
 	github.com/google/gofuzz v1.1.0
 	github.com/google/uuid v1.1.2
-	github.com/googleapis/gnostic v0.5.1
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 	github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c
 	github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/text v0.3.5 // indirect
 	golang.org/x/tools v0.1.5 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c

diff --git a/go.sum b/go.sum
diff --git a/pkg/handler/handler.go b/pkg/handler/handler.go
@@ -28,7 +28,7 @@ import (
 	"github.com/NYTimes/gziphandler"
 	"github.com/emicklei/go-restful"
 	"github.com/golang/protobuf/proto"
-	openapi_v2 "github.com/googleapis/gnostic/openapiv2"
+	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"github.com/munnerz/goautoneg"
 	"gopkg.in/yaml.v2"
 	klog "k8s.io/klog/v2"

diff --git a/pkg/handler3/handler.go b/pkg/handler3/handler.go
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	openapi_v3 "github.com/googleapis/gnostic/openapiv3"
+	openapi_v3 "github.com/google/gnostic/openapiv3"
 	"github.com/munnerz/goautoneg"
 	"k8s.io/kube-openapi/pkg/common"
 	"k8s.io/kube-openapi/pkg/internal/handler"

diff --git a/pkg/util/proto/document.go b/pkg/util/proto/document.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	openapi_v2 "github.com/googleapis/gnostic/openapiv2"
+	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/pkg/util/proto/testing/openapi.go b/pkg/util/proto/testing/openapi.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"sync"
 
-	openapi_v2 "github.com/googleapis/gnostic/openapiv2"
+	openapi_v2 "github.com/google/gnostic/openapiv2"
 )
 
 // Fake opens and returns a openapi swagger from a file Path. It will