Merge pull request #226 from AwesomePatrol/fix-364244347

Fix calls to NetworkServices List
GoogleCloudPlatform · Sep 6, 2024 · c62a30e · c62a30e
2 parents 6f792c8 + d2360d4
commit c62a30e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkg/cloud/gen.go b/pkg/cloud/gen.go
@@ -51999,7 +51999,8 @@ func (g *TDTcpRoutes) List(ctx context.Context, fl *filter.F, options ...Option)
 		return nil, err
 	}
 	klog.V(5).Infof("TDTcpRoutes.List(%v, %v): projectID = %v, ck = %+v", ctx, fl, projectID, ck)
-	call := g.s.NetworkServicesGA.TcpRoutes.List(projectID)
+	parent := fmt.Sprintf("projects/%s/locations/global", projectID)
+	call := g.s.NetworkServicesGA.TcpRoutes.List(parent)
 
 	var all []*networkservicesga.TcpRoute
 	f := func(l *networkservicesga.ListTcpRoutesResponse) error {
@@ -52420,7 +52421,8 @@ func (g *TDBetaTcpRoutes) List(ctx context.Context, fl *filter.F, options ...Opt
 		return nil, err
 	}
 	klog.V(5).Infof("TDBetaTcpRoutes.List(%v, %v): projectID = %v, ck = %+v", ctx, fl, projectID, ck)
-	call := g.s.NetworkServicesBeta.TcpRoutes.List(projectID)
+	parent := fmt.Sprintf("projects/%s/locations/global", projectID)
+	call := g.s.NetworkServicesBeta.TcpRoutes.List(parent)
 
 	var all []*networkservicesbeta.TcpRoute
 	f := func(l *networkservicesbeta.ListTcpRoutesResponse) error {
@@ -52841,7 +52843,8 @@ func (g *TDMeshes) List(ctx context.Context, fl *filter.F, options ...Option) ([
 		return nil, err
 	}
 	klog.V(5).Infof("TDMeshes.List(%v, %v): projectID = %v, ck = %+v", ctx, fl, projectID, ck)
-	call := g.s.NetworkServicesGA.Meshes.List(projectID)
+	parent := fmt.Sprintf("projects/%s/locations/global", projectID)
+	call := g.s.NetworkServicesGA.Meshes.List(parent)
 
 	var all []*networkservicesga.Mesh
 	f := func(l *networkservicesga.ListMeshesResponse) error {
@@ -53262,7 +53265,8 @@ func (g *TDBetaMeshes) List(ctx context.Context, fl *filter.F, options ...Option
 		return nil, err
 	}
 	klog.V(5).Infof("TDBetaMeshes.List(%v, %v): projectID = %v, ck = %+v", ctx, fl, projectID, ck)
-	call := g.s.NetworkServicesBeta.Meshes.List(projectID)
+	parent := fmt.Sprintf("projects/%s/locations/global", projectID)
+	call := g.s.NetworkServicesBeta.Meshes.List(parent)
 
 	var all []*networkservicesbeta.Mesh
 	f := func(l *networkservicesbeta.ListMeshesResponse) error {

diff --git a/pkg/cloud/gen/main.go b/pkg/cloud/gen/main.go
@@ -837,8 +837,13 @@ func (g *{{.GCPWrapType}}) List(ctx context.Context, zone string, fl *filter.F,
 
 {{- if .KeyIsGlobal}}
 	klog.V(5).Infof("{{.GCPWrapType}}.List(%v, %v): projectID = %v, ck = %+v", ctx, fl, projectID, ck)
+{{- if .IsNetworkServices }}
+	parent := fmt.Sprintf("projects/%s/locations/global", projectID)
+	call := g.s.{{.GroupVersionTitle}}.{{.Service}}.List(parent)
+{{- else}}
 	call := g.s.{{.GroupVersionTitle}}.{{.Service}}.List(projectID)
 {{- end -}}
+{{- end -}}
 {{- if .KeyIsRegional}}
 	klog.V(5).Infof("{{.GCPWrapType}}.List(%v, %v, %v): projectID = %v, ck = %+v", ctx, region, fl, projectID, ck)
 	call := g.s.{{.GroupVersionTitle}}.{{.Service}}.List(projectID, region)