Basic config generation and writing to files

Author: manupedrozo

cmd/plugin/main.go

@@ -8,7 +8,7 @@ import (
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/cli/clu2adv"
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/cli/moduleimport"
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/flags"
-	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/log"
+	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/logger"
 	"github.com/spf13/cobra"
 )
 
@@ -21,9 +21,9 @@ func main() {
 		Short:   "Utilities for Terraform's MongoDB Atlas Provider",
 		Aliases: []string{"tf"},
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			log.SetWriter(cmd.ErrOrStderr())
+			logger.SetWriter(cmd.ErrOrStderr())
 			if debugLevel {
-				log.SetLevel(log.DebugLevel)
+				logger.SetLevel(logger.DebugLevel)
 			}
 
 			return nil

internal/cli/moduleimport/moduleimport.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/flags"
-	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/log"
+	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/logger"
 	"github.com/mongodb-labs/atlas-cli-plugin-terraform/internal/modulegen"
 	"github.com/mongodb/atlas-cli-core/config"
 	"github.com/mongodb/atlas-cli-core/transport"
@@ -21,15 +21,15 @@ const (
 // TODO@non-spike: Support tracking plugin versions, used in UserAgent header.
 var Version = "dev"
 
-type ModuleImportOpts struct {
+type Opts struct {
+	httpClient   *http.Client
 	input        string
 	output       string
-	atlasBaseUrl string
-	httpClient   *http.Client
+	atlasBaseURL string
 }
 
 func Builder() *cobra.Command {
-	opts := &ModuleImportOpts{}
+	opts := &Opts{}
 	cmd := &cobra.Command{
 		Use:     "module-import",
 		Short:   "Generate Terraform module configurations",
@@ -38,27 +38,33 @@ func Builder() *cobra.Command {
 		RunE:    opts.Run,
 	}
 
-	cmd.Flags().StringVarP(&opts.input, flags.Input, flags.InputShort, "", "path to the input file")
+	cmd.Flags().StringVarP(
+		&opts.input, flags.Input, flags.InputShort, "",
+		"path to the input file",
+	)
 	_ = cmd.MarkFlagRequired(flags.Input)
-	cmd.Flags().StringVarP(&opts.output, flags.Output, flags.OutputShort, "", "path where to the directory where to generate the output files")
+	cmd.Flags().StringVarP(
+		&opts.output, flags.Output, flags.OutputShort, "",
+		"path where to the directory where to generate the output files",
+	)
 	_ = cmd.MarkFlagRequired(flags.Output)
 	return cmd
 }
 
-func (opts *ModuleImportOpts) PreRun(cmd *cobra.Command, args []string) error {
-	_, _ = log.Debugln("[module-import] PreRunE")
+func (opts *Opts) PreRun(cmd *cobra.Command, args []string) error {
+	_, _ = logger.Debugln("[module-import] PreRunE")
 
 	profile, err := config.LoadAtlasCLIConfig()
 	if err != nil {
 		return err
 	}
 
 	// Use user-overridden url, otherwise if gov use gov url, otherwise use default.
-	if opts.atlasBaseUrl = profile.OpsManagerURL(); opts.atlasBaseUrl == "" {
+	if opts.atlasBaseURL = profile.OpsManagerURL(); opts.atlasBaseURL == "" {
 		if profile.Service() == config.CloudService {
-			opts.atlasBaseUrl = CloudGovServiceURL
+			opts.atlasBaseURL = CloudGovServiceURL
 		} else {
-			opts.atlasBaseUrl = CloudServiceURL
+			opts.atlasBaseURL = CloudServiceURL
 		}
 	}
 
@@ -78,18 +84,19 @@ func (opts *ModuleImportOpts) PreRun(cmd *cobra.Command, args []string) error {
 	return err
 }
 
-func (opts *ModuleImportOpts) Run(cmd *cobra.Command, args []string) error {
-	_, _ = log.Debugln("[module-import] RunE")
+func (opts *Opts) Run(cmd *cobra.Command, args []string) error {
+	_, _ = logger.Debugln("[module-import] RunE")
 	err := modulegen.Run(
 		cmd.Context(),
-		&modulegen.ModuleGenArgs{
+		&modulegen.GenArgs{
 			InputPath:  opts.input,
 			OutputPath: opts.output,
 		},
 		&modulegen.AtlasClientArgs{
-			AtlasBaseUrl: opts.atlasBaseUrl,
-			UserAgent:    config.UserAgent(Version), // TODO@non-spike: Look into differentiating the plugin's UserAgent from the cli one
-			HttpClient:   opts.httpClient,
+			AtlasBaseURL: opts.atlasBaseURL,
+			// TODO@non-spike: Look into differentiating the plugin's UserAgent from the cli one
+			UserAgent:  config.UserAgent(Version),
+			HTTPClient: opts.httpClient,
 		},
 	)
 	return err

internal/convert/cli_common.go

@@ -11,12 +11,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type ConvertFn func(config []byte) ([]byte, error)
+type Fn func(config []byte) ([]byte, error)
 
 // BaseOpts contains common functionality for CLI commands that convert files.
 type BaseOpts struct {
 	Fs            afero.Fs
-	Convert       ConvertFn
+	Convert       Fn
 	File          string
 	Output        string
 	ReplaceOutput bool

internal/log/log_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package log
+package logger
 
 import (
 	"fmt"
@@ -25,6 +25,7 @@ type Level int
 const (
 	NoneLevel Level = iota
 	WarningLevel
+	InfoLevel
 	DebugLevel
 )
 
@@ -60,6 +61,10 @@ func (l *Logger) IsDebugLevel() bool {
 	return l.level >= DebugLevel
 }
 
+func (l *Logger) IsInfoLevel() bool {
+	return l.level >= InfoLevel
+}
+
 func (l *Logger) IsWarningLevel() bool {
 	return l.level >= WarningLevel
 }
@@ -107,18 +112,27 @@ func (l *Logger) Warningf(format string, a ...any) (int, error) {
 }
 
 func (l *Logger) Info(a ...any) (int, error) {
+	if !l.IsInfoLevel() {
+		return 0, nil
+	}
 	return fmt.Fprint(l.w, a...)
 }
 
 func (l *Logger) Infoln(a ...any) (int, error) {
+	if !l.IsInfoLevel() {
+		return 0, nil
+	}
 	return fmt.Fprintln(l.w, a...)
 }
 
 func (l *Logger) Infof(format string, a ...any) (int, error) {
+	if !l.IsInfoLevel() {
+		return 0, nil
+	}
 	return fmt.Fprintf(l.w, format, a...)
 }
 
-var std = New(os.Stderr, WarningLevel)
+var std = New(os.Stderr, InfoLevel)
 
 func Writer() io.Writer {
 	return std.Writer()
@@ -136,6 +150,10 @@ func IsDebugLevel() bool {
 	return std.IsDebugLevel()
 }
 
+func IsInfoLevel() bool {
+	return std.IsInfoLevel()
+}
+
 func IsWarningLevel() bool {
 	return std.IsWarningLevel()
 }