dentaku/woodpecker-helm3
1
0
Fork 0
Code Pull requests Releases Activity

Deduplicate the kubeValues data in InitKube [#67]

Browse source 
Now that the InitKube initialization happens inside its own package, the
private .values field can be populated at the same time, rather than
having to wait for Prepare().

Also clarified the config/template filename fields (configFile vs.
ConfigFile was particularly ambiguous).
This commit is contained in:
Erin Call 2020-01-16 15:11:42 -08:00
parent 21b9d32329
commit 88bb8085b0
No known key found for this signature in database
GPG key ID: 4071FF6C15B8DAD1
2 changed files with 92 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
internal/run/initkube.go
View file

@ -11,14 +11,8 @@ import (
// InitKube is a step in a helm Plan that initializes the kubernetes config file. // InitKube is a step in a helm Plan that initializes the kubernetes config file.
type InitKube struct { type InitKube struct {
SkipTLSVerify bool templateFilename string
Certificate string configFilename string
APIServer string
ServiceAccount string
Token string
TemplateFile string
ConfigFile string
template *template.Template template *template.Template
configFile io.WriteCloser configFile io.WriteCloser
values kubeValues values kubeValues
@ -36,20 +30,23 @@ type kubeValues struct {
// NewInitKube creates a InitKube using the given Config and filepaths. No validation is performed at this time. // NewInitKube creates a InitKube using the given Config and filepaths. No validation is performed at this time.
func NewInitKube(cfg env.Config, templateFile, configFile string) *InitKube { func NewInitKube(cfg env.Config, templateFile, configFile string) *InitKube {
return &InitKube{ return &InitKube{
values: kubeValues{
SkipTLSVerify: cfg.SkipTLSVerify, SkipTLSVerify: cfg.SkipTLSVerify,
Certificate: cfg.Certificate, Certificate: cfg.Certificate,
APIServer: cfg.APIServer, APIServer: cfg.APIServer,
Namespace: cfg.Namespace,
ServiceAccount: cfg.ServiceAccount, ServiceAccount: cfg.ServiceAccount,
Token: cfg.KubeToken, Token: cfg.KubeToken,
TemplateFile: templateFile, },
ConfigFile: configFile, templateFilename: templateFile,
configFilename: configFile,
} }
} }
// Execute generates a kubernetes config file from drone-helm3's template. // Execute generates a kubernetes config file from drone-helm3's template.
func (i *InitKube) Execute(cfg Config) error { func (i *InitKube) Execute(cfg Config) error {
if cfg.Debug { if cfg.Debug {
fmt.Fprintf(cfg.Stderr, "writing kubeconfig file to %s\n", i.ConfigFile) fmt.Fprintf(cfg.Stderr, "writing kubeconfig file to %s\n", i.configFilename)
} }
defer i.configFile.Close() defer i.configFile.Close()
return i.template.Execute(i.configFile, i.values) return i.template.Execute(i.configFile, i.values)
@ -59,45 +56,36 @@ func (i *InitKube) Execute(cfg Config) error {
func (i *InitKube) Prepare(cfg Config) error { func (i *InitKube) Prepare(cfg Config) error {
var err error var err error
if i.APIServer == "" { if i.values.APIServer == "" {
return errors.New("an API Server is needed to deploy") return errors.New("an API Server is needed to deploy")
} }
if i.Token == "" { if i.values.Token == "" {
return errors.New("token is needed to deploy") return errors.New("token is needed to deploy")
} }
if i.ServiceAccount == "" { if i.values.ServiceAccount == "" {
i.ServiceAccount = "helm" i.values.ServiceAccount = "helm"
} }
if cfg.Debug { if cfg.Debug {
fmt.Fprintf(cfg.Stderr, "loading kubeconfig template from %s\n", i.TemplateFile) fmt.Fprintf(cfg.Stderr, "loading kubeconfig template from %s\n", i.templateFilename)
} }
i.template, err = template.ParseFiles(i.TemplateFile) i.template, err = template.ParseFiles(i.templateFilename)
if err != nil { if err != nil {
return fmt.Errorf("could not load kubeconfig template: %w", err) return fmt.Errorf("could not load kubeconfig template: %w", err)
} }
i.values = kubeValues{
SkipTLSVerify: i.SkipTLSVerify,
Certificate: i.Certificate,
APIServer: i.APIServer,
ServiceAccount: i.ServiceAccount,
Token: i.Token,
Namespace: cfg.Namespace,
}
if cfg.Debug { if cfg.Debug {
if _, err := os.Stat(i.ConfigFile); err != nil { if _, err := os.Stat(i.configFilename); err != nil {
// non-nil err here isn't an actual error state; the kubeconfig just doesn't exist // non-nil err here isn't an actual error state; the kubeconfig just doesn't exist
fmt.Fprint(cfg.Stderr, "creating ") fmt.Fprint(cfg.Stderr, "creating ")
} else { } else {
fmt.Fprint(cfg.Stderr, "truncating ") fmt.Fprint(cfg.Stderr, "truncating ")
} }
fmt.Fprintf(cfg.Stderr, "kubeconfig file at %s\n", i.ConfigFile) fmt.Fprintf(cfg.Stderr, "kubeconfig file at %s\n", i.configFilename)
} }
i.configFile, err = os.Create(i.ConfigFile) i.configFile, err = os.Create(i.configFilename)
if err != nil { if err != nil {
return fmt.Errorf("could not open kubeconfig file for writing: %w", err) return fmt.Errorf("could not open kubeconfig file for writing: %w", err)
} }

64
internal/run/initkube_test.go
View file

@ -29,13 +29,15 @@ func (suite *InitKubeTestSuite) TestNewInitKube() {
init := NewInitKube(cfg, "conf.tpl", "conf.yml") init := NewInitKube(cfg, "conf.tpl", "conf.yml")
suite.Equal(&InitKube{ suite.Equal(&InitKube{
values: kubeValues{
SkipTLSVerify: true, SkipTLSVerify: true,
Certificate: "cHJvY2xhaW1zIHdvbmRlcmZ1bCBmcmllbmRzaGlw", Certificate: "cHJvY2xhaW1zIHdvbmRlcmZ1bCBmcmllbmRzaGlw",
APIServer: "98.765.43.21", APIServer: "98.765.43.21",
ServiceAccount: "greathelm", ServiceAccount: "greathelm",
Token: "b2YgbXkgYWZmZWN0aW9u", Token: "b2YgbXkgYWZmZWN0aW9u",
TemplateFile: "conf.tpl", },
ConfigFile: "conf.yml", templateFilename: "conf.tpl",
configFilename: "conf.yml",
}, init) }, init)
} }
@ -52,15 +54,16 @@ namespace: {{ .Namespace }}
suite.Require().Nil(err) suite.Require().Nil(err)
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: templateFile.Name(),
ConfigFile: configFile.Name(),
}
cfg := Config{
Namespace: "Cisco", Namespace: "Cisco",
},
templateFilename: templateFile.Name(),
configFilename: configFile.Name(),
} }
cfg := Config{}
err = init.Prepare(cfg) err = init.Prepare(cfg)
suite.Require().Nil(err) suite.Require().Nil(err)
@ -85,16 +88,17 @@ func (suite *InitKubeTestSuite) TestExecuteGeneratesConfig() {
defer os.Remove(configFile.Name()) defer os.Remove(configFile.Name())
suite.Require().NoError(err) suite.Require().NoError(err)
cfg := Config{ cfg := Config{}
Namespace: "marshmallow",
}
init := InitKube{ init := InitKube{
ConfigFile: configFile.Name(), configFilename: configFile.Name(),
TemplateFile: "../../assets/kubeconfig.tpl", // the actual kubeconfig template templateFilename: "../../assets/kubeconfig.tpl", // the actual kubeconfig template
values: kubeValues{
APIServer: "https://kube.cluster/peanut", APIServer: "https://kube.cluster/peanut",
ServiceAccount: "chef", ServiceAccount: "chef",
Token: "eWVhaCB3ZSB0b2tpbic=", Token: "eWVhaCB3ZSB0b2tpbic=",
Certificate: "d293LCB5b3UgYXJlIHNvIGNvb2wgZm9yIHNtb2tpbmcgd2VlZCDwn5mE", Certificate: "d293LCB5b3UgYXJlIHNvIGNvb2wgZm9yIHNtb2tpbmcgd2VlZCDwn5mE",
Namespace: "marshmallow",
},
} }
suite.Require().NoError(init.Prepare(cfg)) suite.Require().NoError(init.Prepare(cfg))
suite.Require().NoError(init.Execute(cfg)) suite.Require().NoError(init.Execute(cfg))
@ -120,8 +124,8 @@ func (suite *InitKubeTestSuite) TestExecuteGeneratesConfig() {
suite.NoError(yaml.UnmarshalStrict(contents, &conf)) suite.NoError(yaml.UnmarshalStrict(contents, &conf))
// test the other branch of the certificate/SkipTLSVerify conditional // test the other branch of the certificate/SkipTLSVerify conditional
init.SkipTLSVerify = true init.values.SkipTLSVerify = true
init.Certificate = "" init.values.Certificate = ""
suite.Require().NoError(init.Prepare(cfg)) suite.Require().NoError(init.Prepare(cfg))
suite.Require().NoError(init.Execute(cfg)) suite.Require().NoError(init.Execute(cfg))
@ -139,10 +143,12 @@ func (suite *InitKubeTestSuite) TestPrepareParseError() {
suite.Require().Nil(err) suite.Require().Nil(err)
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: templateFile.Name(), },
templateFilename: templateFile.Name(),
} }
err = init.Prepare(Config{}) err = init.Prepare(Config{})
suite.Error(err) suite.Error(err)
@ -151,10 +157,12 @@ func (suite *InitKubeTestSuite) TestPrepareParseError() {
func (suite *InitKubeTestSuite) TestPrepareNonexistentTemplateFile() { func (suite *InitKubeTestSuite) TestPrepareNonexistentTemplateFile() {
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: "/usr/foreign/exclude/kubeprofig.tpl", },
templateFilename: "/usr/foreign/exclude/kubeprofig.tpl",
} }
err := init.Prepare(Config{}) err := init.Prepare(Config{})
suite.Error(err) suite.Error(err)
@ -166,11 +174,13 @@ func (suite *InitKubeTestSuite) TestPrepareCannotOpenDestinationFile() {
defer os.Remove(templateFile.Name()) defer os.Remove(templateFile.Name())
suite.Require().Nil(err) suite.Require().Nil(err)
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: templateFile.Name(), },
ConfigFile: "/usr/foreign/exclude/kubeprofig", templateFilename: templateFile.Name(),
configFilename: "/usr/foreign/exclude/kubeprofig",
} }
cfg := Config{} cfg := Config{}
@ -190,22 +200,24 @@ func (suite *InitKubeTestSuite) TestPrepareRequiredConfig() {
// initial config with all required fields present // initial config with all required fields present
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: templateFile.Name(), },
ConfigFile: configFile.Name(), templateFilename: templateFile.Name(),
configFilename: configFile.Name(),
} }
cfg := Config{} cfg := Config{}
suite.NoError(init.Prepare(cfg)) // consistency check; we should be starting in a happy state suite.NoError(init.Prepare(cfg)) // consistency check; we should be starting in a happy state
init.APIServer = "" init.values.APIServer = ""
suite.Error(init.Prepare(cfg), "APIServer should be required.") suite.Error(init.Prepare(cfg), "APIServer should be required.")
init.APIServer = "Sysadmin" init.values.APIServer = "Sysadmin"
init.Token = "" init.values.Token = ""
suite.Error(init.Prepare(cfg), "Token should be required.") suite.Error(init.Prepare(cfg), "Token should be required.")
} }
@ -219,17 +231,19 @@ func (suite *InitKubeTestSuite) TestPrepareDefaultsServiceAccount() {
suite.Require().Nil(err) suite.Require().Nil(err)
init := InitKube{ init := InitKube{
values: kubeValues{
APIServer: "Sysadmin", APIServer: "Sysadmin",
Certificate: "CCNA", Certificate: "CCNA",
Token: "Aspire virtual currency", Token: "Aspire virtual currency",
TemplateFile: templateFile.Name(), },
ConfigFile: configFile.Name(), templateFilename: templateFile.Name(),
configFilename: configFile.Name(),
} }
cfg := Config{} cfg := Config{}
init.Prepare(cfg) init.Prepare(cfg)
suite.Equal("helm", init.ServiceAccount) suite.Equal("helm", init.values.ServiceAccount)
} }
func tempfile(name, contents string) (*os.File, error) { func tempfile(name, contents string) (*os.File, error) {