Fix python client for proto files with underscores.

generate/Makefile

@@ -17,4 +17,4 @@ go-mocks:
 		--tmpfs /.cache:uid=$$(id -u),gid=$$(id -g) \
 		-w /work \
 		-v ${PWD}:/work \
-		vektra/mockery:v3.6.3
+		vektra/mockery:v3.6.3

generate/generate.go

@@ -39,8 +39,11 @@ var (
 
 type api struct {
 	Name     string
-	Services []string
-	Path     string
+	Services []struct {
+		Name     string
+		FileName string
+	}
+	Path string
 }
 
 func main() {
@@ -251,7 +254,13 @@ func svcs(root string) (map[string]api, error) {
 			}
 		}
 		for _, serviceDesc := range fd.GetService() {
-			a.Services = append(a.Services, *serviceDesc.Name)
+			a.Services = append(a.Services, struct {
+				Name     string
+				FileName string
+			}{
+				Name:     *serviceDesc.Name,
+				FileName: path.Base(filename),
+			})
 		}
 		result[name] = a
 	}

generate/go_client.tpl

@@ -24,13 +24,13 @@ type (
 {{ range $name, $api := . -}}
 	{{ $name | title }} interface {
 {{ range $svc := $api.Services -}}
-	{{ $svc | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc }}Client
+	{{ $svc.Name | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc.Name }}Client
 {{ end }}
 	}
 
     {{ $name }} struct {
 {{ range $svc := $api.Services -}}
-	{{ $svc | lower }} {{ $name }}connect.{{ $svc }}Client
+	{{ $svc.Name | lower }} {{ $name }}connect.{{ $svc.Name }}Client
 {{ end }}
     }
 
@@ -70,7 +70,7 @@ func New(config *DialConfig) (Client, error) {
 func (c *client) {{ $name | title }}() {{ $name | title }} {
 	a := &{{ $name }}{
 {{ range $svc := $api.Services -}}
-	{{ $svc | lower }}:  {{ $name }}connect.New{{ $svc }}Client(
+	{{ $svc.Name | lower }}:  {{ $name }}connect.New{{ $svc.Name }}Client(
 		c.config.HttpClient(),
 		c.config.BaseURL,
 		connect.WithInterceptors(c.interceptors...),
@@ -82,8 +82,8 @@ func (c *client) {{ $name | title }}() {{ $name | title }} {
 }
 
 {{ range $svc := $api.Services -}}
-func (c  *{{ $name }} ) {{ $svc | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc }}Client {
-	return c.{{ $svc | lower }}
+func (c  *{{ $name }} ) {{ $svc.Name | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc.Name }}Client {
+	return c.{{ $svc.Name | lower }}
 }
 {{ end }}
 

generate/go_mock_client.tpl

@@ -31,13 +31,13 @@ type (
 {{ range $name, $api := . -}}
     {{ $name }} struct {
 {{ range $svc := $api.Services -}}
-	{{ $svc | lower }} *{{ $name }}mocks.{{ $svc }}Client
+	{{ $svc.Name | lower }} *{{ $name }}mocks.{{ $svc.Name }}Client
 {{ end }}
     }
 
 	{{ $name | title }}MockFns struct {
 {{ range $svc := $api.Services -}}
-	{{ $svc | trimSuffix "Service" }}  func(m *mock.Mock)
+	{{ $svc.Name | trimSuffix "Service" }}  func(m *mock.Mock)
 {{ end }}
 	}
 {{ end }}
@@ -69,14 +69,14 @@ func (w wrapper) {{ $name | title }}(fns *{{ $name | title }}MockFns) *{{ $name
 func new{{ $name }}(t *testing.T, fns *{{ $name | title }}MockFns) *{{ $name }} {
 	a := &{{ $name }}{
 {{ range $svc := $api.Services -}}
-	{{ $svc | lower }}:  {{ $name }}mocks.New{{ $svc }}Client(t),
+	{{ $svc.Name | lower }}:  {{ $name }}mocks.New{{ $svc.Name }}Client(t),
 {{ end }}
 	}
 
 	if fns != nil {
 {{ range $svc := $api.Services -}}
-		if fns.{{ $svc | trimSuffix "Service" }} != nil {
-			fns.{{ $svc | trimSuffix "Service" }}(&a.{{ $svc | lower }}.Mock)
+		if fns.{{ $svc.Name | trimSuffix "Service" }} != nil {
+			fns.{{ $svc.Name | trimSuffix "Service" }}(&a.{{ $svc.Name | lower }}.Mock)
 		}
 {{ end }}
 	}
@@ -85,8 +85,8 @@ func new{{ $name }}(t *testing.T, fns *{{ $name | title }}MockFns) *{{ $name }}
 }
 
 {{ range $svc := $api.Services -}}
-func (c  *{{ $name }} ) {{ $svc | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc }}Client {
-	return c.{{ $svc | lower }}
+func (c  *{{ $name }} ) {{ $svc.Name | trimSuffix "Service" }}() {{ $name }}connect.{{ $svc.Name }}Client {
+	return c.{{ $svc.Name | lower }}
 }
 {{ end }}
 

generate/python_client.tpl

@@ -4,7 +4,7 @@ import pyqwest
 
 {{ range $name, $api := . -}}
 {{ range $svc := $api.Services -}}
-import metalstack.{{ $name | trimSuffix "v2" }}.v2.{{ $svc | trimSuffix "Service" | lower }}_connect as {{ $name | trimSuffix "v2" }}_{{ $svc | trimSuffix "Service" | lower }}_connect
+import metalstack.{{ $name | trimSuffix "v2" }}.v2.{{ $svc.FileName | trimSuffix ".proto" | lower }}_connect as {{ $name | trimSuffix "v2" }}_{{ $svc.FileName | trimSuffix ".proto" | lower }}_connect
 {{ end }}
 {{ end }}
 
@@ -31,7 +31,7 @@ class Client:
             self._client = client
 
 {{ range $svc := $api.Services }}
-        def {{ $svc | trimSuffix "Service" | lower }}(self):
-            return {{ $name | trimSuffix "v2" }}_{{ $svc | trimSuffix "Service" | lower }}_connect.{{ $svc }}ClientSync(address=self._baseurl, http_client=self._client)
+        def {{ $svc.FileName | trimSuffix ".proto" | lower }}(self):
+            return {{ $name | trimSuffix "v2" }}_{{ $svc.FileName | trimSuffix ".proto" | lower }}_connect.{{ $svc.Name }}ClientSync(address=self._baseurl, http_client=self._client)
 {{ end }}
 {{ end }}

js/Makefile

@@ -2,7 +2,7 @@ VERSION_STRIPPED := $(patsubst v%,%,$(VERSION))
 
 .PHONY: install
 install:
-	bun upgrade
+	bun upgrade || true
 	bun install -dd
 
 .PHONY: clean

python/metalstack/client/client.py

@@ -10,7 +10,7 @@
 import metalstack.admin.v2.partition_connect as admin_partition_connect
 import metalstack.admin.v2.project_connect as admin_project_connect
 import metalstack.admin.v2.size_connect as admin_size_connect
-import metalstack.admin.v2.sizereservation_connect as admin_sizereservation_connect
+import metalstack.admin.v2.size_reservation_connect as admin_size_reservation_connect
 import metalstack.admin.v2.switch_connect as admin_switch_connect
 import metalstack.admin.v2.task_connect as admin_task_connect
 import metalstack.admin.v2.tenant_connect as admin_tenant_connect
@@ -27,7 +27,7 @@
 import metalstack.api.v2.partition_connect as api_partition_connect
 import metalstack.api.v2.project_connect as api_project_connect
 import metalstack.api.v2.size_connect as api_size_connect
-import metalstack.api.v2.sizereservation_connect as api_sizereservation_connect
+import metalstack.api.v2.size_reservation_connect as api_size_reservation_connect
 import metalstack.api.v2.tenant_connect as api_tenant_connect
 import metalstack.api.v2.token_connect as api_token_connect
 import metalstack.api.v2.user_connect as api_user_connect
@@ -93,8 +93,8 @@ def project(self):
         def size(self):
             return admin_size_connect.SizeServiceClientSync(address=self._baseurl, http_client=self._client)
 
-        def sizereservation(self):
-            return admin_sizereservation_connect.SizeReservationServiceClientSync(address=self._baseurl, http_client=self._client)
+        def size_reservation(self):
+            return admin_size_reservation_connect.SizeReservationServiceClientSync(address=self._baseurl, http_client=self._client)
 
         def switch(self):
             return admin_switch_connect.SwitchServiceClientSync(address=self._baseurl, http_client=self._client)
@@ -148,8 +148,8 @@ def project(self):
         def size(self):
             return api_size_connect.SizeServiceClientSync(address=self._baseurl, http_client=self._client)
 
-        def sizereservation(self):
-            return api_sizereservation_connect.SizeReservationServiceClientSync(address=self._baseurl, http_client=self._client)
+        def size_reservation(self):
+            return api_size_reservation_connect.SizeReservationServiceClientSync(address=self._baseurl, http_client=self._client)
 
         def tenant(self):
             return api_tenant_connect.TenantServiceClientSync(address=self._baseurl, http_client=self._client)