enhance(pipeline): add fields for secrets

database/pipeline/create_test.go

@@ -28,9 +28,9 @@ func TestPipeline_Engine_CreatePipeline(t *testing.T) {
 
 	// ensure the mock expects the query
 	_mock.ExpectQuery(`INSERT INTO "pipelines"
-("repo_id","number","flavor","platform","ref","type","version","services","stages","steps","templates","data","id")
-VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13) RETURNING "id"`).
-		WithArgs(1, 1, nil, nil, "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, AnyArgument{}, 1).
+("repo_id","number","flavor","platform","ref","type","version","external_secrets","internal_secrets","services","stages","steps","templates","data","id")
+VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15) RETURNING "id"`).
+		WithArgs(1, 1, nil, nil, "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, false, false, AnyArgument{}, 1).
 		WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)

database/pipeline/pipeline_test.go

@@ -117,19 +117,21 @@ func testSqlite(t *testing.T) *engine {
 // zero values.
 func testPipeline() *library.Pipeline {
 	return &library.Pipeline{
-		ID:        new(int64),
-		RepoID:    new(int64),
-		Number:    new(int),
-		Flavor:    new(string),
-		Platform:  new(string),
-		Ref:       new(string),
-		Type:      new(string),
-		Version:   new(string),
-		Services:  new(bool),
-		Stages:    new(bool),
-		Steps:     new(bool),
-		Templates: new(bool),
-		Data:      new([]byte),
+		ID:              new(int64),
+		RepoID:          new(int64),
+		Number:          new(int),
+		Flavor:          new(string),
+		Platform:        new(string),
+		Ref:             new(string),
+		Type:            new(string),
+		Version:         new(string),
+		ExternalSecrets: new(bool),
+		InternalSecrets: new(bool),
+		Services:        new(bool),
+		Stages:          new(bool),
+		Steps:           new(bool),
+		Templates:       new(bool),
+		Data:            new([]byte),
 	}
 }
 

database/pipeline/table.go

@@ -12,19 +12,21 @@ const (
 CREATE TABLE
 IF NOT EXISTS
 pipelines (
-	id        SERIAL PRIMARY KEY,
-	repo_id   INTEGER,
-	number    INTEGER,
-	flavor    VARCHAR(100),
-	platform  VARCHAR(100),
-	ref       VARCHAR(500),
-	type      VARCHAR(100),
-	version   VARCHAR(50),
-	services  BOOLEAN,
-	stages    BOOLEAN,
-	steps     BOOLEAN,
-	templates BOOLEAN,
-	data      BYTEA,
+	id               SERIAL PRIMARY KEY,
+	repo_id          INTEGER,
+	number           INTEGER,
+	flavor           VARCHAR(100),
+	platform         VARCHAR(100),
+	ref              VARCHAR(500),
+	type             VARCHAR(100),
+	version          VARCHAR(50),
+	external_secrets BOOLEAN,
+	internal_secrets BOOLEAN,
+	services         BOOLEAN,
+	stages           BOOLEAN,
+	steps            BOOLEAN,
+	templates        BOOLEAN,
+	data             BYTEA,
 	UNIQUE(repo_id, number)
 );
 `
@@ -34,19 +36,21 @@ pipelines (
 CREATE TABLE
 IF NOT EXISTS
 pipelines (
-	id        INTEGER PRIMARY KEY AUTOINCREMENT,
-	repo_id   INTEGER,
-	number    INTEGER,
-	flavor    TEXT,
-	platform  TEXT,
-	ref       TEXT,
-	type      TEXT,
-	version   TEXT,
-	services  BOOLEAN,
-	stages    BOOLEAN,
-	steps     BOOLEAN,
-	templates BOOLEAN,
-	data      BLOB,
+	id               INTEGER PRIMARY KEY AUTOINCREMENT,
+	repo_id          INTEGER,
+	number           INTEGER,
+	flavor           TEXT,
+	platform         TEXT,
+	ref              TEXT,
+	type             TEXT,
+	version          TEXT,
+	external_secrets BOOLEAN,
+	internal_secrets BOOLEAN,
+	services         BOOLEAN,
+	stages           BOOLEAN,
+	steps            BOOLEAN,
+	templates        BOOLEAN,
+	data             BLOB,
 	UNIQUE(repo_id, number)
 );
 `

database/pipeline/update_test.go

@@ -25,9 +25,9 @@ func TestPipeline_Engine_UpdatePipeline(t *testing.T) {
 
 	// ensure the mock expects the query
 	_mock.ExpectExec(`UPDATE "pipelines"
-SET "repo_id"=$1,"number"=$2,"flavor"=$3,"platform"=$4,"ref"=$5,"type"=$6,"version"=$7,"services"=$8,"stages"=$9,"steps"=$10,"templates"=$11,"data"=$12
-WHERE "id" = $13`).
-		WithArgs(1, 1, nil, nil, "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, AnyArgument{}, 1).
+SET "repo_id"=$1,"number"=$2,"flavor"=$3,"platform"=$4,"ref"=$5,"type"=$6,"version"=$7,"external_secrets"=$8,"internal_secrets"=$9,"services"=$10,"stages"=$11,"steps"=$12,"templates"=$13,"data"=$14
+WHERE "id" = $15`).
+		WithArgs(1, 1, nil, nil, "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, false, false, AnyArgument{}, 1).
 		WillReturnResult(sqlmock.NewResult(1, 1))
 
 	_sqlite := testSqlite(t)

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/gin-gonic/gin v1.7.7
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/go-redis/redis/v8 v8.11.4
-	github.com/go-vela/types v0.11.1-0.20220119164440-1e45cf9e3508
+	github.com/go-vela/types v0.11.1-0.20220121154054-d7791d3c0140
 	github.com/golang-jwt/jwt/v4 v4.2.0
 	github.com/google/go-cmp v0.5.6
 	github.com/google/go-github/v42 v42.0.0

go.sum

@@ -181,8 +181,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-vela/types v0.11.1-0.20220119164440-1e45cf9e3508 h1:c9jrn6DVgaYmPq7MwYsG5zVmsqBid2v4czqzVC3nMFI=
-github.com/go-vela/types v0.11.1-0.20220119164440-1e45cf9e3508/go.mod h1:nMZJ/0tb0HO8/AVaJXHuR5slG9UPuP9or+CnkuyFcL4=
+github.com/go-vela/types v0.11.1-0.20220121154054-d7791d3c0140 h1:Sb9+vbctqElxGae0zxYwoB2Vqye0IqT2iFKcSBSaVxE=
+github.com/go-vela/types v0.11.1-0.20220121154054-d7791d3c0140/go.mod h1:nMZJ/0tb0HO8/AVaJXHuR5slG9UPuP9or+CnkuyFcL4=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=