refactor: remove unnecessary fields and add default values

pull/7459/head
Marin Salinas 7 years ago committed by Megan Marsh
parent 810e30e8e1
commit 35c7c6163c

@ -14,8 +14,7 @@ import (
// AccessConfig is for common configuration related to AWS access
type AccessConfig struct {
AccessKey string `mapstructure:"access_key"`
CustomEndpoint string `mapstructure:"custom_endpoint"`
DecodeAuthZMessages bool `mapstructure:"decode_authorization_messages"`
CustomEndpointOAPI string `mapstructure:"custom_endpoint_oapi"`
InsecureSkipTLSVerify bool `mapstructure:"insecure_skip_tls_verify"`
MFACode string `mapstructure:"mfa_code"`
ProfileName string `mapstructure:"profile"`
@ -50,15 +49,19 @@ func (c *AccessConfig) Config() (*oapi.Config, error) {
c.RawRegion = os.Getenv("OUTSCALE_REGION")
}
if c.CustomEndpoint == "" {
c.CustomEndpoint = os.Getenv("OUTSCALE_OAPI_URL")
if c.CustomEndpointOAPI == "" {
c.CustomEndpointOAPI = os.Getenv("OUTSCALE_OAPI_URL")
}
if c.CustomEndpointOAPI == "" {
c.CustomEndpointOAPI = "outscale.com/oapi/latest"
}
config := &oapi.Config{
AccessKey: c.AccessKey,
SecretKey: c.SecretKey,
Region: c.RawRegion,
URL: c.CustomEndpoint,
URL: c.CustomEndpointOAPI,
Service: "api",
}
@ -77,7 +80,7 @@ func (c *AccessConfig) NewOAPIConnection() (oapi.OAPIClient, error) {
skipClient := &http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
TLSClientConfig: &tls.Config{InsecureSkipVerify: c.InsecureSkipTLSVerify},
},
}

@ -65,27 +65,27 @@ func buildOMIFilters(input map[string]string) oapi.FiltersImage {
filterValue := []string{v}
switch name := k; name {
case "account-aliases":
case "account-alias":
filters.AccountAliases = filterValue
case "account-ids":
case "account-id":
filters.AccountIds = filterValue
case "architectures":
case "architecture":
filters.Architectures = filterValue
case "image-ids":
case "image-id":
filters.ImageIds = filterValue
case "image-names":
case "image-name":
filters.ImageNames = filterValue
case "image-types":
case "image-type":
filters.ImageTypes = filterValue
case "virtualization-types":
case "virtualization-type":
filters.VirtualizationTypes = filterValue
case "root-device-types":
case "root-device-type":
filters.RootDeviceTypes = filterValue
case "block-device-mapping-volume-type":
filters.BlockDeviceMappingVolumeType = filterValue
//Some params are missing.
default:
log.Printf("[Debug] Unknown Filter Name: %s.", name)
log.Printf("[WARN] Unknown Filter Name: %s.", name)
}
}
return filters

Loading…
Cancel
Save