cncf · htuch · Mar 12, 2021 · Feb 10, 2021 · Mar 10, 2021 · Mar 11, 2021
diff --git a/.bazelrc b/.bazelrc
@@ -0,0 +1 @@
+build:ci --announce_rc
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+2.0.0
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+*.pb.go linguist-generated=true
+*.pb.go -diff -merge
+*.pb.validate.go linguist-generated=true
+*.pb.validate.go -diff -merge
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+bazel-*
+go.sum
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "com_github_cncf_udpa")
+workspace(name = "com_github_cncf_xds")
 
 load("//bazel:repositories.bzl", "udpa_api_dependencies")
 

diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl
@@ -8,7 +8,7 @@ _PY_PROTO_SUFFIX = "_py_proto"
 _CC_PROTO_SUFFIX = "_cc_proto"
 _CC_GRPC_SUFFIX = "_cc_grpc"
 _GO_PROTO_SUFFIX = "_go_proto"
-_GO_IMPORTPATH_PREFIX = "github.com/cncf/udpa/go/"
+_GO_IMPORTPATH_PREFIX = "github.com/cncf/xds/go/"
 
 _COMMON_PROTO_DEPS = [
     "@com_google_protobuf//:any_proto",

diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
@@ -18,7 +18,7 @@ def udpa_dependency_imports(go_version = GO_VERSION):
         go = True,
         grpc = True,
         rules_override = {
-            "py_proto_library": "@com_github_cncf_udpa//bazel:api_build_system.bzl",
+            "py_proto_library": "@com_github_cncf_xds//bazel:api_build_system.bzl",
         },
     )
 

diff --git a/ci/check.sh b/ci/check.sh
@@ -4,11 +4,11 @@ set -e
 
 bazel test --config=ci //...
 
-rm -rf go/udpa
+rm -rf go/xds go/udpa
 
 tools/generate_go_protobuf.py
 
-git add go/udpa
+git add go/xds go/udpa
 
 echo "If this check fails, apply following diff:"
 git diff HEAD

diff --git a/go/go.mod b/go/go.mod
@@ -1,4 +1,4 @@
-module github.com/cncf/udpa/go
+module github.com/cncf/xds/go
 
 go 1.11
 

diff --git a/go/udpa/service/orca/v1/orca.pb.go b/go/udpa/service/orca/v1/orca.pb.go
diff --git a/go/xds/core/v3/authority.pb.go b/go/xds/core/v3/authority.pb.go
diff --git a/go/xds/core/v3/collection_entry.pb.go b/go/xds/core/v3/collection_entry.pb.go
diff --git a/go/xds/core/v3/context_params.pb.go b/go/xds/core/v3/context_params.pb.go
diff --git a/go/xds/core/v3/resource.pb.go b/go/xds/core/v3/resource.pb.go
diff --git a/go/xds/core/v3/resource_locator.pb.go b/go/xds/core/v3/resource_locator.pb.go
diff --git a/go/xds/core/v3/resource_name.pb.go b/go/xds/core/v3/resource_name.pb.go
diff --git a/test/build/go_build_test.go b/test/build/go_build_test.go
@@ -3,11 +3,11 @@ package go_build_test
 import (
 	"testing"
 
-	_ "github.com/cncf/udpa/go/udpa/data/orca/v1"
-	_ "github.com/cncf/udpa/go/udpa/service/orca/v1"
-	_ "github.com/cncf/udpa/go/udpa/type/v1"
+	_ "github.com/cncf/xds/go/udpa/data/orca/v1"
+	_ "github.com/cncf/xds/go/udpa/service/orca/v1"
+	_ "github.com/cncf/xds/go/udpa/type/v1"
 )
 
 func TestNoop(t *testing.T) {
-	// Noop test that verifies the successful importation of UDPA protos
+	// Noop test that verifies the successful importation of xDS protos
 }
diff --git a/tools/generate_go_protobuf.py b/tools/generate_go_protobuf.py
@@ -19,7 +19,7 @@ def generateProtobufs(output):
   for rule in go_protos:
     rule_dir, proto = rule.decode()[2:].rsplit(':', 1)
     input_dir = os.path.join(bazel_bin, rule_dir, 'linux_amd64_stripped',
-                             proto + '%', 'github.com/cncf/udpa/go', rule_dir)
+                             proto + '%', 'github.com/cncf/xds/go', rule_dir)
     input_files = glob.glob(os.path.join(input_dir, '*.go'))
     output_dir = os.path.join(output, rule_dir)