This is an automated email from the ASF dual-hosted git repository.
likyh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new f32f8046 feat(cicd): add cicd scope (#3693)
f32f8046 is described below
commit f32f8046c16a05546211d9321f4d3dce5c89eb8d
Author: Warren Chen <[email protected]>
AuthorDate: Tue Nov 8 14:07:19 2022 +0800
feat(cicd): add cicd scope (#3693)
---
.../devops/cicd_scope.go} | 31 +++++++-----------
...line_relation.go => 20221107_add_cicd_scope.go} | 37 ++++++++++++++++------
.../20221107_remove_cicd_pipeline_relation.go | 2 +-
.../cicd_scope.go} | 30 +++++++-----------
models/migrationscripts/register.go | 1 +
5 files changed, 53 insertions(+), 48 deletions(-)
diff --git a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
b/models/domainlayer/devops/cicd_scope.go
similarity index 55%
copy from models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
copy to models/domainlayer/devops/cicd_scope.go
index ee4d8f72..068ee5cf 100644
--- a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
+++ b/models/domainlayer/devops/cicd_scope.go
@@ -15,29 +15,22 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package migrationscripts
+package devops
import (
- "github.com/apache/incubator-devlake/errors"
- "github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/models/domainlayer"
+ "time"
)
-type removeCicdPipelineRelation struct{}
-
-type CICDPipelineRelationship20221107 struct{}
-
-func (CICDPipelineRelationship20221107) TableName() string {
- return "cicd_pipeline_relationships"
-}
-
-func (*removeCicdPipelineRelation) Up(basicRes core.BasicRes) errors.Error {
- return basicRes.GetDal().DropTables(CICDPipelineRelationship20221107{})
-}
-
-func (*removeCicdPipelineRelation) Version() uint64 {
- return 20221107000001
+type CicdScope struct {
+ domainlayer.DomainEntity
+ Name string `gorm:"type:varchar(255)"`
+ Description string
+ Url string `gorm:"type:varchar(255)"`
+ CreatedDate *time.Time
+ UpdatedDate *time.Time
}
-func (*removeCicdPipelineRelation) Name() string {
- return "Remove cicd_pipeline_relation"
+func (CicdScope) TableName() string {
+ return "cicd_scopes"
}
diff --git a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
b/models/migrationscripts/20221107_add_cicd_scope.go
similarity index 54%
copy from models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
copy to models/migrationscripts/20221107_add_cicd_scope.go
index ee4d8f72..1f3afb61 100644
--- a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
+++ b/models/migrationscripts/20221107_add_cicd_scope.go
@@ -19,25 +19,44 @@ package migrationscripts
import (
"github.com/apache/incubator-devlake/errors"
+ "github.com/apache/incubator-devlake/models/migrationscripts/archived"
"github.com/apache/incubator-devlake/plugins/core"
)
-type removeCicdPipelineRelation struct{}
+type addCicdScope struct{}
-type CICDPipelineRelationship20221107 struct{}
+type cicdPipeline20221107 struct {
+ CicdScopeId string
+}
+
+func (cicdPipeline20221107) TableName() string {
+ return "cicd_pipelines"
+}
+
+type cicdTask20221107 struct {
+ CicdScopeId string
+}
-func (CICDPipelineRelationship20221107) TableName() string {
- return "cicd_pipeline_relationships"
+func (cicdTask20221107) TableName() string {
+ return "cicd_tasks"
}
-func (*removeCicdPipelineRelation) Up(basicRes core.BasicRes) errors.Error {
- return basicRes.GetDal().DropTables(CICDPipelineRelationship20221107{})
+func (*addCicdScope) Up(basicRes core.BasicRes) errors.Error {
+ err := basicRes.GetDal().AutoMigrate(&cicdPipeline20221107{})
+ if err != nil {
+ return err
+ }
+ err = basicRes.GetDal().AutoMigrate(&cicdTask20221107{})
+ if err != nil {
+ return err
+ }
+ return basicRes.GetDal().AutoMigrate(&archived.CicdScope{})
}
-func (*removeCicdPipelineRelation) Version() uint64 {
+func (*addCicdScope) Version() uint64 {
return 20221107000001
}
-func (*removeCicdPipelineRelation) Name() string {
- return "Remove cicd_pipeline_relation"
+func (*addCicdScope) Name() string {
+ return "add cicd scope and add cicd_scope_id"
}
diff --git a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
b/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
index ee4d8f72..72ec9ed7 100644
--- a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
+++ b/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
@@ -31,7 +31,7 @@ func (CICDPipelineRelationship20221107) TableName() string {
}
func (*removeCicdPipelineRelation) Up(basicRes core.BasicRes) errors.Error {
- return basicRes.GetDal().DropTables(CICDPipelineRelationship20221107{})
+ return basicRes.GetDal().DropTables(&CICDPipelineRelationship20221107{})
}
func (*removeCicdPipelineRelation) Version() uint64 {
diff --git a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
b/models/migrationscripts/archived/cicd_scope.go
similarity index 55%
copy from models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
copy to models/migrationscripts/archived/cicd_scope.go
index ee4d8f72..b210b424 100644
--- a/models/migrationscripts/20221107_remove_cicd_pipeline_relation.go
+++ b/models/migrationscripts/archived/cicd_scope.go
@@ -15,29 +15,21 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package migrationscripts
+package archived
import (
- "github.com/apache/incubator-devlake/errors"
- "github.com/apache/incubator-devlake/plugins/core"
+ "time"
)
-type removeCicdPipelineRelation struct{}
-
-type CICDPipelineRelationship20221107 struct{}
-
-func (CICDPipelineRelationship20221107) TableName() string {
- return "cicd_pipeline_relationships"
-}
-
-func (*removeCicdPipelineRelation) Up(basicRes core.BasicRes) errors.Error {
- return basicRes.GetDal().DropTables(CICDPipelineRelationship20221107{})
-}
-
-func (*removeCicdPipelineRelation) Version() uint64 {
- return 20221107000001
+type CicdScope struct {
+ DomainEntity
+ Name string `gorm:"type:varchar(255)"`
+ Description string
+ Url string `gorm:"type:varchar(255)"`
+ CreatedDate *time.Time
+ UpdatedDate *time.Time
}
-func (*removeCicdPipelineRelation) Name() string {
- return "Remove cicd_pipeline_relation"
+func (CicdScope) TableName() string {
+ return "cicd_scopes"
}
diff --git a/models/migrationscripts/register.go
b/models/migrationscripts/register.go
index a15f8ca5..8f12061e 100644
--- a/models/migrationscripts/register.go
+++ b/models/migrationscripts/register.go
@@ -53,5 +53,6 @@ func All() []core.MigrationScript {
new(addRepoSnapshot),
new(createCollectorState),
new(removeCicdPipelineRelation),
+ new(addCicdScope),
}
}
