e2e/framework: add consul and vault client detection

This commit is contained in:
Nick Ethier
2018-06-28 22:58:57 -04:00
parent cb9e1e14a4
commit 7c224cf766

View File

@@ -43,20 +43,33 @@ func (p *singleClusterProvisioner) ProvisionCluster(opts ProvisionerOptions) (*C
ID: hex.EncodeToString(h.Sum(nil))[:8],
Name: opts.Name,
}
nomadAddr := os.Getenv("NOMAD_ADDR")
if len(nomadAddr) == 0 {
if len(os.Getenv("NOMAD_ADDR")) == 0 {
return nil, fmt.Errorf("environment variable NOMAD_ADDR not set")
}
nomadConfig := napi.DefaultConfig()
nomadConfig.Address = nomadAddr
nomadClient, err := napi.NewClient(nomadConfig)
nomadClient, err := napi.NewClient(napi.DefaultConfig())
if err != nil {
return nil, err
}
info.NomadClient = nomadClient
if len(os.Getenv(capi.HTTPAddrEnvName)) != 0 {
consulClient, err := capi.NewClient(capi.DefaultConfig())
if err != nil {
return nil, err
}
info.ConsulClient = consulClient
}
if len(os.Getenv(vapi.EnvVaultAddress)) != 0 {
vaultClient, err := vapi.NewClient(vapi.DefaultConfig())
if err != nil {
return nil, err
}
info.VaultClient = vaultClient
}
return info, err
}