From ecebd974e868af33e05e6a243f78c63370da0e68 Mon Sep 17 00:00:00 2001 From: max furman Date: Fri, 25 Oct 2024 18:44:04 -0700 Subject: [PATCH 1/3] Add DisableSSHCAUser and DisableSSHCAHost options to linkedca GCP provisioner --- authority/provisioners.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/authority/provisioners.go b/authority/provisioners.go index d56ce9e53..44e603481 100644 --- a/authority/provisioners.go +++ b/authority/provisioners.go @@ -955,6 +955,8 @@ func ProvisionerToCertificates(p *linkedca.Provisioner) (provisioner.Interface, ProjectIDs: cfg.ProjectIds, DisableCustomSANs: cfg.DisableCustomSans, DisableTrustOnFirstUse: cfg.DisableTrustOnFirstUse, + DisableSSHCAUser: cfg.DisableSSHCAUser, + DisableSSHCAHost: cfg.DisableSSHCAHost, InstanceAge: instanceAge, Claims: claims, Options: options, @@ -1095,6 +1097,8 @@ func ProvisionerToLinkedca(p provisioner.Interface) (*linkedca.Provisioner, erro ProjectIds: p.ProjectIDs, DisableCustomSans: p.DisableCustomSANs, DisableTrustOnFirstUse: p.DisableTrustOnFirstUse, + DisableSSHCAUser: p.DisableSSHCAUser, + DisableSSHCAHost: p.DisableSSHCAHost, InstanceAge: p.InstanceAge.String(), }, }, From 93011ec6c676f4bb285e50588865541066e625d4 Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 28 Oct 2024 09:11:54 -0700 Subject: [PATCH 2/3] updated linkedca attribute name --- authority/provisioners.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/authority/provisioners.go b/authority/provisioners.go index 44e603481..18bdd233d 100644 --- a/authority/provisioners.go +++ b/authority/provisioners.go @@ -955,8 +955,8 @@ func ProvisionerToCertificates(p *linkedca.Provisioner) (provisioner.Interface, ProjectIDs: cfg.ProjectIds, DisableCustomSANs: cfg.DisableCustomSans, DisableTrustOnFirstUse: cfg.DisableTrustOnFirstUse, - DisableSSHCAUser: cfg.DisableSSHCAUser, - DisableSSHCAHost: cfg.DisableSSHCAHost, + DisableSSHCAUser: cfg.DisableSshCaUser, + DisableSSHCAHost: cfg.DisableSshCaHost, InstanceAge: instanceAge, Claims: claims, Options: options, @@ -1097,8 +1097,8 @@ func ProvisionerToLinkedca(p provisioner.Interface) (*linkedca.Provisioner, erro ProjectIds: p.ProjectIDs, DisableCustomSans: p.DisableCustomSANs, DisableTrustOnFirstUse: p.DisableTrustOnFirstUse, - DisableSSHCAUser: p.DisableSSHCAUser, - DisableSSHCAHost: p.DisableSSHCAHost, + DisableSshCaUser: p.DisableSSHCAUser, + DisableSshCaHost: p.DisableSSHCAHost, InstanceAge: p.InstanceAge.String(), }, }, From 36946595f262ca1ccb45b87ed4213a07f98d73c3 Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 28 Oct 2024 13:47:45 -0700 Subject: [PATCH 3/3] Bump linkedca @ v0.22.2 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4ea556bc5..3279ba06d 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.16 go.step.sm/crypto v0.54.0 - go.step.sm/linkedca v0.22.1 + go.step.sm/linkedca v0.22.2 golang.org/x/crypto v0.28.0 golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 golang.org/x/net v0.30.0 diff --git a/go.sum b/go.sum index 9215e1129..f755b1b4d 100644 --- a/go.sum +++ b/go.sum @@ -440,6 +440,8 @@ go.step.sm/crypto v0.54.0 h1:V8p+12Ld0NRA/RBMYoKXA0dWmVKZSdCwP56IwzweT9g= go.step.sm/crypto v0.54.0/go.mod h1:vQJyTngfZDW+UyZdFzOMCY/txWDAmcwViEUC7Gn4YfU= go.step.sm/linkedca v0.22.1 h1:GvprpH9P4Sv9U+eZ3bxDgRSSpW14cFDYpe1kS6yWLkw= go.step.sm/linkedca v0.22.1/go.mod h1:dOKdF4HSn73YUEkfS5/FECngZmBtj2Il5DTKWXY4S6Y= +go.step.sm/linkedca v0.22.2 h1:zmFIyDC77gFHo6FLQJ8OIXYpLYDIsgDWaYqtYs6A9/Q= +go.step.sm/linkedca v0.22.2/go.mod h1:ESY8r5VfhJA8ZVzI6hXIQcEX9LwaY3aoPnT+Hb9jpbw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=