From 3a4f877be84b1c45bc095ce07f4815e5df7093f7 Mon Sep 17 00:00:00 2001 From: Clayton Rosenthal Date: Tue, 16 May 2023 20:36:09 -0700 Subject: [PATCH 1/2] Fixes #939 provisioner update tofu flag changing custom sans. --- command/ca/provisioner/update.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/command/ca/provisioner/update.go b/command/ca/provisioner/update.go index d6d1cbd9d..f36b53ba9 100644 --- a/command/ca/provisioner/update.go +++ b/command/ca/provisioner/update.go @@ -800,7 +800,7 @@ func updateAWSDetails(ctx *cli.Context, p *linkedca.Provisioner) error { details.DisableCustomSans = ctx.Bool("disable-custom-sans") } if ctx.IsSet("disable-trust-on-first-use") { - details.DisableCustomSans = ctx.Bool("disable-trust-on-first-use") + details.DisableTrustOnFirstUse = ctx.Bool("disable-trust-on-first-use") } if ctx.IsSet("remove-aws-account") { details.Accounts = removeElements(details.Accounts, ctx.StringSlice("remove-aws-account")) @@ -828,7 +828,7 @@ func updateAzureDetails(ctx *cli.Context, p *linkedca.Provisioner) error { details.DisableCustomSans = ctx.Bool("disable-custom-sans") } if ctx.IsSet("disable-trust-on-first-use") { - details.DisableCustomSans = ctx.Bool("disable-trust-on-first-use") + details.DisableTrustOnFirstUse = ctx.Bool("disable-trust-on-first-use") } if ctx.IsSet("remove-azure-resource-group") { details.ResourceGroups = removeElements(details.ResourceGroups, ctx.StringSlice("remove-azure-resource-group")) @@ -869,7 +869,7 @@ func updateGCPDetails(ctx *cli.Context, p *linkedca.Provisioner) error { details.DisableCustomSans = ctx.Bool("disable-custom-sans") } if ctx.IsSet("disable-trust-on-first-use") { - details.DisableCustomSans = ctx.Bool("disable-trust-on-first-use") + details.DisableTrustOnFirstUse = ctx.Bool("disable-trust-on-first-use") } if ctx.IsSet("remove-gcp-service-account") { details.ServiceAccounts = removeElements(details.ServiceAccounts, ctx.StringSlice("remove-gcp-service-account")) From 96040b3c318f8b9e57a6e561bbbd71f10e24647f Mon Sep 17 00:00:00 2001 From: Clayton Rosenthal Date: Mon, 3 Jul 2023 18:04:42 -0700 Subject: [PATCH 2/2] trying to fix #664 --- command/ssh/config.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/command/ssh/config.go b/command/ssh/config.go index 9838614d3..c37986137 100644 --- a/command/ssh/config.go +++ b/command/ssh/config.go @@ -95,13 +95,9 @@ times to set multiple variables.`, flags.CaURL, flags.Root, flags.Offline, - cli.StringFlag{ - Name: "context", - Usage: `The of the context for the new authority.`, - }, + flags.Context, flags.ContextProfile, flags.ContextAuthority, - flags.HiddenNoContext, }, } }