refactor: names follow the URL they serve

cmd/agent_setup.go

@@ -47,15 +47,15 @@ import (
 	nodeHost "github.com/osapi-io/osapi/internal/provider/node/host"
 	"github.com/osapi-io/osapi/internal/provider/node/load"
 	logProv "github.com/osapi-io/osapi/internal/provider/node/log"
-	"github.com/osapi-io/osapi/internal/provider/node/mem"
+	"github.com/osapi-io/osapi/internal/provider/node/memory"
 	ntpProv "github.com/osapi-io/osapi/internal/provider/node/ntp"
 	powerProv "github.com/osapi-io/osapi/internal/provider/node/power"
 	processProv "github.com/osapi-io/osapi/internal/provider/node/process"
 	serviceProv "github.com/osapi-io/osapi/internal/provider/node/service"
 	sysctlProv "github.com/osapi-io/osapi/internal/provider/node/sysctl"
 	timezoneProv "github.com/osapi-io/osapi/internal/provider/node/timezone"
 	userProv "github.com/osapi-io/osapi/internal/provider/node/user"
-	cronProv "github.com/osapi-io/osapi/internal/provider/scheduled/cron"
+	cronProv "github.com/osapi-io/osapi/internal/provider/schedule/cron"
 	"github.com/osapi-io/osapi/internal/telemetry/process"
 	"github.com/osapi-io/osapi/pkg/sdk/platform"
 )
@@ -114,14 +114,14 @@ func setupAgent(
 		diskProvider = disk.NewLinuxProvider()
 	}
 
-	var memProvider mem.Provider
+	var memoryProvider memory.Provider
 	switch plat {
 	case "debian":
-		memProvider = mem.NewDebianProvider()
+		memoryProvider = memory.NewDebianProvider()
 	case "darwin":
-		memProvider = mem.NewDarwinProvider()
+		memoryProvider = memory.NewDarwinProvider()
 	default:
-		memProvider = mem.NewLinuxProvider()
+		memoryProvider = memory.NewLinuxProvider()
 	}
 
 	var loadProvider load.Provider
