From 9b0cce182f70c13af33897f194238fb1e68e3b57 Mon Sep 17 00:00:00 2001 From: Nikolay Edigaryev Date: Mon, 26 Jun 2023 19:35:50 +0400 Subject: [PATCH] Use os.MkdirAll instead of os.Mkdir to create Orchard's home directory (#96) * Use os.MkdirAll instead of os.Mkdir to create Orchard's home directory * README.md: document ORCHARD_HOME * README.md: sort environment variables --- README.md | 11 ++++++----- internal/orchardhome/orchardhome.go | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 28df872..3b238ac 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,9 @@ Orchard Controller instance is secured by default and all API calls are authenti In addition to controlling the Orchard via the CLI arguments, there are environment variables that may be beneficial both when automating Orchard and in daily use: -| Variable name | Description | -|---------------------------------|------------------------------------------------------------------------------------| -| `ORCHARD_URL` | Override controller URL on per-command basis | -| `ORCHARD_SERVICE_ACCOUNT_NAME` | Override service account name (used for controller API auth) on per-command basis | -| `ORCHARD_SERVICE_ACCOUNT_TOKEN` | Override service account token (used for controller API auth) on per-command basis | +| Variable name | Description | +|---------------------------------|----------------------------------------------------------------------------------------------------------------------| +| `ORCHARD_HOME` | Override Orchard's home directory. Useful when running multiple Orchard instances on the same host and when testing. | +| `ORCHARD_SERVICE_ACCOUNT_NAME` | Override service account name (used for controller API auth) on per-command basis | +| `ORCHARD_SERVICE_ACCOUNT_TOKEN` | Override service account token (used for controller API auth) on per-command basis | +| `ORCHARD_URL` | Override controller URL on per-command basis | diff --git a/internal/orchardhome/orchardhome.go b/internal/orchardhome/orchardhome.go index 9e543d7..ea17809 100644 --- a/internal/orchardhome/orchardhome.go +++ b/internal/orchardhome/orchardhome.go @@ -21,7 +21,7 @@ func Path() (string, error) { orchardDir := filepath.Join(homeDir, ".orchard") - if err := os.Mkdir(orchardDir, 0700); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(orchardDir, 0700); err != nil && !os.IsExist(err) { return "", fmt.Errorf("%w: cannot create directory %s: %v", ErrFailed, orchardDir, err) }