fix: some problems of remote state backend (#585)

Author: liu-hm19

pkg/engine/states/remote/db/db_state.go

@@ -40,9 +40,15 @@ func (s *DBState) Apply(state *states.State) error {
 	err = json.Unmarshal(marshal, &m)
 	util.CheckNotError(err, fmt.Sprintf("unmarshal state failed:%+v", marshal))
 	m["resources"] = jsonutil.MustMarshal2String(m["resources"])
+	// convert the camel case formatted key to underscore formatted key
+	// before we insert the state data into the database
+	m["kusion_version"] = m["kusionVersion"]
+	delete(m, "kusionVersion")
 	// timestamp is generated by DB, we ignore zero timestamp here
 	delete(m, "createTime")
 	delete(m, "modifiedTime")
+	// id should be an auto-increment key, we also ignore here
+	delete(m, "id")
 	id, err := mapper.Insert(s.DB, []map[string]interface{}{m})
 	state.ID = id
 	return err
@@ -55,20 +61,17 @@ func (s *DBState) Delete(id string) error {
 func (s *DBState) GetLatestState(q *states.StateQuery) (*states.State, error) {
 	where := make(map[string]interface{})
 
-	if len(q.Tenant) == 0 {
-		msg := "no Tenant in query"
-		log.Errorf(msg)
-		return nil, fmt.Errorf(msg)
-	}
-	where["tenant"] = q.Tenant
-
 	if len(q.Project) == 0 {
 		msg := "no Project in query"
 		log.Errorf(msg)
 		return nil, fmt.Errorf(msg)
 	}
 	where["project"] = q.Project
 
+	if len(q.Tenant) != 0 {
+		where["tenant"] = q.Tenant
+	}
+
 	if len(q.Stack) != 0 {
 		where["stack"] = q.Stack
 	}

pkg/engine/states/remote/oss/oss_state.go

@@ -45,7 +45,14 @@ func (s *OssState) Apply(state *states.State) error {
 	if err != nil {
 		return err
 	}
-	prefix := state.Tenant + "/" + state.Project + "/" + state.Stack + "/" + OSSStateName
+
+	var prefix string
+	if state.Tenant != "" {
+		prefix = state.Tenant + "/" + state.Project + "/" + state.Stack + "/" + OSSStateName
+	} else {
+		prefix = state.Project + "/" + state.Stack + "/" + OSSStateName
+	}
+
 	err = s.bucket.PutObject(prefix, bytes.NewReader(jsonByte))
 	if err != nil {
 		return err
@@ -58,7 +65,13 @@ func (s *OssState) Delete(id string) error {
 }
 
 func (s *OssState) GetLatestState(query *states.StateQuery) (*states.State, error) {
-	prefix := query.Tenant + "/" + query.Project + "/" + query.Stack + "/" + OSSStateName
+	var prefix string
+	if query.Tenant != "" {
+		prefix = query.Tenant + "/" + query.Project + "/" + query.Stack + "/" + OSSStateName
+	} else {
+		prefix = query.Project + "/" + query.Stack + "/" + OSSStateName
+	}
+
 	objects, err := s.bucket.ListObjects(oss.Delimiter("/"), oss.Prefix(prefix))
 	if err != nil {
 		return nil, err

pkg/engine/states/remote/s3/s3_state.go

@@ -48,7 +48,14 @@ func (s *S3State) Apply(state *states.State) error {
 	if err != nil {
 		return err
 	}
-	prefix := state.Tenant + "/" + state.Project + "/" + state.Stack + "/" + S3StateName
+
+	var prefix string
+	if state.Tenant != "" {
+		prefix = state.Tenant + "/" + state.Project + "/" + state.Stack + "/" + S3StateName
+	} else {
+		prefix = state.Project + "/" + state.Stack + "/" + S3StateName
+	}
+
 	s3Client := s3.New(s.sess)
 	_, err = s3Client.PutObject(&s3.PutObjectInput{
 		Bucket: aws.String(s.bucketName),
@@ -67,7 +74,12 @@ func (s *S3State) Delete(id string) error {
 }
 
 func (s *S3State) GetLatestState(query *states.StateQuery) (*states.State, error) {
-	prefix := query.Tenant + "/" + query.Project + "/" + query.Stack + "/" + S3StateName
+	var prefix string
+	if query.Tenant != "" {
+		prefix = query.Tenant + "/" + query.Project + "/" + query.Stack + "/" + S3StateName
+	} else {
+		prefix = query.Project + "/" + query.Stack + "/" + S3StateName
+	}
 	s3Client := s3.New(s.sess)
 
 	params := &s3.ListObjectsInput{