From 6e77a8b2f6a0c45a9fb9854734718482b827f6e5 Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Thu, 16 Jul 2020 13:37:27 -0700
Subject: [PATCH] xds: delete experimental package and experimental scheme
 (#3729)

---
 xds/experimental/xds_experimental.go       | 29 ----------------------
 xds/internal/resolver/xds_resolver.go      | 15 -----------
 xds/internal/resolver/xds_resolver_test.go |  8 +++---
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 xds/experimental/xds_experimental.go

diff --git a/xds/experimental/xds_experimental.go b/xds/experimental/xds_experimental.go
deleted file mode 100644
index b7ac3019e..000000000
--- a/xds/experimental/xds_experimental.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Copyright 2019 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Package experimental contains xds implementation. Users only need to import
-// this package to get all xds functionality.
-//
-// Deprecated: import package xds instead.
-package experimental
-
-// TODO: remove this package after one release.
-
-import (
-	_ "google.golang.org/grpc/xds" // Register the balancers and resolvers.
-)
diff --git a/xds/internal/resolver/xds_resolver.go b/xds/internal/resolver/xds_resolver.go
index 690642094..fb46a9160 100644
--- a/xds/internal/resolver/xds_resolver.go
+++ b/xds/internal/resolver/xds_resolver.go
@@ -221,18 +221,3 @@ func (r *xdsResolver) Close() {
 	r.cancelCtx()
 	r.logger.Infof("Shutdown")
 }
-
-// Keep scheme with "-experimental" temporarily. Remove after one release.
-const schemeExperimental = "xds-experimental"
-
-type xdsResolverExperimentalBuilder struct {
-	xdsResolverBuilder
-}
-
-func (*xdsResolverExperimentalBuilder) Scheme() string {
-	return schemeExperimental
-}
-
-func init() {
-	resolver.Register(&xdsResolverExperimentalBuilder{})
-}
diff --git a/xds/internal/resolver/xds_resolver_test.go b/xds/internal/resolver/xds_resolver_test.go
index dcb5c9e8e..025a8b2db 100644
--- a/xds/internal/resolver/xds_resolver_test.go
+++ b/xds/internal/resolver/xds_resolver_test.go
@@ -55,11 +55,9 @@ var (
 )
 
 func TestRegister(t *testing.T) {
-	for _, s := range []string{"xds", "xds-experimental"} {
-		b := resolver.Get(s)
-		if b == nil {
-			t.Errorf("scheme %v is not registered", s)
-		}
+	b := resolver.Get(xdsScheme)
+	if b == nil {
+		t.Errorf("scheme %v is not registered", xdsScheme)
 	}
 }