From 9b9f8a10a129eac510da4e33783db917038b94ce Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 29 Apr 2022 14:02:13 -0500 Subject: [PATCH] Fix merge conflicts Signed-off-by: Carolyn Van Slyck --- docs/content/cli/bundles_install.md | 2 +- docs/content/cli/bundles_invoke.md | 2 +- docs/content/cli/bundles_uninstall.md | 2 +- docs/content/cli/bundles_upgrade.md | 24 ++++++++++++------------ docs/content/cli/install.md | 2 +- docs/content/cli/invoke.md | 2 +- docs/content/cli/uninstall.md | 2 +- docs/content/cli/upgrade.md | 24 ++++++++++++------------ tests/integration/install_test.go | 6 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/content/cli/bundles_install.md b/docs/content/cli/bundles_install.md index 48033f2ff..588bc8671 100644 --- a/docs/content/cli/bundles_install.md +++ b/docs/content/cli/bundles_install.md @@ -38,7 +38,7 @@ porter bundles install [INSTALLATION] [flags] ``` --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. --force Force a fresh pull of the bundle diff --git a/docs/content/cli/bundles_invoke.md b/docs/content/cli/bundles_invoke.md index f05ec1cfb..44ff30e96 100644 --- a/docs/content/cli/bundles_invoke.md +++ b/docs/content/cli/bundles_invoke.md @@ -39,7 +39,7 @@ porter bundles invoke [INSTALLATION] --action ACTION [flags] --action string Custom action name to invoke. --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. --force Force a fresh pull of the bundle diff --git a/docs/content/cli/bundles_uninstall.md b/docs/content/cli/bundles_uninstall.md index 2f2cc4192..11136c693 100644 --- a/docs/content/cli/bundles_uninstall.md +++ b/docs/content/cli/bundles_uninstall.md @@ -40,7 +40,7 @@ porter bundles uninstall [INSTALLATION] [flags] ``` --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when uninstalling the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when uninstalling the bundle. May be either a named set of credentials or a filepath, and specified multiple times. --delete Delete all records associated with the installation, assuming the uninstall action succeeds -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. Optional unless a newer version of the bundle should be used to uninstall the bundle. diff --git a/docs/content/cli/bundles_upgrade.md b/docs/content/cli/bundles_upgrade.md index 8ac3a591a..0a9bbe8b9 100644 --- a/docs/content/cli/bundles_upgrade.md +++ b/docs/content/cli/bundles_upgrade.md @@ -36,18 +36,18 @@ porter bundles upgrade [INSTALLATION] [flags] ### Options ``` - --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. - --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. - -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") - -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. - --force Force a fresh pull of the bundle - -h, --help help for upgrade - --insecure-registry Don't require TLS for the registry - --no-logs Do not persist the bundle execution logs - --param strings Define an individual parameter in the form NAME=VALUE. Overrides parameters otherwise set via --parameter-set. May be specified multiple times. - -p, --parameter-set strings Name of a parameter set file for the bundle. May be either a named set of parameters or a filepath, and specified multiple times. - -r, --reference string Use a bundle in an OCI registry specified by the given reference. + --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. + --cnab-file string Path to the CNAB bundle.json file. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") + -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. + --force Force a fresh pull of the bundle + -h, --help help for upgrade + --insecure-registry Don't require TLS for the registry + --no-logs Do not persist the bundle execution logs + --param stringArray Define an individual parameter in the form NAME=VALUE. Overrides parameters otherwise set via --parameter-set. May be specified multiple times. + -p, --parameter-set stringArray Name of a parameter set file for the bundle. May be either a named set of parameters or a filepath, and specified multiple times. + -r, --reference string Use a bundle in an OCI registry specified by the given reference. ``` ### Options inherited from parent commands diff --git a/docs/content/cli/install.md b/docs/content/cli/install.md index 273242bb4..d8bc350cb 100644 --- a/docs/content/cli/install.md +++ b/docs/content/cli/install.md @@ -38,7 +38,7 @@ porter install [INSTALLATION] [flags] ``` --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. --force Force a fresh pull of the bundle diff --git a/docs/content/cli/invoke.md b/docs/content/cli/invoke.md index 2c1e51ebd..483a42d22 100644 --- a/docs/content/cli/invoke.md +++ b/docs/content/cli/invoke.md @@ -39,7 +39,7 @@ porter invoke [INSTALLATION] --action ACTION [flags] --action string Custom action name to invoke. --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. --force Force a fresh pull of the bundle diff --git a/docs/content/cli/uninstall.md b/docs/content/cli/uninstall.md index a093cd35c..c1253fe1e 100644 --- a/docs/content/cli/uninstall.md +++ b/docs/content/cli/uninstall.md @@ -40,7 +40,7 @@ porter uninstall [INSTALLATION] [flags] ``` --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when uninstalling the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -c, --cred stringArray Credential to use when uninstalling the bundle. May be either a named set of credentials or a filepath, and specified multiple times. --delete Delete all records associated with the installation, assuming the uninstall action succeeds -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. Optional unless a newer version of the bundle should be used to uninstall the bundle. diff --git a/docs/content/cli/upgrade.md b/docs/content/cli/upgrade.md index 9c952fcbc..dc3e5fe36 100644 --- a/docs/content/cli/upgrade.md +++ b/docs/content/cli/upgrade.md @@ -36,18 +36,18 @@ porter upgrade [INSTALLATION] [flags] ### Options ``` - --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. - --cnab-file string Path to the CNAB bundle.json file. - -c, --cred strings Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. - -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") - -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. - --force Force a fresh pull of the bundle - -h, --help help for upgrade - --insecure-registry Don't require TLS for the registry - --no-logs Do not persist the bundle execution logs - --param strings Define an individual parameter in the form NAME=VALUE. Overrides parameters otherwise set via --parameter-set. May be specified multiple times. - -p, --parameter-set strings Name of a parameter set file for the bundle. May be either a named set of parameters or a filepath, and specified multiple times. - -r, --reference string Use a bundle in an OCI registry specified by the given reference. + --allow-docker-host-access Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://porter.sh/configuration/#allow-docker-host-access for the full implications of this flag. + --cnab-file string Path to the CNAB bundle.json file. + -c, --cred stringArray Credential to use when installing the bundle. May be either a named set of credentials or a filepath, and specified multiple times. + -d, --driver string Specify a driver to use. Allowed values: docker, debug (default "docker") + -f, --file string Path to the porter manifest file. Defaults to the bundle in the current directory. + --force Force a fresh pull of the bundle + -h, --help help for upgrade + --insecure-registry Don't require TLS for the registry + --no-logs Do not persist the bundle execution logs + --param stringArray Define an individual parameter in the form NAME=VALUE. Overrides parameters otherwise set via --parameter-set. May be specified multiple times. + -p, --parameter-set stringArray Name of a parameter set file for the bundle. May be either a named set of parameters or a filepath, and specified multiple times. + -r, --reference string Use a bundle in an OCI registry specified by the given reference. ``` ### Options inherited from parent commands diff --git a/tests/integration/install_test.go b/tests/integration/install_test.go index 9a08f901e..52ad5c925 100644 --- a/tests/integration/install_test.go +++ b/tests/integration/install_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package integration @@ -134,7 +135,6 @@ func TestInstall_stringParam(t *testing.T) { t.Skip("This is a failing test for https://github.com/getporter/porter/issues/1862") p := porter.NewTestPorter(t) - defer p.Close() p.SetupIntegrationTest() p.Debug = false @@ -143,10 +143,10 @@ func TestInstall_stringParam(t *testing.T) { installOpts := porter.NewInstallOptions() installOpts.Params = []string{"name=Demo Time"} - err := installOpts.Validate(context.Background(), []string{}, p.Porter) + err := installOpts.Validate([]string{}, p.Porter) require.NoError(t, err) - err = p.InstallBundle(context.Background(), installOpts) + err = p.InstallBundle(installOpts) require.NoError(t, err) output := p.TestConfig.TestContext.GetOutput()