Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into bugfix/qj-resolve-conflict-2.1.0-20180824

Gopkg.lock

@@ -1032,11 +1032,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:5ede93047a3e04f6ede8fbc011f13ee94c397b727613fd9712cc99ebc47ff906"
+  digest = "1:d0257638bb52243f9fa293ef07544081259d54edd8e53f084e522b6c22e92637"
   name = "yunion.io/x/jsonutils"
   packages = ["."]
   pruneopts = "UT"
-  revision = "41e805b221e8fcd9435b706b4dd473df3dd8cff4"
+  revision = "38477c9cceb895816fe21507d73da30376d358b7"
 
 [[projects]]
   branch = "master"
@@ -1051,7 +1051,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:13da776b435ec7873c6f9309191296d920a110145372d2a9e1a58ab9e8b34b0d"
+  digest = "1:47670c70d0326f624de21c8f29d0f73850062f0752f27e146308db62fbb540d3"
   name = "yunion.io/x/pkg"
   packages = [
     "gotypes",
@@ -1086,23 +1086,23 @@
     "utils",
   ]
   pruneopts = "UT"
-  revision = "56b426f0ca15288cc26442f5802c949f137ade60"
+  revision = "6c349ecbdb90d5f6ecc9b86596428176c1937b32"
 
 [[projects]]
   branch = "master"
-  digest = "1:3d3e1ecb41c63448df5d66eeafa5f6da720ca6e32543e89faa82b5bc4b9adebc"
+  digest = "1:e23019db2cda58480528738c86bc7abbff09d10488c2a51dd5d500f8686815f0"
   name = "yunion.io/x/sqlchemy"
   packages = ["."]
   pruneopts = "UT"
-  revision = "a74ef73e555a1ed2e19b1a47e0567814c289eaf9"
+  revision = "19a3c90524d3638f8e3580231396dda46088aebc"
 
 [[projects]]
   branch = "master"
-  digest = "1:6baf7b4ee14e156a9dd6c5c850bb8201af47665e3267e3cdee26edf2a90eaf73"
+  digest = "1:71e1b62648868a9083f9e4693145a0154a600591ca548aaf64cae32a10e956e5"
   name = "yunion.io/x/structarg"
   packages = ["."]
   pruneopts = "UT"
-  revision = "d5e5d87357b9bc2164215117763f6b15b2a3e75d"
+  revision = "4a5eb8e2cdfbf7f6511561a3c710c116b171f405"
 
 [solve-meta]
   analyzer-name = "dep"

Makefile

@@ -83,10 +83,6 @@ bin_dir: output_dir
 output_dir:
 	@mkdir -p $(BUILD_DIR)
 
-
-dep:
-	cd $(ROOT_DIR) && dep ensure -v
-
 dep_clean:
 	rm -fr $(GOPATH)/pkg/dep/sources/*
 
@@ -105,5 +101,8 @@ fmt:
 	find . -type f -name "*.go" -not -path "./_output/*" \
 		-not -path "./vendor/*" | xargs gofmt -s -w
 
+dep:
+	cd $(ROOT_DIR) && dep ensure -v -update $(shell for p in $$(ls vendor/yunion.io/x/); do echo "yunion.io/x/$$p"; done | xargs)
+
 %:
 	@:

pkg/util/aliyun/securitygroup.go

@@ -574,3 +574,15 @@ func (self *SRegion) leaveSecurityGroup(secgroupId, instanceId string) error {
 	_, err := self.ecsRequest("LeaveSecurityGroup", params)
 	return err
 }
+
+func (self *SRegion) deleteSecurityGroup(secGrpId string) error {
+	params := make(map[string]string)
+	params["SecurityGroupId"] = secGrpId
+
+	_, err := self.ecsRequest("DeleteSecurityGroup", params)
+	if err != nil {
+		log.Errorf("Delete security group fail %s", err)
+		return err
+	}
+	return nil
+}

pkg/util/aliyun/vpc.go

@@ -184,6 +184,19 @@ func (self *SVpc) GetManagerId() string {
 }
 
 func (self *SVpc) Delete() error {
+	err := self.fetchSecurityGroups()
+	if err != nil {
+		log.Errorf("fetchSecurityGroup for VPC delete fail %s", err)
+		return err
+	}
+	for i := 0; i < len(self.secgroups); i += 1 {
+		secgroup := self.secgroups[i].(*SSecurityGroup)
+		err := self.region.deleteSecurityGroup(secgroup.SecurityGroupId)
+		if err != nil {
+			log.Errorf("deleteSecurityGroup for VPC delete fail %s", err)
+			return err
+		}
+	}
 	return self.region.DeleteVpc(self.VpcId)
 }
 

vendor/yunion.io/x/sqlchemy/field_update.go

@@ -102,7 +102,7 @@ func (ts *STableSpec) updateFields(dt interface{}, fields map[string]interface{}
 		buf.WriteString(fmt.Sprintf(", `%s` = `%s` + 1", versionField, versionField))
 	}
 	for _, updatedField := range updatedFields {
-		buf.WriteString(fmt.Sprintf(", `%s` = NOW()", updatedField))
+		buf.WriteString(fmt.Sprintf(", `%s` = UTC_TIMESTAMP()", updatedField))
 	}
 	buf.WriteString(" WHERE ")
 	first = true

vendor/yunion.io/x/sqlchemy/insert.go

@@ -36,7 +36,7 @@ func (t *STableSpec) insertSqlPrep(dataFields map[string]interface{}) (string, [
 		if ok && (dtc.IsCreatedAt || dtc.IsUpdatedAt) {
 			createdAtFields = append(createdAtFields, k)
 			names = append(names, fmt.Sprintf("`%s`", k))
-			format = append(format, "NOW()")
+			format = append(format, "UTC_TIMESTAMP()")
 		} else if ov != nil && !c.IsZero(ov) && !isAutoInc {
 			v := c.ConvertFromValue(ov)
 			values = append(values, v)

vendor/yunion.io/x/sqlchemy/update.go

@@ -126,7 +126,7 @@ func (us *SUpdateSession) saveUpdate(dt interface{}) (map[string]SUpdateDiff, er
 		buf.WriteString(fmt.Sprintf(", `%s` = `%s` + 1", versionField, versionField))
 	}
 	for _, updatedField := range updatedFields {
-		buf.WriteString(fmt.Sprintf(", `%s` = NOW()", updatedField))
+		buf.WriteString(fmt.Sprintf(", `%s` = UTC_TIMESTAMP()", updatedField))
 	}
 	buf.WriteString(" WHERE ")
 	first = true

vendor/yunion.io/x/structarg/structarg.go

@@ -305,6 +305,9 @@ func (this *ArgumentParser) addArgument(f reflect.StructField, v reflect.Value)
 			return fmt.Errorf("positional %s must not have default value", token)
 		}
 	}
+	if !positional && use_default && required {
+		return fmt.Errorf("non-positional argument with default value should not have required:true set")
+	}
 	subcommand, err := strconv.ParseBool(tagMap[TAG_SUBCOMMAND])
 	if err != nil {
 		subcommand = false