kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename fi.Keystore.StoreKeypair to StoreKeyset

This commit is contained in:
John Gardiner Myers 2021-05-03 21:12:27 -07:00
parent 2300d89591
commit fa77f8b964
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_secret_keypair_ca.go
View File

@ -140,7 +140,7 @@ func RunCreateSecretCaCert(ctx context.Context, f *util.Factory, out io.Writer,
PrivateKey: privateKey,
}
err = keyStore.StoreKeypair(fi.CertificateIDCA, &fi.Keyset{
err = keyStore.StoreKeyset(fi.CertificateIDCA, &fi.Keyset{
LegacyFormat: false,
Items: map[string]*fi.KeysetItem{
serialString: ki,

4
nodeup/pkg/model/fakes_test.go
View File

@ -45,8 +45,8 @@ func (k fakeKeyStore) CreateKeypair(signer string, name string, template *x509.C
panic("fakeKeyStore does not implement CreateKeypair")
}
func (k fakeKeyStore) StoreKeypair(id string, keyset *fi.Keyset) error {
panic("fakeKeyStore does not implement StoreKeypair")
func (k fakeKeyStore) StoreKeyset(name string, keyset *fi.Keyset) error {
panic("fakeKeyStore does not implement StoreKeyset")
}
func (k fakeKeyStore) MirrorTo(basedir vfs.Path) error {

6
pkg/configserver/keystore.go
View File

@ -53,9 +53,9 @@ func (s *configserverKeyStore) CreateKeypair(signer string, name string, templat
return nil, fmt.Errorf("CreateKeypair not supported by configserverKeyStore")
}
// StoreKeypair implements fi.Keystore
func (s *configserverKeyStore) StoreKeypair(id string, keyset *fi.Keyset) error {
return fmt.Errorf("StoreKeypair not supported by configserverKeyStore")
// StoreKeyset implements fi.Keystore
func (s *configserverKeyStore) StoreKeyset(name string, keyset *fi.Keyset) error {
return fmt.Errorf("StoreKeyset not supported by configserverKeyStore")
}
// MirrorTo implements fi.Keystore

8
pkg/kubeconfig/create_kubecfg_test.go
View File

@ -87,8 +87,8 @@ func (f fakeStatusCloud) FindClusterStatus(cluster *kops.Cluster) (*kops.Cluster
type fakeKeyStore struct {
FindKeysetFn func(name string) (*fi.Keyset, error)
// StoreKeypair writes the keypair to the store.
StoreKeypairFn func(id string, keyset *fi.Keyset) error
// StoreKeysetFn writes the keyset to the store.
StoreKeysetFn func(name string, keyset *fi.Keyset) error
// MirrorTo will copy secrets to a vfs.Path, which is often easier for a machine to read
MirrorToFn func(basedir vfs.Path) error
@ -102,8 +102,8 @@ func (f fakeKeyStore) FindKeyset(name string) (*fi.Keyset, error) {
return f.FindKeysetFn(name)
}
func (f fakeKeyStore) StoreKeypair(id string, keyset *fi.Keyset) error {
return f.StoreKeypairFn(id, keyset)
func (f fakeKeyStore) StoreKeyset(name string, keyset *fi.Keyset) error {
return f.StoreKeysetFn(name, keyset)
}
func (f fakeKeyStore) MirrorTo(basedir vfs.Path) error {

4
upup/pkg/fi/ca.go
View File

@ -66,8 +66,8 @@ type Keystore interface {
// FindKeyset finds a Keyset.
FindKeyset(name string) (*Keyset, error)
// StoreKeypair writes the keyset to the store.
StoreKeypair(id string, keyset *Keyset) error
// StoreKeyset writes a Keyset to the store.
StoreKeyset(name string, keyset *Keyset) error
// MirrorTo will copy secrets to a vfs.Path, which is often easier for a machine to read
MirrorTo(basedir vfs.Path) error

4
upup/pkg/fi/clientset_castore.go
View File

@ -257,8 +257,8 @@ func (c *ClientsetCAStore) ListSSHCredentials() ([]*kops.SSHCredential, error) {
return items, nil
}
// StoreKeypair implements CAStore::StoreKeypair
func (c *ClientsetCAStore) StoreKeypair(name string, keyset *Keyset) error {
// StoreKeyset implements CAStore::StoreKeyset
func (c *ClientsetCAStore) StoreKeyset(name string, keyset *Keyset) error {
ctx := context.TODO()
return c.storeKeyset(ctx, name, keyset, kops.SecretTypeKeypair)
}

4
upup/pkg/fi/fitasks/keypair.go
View File

@ -239,7 +239,7 @@ func (_ *Keypair) Render(c *fi.Context, a, e, changes *Keypair) error {
},
Primary: ki,
}
err = c.Keystore.StoreKeypair(name, keyset)
err = c.Keystore.StoreKeyset(name, keyset)
if err != nil {
return err
}
@ -267,7 +267,7 @@ func (_ *Keypair) Render(c *fi.Context, a, e, changes *Keypair) error {
return err
}
keyset.LegacyFormat = false
err = c.Keystore.StoreKeypair(name, keyset)
err = c.Keystore.StoreKeyset(name, keyset)
if err != nil {
return err
}

2
upup/pkg/fi/vfs_castore.go
View File

@ -520,7 +520,7 @@ func mirrorSSHCredential(cluster *kops.Cluster, basedir vfs.Path, sshCredential
return nil
}
func (c *VFSCAStore) StoreKeypair(name string, keyset *Keyset) error {
func (c *VFSCAStore) StoreKeyset(name string, keyset *Keyset) error {
{
p := c.buildPrivateKeyPoolPath(name)
if err := c.writeKeysetBundle(p, name, keyset, true); err != nil {

8
upup/pkg/fi/vfs_castore_test.go
View File

@ -81,8 +81,8 @@ func TestVFSCAStoreRoundTrip(t *testing.T) {
},
Primary: item,
}
if err := s.StoreKeypair("ca", keyset); err != nil {
t.Fatalf("error from StoreKeypair: %v", err)
if err := s.StoreKeyset("ca", keyset); err != nil {
t.Fatalf("error from StoreKeyset: %v", err)
}
paths, err := basePath.ReadTree()
@ -244,8 +244,8 @@ func TestVFSCAStoreRoundTripWithVault(t *testing.T) {
},
Primary: item,
}
if err := s.StoreKeypair("ca", keyset); err != nil {
t.Fatalf("error from StoreKeypair: %v", err)
if err := s.StoreKeyset("ca", keyset); err != nil {
t.Fatalf("error from StoreKeyset: %v", err)
}
paths, err := basePath.ReadTree()

2
upup/pkg/kutil/convert_kubeup_cluster.go
View File

@ -497,7 +497,7 @@ func (x *ConvertKubeupCluster) Upgrade(ctx context.Context) error {
if oldCACertPool.Primary != nil {
fi.AddCert(keyset, oldCACertPool.Primary)
}
err = newKeyStore.StoreKeypair(fi.CertificateIDCA, keyset)
err = newKeyStore.StoreKeyset(fi.CertificateIDCA, keyset)
if err != nil {
return fmt.Errorf("error importing old CA certs: %v", err)
}

2
upup/pkg/kutil/import_cluster.go
View File

@ -429,7 +429,7 @@ func (x *ImportCluster) ImportAWSCluster(ctx context.Context) error {
return err
}
fi.AddCert(keyset, caCert)
err = keyStore.StoreKeypair(fi.CertificateIDCA, keyset)
err = keyStore.StoreKeyset(fi.CertificateIDCA, keyset)
if err != nil {
return err
}