Rename generated interfaces (for easier ext.)

compose/service/service.go

@@ -35,6 +35,15 @@ type (
 		WaitFor(ctx context.Context, ev eventbus.Event) (err error)
 		Dispatch(ctx context.Context, ev eventbus.Event)
 	}
+
+	// storeInterface wraps generated interfaces to enable extensions
+	storeInterface interface {
+		// Include generated interfaces
+		storeGeneratedInterfaces
+
+		// And all additional required functions
+		// ...
+	}
 )
 
 var (

compose/service/store_interface.gen.go

@@ -2,10 +2,8 @@ package service
 
 // This file is auto-generated.
 //
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// Definitions file that controls how this file is generated:
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
 //  - store/actionlog.yaml
 //  - store/compose_charts.yaml
 //  - store/compose_module_fields.yaml
@@ -13,10 +11,14 @@ package service
 //  - store/compose_namespaces.yaml
 //  - store/compose_pages.yaml
 //  - store/rbac_rules.yaml
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		actionlogsStore
 		composeChartsStore
 		composeModuleFieldsStore

messaging/service/service.go

@@ -30,6 +30,15 @@ type (
 		ActionLog options.ActionLogOpt
 		Storage   options.StorageOpt
 	}
+
+	// storeInterface wraps generated interfaces to enable extensions
+	storeInterface interface {
+		// Include generated interfaces
+		storeGeneratedInterfaces
+
+		// And all additional required functions
+		// ...
+	}
 )
 
 var (

messaging/service/store_interface.gen.go

@@ -2,16 +2,18 @@ package service
 
 // This file is auto-generated.
 //
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
+//  - store/actionlog.yaml
+//  - store/rbac_rules.yaml
+//
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
 //
-// Definitions file that controls how this file is generated:
-//  - store/actionlog.yaml
-//  - store/rbac_rules.yaml
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		actionlogsStore
 		rbacRulesStore
 	}

pkg/codegen/assets/store_interfaces_joined.gen.go.tpl

@@ -2,17 +2,19 @@ package {{ .Package }}
 
 // This file is auto-generated.
 //
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// Definitions file that controls how this file is generated:
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
 {{- range .Definitions }}
 //  - {{ .Source }}
 {{- end }}
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 	{{ range .Definitions -}}
 		{{ unpubIdent .Types.Plural }}Store
 	{{ end }}

store/bulk/bulk.go

@@ -5,6 +5,10 @@ import (
 )
 
 type (
+	storeInterface interface {
+		storeGeneratedInterfaces
+	}
+
 	Job interface {
 		Do(ctx context.Context, s storeInterface) error
 	}

store/bulk/store_interface.gen.go

@@ -2,10 +2,8 @@ package bulk
 
 // This file is auto-generated.
 //
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// Definitions file that controls how this file is generated:
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
 //  - store/actionlog.yaml
 //  - store/applications.yaml
 //  - store/compose_charts.yaml
@@ -20,10 +18,14 @@ package bulk
 //  - store/settings.yaml
 //  - store/system_attachments.yaml
 //  - store/users.yaml
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		actionlogsStore
 		applicationsStore
 		composeChartsStore

store/tests/store_interface.gen.go

@@ -2,10 +2,8 @@ package tests
 
 // This file is auto-generated.
 //
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// Definitions file that controls how this file is generated:
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
 //  - store/actionlog.yaml
 //  - store/applications.yaml
 //  - store/compose_charts.yaml
@@ -20,10 +18,14 @@ package tests
 //  - store/settings.yaml
 //  - store/system_attachments.yaml
 //  - store/users.yaml
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		actionlogsStore
 		applicationsStore
 		composeChartsStore

system/service/service.go

@@ -21,10 +21,6 @@ import (
 )
 
 type (
-	db interface {
-		Transaction(callback func() error) error
-	}
-
 	permissionServicer interface {
 		accessControlPermissionServicer
 		Watch(ctx context.Context)
@@ -45,6 +41,16 @@ type (
 		WaitFor(ctx context.Context, ev eventbus.Event) (err error)
 		Dispatch(ctx context.Context, ev eventbus.Event)
 	}
+
+	// storeInterface wraps generated interfaces to enable extensions
+	storeInterface interface {
+		// Include generated interfaces
+		storeGeneratedInterfaces
+
+		// And all additional required functions
+		AddRoleMembersByID(context.Context, uint64, ...uint64) error
+		CountUsers(context.Context, types.UserFilter) (uint, error)
+	}
 )
 
 var (

system/service/store_interface.gen.go

@@ -2,10 +2,8 @@ package service
 
 // This file is auto-generated.
 //
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// Definitions file that controls how this file is generated:
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
 //  - store/actionlog.yaml
 //  - store/applications.yaml
 //  - store/credentials.yaml
@@ -15,10 +13,14 @@ package service
 //  - store/settings.yaml
 //  - store/system_attachments.yaml
 //  - store/users.yaml
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		actionlogsStore
 		applicationsStore
 		credentialsStore

tests/compose/store_interface.gen.go

@@ -2,15 +2,17 @@ package compose
 
 // This file is auto-generated.
 //
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
+//  - store/rbac_rules.yaml
+//
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
 //
-// Definitions file that controls how this file is generated:
-//  - store/rbac_rules.yaml
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		rbacRulesStore
 	}
 )

tests/messaging/store_interface.gen.go

@@ -2,15 +2,17 @@ package messaging
 
 // This file is auto-generated.
 //
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
+//  - store/rbac_rules.yaml
+//
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
 //
-// Definitions file that controls how this file is generated:
-//  - store/rbac_rules.yaml
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		rbacRulesStore
 	}
 )

tests/system/store_interface.gen.go

@@ -2,15 +2,17 @@ package system
 
 // This file is auto-generated.
 //
+// Template: pkg/store_interfaces_joined.gen.go.tpl
+// Definitions:
+//  - store/rbac_rules.yaml
+//
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
 //
-// Definitions file that controls how this file is generated:
-//  - store/rbac_rules.yaml
 
 type (
 	// Interface combines interfaces of all supported store interfaces
-	storeInterface interface {
+	storeGeneratedInterfaces interface {
 		rbacRulesStore
 	}
 )