add ClientDefaultListenerResourceNameTemplate when used with --includ…

…e-xdstp-name-in-lds-experimental (#57)
GoogleCloudPlatform · Feb 9, 2024 · c53528b · c53528b
1 parent 2bf1b5e
commit c53528b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -319,6 +319,7 @@ func generate(in configInput) ([]byte, error) {
 			// xdstp://<authority>/envoy.config.listener.v3.Listener/<project_number>/<(network)|(mesh:mesh_name)>/id
 			ClientListenerResourceNameTemplate: fmt.Sprintf("xdstp://%s/envoy.config.listener.v3.Listener/%d/%s/%%s", tdAuthority, in.gcpProjectNumber, networkIdentifier),
 		}
+		c.ClientDefaultListenerResourceNameTemplate = fmt.Sprintf("xdstp://%s/envoy.config.listener.v3.Listener/%d/%s/%%s", tdAuthority, in.gcpProjectNumber, networkIdentifier)
 	}
 
 	c2pAuthority := "traffic-director-c2p.xds.googleapis.com"
@@ -462,11 +463,12 @@ func getFromMetadata(urlStr string) ([]byte, error) {
 }
 
 type config struct {
-	XdsServers                         []server                             `json:"xds_servers,omitempty"`
-	Authorities                        map[string]Authority                 `json:"authorities,omitempty"`
-	Node                               *node                                `json:"node,omitempty"`
-	CertificateProviders               map[string]certificateProviderConfig `json:"certificate_providers,omitempty"`
-	ServerListenerResourceNameTemplate string                               `json:"server_listener_resource_name_template,omitempty"`
+	XdsServers                                []server                             `json:"xds_servers,omitempty"`
+	Authorities                               map[string]Authority                 `json:"authorities,omitempty"`
+	Node                                      *node                                `json:"node,omitempty"`
+	CertificateProviders                      map[string]certificateProviderConfig `json:"certificate_providers,omitempty"`
+	ServerListenerResourceNameTemplate        string                               `json:"server_listener_resource_name_template,omitempty"`
+	ClientDefaultListenerResourceNameTemplate string                               `json:"client_default_listener_resource_name_template,omitempty"`
 }
 
 type server struct {

diff --git a/main_test.go b/main_test.go
@@ -553,7 +553,8 @@ func TestGenerate(t *testing.T) {
       }
     }
   },
-  "server_listener_resource_name_template": "grpc/server?xds.resource.listening_address=%s"
+  "server_listener_resource_name_template": "grpc/server?xds.resource.listening_address=%s",
+  "client_default_listener_resource_name_template": "xdstp://traffic-director-global.xds.googleapis.com/envoy.config.listener.v3.Listener/123456789012345/thedefault/%s"
 }`,
 		},
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -553,7 +553,8 @@ func TestGenerate(t *testing.T) { @@
           }
         }
       },
-      "server_listener_resource_name_template": "grpc/server?xds.resource.listening_address=%s"
+      "server_listener_resource_name_template": "grpc/server?xds.resource.listening_address=%s",
+      "client_default_listener_resource_name_template": "xdstp://traffic-director-global.xds.googleapis.com/envoy.config.listener.v3.Listener/123456789012345/thedefault/%s"
     }`,
     		},
     	}
@@ Expand Down @@