elastic cache auth_mode status & password reset bugfix

pkg/multicloud/aws/securitygroup.go

@@ -401,6 +401,10 @@ func (self *SRegion) syncSecgroupRules(secgroupId string, rules []secrules.Secur
 
 	for _, r := range DeleteRules {
 		if err := self.delSecurityGroupRule(secgroupId, &r); err != nil {
+			if strings.Contains(err.Error(), "InvalidPermission.NotFound") {
+				continue
+			}
+
 			log.Errorf("delSecurityGroupRule %v error: %s", r, err.Error())
 			return err
 		}

pkg/multicloud/huawei/elasticcache_account.go

@@ -72,7 +72,7 @@ func (self *SElasticcacheAccount) ResetPassword(input cloudprovider.SCloudElasti
 	params := jsonutils.NewDict()
 	params.Set("old_password", jsonutils.NewString(*input.OldPassword))
 	params.Set("new_password", jsonutils.NewString(input.NewPassword))
-	err := DoUpdateWithSpec(self.cacheDB.region.ecsClient.Elasticcache.UpdateInContextWithSpec, self.GetId(), "password", params)
+	err := DoUpdateWithSpec(self.cacheDB.region.ecsClient.Elasticcache.UpdateInContextWithSpec, self.cacheDB.GetId(), "password", params)
 	if err != nil {
 		return errors.Wrap(err, "elasticcacheAccount.ResetPassword")
 	}

pkg/multicloud/huawei/elasticcache_instance.go

@@ -681,9 +681,9 @@ func (self *SElasticcache) UpdateAuthMode(noPwdAccess bool) error {
 func (self *SElasticcache) GetAuthMode() string {
 	switch self.NoPasswordAccess {
 	case "true":
-		return "on"
-	default:
 		return "off"
+	default:
+		return "on"
 	}
 }
 

pkg/util/seclib2/seclib.go

@@ -25,7 +25,7 @@ const (
 	DIGITS  = "23456789"
 	LETTERS = "abcdefghjkmnpqrstuvwxyz"
 	UPPERS  = "ABCDEFGHJKMNPRSTUVWXYZ"
-	PUNC    = "@%^-+="
+	PUNC    = "@^-+="
 
 	ALL_DIGITS  = "0123456789"
 	ALL_LETTERS = "abcdefghijklmnopqrstuvwxyz"