Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spec init overrides existing deploymentconfig (#1449)

Browse Source
This commit is contained in:
Ta-Ching Chen
2019-11-29 23:59:10 +08:00
committed by GitHub
parent 19ae7d5ac6
commit 506b427124
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/spec/init.go
+11 -4
View File
@@ -105,13 +105,20 @@ func (opts *InitSubCommand) complete(input cli.Input) error {
func (opts *InitSubCommand) run(input cli.Input) error { func (opts *InitSubCommand) run(input cli.Input) error {
specDir := util.GetSpecDir(input) specDir := util.GetSpecDir(input)
readme := filepath.Join(specDir, "README")
config := filepath.Join(specDir, "fission-deployment-config.yaml")
if _, err := os.Stat(config); err == nil {
return errors.Errorf("Spec DeploymentConfig already exists in directory '%v'", specDir)
}
// Add a bit of documentation to the spec dir here // Add a bit of documentation to the spec dir here
err := ioutil.WriteFile(filepath.Join(specDir, "README"), []byte(SPEC_README), 0644) err := ioutil.WriteFile(readme, []byte(SPEC_README), 0644)
if err != nil { if err != nil {
return err return err
} }
err = writeDeploymentConfig(specDir, opts.deployConfig) err = writeDeploymentConfig(config, opts.deployConfig)
if err != nil { if err != nil {
return errors.Wrap(err, "error writing deployment config") return errors.Wrap(err, "error writing deployment config")
} }
@@ -124,7 +131,7 @@ func (opts *InitSubCommand) run(input cli.Input) error {
// writeDeploymentConfig serializes the DeploymentConfig to YAML and writes it to a new // writeDeploymentConfig serializes the DeploymentConfig to YAML and writes it to a new
// fission-config.yaml in specDir. // fission-config.yaml in specDir.
func writeDeploymentConfig(specDir string, dc *spectypes.DeploymentConfig) error { func writeDeploymentConfig(file string, dc *spectypes.DeploymentConfig) error {
y, err := yaml.Marshal(dc) y, err := yaml.Marshal(dc)
if err != nil { if err != nil {
return err return err
@@ -134,7 +141,7 @@ func writeDeploymentConfig(specDir string, dc *spectypes.DeploymentConfig) error
"# See the README in this directory for background and usage information.\n" + "# See the README in this directory for background and usage information.\n" +
"# Do not edit the UID below: that will break 'fission spec apply'\n") "# Do not edit the UID below: that will break 'fission spec apply'\n")
err = ioutil.WriteFile(filepath.Join(specDir, "fission-deployment-config.yaml"), append(msg, y...), 0644) err = ioutil.WriteFile(file, append(msg, y...), 0644)
if err != nil { if err != nil {
return err return err
} }