darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1824 from donny-dont/feature/secret_skip_verify_model

Browse source 
Adding SkipVerify to Secrets
This commit is contained in:
Brad Rydzewski 2016-10-20 01:53:24 +02:00 committed by GitHub
commit 01945b1ae5
8 changed files with 77 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
model/repo_secret.go
View file

@ -20,6 +20,9 @@ type RepoSecret struct {
// the secret is restricted to this list of events. // the secret is restricted to this list of events.
Events []string `json:"event,omitempty" meddler:"secret_events,json"` Events []string `json:"event,omitempty" meddler:"secret_events,json"`
// whether the secret requires verification
SkipVerify bool `json:"skip_verify" meddler:"secret_skip_verify"`
} }
// Secret transforms a repo secret into a simple secret. // Secret transforms a repo secret into a simple secret.
@ -29,6 +32,7 @@ func (s *RepoSecret) Secret() *Secret {
Value: s.Value, Value: s.Value,
Images: s.Images, Images: s.Images,
Events: s.Events, Events: s.Events,
SkipVerify: s.SkipVerify,
} }
} }
@ -39,6 +43,7 @@ func (s *RepoSecret) Clone() *RepoSecret {
Name: s.Name, Name: s.Name,
Images: s.Images, Images: s.Images,
Events: s.Events, Events: s.Events,
SkipVerify: s.SkipVerify,
} }
} }

3
model/secret.go
View file

@ -18,6 +18,9 @@ type Secret struct {
// the secret is restricted to this list of events. // the secret is restricted to this list of events.
Events []string `json:"event,omitempty"` Events []string `json:"event,omitempty"`
// whether the secret requires verification
SkipVerify bool `json:"skip_verify"`
} }
// Match returns true if an image and event match the restricted list. // Match returns true if an image and event match the restricted list.

5
model/team_secret.go
View file

@ -20,6 +20,9 @@ type TeamSecret struct {
// the secret is restricted to this list of events. // the secret is restricted to this list of events.
Events []string `json:"event,omitempty" meddler:"team_secret_events,json"` Events []string `json:"event,omitempty" meddler:"team_secret_events,json"`
// whether the secret requires verification
SkipVerify bool `json:"skip_verify" meddler:"team_secret_skip_verify"`
} }
// Secret transforms a repo secret into a simple secret. // Secret transforms a repo secret into a simple secret.
@ -29,6 +32,7 @@ func (s *TeamSecret) Secret() *Secret {
Value: s.Value, Value: s.Value,
Images: s.Images, Images: s.Images,
Events: s.Events, Events: s.Events,
SkipVerify: s.SkipVerify,
} }
} }
@ -39,6 +43,7 @@ func (s *TeamSecret) Clone() *TeamSecret {
Name: s.Name, Name: s.Name,
Images: s.Images, Images: s.Images,
Events: s.Events, Events: s.Events,
SkipVerify: s.SkipVerify,
} }
} }

12
store/datastore/ddl/mysql/9.sql Normal file
View file

@ -0,0 +1,12 @@
-- +migrate Up
ALTER TABLE secrets ADD COLUMN secret_skip_verify BOOLEAN;
ALTER TABLE team_secrets ADD COLUMN team_secret_skip_verify BOOLEAN;
UPDATE secrets SET secret_skip_verify = false;
UPDATE team_secrets SET team_secret_skip_verify = false;
-- +migrate Down
ALTER TABLE secrets DROP COLUMN secret_skip_verify;
ALTER TABLE team_secrets DROP COLUMN team_secret_skip_verify;

12
store/datastore/ddl/postgres/9.sql Normal file
View file

@ -0,0 +1,12 @@
-- +migrate Up
ALTER TABLE secrets ADD COLUMN secret_skip_verify BOOLEAN;
ALTER TABLE team_secrets ADD COLUMN team_secret_skip_verify BOOLEAN;
UPDATE secrets SET secret_skip_verify = false;
UPDATE team_secrets SET team_secret_skip_verify = false;
-- +migrate Down
ALTER TABLE secrets DROP COLUMN secret_skip_verify;
ALTER TABLE team_secrets DROP COLUMN team_secret_skip_verify;

12
store/datastore/ddl/sqlite3/9.sql Normal file
View file

@ -0,0 +1,12 @@
-- +migrate Up
ALTER TABLE secrets ADD COLUMN secret_skip_verify BOOLEAN;
ALTER TABLE team_secrets ADD COLUMN team_secret_skip_verify BOOLEAN;
UPDATE secrets SET secret_skip_verify = 0;
UPDATE team_secrets SET team_secret_skip_verify = 0;
-- +migrate Down
ALTER TABLE secrets DROP COLUMN secret_skip_verify;
ALTER TABLE team_secrets DROP COLUMN team_secret_skip_verify;

1
store/datastore/repo_secret_test.go
View file

@ -28,6 +28,7 @@ func TestRepoSecrets(t *testing.T) {
Value: "bar", Value: "bar",
Images: []string{"docker", "gcr"}, Images: []string{"docker", "gcr"},
Events: []string{"push", "tag"}, Events: []string{"push", "tag"},
SkipVerify: false,
} }
err := s.SetSecret(secret) err := s.SetSecret(secret)
g.Assert(err == nil).IsTrue() g.Assert(err == nil).IsTrue()

1
store/datastore/team_secret_test.go
View file

@ -28,6 +28,7 @@ func TestTeamSecrets(t *testing.T) {
Value: "bar", Value: "bar",
Images: []string{"docker", "gcr"}, Images: []string{"docker", "gcr"},
Events: []string{"push", "tag"}, Events: []string{"push", "tag"},
SkipVerify: false,
} }
err := s.SetTeamSecret(secret) err := s.SetTeamSecret(secret)
g.Assert(err == nil).IsTrue() g.Assert(err == nil).IsTrue()