Skip to content

Commit 2b489b7

Browse files
fix(generate-config): print path to configuration file (#1661)
1 parent 30921a8 commit 2b489b7

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

pkg/cmd/generate/build-configs.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,12 @@ func BuildConfiguration(svcConfig *servicecontext.ServiceConfig, opts *options)
114114
configurations.TokenURL = providerUrls.GetTokenUrl()
115115
configurations.Name = configInstanceName
116116

117-
if err = WriteConfig(opts, configurations); err != nil {
117+
var fileName string
118+
if fileName, err = WriteConfig(opts, configurations); err != nil {
118119
return err
119120
}
120121

121-
opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("generate.log.info.credentialsSaved"))
122+
opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("generate.log.info.credentialsSaved", localize.NewEntry("FilePath", fileName)))
122123

123124
return nil
124125
}

pkg/cmd/generate/configurations.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ var (
2929

3030
// WriteConfig saves the configurations to a file
3131
// in the specified output format
32-
func WriteConfig(opts *options, config *configValues) error {
32+
func WriteConfig(opts *options, config *configValues) (string, error) {
3333

3434
var fileBody bytes.Buffer
3535
fileTemplate := getFileFormat(opts.configType)
3636
err := fileTemplate.Execute(&fileBody, config)
3737
if err != nil {
38-
return err
38+
return "", err
3939
}
4040

4141
fileData := []byte(fileBody.String())
@@ -47,10 +47,10 @@ func WriteConfig(opts *options, config *configValues) error {
4747
// indicating that the user should explicitly request overwriting of the file
4848
_, err = os.Stat(opts.fileName)
4949
if err == nil && !opts.overwrite {
50-
return opts.localizer.MustLocalizeError("generate.error.configFileAlreadyExists", localize.NewEntry("FilePath", opts.fileName))
50+
return "", opts.localizer.MustLocalizeError("generate.error.configFileAlreadyExists", localize.NewEntry("FilePath", opts.fileName))
5151
}
5252

53-
return ioutil.WriteFile(opts.fileName, fileData, 0o600)
53+
return opts.fileName, ioutil.WriteFile(opts.fileName, fileData, 0o600)
5454
}
5555

5656
// getDefaultPath returns the default absolute path for the configuration file

pkg/core/localize/locales/en/cmd/generate_config.en.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ one = 'file {{.FilePath}} already exists. Use --overwrite to overwrite the file,
4343
one='No services available to generate configurations'
4444

4545
[generate.log.info.credentialsSaved]
46-
one='Configurations successfully saved'
46+
one='Configurations successfully saved to "{{.FilePath}}"'

0 commit comments

Comments
 (0)