@@ -235,7 +235,7 @@ func setupAgent(
 		agent.NewNodeProcessor(
 			hostProvider,
 			diskProvider,
-			memProvider,
+			memoryProvider,
 			loadProvider,
 			sysctlProvider,
 			ntpProvider,
@@ -251,7 +251,7 @@ func setupAgent(
 		),
 		hostProvider,
 		diskProvider,
-		memProvider,
+		memoryProvider,
 		loadProvider,
 		sysctlProvider,
 		ntpProvider,
@@ -313,7 +313,7 @@ func setupAgent(
 		streamName,
 		hostProvider,
 		diskProvider,
-		memProvider,
+		memoryProvider,
 		loadProvider,
 		netinfoProvider,
 		process.New(),

cmd/client_node_schedule_cron_create.go → cmd/client_node_schedule_create.go

@@ -29,8 +29,8 @@ import (
 	"github.com/osapi-io/osapi/pkg/sdk/client"
 )
 
-// clientNodeScheduleCronCreateCmd represents the cron create command.
-var clientNodeScheduleCronCreateCmd = &cobra.Command{
+// clientNodeScheduleCreateCmd represents the cron create command.
+var clientNodeScheduleCreateCmd = &cobra.Command{
 	Use:   "create",
 	Short: "Create a cron entry",
 	Run: func(cmd *cobra.Command, _ []string) {
@@ -43,7 +43,7 @@ var clientNodeScheduleCronCreateCmd = &cobra.Command{
 		user, _ := cmd.Flags().GetString("user")
 		contentType, _ := cmd.Flags().GetString("content-type")
 
-		resp, err := sdkClient.Cron.Create(ctx, host, client.CronCreateOpts{
+		resp, err := sdkClient.Schedule.Create(ctx, host, client.ScheduleCreateOpts{
 			Name:        name,
 			Object:      object,
 			Schedule:    schedule,
@@ -89,21 +89,21 @@ var clientNodeScheduleCronCreateCmd = &cobra.Command{
 }
 
 func init() {
-	clientNodeScheduleCronCmd.AddCommand(clientNodeScheduleCronCreateCmd)
+	clientNodeScheduleCmd.AddCommand(clientNodeScheduleCreateCmd)
 
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("name", "", "Name for the cron drop-in entry (required)")
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("object", "", "Name of the uploaded file in the object store (required)")
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("schedule", "", "Cron schedule expression, e.g. \"*/5 * * * *\"")
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("interval", "", "Periodic interval: hourly, daily, weekly, monthly")
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("user", "", "User to run the command as (default root)")
-	clientNodeScheduleCronCreateCmd.PersistentFlags().
+	clientNodeScheduleCreateCmd.PersistentFlags().
 		String("content-type", "", "Content type: raw or template")
 
-	_ = clientNodeScheduleCronCreateCmd.MarkPersistentFlagRequired("name")
-	_ = clientNodeScheduleCronCreateCmd.MarkPersistentFlagRequired("object")
+	_ = clientNodeScheduleCreateCmd.MarkPersistentFlagRequired("name")
+	_ = clientNodeScheduleCreateCmd.MarkPersistentFlagRequired("object")
 }

cmd/client_node_schedule_cron_delete.go → cmd/client_node_schedule_delete.go

@@ -28,16 +28,16 @@ import (
 	"github.com/osapi-io/osapi/internal/cli"
 )
 
-// clientNodeScheduleCronDeleteCmd represents the cron delete command.
-var clientNodeScheduleCronDeleteCmd = &cobra.Command{
+// clientNodeScheduleDeleteCmd represents the cron delete command.
+var clientNodeScheduleDeleteCmd = &cobra.Command{
 	Use:   "delete",
 	Short: "Delete a cron entry",
 	Run: func(cmd *cobra.Command, _ []string) {
 		ctx := cmd.Context()
 		host, _ := cmd.Flags().GetString("target")
 		name, _ := cmd.Flags().GetString("name")
 
-		resp, err := sdkClient.Cron.Delete(ctx, host, name)
+		resp, err := sdkClient.Schedule.Delete(ctx, host, name)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -76,10 +76,10 @@ var clientNodeScheduleCronDeleteCmd = &cobra.Command{
 }
 
 func init() {
-	clientNodeScheduleCronCmd.AddCommand(clientNodeScheduleCronDeleteCmd)
+	clientNodeScheduleCmd.AddCommand(clientNodeScheduleDeleteCmd)
 
-	clientNodeScheduleCronDeleteCmd.PersistentFlags().
+	clientNodeScheduleDeleteCmd.PersistentFlags().
 		String("name", "", "Name of the cron entry to delete (required)")
 
-	_ = clientNodeScheduleCronDeleteCmd.MarkPersistentFlagRequired("name")
+	_ = clientNodeScheduleDeleteCmd.MarkPersistentFlagRequired("name")
 }

cmd/client_node_schedule_cron_get.go → cmd/client_node_schedule_get.go

@@ -28,16 +28,16 @@ import (
 	"github.com/osapi-io/osapi/internal/cli"
 )
 
-// clientNodeScheduleCronGetCmd represents the cron get command.
-var clientNodeScheduleCronGetCmd = &cobra.Command{
+// clientNodeScheduleGetCmd represents the cron get command.
+var clientNodeScheduleGetCmd = &cobra.Command{
 	Use:   "get",
 	Short: "Get a cron entry by name",
 	Run: func(cmd *cobra.Command, _ []string) {
 		ctx := cmd.Context()
 		host, _ := cmd.Flags().GetString("target")
 		name, _ := cmd.Flags().GetString("name")
 
-		resp, err := sdkClient.Cron.Get(ctx, host, name)
+		resp, err := sdkClient.Schedule.Get(ctx, host, name)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -76,10 +76,10 @@ var clientNodeScheduleCronGetCmd = &cobra.Command{
 }
 
 func init() {
-	clientNodeScheduleCronCmd.AddCommand(clientNodeScheduleCronGetCmd)
+	clientNodeScheduleCmd.AddCommand(clientNodeScheduleGetCmd)
 
-	clientNodeScheduleCronGetCmd.PersistentFlags().
+	clientNodeScheduleGetCmd.PersistentFlags().
 		String("name", "", "Name of the cron entry (required)")
 
-	_ = clientNodeScheduleCronGetCmd.MarkPersistentFlagRequired("name")
+	_ = clientNodeScheduleGetCmd.MarkPersistentFlagRequired("name")
 }

cmd/client_node_schedule_cron_list.go → cmd/client_node_schedule_list.go

@@ -28,15 +28,15 @@ import (
 	"github.com/osapi-io/osapi/internal/cli"
 )
 
-// clientNodeScheduleCronListCmd represents the cron list command.
-var clientNodeScheduleCronListCmd = &cobra.Command{
+// clientNodeScheduleListCmd represents the cron list command.
+var clientNodeScheduleListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List all cron entries",
 	Run: func(cmd *cobra.Command, _ []string) {
 		ctx := cmd.Context()
 		host, _ := cmd.Flags().GetString("target")
 
-		resp, err := sdkClient.Cron.List(ctx, host)
+		resp, err := sdkClient.Schedule.List(ctx, host)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -79,5 +79,5 @@ var clientNodeScheduleCronListCmd = &cobra.Command{
 }
 
 func init() {
-	clientNodeScheduleCronCmd.AddCommand(clientNodeScheduleCronListCmd)
+	clientNodeScheduleCmd.AddCommand(clientNodeScheduleListCmd)
 }

cmd/client_node_schedule_cron_update.go → cmd/client_node_schedule_update.go

@@ -29,8 +29,8 @@ import (
 	"github.com/osapi-io/osapi/pkg/sdk/client"
 )
 
-// clientNodeScheduleCronUpdateCmd represents the cron update command.
-var clientNodeScheduleCronUpdateCmd = &cobra.Command{
+// clientNodeScheduleUpdateCmd represents the cron update command.
+var clientNodeScheduleUpdateCmd = &cobra.Command{
 	Use:   "update",
 	Short: "Update a cron entry",
 	Run: func(cmd *cobra.Command, _ []string) {
@@ -42,7 +42,7 @@ var clientNodeScheduleCronUpdateCmd = &cobra.Command{
 		user, _ := cmd.Flags().GetString("user")
 		contentType, _ := cmd.Flags().GetString("content-type")
 
-		resp, err := sdkClient.Cron.Update(ctx, host, name, client.CronUpdateOpts{
+		resp, err := sdkClient.Schedule.Update(ctx, host, name, client.ScheduleUpdateOpts{
 			Object:      object,
 			Schedule:    schedule,
 			User:        user,
@@ -86,19 +86,19 @@ var clientNodeScheduleCronUpdateCmd = &cobra.Command{
 }
 
 func init() {
-	clientNodeScheduleCronCmd.AddCommand(clientNodeScheduleCronUpdateCmd)
+	clientNodeScheduleCmd.AddCommand(clientNodeScheduleUpdateCmd)
 
-	clientNodeScheduleCronUpdateCmd.PersistentFlags().
+	clientNodeScheduleUpdateCmd.PersistentFlags().
 		String("name", "", "Name of the cron entry to update (required)")
-	clientNodeScheduleCronUpdateCmd.PersistentFlags().
+	clientNodeScheduleUpdateCmd.PersistentFlags().
 		String("object", "", "New object to deploy")
-	clientNodeScheduleCronUpdateCmd.PersistentFlags().
+	clientNodeScheduleUpdateCmd.PersistentFlags().
 		String("schedule", "", "New cron schedule expression")
-	clientNodeScheduleCronUpdateCmd.PersistentFlags().
+	clientNodeScheduleUpdateCmd.PersistentFlags().
 		String("user", "", "New user to run the command as")
-	clientNodeScheduleCronUpdateCmd.PersistentFlags().
+	clientNodeScheduleUpdateCmd.PersistentFlags().
 		String("content-type", "", "Content type: raw or template")
 
-	_ = clientNodeScheduleCronUpdateCmd.MarkPersistentFlagRequired("name")
-	clientNodeScheduleCronUpdateCmd.MarkFlagsOneRequired("object", "schedule", "user")
+	_ = clientNodeScheduleUpdateCmd.MarkPersistentFlagRequired("name")
+	clientNodeScheduleUpdateCmd.MarkFlagsOneRequired("object", "schedule", "user")
 }

cmd/controller_setup.go

@@ -52,7 +52,7 @@ import (
 	nodeAPI "github.com/osapi-io/osapi/internal/controller/api/node"
 	certificateAPI "github.com/osapi-io/osapi/internal/controller/api/node/certificate"
 	commandAPI "github.com/osapi-io/osapi/internal/controller/api/node/command"
-	dockerAPI "github.com/osapi-io/osapi/internal/controller/api/node/docker"
+	dockerAPI "github.com/osapi-io/osapi/internal/controller/api/node/container"
 	nodeFileAPI "github.com/osapi-io/osapi/internal/controller/api/node/file"
 	hostnameAPI "github.com/osapi-io/osapi/internal/controller/api/node/hostname"
 	logAPI "github.com/osapi-io/osapi/internal/controller/api/node/log"

docs/docs/gen/api/delete-node-schedule-cron.ParamsDetails.json → docs/docs/gen/api/delete-node-schedule.ParamsDetails.json

@@ -1 +1 @@
-{"parameters":[{"name":"hostname","in":"path","required":true,"description":"Target agent hostname, reserved routing value (_any, _all), or label selector (key:value).\n","x-oapi-codegen-extra-tags":{"validate":"required,min=1,valid_target"},"schema":{"type":"string","minLength":1}},{"name":"name","in":"path","required":true,"description":"Cron entry name. Must contain only alphanumeric characters, underscores, and hyphens.\n","x-oapi-codegen-extra-tags":{"validate":"required,min=1"},"schema":{"type":"string","minLength":1,"pattern":"^[a-zA-Z0-9_-]+$"}}]}
+{"parameters":[{"name":"hostname","in":"path","required":true,"description":"Target agent hostname, reserved routing value (_any, _all), or label selector (key:value).\n","x-oapi-codegen-extra-tags":{"validate":"required,min=1,valid_target"},"schema":{"type":"string","minLength":1}},{"name":"name","in":"path","required":true,"description":"Scheduled entry name. Must contain only alphanumeric characters, underscores, and hyphens.\n","x-oapi-codegen-extra-tags":{"validate":"required,min=1"},"schema":{"type":"string","minLength":1,"pattern":"^[a-zA-Z0-9_-]+$"}}]}