support aliyun profile
This commit is contained in:
parent
0649c3f7dc
commit
ec4a7b6af0
|
@ -3,32 +3,42 @@
|
||||||
package ecs
|
package ecs
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
|
"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
|
||||||
"github.com/hashicorp/packer/template/interpolate"
|
"github.com/hashicorp/packer/template/interpolate"
|
||||||
"github.com/hashicorp/packer/version"
|
"github.com/hashicorp/packer/version"
|
||||||
|
"github.com/mitchellh/go-homedir"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config of alicloud
|
// Config of alicloud
|
||||||
type AlicloudAccessConfig struct {
|
type AlicloudAccessConfig struct {
|
||||||
// This is the Alicloud access key. It must be provided, but it can also be
|
// This is the Alicloud access key. It must be provided when profile not exist, but it can also be
|
||||||
// sourced from the ALICLOUD_ACCESS_KEY environment variable.
|
// sourced from the ALICLOUD_ACCESS_KEY environment variable.
|
||||||
AlicloudAccessKey string `mapstructure:"access_key" required:"true"`
|
AlicloudAccessKey string `mapstructure:"access_key" required:"false"`
|
||||||
// This is the Alicloud secret key. It must be provided, but it can also be
|
// This is the Alicloud secret key. It must be provided when profile not exist, but it can also be
|
||||||
// sourced from the ALICLOUD_SECRET_KEY environment variable.
|
// sourced from the ALICLOUD_SECRET_KEY environment variable.
|
||||||
AlicloudSecretKey string `mapstructure:"secret_key" required:"true"`
|
AlicloudSecretKey string `mapstructure:"secret_key" required:"false"`
|
||||||
// This is the Alicloud region. It must be provided, but it can also be
|
// This is the Alicloud region. It must be provided when profile not exist, but it can also be
|
||||||
// sourced from the ALICLOUD_REGION environment variables.
|
// sourced from the ALICLOUD_REGION environment variables.
|
||||||
AlicloudRegion string `mapstructure:"region" required:"true"`
|
AlicloudRegion string `mapstructure:"region" required:"false"`
|
||||||
// The region validation can be skipped if this value is true, the default
|
// The region validation can be skipped if this value is true, the default
|
||||||
// value is false.
|
// value is false.
|
||||||
AlicloudSkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
|
AlicloudSkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
|
||||||
// The image validation can be skipped if this value is true, the default
|
// The image validation can be skipped if this value is true, the default
|
||||||
// value is false.
|
// value is false.
|
||||||
AlicloudSkipImageValidation bool `mapstructure:"skip_image_validation" required:"false"`
|
AlicloudSkipImageValidation bool `mapstructure:"skip_image_validation" required:"false"`
|
||||||
|
// This is th Alicloud profile. If access_key not exist, is must be provided, but it can also be
|
||||||
|
// sourced from the ALICLOUD_PROFILE environment variables.
|
||||||
|
AlicloudProfile string `mapstructure:"profile" required:"false"`
|
||||||
|
// This is the Alicloud shared credentials file path. If this file path exist, os will read access key
|
||||||
|
// and secret key from this file.
|
||||||
|
AlicloudSharedCredentialsFile string `mapstructure:"shared_credentials_file" required:"false"`
|
||||||
// STS access token, can be set through template or by exporting as
|
// STS access token, can be set through template or by exporting as
|
||||||
// environment variable such as `export SECURITY_TOKEN=value`.
|
// environment variable such as `export SECURITY_TOKEN=value`.
|
||||||
SecurityToken string `mapstructure:"security_token" required:"false"`
|
SecurityToken string `mapstructure:"security_token" required:"false"`
|
||||||
|
@ -48,8 +58,22 @@ func (c *AlicloudAccessConfig) Client() (*ClientWrapper, error) {
|
||||||
c.SecurityToken = os.Getenv("SECURITY_TOKEN")
|
c.SecurityToken = os.Getenv("SECURITY_TOKEN")
|
||||||
}
|
}
|
||||||
|
|
||||||
client, err := ecs.NewClientWithStsToken(c.AlicloudRegion, c.AlicloudAccessKey,
|
var getProviderConfig = func(str string, key string) string {
|
||||||
c.AlicloudSecretKey, c.SecurityToken)
|
value, err := getConfigFromProfile(c, key)
|
||||||
|
if err == nil && value != nil {
|
||||||
|
str = value.(string)
|
||||||
|
}
|
||||||
|
return str
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "" {
|
||||||
|
c.AlicloudAccessKey = getProviderConfig(c.AlicloudAccessKey, "access_key_id")
|
||||||
|
c.AlicloudSecretKey = getProviderConfig(c.AlicloudSecretKey, "access_key_secret")
|
||||||
|
c.AlicloudRegion = getProviderConfig(c.AlicloudRegion, "region_id")
|
||||||
|
c.SecurityToken = getProviderConfig(c.SecurityToken, "sts_token")
|
||||||
|
}
|
||||||
|
|
||||||
|
client, err := ecs.NewClientWithStsToken(c.AlicloudRegion, c.AlicloudAccessKey, c.AlicloudSecretKey, c.SecurityToken)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -89,7 +113,13 @@ func (c *AlicloudAccessConfig) Config() error {
|
||||||
if c.AlicloudSecretKey == "" {
|
if c.AlicloudSecretKey == "" {
|
||||||
c.AlicloudSecretKey = os.Getenv("ALICLOUD_SECRET_KEY")
|
c.AlicloudSecretKey = os.Getenv("ALICLOUD_SECRET_KEY")
|
||||||
}
|
}
|
||||||
if c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "" {
|
if c.AlicloudProfile == "" {
|
||||||
|
c.AlicloudProfile = os.Getenv("ALICLOUD_PROFILE")
|
||||||
|
}
|
||||||
|
if c.AlicloudSharedCredentialsFile == "" {
|
||||||
|
c.AlicloudSharedCredentialsFile = os.Getenv("ALICLOUD_SHARED_CREDENTIALS_FILE")
|
||||||
|
}
|
||||||
|
if (c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "") && c.AlicloudProfile == "" {
|
||||||
return fmt.Errorf("ALICLOUD_ACCESS_KEY and ALICLOUD_SECRET_KEY must be set in template file or environment variables.")
|
return fmt.Errorf("ALICLOUD_ACCESS_KEY and ALICLOUD_SECRET_KEY must be set in template file or environment variables.")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -131,3 +161,66 @@ func (c *AlicloudAccessConfig) getSupportedRegions() ([]string, error) {
|
||||||
|
|
||||||
return validRegions, nil
|
return validRegions, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getConfigFromProfile(c *AlicloudAccessConfig, ProfileKey string) (interface{}, error) {
|
||||||
|
providerConfig := make(map[string]interface{})
|
||||||
|
current := c.AlicloudProfile
|
||||||
|
if current != "" {
|
||||||
|
profilePath, err := homedir.Expand(c.AlicloudSharedCredentialsFile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if profilePath == "" {
|
||||||
|
profilePath = fmt.Sprintf("%s/.aliyun/config.json", os.Getenv("HOME"))
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
profilePath = fmt.Sprintf("%s/.aliyun/config.json", os.Getenv("USERPROFILE"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_, err = os.Stat(profilePath)
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
data, err := ioutil.ReadFile(profilePath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
config := map[string]interface{}{}
|
||||||
|
err = json.Unmarshal(data, &config)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, v := range config["profiles"].([]interface{}) {
|
||||||
|
if current == v.(map[string]interface{})["name"] {
|
||||||
|
providerConfig = v.(map[string]interface{})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mode := ""
|
||||||
|
if v, ok := providerConfig["mode"]; ok {
|
||||||
|
mode = v.(string)
|
||||||
|
} else {
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
switch ProfileKey {
|
||||||
|
case "access_key_id", "access_key_secret":
|
||||||
|
if mode == "EcsRamRole" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
case "ram_role_name":
|
||||||
|
if mode != "EcsRamRole" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
case "sts_token":
|
||||||
|
if mode != "StsToken" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
case "ram_role_arn", "ram_session_name":
|
||||||
|
if mode != "RamRoleArn" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
case "expired_seconds":
|
||||||
|
if mode != "RamRoleArn" {
|
||||||
|
return float64(0), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return providerConfig[ProfileKey], nil
|
||||||
|
}
|
||||||
|
|
|
@ -32,5 +32,21 @@ func TestAlicloudAccessConfigPrepareRegion(t *testing.T) {
|
||||||
t.Fatalf("shouldn't have err: %s", err)
|
t.Fatalf("shouldn't have err: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
c.AlicloudAccessKey = ""
|
||||||
|
if err := c.Prepare(nil); err == nil {
|
||||||
|
t.Fatalf("should have err")
|
||||||
|
}
|
||||||
|
|
||||||
|
c.AlicloudProfile = "default"
|
||||||
|
if err := c.Prepare(nil); err != nil {
|
||||||
|
t.Fatalf("shouldn't have err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
c.AlicloudProfile = ""
|
||||||
|
os.Setenv("ALICLOUD_PROFILE", "default")
|
||||||
|
if err := c.Prepare(nil); err != nil {
|
||||||
|
t.Fatalf("shouldn't have err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
c.AlicloudSkipValidation = false
|
c.AlicloudSkipValidation = false
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,11 +53,13 @@ type FlatConfig struct {
|
||||||
PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error"`
|
PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error"`
|
||||||
PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
|
PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
|
||||||
PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
|
PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
|
||||||
AlicloudAccessKey *string `mapstructure:"access_key" required:"true" cty:"access_key"`
|
AlicloudAccessKey *string `mapstructure:"access_key" required:"false" cty:"access_key"`
|
||||||
AlicloudSecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key"`
|
AlicloudSecretKey *string `mapstructure:"secret_key" required:"false" cty:"secret_key"`
|
||||||
AlicloudRegion *string `mapstructure:"region" required:"true" cty:"region"`
|
AlicloudRegion *string `mapstructure:"region" required:"false" cty:"region"`
|
||||||
AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
|
AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
|
||||||
AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
|
AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
|
||||||
|
AlicloudProfile *string `mapstructure:"profile" required:"false" cty:"profile"`
|
||||||
|
AlicloudSharedCredentialsFile *string `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file"`
|
||||||
SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token"`
|
SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token"`
|
||||||
AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name"`
|
AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name"`
|
||||||
AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version"`
|
AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version"`
|
||||||
|
@ -162,6 +164,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
|
||||||
"region": &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
|
"region": &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
|
||||||
"skip_region_validation": &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
|
"skip_region_validation": &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
|
||||||
"skip_image_validation": &hcldec.AttrSpec{Name: "skip_image_validation", Type: cty.Bool, Required: false},
|
"skip_image_validation": &hcldec.AttrSpec{Name: "skip_image_validation", Type: cty.Bool, Required: false},
|
||||||
|
"profile": &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
|
||||||
|
"shared_credentials_file": &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
|
||||||
"security_token": &hcldec.AttrSpec{Name: "security_token", Type: cty.String, Required: false},
|
"security_token": &hcldec.AttrSpec{Name: "security_token", Type: cty.String, Required: false},
|
||||||
"image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
|
"image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
|
||||||
"image_version": &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
|
"image_version": &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
|
||||||
|
|
|
@ -17,11 +17,13 @@ type FlatConfig struct {
|
||||||
PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error"`
|
PackerOnError *string `mapstructure:"packer_on_error" cty:"packer_on_error"`
|
||||||
PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
|
PackerUserVars map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
|
||||||
PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
|
PackerSensitiveVars []string `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
|
||||||
AlicloudAccessKey *string `mapstructure:"access_key" required:"true" cty:"access_key"`
|
AlicloudAccessKey *string `mapstructure:"access_key" required:"false" cty:"access_key"`
|
||||||
AlicloudSecretKey *string `mapstructure:"secret_key" required:"true" cty:"secret_key"`
|
AlicloudSecretKey *string `mapstructure:"secret_key" required:"false" cty:"secret_key"`
|
||||||
AlicloudRegion *string `mapstructure:"region" required:"true" cty:"region"`
|
AlicloudRegion *string `mapstructure:"region" required:"false" cty:"region"`
|
||||||
AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
|
AlicloudSkipValidation *bool `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
|
||||||
AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
|
AlicloudSkipImageValidation *bool `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
|
||||||
|
AlicloudProfile *string `mapstructure:"profile" required:"false" cty:"profile"`
|
||||||
|
AlicloudSharedCredentialsFile *string `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file"`
|
||||||
SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token"`
|
SecurityToken *string `mapstructure:"security_token" required:"false" cty:"security_token"`
|
||||||
AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name"`
|
AlicloudImageName *string `mapstructure:"image_name" required:"true" cty:"image_name"`
|
||||||
AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version"`
|
AlicloudImageVersion *string `mapstructure:"image_version" required:"false" cty:"image_version"`
|
||||||
|
@ -134,6 +136,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
|
||||||
"region": &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
|
"region": &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
|
||||||
"skip_region_validation": &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
|
"skip_region_validation": &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
|
||||||
"skip_image_validation": &hcldec.AttrSpec{Name: "skip_image_validation", Type: cty.Bool, Required: false},
|
"skip_image_validation": &hcldec.AttrSpec{Name: "skip_image_validation", Type: cty.Bool, Required: false},
|
||||||
|
"profile": &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
|
||||||
|
"shared_credentials_file": &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
|
||||||
"security_token": &hcldec.AttrSpec{Name: "security_token", Type: cty.String, Required: false},
|
"security_token": &hcldec.AttrSpec{Name: "security_token", Type: cty.String, Required: false},
|
||||||
"image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
|
"image_name": &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
|
||||||
"image_version": &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
|
"image_version": &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
|
||||||
|
|
|
@ -23,7 +23,6 @@ builder.
|
||||||
|
|
||||||
### Required:
|
### Required:
|
||||||
|
|
||||||
<%= partial "partials/builder/alicloud/ecs/AlicloudAccessConfig-required" %>
|
|
||||||
<%= partial "partials/builder/alicloud/ecs/RunConfig-required" %>
|
<%= partial "partials/builder/alicloud/ecs/RunConfig-required" %>
|
||||||
<%= partial "partials/builder/alicloud/ecs/AlicloudImageConfig-required" %>
|
<%= partial "partials/builder/alicloud/ecs/AlicloudImageConfig-required" %>
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,26 @@
|
||||||
<!-- Code generated from the comments of the AlicloudAccessConfig struct in builder/alicloud/ecs/access_config.go; DO NOT EDIT MANUALLY -->
|
<!-- Code generated from the comments of the AlicloudAccessConfig struct in builder/alicloud/ecs/access_config.go; DO NOT EDIT MANUALLY -->
|
||||||
|
|
||||||
|
- `access_key` (string) - This is the Alicloud access key. It must be provided when profile not exist, but it can also be
|
||||||
|
sourced from the ALICLOUD_ACCESS_KEY environment variable.
|
||||||
|
|
||||||
|
- `secret_key` (string) - This is the Alicloud secret key. It must be provided when profile not exist, but it can also be
|
||||||
|
sourced from the ALICLOUD_SECRET_KEY environment variable.
|
||||||
|
|
||||||
|
- `region` (string) - This is the Alicloud region. It must be provided when profile not exist, but it can also be
|
||||||
|
sourced from the ALICLOUD_REGION environment variables.
|
||||||
|
|
||||||
- `skip_region_validation` (bool) - The region validation can be skipped if this value is true, the default
|
- `skip_region_validation` (bool) - The region validation can be skipped if this value is true, the default
|
||||||
value is false.
|
value is false.
|
||||||
|
|
||||||
- `skip_image_validation` (bool) - The image validation can be skipped if this value is true, the default
|
- `skip_image_validation` (bool) - The image validation can be skipped if this value is true, the default
|
||||||
value is false.
|
value is false.
|
||||||
|
|
||||||
|
- `profile` (string) - This is th Alicloud profile. If access_key not exist, is must be provided, but it can also be
|
||||||
|
sourced from the ALICLOUD_PROFILE environment variables.
|
||||||
|
|
||||||
|
- `shared_credentials_file` (string) - This is the Alicloud shared credentials file path. If this file path exist, os will read access key
|
||||||
|
and secret key from this file.
|
||||||
|
|
||||||
- `security_token` (string) - STS access token, can be set through template or by exporting as
|
- `security_token` (string) - STS access token, can be set through template or by exporting as
|
||||||
environment variable such as `export SECURITY_TOKEN=value`.
|
environment variable such as `export SECURITY_TOKEN=value`.
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
<!-- Code generated from the comments of the AlicloudAccessConfig struct in builder/alicloud/ecs/access_config.go; DO NOT EDIT MANUALLY -->
|
|
||||||
|
|
||||||
- `access_key` (string) - This is the Alicloud access key. It must be provided, but it can also be
|
|
||||||
sourced from the ALICLOUD_ACCESS_KEY environment variable.
|
|
||||||
|
|
||||||
- `secret_key` (string) - This is the Alicloud secret key. It must be provided, but it can also be
|
|
||||||
sourced from the ALICLOUD_SECRET_KEY environment variable.
|
|
||||||
|
|
||||||
- `region` (string) - This is the Alicloud region. It must be provided, but it can also be
|
|
||||||
sourced from the ALICLOUD_REGION environment variables.
|
|
||||||
|
|
Loading…
Reference in New Issue