Merge pull request #15 from qqshfox/fix_iam_for_china_region

add a new var IsChinaRegion to fix for China Region

Author: mumoshu

config/config.go

@@ -67,6 +67,7 @@ func newDefaultCluster() *Cluster {
 		Subnets:                  []*Subnet{},
 		MapPublicIPs:             true,
 		Experimental:             experimental,
+		IsChinaRegion:            false,
 	}
 }
 
@@ -172,6 +173,7 @@ type Cluster struct {
 	MapPublicIPs             bool              `yaml:"mapPublicIPs,omitempty"`
 	Experimental             Experimental      `yaml:"experimental"`
 	providedEncryptService   encryptService
+	IsChinaRegion            bool
 }
 
 type Subnet struct {
@@ -318,6 +320,8 @@ func (c Cluster) Config() (*Config, error) {
 	config.EtcdEndpoints = etcdEndpoints.String()
 	config.EtcdInitialCluster = etcdInitialCluster.String()
 
+	config.IsChinaRegion = strings.HasPrefix(config.Region, "cn")
+
 	return &config, nil
 }
 

config/templates/stack-template.json

@@ -174,7 +174,7 @@
               "Effect": "Allow",
               "Principal": {
                 "Service": [
-                  "ec2.amazonaws.com"
+                  "ec2.amazonaws.com{{if .IsChinaRegion}}.cn{{end}}"
                 ]
               }
             }
@@ -221,7 +221,7 @@
               "Effect": "Allow",
               "Principal": {
                 "Service": [
-                  "ec2.amazonaws.com"
+                  "ec2.amazonaws.com{{if .IsChinaRegion}}.cn{{end}}"
                 ]
               }
             }
@@ -286,7 +286,7 @@
               "Effect": "Allow",
               "Principal": {
                 "Service": [
-                  "ec2.amazonaws.com"
+                  "ec2.amazonaws.com{{if .IsChinaRegion}}.cn{{end}}"
                 ]
               }
             }