diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..131903506f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +* text=auto eol=lf + +*.go text eol=lf +*.yaml text eol=lf +*.yml text eol=lf +*.json text eol=lf +*.sh text eol=lf +*.patch text eol=lf +*.txt text eol=lf +Makefile text eol=lf \ No newline at end of file diff --git a/commands/live/migrate/migratecmd.go b/commands/live/migrate/migratecmd.go index 616e228898..fee6426adb 100644 --- a/commands/live/migrate/migratecmd.go +++ b/commands/live/migrate/migratecmd.go @@ -386,8 +386,8 @@ func (mr *Runner) migrateKptfileToRG(args []string) error { switch { case rgFileErr == nil: return errors.E(op, errors.IO, types.UniquePath(dir), "the resourcegroup file already exists and inventory information cannot be migrated") - case err != nil && !goerrors.Is(err, os.ErrNotExist): - return errors.E(op, errors.IO, types.UniquePath(dir), err) + case rgFileErr != nil && !goerrors.Is(rgFileErr, os.ErrNotExist): + return errors.E(op, errors.IO, types.UniquePath(dir), rgFileErr) } err = (&initialization.ConfigureInventoryInfo{ diff --git a/documentation/static/images/func.svg b/documentation/static/images/func.svg index f2fdeaf871..f709c1a931 100644 --- a/documentation/static/images/func.svg +++ b/documentation/static/images/func.svg @@ -8,736 +8,736 @@ link input to FUNC-->RenderPublishApply StatusReconcileReconcile Status