iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8210 from dvrkps/patch-4 

Consolidate receiver name
This commit is contained in:
Adrien Delorme 2019-10-10 16:40:53 +02:00 committed by GitHub
parent 26ab75ea34 3eb075b9fc
commit 9aac2246f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builder/jdcloud/credential_config.go
View File

@ -67,19 +67,19 @@ func (jd *JDCloudCredentialConfig) ValidateKeyPair() error {
return nil return nil
} }
func (config *JDCloudCredentialConfig) validateRegion() error { func (jd *JDCloudCredentialConfig) validateRegion() error {
regionArray := []string{"cn-north-1", "cn-south-1", "cn-east-1", "cn-east-2"} regionArray := []string{"cn-north-1", "cn-south-1", "cn-east-1", "cn-east-2"}
for _, item := range regionArray { for _, item := range regionArray {
if item == config.RegionId { if item == jd.RegionId {
return nil return nil
} }
} }
return fmt.Errorf("[PRE-FLIGHT] Invalid RegionId:%s. "+ return fmt.Errorf("[PRE-FLIGHT] Invalid RegionId:%s. "+
"Legit RegionId are: {cn-north-1, cn-south-1, cn-east-1, cn-east-2}", config.RegionId) "Legit RegionId are: {cn-north-1, cn-south-1, cn-east-1, cn-east-2}", jd.RegionId)
} }
func (config *JDCloudCredentialConfig) validateAz() error { func (jd *JDCloudCredentialConfig) validateAz() error {
if len(config.Az) == 0 { if len(jd.Az) == 0 {
return fmt.Errorf("[PRE-FLIGHT] az info missing") return fmt.Errorf("[PRE-FLIGHT] az info missing")
} }
return nil return nil