steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Andrew Nester 2024-11-14 13:46:21 +01:00
parent 9cea93d159
commit 1c571962d2
No known key found for this signature in database
GPG Key ID: 12BC628A44B7DA57
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/bundle/generate/generate_test.go
View File

@ -90,7 +90,7 @@ func TestGeneratePipelineCommand(t *testing.T) {
err := cmd.RunE(cmd, []string{}) err := cmd.RunE(cmd, []string{})
require.NoError(t, err) require.NoError(t, err)
data, err := os.ReadFile(filepath.Join(configDir, "test_pipeline.yml")) data, err := os.ReadFile(filepath.Join(configDir, "test_pipeline.pipeline.yml"))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, fmt.Sprintf(`resources: require.Equal(t, fmt.Sprintf(`resources:
pipelines: pipelines:
@ -186,7 +186,7 @@ func TestGenerateJobCommand(t *testing.T) {
err := cmd.RunE(cmd, []string{}) err := cmd.RunE(cmd, []string{})
require.NoError(t, err) require.NoError(t, err)
data, err := os.ReadFile(filepath.Join(configDir, "test_job.yml")) data, err := os.ReadFile(filepath.Join(configDir, "test_job.job.yml"))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, fmt.Sprintf(`resources: require.Equal(t, fmt.Sprintf(`resources:

7
cmd/bundle/generate/job.go
View File

@ -1,7 +1,9 @@
package generate package generate
import ( import (
"errors"
"fmt" "fmt"
"io/fs"
"os" "os"
"path/filepath" "path/filepath"
@ -87,9 +89,8 @@ func NewGenerateJobCommand() *cobra.Command {
filename := filepath.Join(configDir, fmt.Sprintf("%s.job.yml", jobKey)) filename := filepath.Join(configDir, fmt.Sprintf("%s.job.yml", jobKey))
err = os.Rename(oldFilename, filename) err = os.Rename(oldFilename, filename)
if err != nil { if err != nil && !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("failed to rename file %s. DABs uses resource type as sub extension for generated content, please rename to %s", oldFilename, filename) return fmt.Errorf("failed to rename file %s. DABs uses resource type as sub extension for generated content, please rename to %s, err: %w", oldFilename, filename, err)
} }
saver := yamlsaver.NewSaverWithStyle(map[string]yaml.Style{ saver := yamlsaver.NewSaverWithStyle(map[string]yaml.Style{

7
cmd/bundle/generate/pipeline.go
View File

@ -1,7 +1,9 @@
package generate package generate
import ( import (
"errors"
"fmt" "fmt"
"io/fs"
"os" "os"
"path/filepath" "path/filepath"
@ -87,9 +89,8 @@ func NewGeneratePipelineCommand() *cobra.Command {
filename := filepath.Join(configDir, fmt.Sprintf("%s.pipeline.yml", pipelineKey)) filename := filepath.Join(configDir, fmt.Sprintf("%s.pipeline.yml", pipelineKey))
err = os.Rename(oldFilename, filename) err = os.Rename(oldFilename, filename)
if err != nil { if err != nil && !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("failed to rename file %s. DABs uses resource type as sub extension for generated content, please rename to %s", oldFilename, filename) return fmt.Errorf("failed to rename file %s. DABs uses resource type as sub extension for generated content, please rename to %s, err: %w", oldFilename, filename, err)
} }
saver := yamlsaver.NewSaverWithStyle( saver := yamlsaver.NewSaverWithStyle(