refactor(sd): use run to start the program

This commit allows the `run servicedirectory` command to start
the program and register services on Service Directory by using the
`run` function.

Signed-off-by: Elis Lulja <[email protected]>

Author: asimpleidea

pkg/command/run/service_directory.go

@@ -61,7 +61,7 @@ func getRunServiceDirectoryCommand(operatorOpts *Options) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "servicedirectory [COMMAND] [OPTIONS]",
 		Aliases: []string{"sd", "google-service-directory", "with-service-directory"},
-		Short:   "Run the program with Google Service Directory",
+		Short:   "Run the program with Google Service Directory.",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if err := parseServiceDirectoryCommand(sdFileOpts, opts, operatorOpts, cmd); err != nil {
 				return fmt.Errorf("error while parsing service directory options: %w", err)
@@ -92,7 +92,7 @@ func getRunServiceDirectoryCommand(operatorOpts *Options) *cobra.Command {
 		RunE: func(_ *cobra.Command, _ []string) error {
 			return runWithServiceDirectory(operatorOpts, opts)
 		},
-		Example: "servicedirectory --project-id my-project-id default-region us-east1",
+		Example: "servicedirectory --project-id my-project-id --default-region us-east1",
 	}
 
 	// -----------------------------
@@ -103,9 +103,9 @@ func getRunServiceDirectoryCommand(operatorOpts *Options) *cobra.Command {
 		"region/location where to register resources. Write auto to try to get it automatically.")
 	cmd.Flags().StringVar(&opts.ProjectID, "project-id", "",
 		"Google Cloud project ID. Write auto to try to get it automatically.")
-	cmd.Flags().StringVar(&sdFileOpts.path, "options-path", "",
+	cmd.Flags().StringVar(&sdFileOpts.path, "service-directory.options-path", "",
 		"path to the file containing service directory options.")
-	cmd.Flags().StringVar(&sdFileOpts.k8s, "options-configmap", func() string {
+	cmd.Flags().StringVar(&sdFileOpts.k8s, "service-directory.options-configmap", func() string {
 		if operatorOpts.RunningInK8s {
 			return defaultServiceDirectoryConfigMapName
 		}
@@ -184,6 +184,12 @@ func parseServiceDirectoryCommand(flagOpts *fileOrK8sResource, sdOpts *ServiceDi
 }
 
 func runWithServiceDirectory(operatorOpts *Options, sdOpts *ServiceDirectoryOptions) error {
+	// TODO: when #81 is solved an merged this will be replaced
+	// with zerolog
+	l := ctrl.Log.WithName("ServiceDirectory")
+	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
+	l.Info("starting...")
+
 	ctx, canc := context.WithTimeout(context.Background(), 15*time.Second)
 	defer canc()
 
@@ -195,21 +201,15 @@ func runWithServiceDirectory(operatorOpts *Options, sdOpts *ServiceDirectoryOpti
 
 	defer cli.Close()
 
-	// TODO: when #81 is solved an merged this will be replaced
-	// with zerolog
-	l := ctrl.Log.WithName("ServiceDirectory")
-	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
-
+	// TODO: the context should be given by the run function, or explicitly
+	// provide a context for each call. This will be fixed with the new API.
 	sr := &sd.Handler{
 		ProjectID:     sdOpts.ProjectID,
 		DefaultRegion: sdOpts.DefaultRegion,
 		Log:           l,
-		Context:       ctx,
+		Context:       context.Background(),
 		Client:        cli,
 	}
 
-	// TODO: use the handler (in next commits)
-	_ = sr
-
-	return nil
+	return run(sr, operatorOpts)
 }