From e2242cffd230d96acb0b7b8fc5925e77a8f945bf Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Fri, 27 Oct 2017 18:16:16 +0800 Subject: [PATCH 01/37] define filter interfaces for replication service including:interface Filter,Converter and FilterChain and other supporting models --- src/replication/consts.go | 10 ++++++++++ src/replication/models/filter_config.go | 7 +++++++ src/replication/models/filter_item.go | 19 +++++++++++++++++++ src/replication/source/convertor.go | 16 ++++++++++++++++ src/replication/source/filter.go | 21 +++++++++++++++++++++ src/replication/source/filter_chain.go | 21 +++++++++++++++++++++ 6 files changed, 94 insertions(+) create mode 100644 src/replication/consts.go create mode 100644 src/replication/models/filter_config.go create mode 100644 src/replication/models/filter_item.go create mode 100644 src/replication/source/convertor.go create mode 100644 src/replication/source/filter.go create mode 100644 src/replication/source/filter_chain.go diff --git a/src/replication/consts.go b/src/replication/consts.go new file mode 100644 index 000000000..10075bcb3 --- /dev/null +++ b/src/replication/consts.go @@ -0,0 +1,10 @@ +package replication + +const ( + //Kind of filter item is 'project' + filterItemKindProject = "project" + //Kind of filter item is 'repository' + filterItemKindRepository = "repository" + //Kind of filter item is 'tag' + filterItemKindTag = "tag" +) diff --git a/src/replication/models/filter_config.go b/src/replication/models/filter_config.go new file mode 100644 index 000000000..cdc8e60a9 --- /dev/null +++ b/src/replication/models/filter_config.go @@ -0,0 +1,7 @@ +package models + +//FilterConfig is data model to provide configurations to the filters. +type FilterConfig struct { + //The pattern for fuzzy matching + pattern string +} diff --git a/src/replication/models/filter_item.go b/src/replication/models/filter_item.go new file mode 100644 index 000000000..9565ac447 --- /dev/null +++ b/src/replication/models/filter_item.go @@ -0,0 +1,19 @@ +package models + +//FilterItem is the general data model represents the filtering resources which are used as input and output for the filters. +type FilterItem struct { + + //The kind of the filtering resources. Support 'project','repository' and 'tag' etc. + kind string + + //The key value of resource which can be used to filter out the resource matched with specified pattern. + //E.g: + //kind == 'project', value will be project name; + //kind == 'repository', value will be repository name + //kind == 'tag', value will be tag name. + value string + + //Extension placeholder. + //To append more additional information if required by the filter. + metadata map[string]interface{} +} diff --git a/src/replication/source/convertor.go b/src/replication/source/convertor.go new file mode 100644 index 000000000..d07aafd35 --- /dev/null +++ b/src/replication/source/convertor.go @@ -0,0 +1,16 @@ +package source + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +//Convertor is designed to covert the format of output from upstream filter to the input format +//required by the downstream filter if needed. +//Each convertor covers only one specified conversion process between the two filters. +//E.g: +//If project filter connects to repository filter, then one convertor should be defined for this connection; +//If project filter connects to tag filter, then another one should be defined. The above one can not be reused. +type Convertor interface { + //Accept the items from upstream filter as input and then covert them to the required format and returned. + Convert(itemsOfUpstream []models.FilterItem) (itemsOfDownstream []models.FilterItem) +} diff --git a/src/replication/source/filter.go b/src/replication/source/filter.go new file mode 100644 index 000000000..831e4b017 --- /dev/null +++ b/src/replication/source/filter.go @@ -0,0 +1,21 @@ +package source + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +//Filter define the operations of selecting the matched resources from the candidates +//according to the specified pattern. +type Filter interface { + //Initialize the filter with specified configurations like pattern definition + Init(config models.FilterConfig) + + //Set Convertor if necessary + SetConvertor(convertor Convertor) + + //Return the convertor if existing or nil if never set + GetConvertor() Convertor + + //Filter the items + DoFilter(filterItems []models.FilterItem) []models.FilterItem +} diff --git a/src/replication/source/filter_chain.go b/src/replication/source/filter_chain.go new file mode 100644 index 000000000..156ed6fc6 --- /dev/null +++ b/src/replication/source/filter_chain.go @@ -0,0 +1,21 @@ +package source + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +//FilterChain is the interface to define the operations of coordinating multiple filters +//to work together as a whole pipeline. +//E.g: +//(original resources)---->[project filter]---->[repository filter]---->[tag filter]---->[......]---->(filter resources) +type FilterChain interface { + //Build the filter chain with the filters provided; + //if failed, an error will be returned. + Build(filter []Filter) error + + //Return all the filters in the chain. + Filters() []Filter + + //Filter the items and returned the filtered items via the appended filters in the chain. + DoFilter(filterItems []models.FilterItem) []models.FilterItem +} From cee0bcec22cef1958a2a283763192ca8ff116e56 Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Tue, 31 Oct 2017 19:43:53 +0800 Subject: [PATCH 02/37] Update the alternate policy and corresponding task to support by weekly besides daily --- .../scan_policy_notitification_handler.go | 4 +- .../scheduler/policy/alternate_policy.go | 65 +++++++++++++++++-- .../scheduler/policy/alternate_policy_test.go | 41 ++++++++++-- src/common/scheduler/policy/policy.go | 1 + src/common/scheduler/policy/uuid.go | 22 +++++++ src/common/scheduler/task/replication_task.go | 24 +++++++ .../scheduler/task/replication_task_test.go | 14 ++++ .../scheduler/task/scan_all_task_test.go | 2 +- 8 files changed, 157 insertions(+), 16 deletions(-) create mode 100644 src/common/scheduler/policy/uuid.go create mode 100644 src/common/scheduler/task/replication_task.go create mode 100644 src/common/scheduler/task/replication_task_test.go diff --git a/src/common/notifier/scan_policy_notitification_handler.go b/src/common/notifier/scan_policy_notitification_handler.go index 076019f06..e3f7d3530 100644 --- a/src/common/notifier/scan_policy_notitification_handler.go +++ b/src/common/notifier/scan_policy_notitification_handler.go @@ -63,7 +63,7 @@ func (s *ScanPolicyNotificationHandler) Handle(value interface{}) error { //To check and compare if the related parameter is changed. if pl := scheduler.DefaultScheduler.GetPolicy(alternatePolicy); pl != nil { - policyCandidate := policy.NewAlternatePolicy(&policy.AlternatePolicyConfiguration{ + policyCandidate := policy.NewAlternatePolicy(alternatePolicy, &policy.AlternatePolicyConfiguration{ Duration: 24 * time.Hour, OffsetTime: notification.DailyTime, }) @@ -95,7 +95,7 @@ func (s *ScanPolicyNotificationHandler) Handle(value interface{}) error { //Schedule policy. func schedulePolicy(notification ScanPolicyNotification) error { - schedulePolicy := policy.NewAlternatePolicy(&policy.AlternatePolicyConfiguration{ + schedulePolicy := policy.NewAlternatePolicy(alternatePolicy, &policy.AlternatePolicyConfiguration{ Duration: 24 * time.Hour, OffsetTime: notification.DailyTime, }) diff --git a/src/common/scheduler/policy/alternate_policy.go b/src/common/scheduler/policy/alternate_policy.go index e37b466f4..dc1d3864f 100644 --- a/src/common/scheduler/policy/alternate_policy.go +++ b/src/common/scheduler/policy/alternate_policy.go @@ -10,11 +10,22 @@ import ( "github.com/vmware/harbor/src/common/utils/log" ) +const ( + oneDay = 24 * 3600 +) + //AlternatePolicyConfiguration store the related configurations for alternate policy. type AlternatePolicyConfiguration struct { //Duration is the interval of executing attached tasks. + //E.g: 24*3600 for daily + // 7*24*3600 for weekly Duration time.Duration + //An integer to indicate the the weekday of the week. Please be noted that Sunday is 7. + //Use default value 0 to indicate weekday is not set. + //To support by weekly function. + Weekday int8 + //OffsetTime is the execution time point of each turn //It's a number to indicate the seconds offset to the 00:00 of UTC time. OffsetTime int64 @@ -42,16 +53,21 @@ type AlternatePolicy struct { //Channel used to receive terminate signal. terminator chan bool + + //Unique name of this policy to support multiple instances + name string } //NewAlternatePolicy is constructor of creating AlternatePolicy. -func NewAlternatePolicy(config *AlternatePolicyConfiguration) *AlternatePolicy { +//Accept name and configuration as parameters. +func NewAlternatePolicy(name string, config *AlternatePolicyConfiguration) *AlternatePolicy { return &AlternatePolicy{ RWMutex: new(sync.RWMutex), tasks: task.NewDefaultStore(), config: config, isEnabled: false, terminator: make(chan bool), + name: name, } } @@ -62,7 +78,7 @@ func (alp *AlternatePolicy) GetConfig() *AlternatePolicyConfiguration { //Name is an implementation of same method in policy interface. func (alp *AlternatePolicy) Name() string { - return "Alternate Policy" + return alp.name } //Tasks is an implementation of same method in policy interface. @@ -110,6 +126,11 @@ func (alp *AlternatePolicy) Evaluate() (<-chan bool, error) { defer alp.Unlock() alp.Lock() + //Check if configuration is valid + if !alp.isValidConfig() { + return nil, errors.New("Policy configuration is not valid") + } + //Check if policy instance is still running if alp.isEnabled { return nil, fmt.Errorf("Instance of policy %s is still running", alp.Name()) @@ -124,19 +145,41 @@ func (alp *AlternatePolicy) Evaluate() (<-chan bool, error) { alp.evaluation = make(chan bool) go func() { + var ( + waitingTime int64 + ) timeNow := time.Now().UTC() //Reach the execution time point? + //Weekday is set + if alp.config.Weekday > 0 { + targetWeekday := (alp.config.Weekday + 7) % 7 + currentWeekday := timeNow.Weekday() + weekdayDiff := (int)(targetWeekday - (int8)(currentWeekday)) + if weekdayDiff < 0 { + weekdayDiff += 7 + } + waitingTime = (int64)(weekdayDiff * oneDay) + } + + //Time utcTime := (int64)(timeNow.Hour()*3600 + timeNow.Minute()*60) diff := alp.config.OffsetTime - utcTime - if diff < 0 { - diff += 24 * 3600 + if waitingTime > 0 { + waitingTime += diff + } else { + waitingTime = diff + if waitingTime < 0 { + waitingTime += oneDay + } } - if diff > 0 { + + //Let's wait for a while + if waitingTime > 0 { //Wait for a while. log.Infof("Waiting for %d seconds after comparing offset %d and utc time %d\n", diff, alp.config.OffsetTime, utcTime) select { - case <-time.After(time.Duration(diff) * time.Second): + case <-time.After(time.Duration(waitingTime) * time.Second): case <-alp.terminator: return } @@ -188,7 +231,10 @@ func (alp *AlternatePolicy) Equal(p Policy) bool { return false } - return cfg == nil || (cfg.Duration == cfg2.Duration && cfg.OffsetTime == cfg2.OffsetTime) + return cfg == nil || + (cfg.Duration == cfg2.Duration && + cfg.OffsetTime == cfg2.OffsetTime && + cfg.Weekday == cfg2.Weekday) } //IsEnabled is an implementation of same method in policy interface. @@ -198,3 +244,8 @@ func (alp *AlternatePolicy) IsEnabled() bool { return alp.isEnabled } + +//Check if the config is valid. At least it should have the configurations for supporting daily policy. +func (alp *AlternatePolicy) isValidConfig() bool { + return alp.config != nil && alp.config.Duration > 0 && alp.config.OffsetTime >= 0 +} diff --git a/src/common/scheduler/policy/alternate_policy_test.go b/src/common/scheduler/policy/alternate_policy_test.go index 777fe59de..5a3eda4e3 100644 --- a/src/common/scheduler/policy/alternate_policy_test.go +++ b/src/common/scheduler/policy/alternate_policy_test.go @@ -6,6 +6,10 @@ import ( "time" ) +const ( + testPolicyName = "TestingPolicy" +) + type fakeTask struct { number int32 } @@ -24,18 +28,18 @@ func (ft *fakeTask) Number() int32 { } func TestBasic(t *testing.T) { - tp := NewAlternatePolicy(&AlternatePolicyConfiguration{}) + tp := NewAlternatePolicy(testPolicyName, &AlternatePolicyConfiguration{}) err := tp.AttachTasks(&fakeTask{number: 100}) if err != nil { t.Fail() } if tp.GetConfig() == nil { - t.Fail() + t.Fatal("nil config") } - if tp.Name() != "Alternate Policy" { - t.Fail() + if tp.Name() != testPolicyName { + t.Fatalf("Wrong name %s", tp.Name()) } tks := tp.Tasks() @@ -48,7 +52,7 @@ func TestBasic(t *testing.T) { func TestEvaluatePolicy(t *testing.T) { now := time.Now().UTC() utcOffset := (int64)(now.Hour()*3600 + now.Minute()*60) - tp := NewAlternatePolicy(&AlternatePolicyConfiguration{ + tp := NewAlternatePolicy(testPolicyName, &AlternatePolicyConfiguration{ Duration: 1 * time.Second, OffsetTime: utcOffset + 1, }) @@ -78,7 +82,7 @@ func TestEvaluatePolicy(t *testing.T) { func TestDisablePolicy(t *testing.T) { now := time.Now().UTC() utcOffset := (int64)(now.Hour()*3600 + now.Minute()*60) - tp := NewAlternatePolicy(&AlternatePolicyConfiguration{ + tp := NewAlternatePolicy(testPolicyName, &AlternatePolicyConfiguration{ Duration: 1 * time.Second, OffsetTime: utcOffset + 1, }) @@ -118,3 +122,28 @@ func TestDisablePolicy(t *testing.T) { t.Fatalf("Policy is still running after calling Disable() %d=%d", atomic.LoadInt32(&copiedCounter), atomic.LoadInt32(&counter)) } } + +func TestPolicyEqual(t *testing.T) { + tp1 := NewAlternatePolicy(testPolicyName, &AlternatePolicyConfiguration{ + Duration: 1 * time.Second, + OffsetTime: 8000, + }) + + tp2 := NewAlternatePolicy(testPolicyName+"2", &AlternatePolicyConfiguration{ + Duration: 100 * time.Second, + OffsetTime: 8000, + }) + + if tp1.Equal(tp2) { + t.Fatal("tp1 should not equal tp2") + } + + tp3 := NewAlternatePolicy(testPolicyName, &AlternatePolicyConfiguration{ + Duration: 1 * time.Second, + OffsetTime: 8000, + }) + + if !tp1.Equal(tp3) { + t.Fatal("tp1 should equal tp3") + } +} diff --git a/src/common/scheduler/policy/policy.go b/src/common/scheduler/policy/policy.go index 732d56cca..4fc72c0d6 100644 --- a/src/common/scheduler/policy/policy.go +++ b/src/common/scheduler/policy/policy.go @@ -15,6 +15,7 @@ import ( // type Policy interface { //Name will return the name of the policy. + //If the policy supports multiple instances, please make sure the name is unique as an UUID. Name() string //Tasks will return the attached tasks with this policy. diff --git a/src/common/scheduler/policy/uuid.go b/src/common/scheduler/policy/uuid.go new file mode 100644 index 000000000..8bd1bd72c --- /dev/null +++ b/src/common/scheduler/policy/uuid.go @@ -0,0 +1,22 @@ +package policy + +import ( + "crypto/rand" + "fmt" + "io" +) + +//NewUUID will generate a new UUID. +//Code copied from https://play.golang.org/p/4FkNSiUDMg +func newUUID() (string, error) { + uuid := make([]byte, 16) + n, err := io.ReadFull(rand.Reader, uuid) + if n != len(uuid) || err != nil { + return "", err + } + + uuid[8] = uuid[8]&^0xc0 | 0x80 + uuid[6] = uuid[6]&^0xf0 | 0x40 + + return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]), nil +} diff --git a/src/common/scheduler/task/replication_task.go b/src/common/scheduler/task/replication_task.go new file mode 100644 index 000000000..aaefcc571 --- /dev/null +++ b/src/common/scheduler/task/replication_task.go @@ -0,0 +1,24 @@ +package task + +import ( + "errors" +) + +//ReplicationTask is the task for triggering one replication +type ReplicationTask struct{} + +//NewReplicationTask is constructor of creating ReplicationTask +func NewReplicationTask() *ReplicationTask { + return &ReplicationTask{} +} + +//Name returns the name of this task +func (rt *ReplicationTask) Name() string { + return "replication" +} + +//Run the actions here +func (rt *ReplicationTask) Run() error { + //Trigger the replication here + return errors.New("Not implemented") +} diff --git a/src/common/scheduler/task/replication_task_test.go b/src/common/scheduler/task/replication_task_test.go new file mode 100644 index 000000000..cd0acd2c0 --- /dev/null +++ b/src/common/scheduler/task/replication_task_test.go @@ -0,0 +1,14 @@ +package task + +import "testing" + +func TestReplicationTask(t *testing.T) { + tk := NewReplicationTask() + if tk == nil { + t.Fail() + } + + if tk.Name() != "replication" { + t.Fail() + } +} diff --git a/src/common/scheduler/task/scan_all_task_test.go b/src/common/scheduler/task/scan_all_task_test.go index 18ac9202b..b7482fbfc 100644 --- a/src/common/scheduler/task/scan_all_task_test.go +++ b/src/common/scheduler/task/scan_all_task_test.go @@ -4,7 +4,7 @@ import ( "testing" ) -func TestTask(t *testing.T) { +func TestScanAllTask(t *testing.T) { tk := NewScanAllTask() if tk == nil { t.Fail() From 82b400c049d11b02f93bc43b1ee0600eb026da85 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 1 Nov 2017 14:13:34 +0800 Subject: [PATCH 03/37] Add replication filter implement --- src/replication/consts.go | 12 +-- src/replication/models/filter_config.go | 2 +- src/replication/models/filter_item.go | 6 +- src/replication/source/filter.go | 7 +- src/replication/source/pattern_filter.go | 84 +++++++++++++++++++ src/replication/source/pattern_filter_test.go | 63 ++++++++++++++ .../source/tag_combination_filter.go | 75 +++++++++++++++++ .../source/tag_combination_filter_test.go | 83 ++++++++++++++++++ 8 files changed, 317 insertions(+), 15 deletions(-) create mode 100644 src/replication/source/pattern_filter.go create mode 100644 src/replication/source/pattern_filter_test.go create mode 100644 src/replication/source/tag_combination_filter.go create mode 100644 src/replication/source/tag_combination_filter_test.go diff --git a/src/replication/consts.go b/src/replication/consts.go index 10075bcb3..76926f224 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -1,10 +1,10 @@ package replication const ( - //Kind of filter item is 'project' - filterItemKindProject = "project" - //Kind of filter item is 'repository' - filterItemKindRepository = "repository" - //Kind of filter item is 'tag' - filterItemKindTag = "tag" + //FilterItemKindProject : Kind of filter item is 'project' + FilterItemKindProject = "project" + //FilterItemKindRepository : Kind of filter item is 'repository' + FilterItemKindRepository = "repository" + //FilterItemKindTag : Kind of filter item is 'tag' + FilterItemKindTag = "tag" ) diff --git a/src/replication/models/filter_config.go b/src/replication/models/filter_config.go index cdc8e60a9..149780eaa 100644 --- a/src/replication/models/filter_config.go +++ b/src/replication/models/filter_config.go @@ -3,5 +3,5 @@ package models //FilterConfig is data model to provide configurations to the filters. type FilterConfig struct { //The pattern for fuzzy matching - pattern string + Pattern string } diff --git a/src/replication/models/filter_item.go b/src/replication/models/filter_item.go index 9565ac447..038287c78 100644 --- a/src/replication/models/filter_item.go +++ b/src/replication/models/filter_item.go @@ -4,16 +4,16 @@ package models type FilterItem struct { //The kind of the filtering resources. Support 'project','repository' and 'tag' etc. - kind string + Kind string //The key value of resource which can be used to filter out the resource matched with specified pattern. //E.g: //kind == 'project', value will be project name; //kind == 'repository', value will be repository name //kind == 'tag', value will be tag name. - value string + Value string //Extension placeholder. //To append more additional information if required by the filter. - metadata map[string]interface{} + Metadata map[string]interface{} } diff --git a/src/replication/source/filter.go b/src/replication/source/filter.go index 831e4b017..eb7b0623c 100644 --- a/src/replication/source/filter.go +++ b/src/replication/source/filter.go @@ -7,11 +7,8 @@ import ( //Filter define the operations of selecting the matched resources from the candidates //according to the specified pattern. type Filter interface { - //Initialize the filter with specified configurations like pattern definition - Init(config models.FilterConfig) - - //Set Convertor if necessary - SetConvertor(convertor Convertor) + //Initialize the filter + Init() error //Return the convertor if existing or nil if never set GetConvertor() Convertor diff --git a/src/replication/source/pattern_filter.go b/src/replication/source/pattern_filter.go new file mode 100644 index 000000000..6c895d0eb --- /dev/null +++ b/src/replication/source/pattern_filter.go @@ -0,0 +1,84 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "regexp" + + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication/models" +) + +// PatternFilter implements Filter interface for pattern filter +type PatternFilter struct { + kind string + pattern string + convertor Convertor +} + +// NewPatternFilter returns an instance of PatternFilter +func NewPatternFilter(kind, pattern string, convertor ...Convertor) *PatternFilter { + filer := &PatternFilter{ + kind: kind, + pattern: pattern, + } + + if len(convertor) > 0 { + filer.convertor = convertor[0] + } + + return filer +} + +// Init the filter. nil implement for now +func (p *PatternFilter) Init() error { + return nil +} + +// GetConvertor returns the convertor +func (p *PatternFilter) GetConvertor() Convertor { + return p.convertor +} + +// DoFilter filters resources +func (p *PatternFilter) DoFilter(filterItems []models.FilterItem) []models.FilterItem { + items := []models.FilterItem{} + for _, item := range filterItems { + if item.Kind != p.kind { + log.Warningf("unexpected filter item kind, expected: %s, got: %s, skip", + p.kind, item.Kind) + continue + } + + matched, err := regexp.MatchString(p.pattern, item.Value) + if err != nil { + log.Errorf("failed to match pattern %s, value %s: %v, skip", + p.pattern, item.Value, err) + continue + } + + if !matched { + log.Debugf("%s does not match to the %s filter %s, skip", + item.Value, p.kind, p.pattern) + continue + } + + log.Debugf("add %s to the result of %s filter %s", + item.Value, p.kind, p.pattern) + items = append(items, item) + } + + return items +} diff --git a/src/replication/source/pattern_filter_test.go b/src/replication/source/pattern_filter_test.go new file mode 100644 index 000000000..2f1ea372e --- /dev/null +++ b/src/replication/source/pattern_filter_test.go @@ -0,0 +1,63 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + + "testing" +) + +var pfilter = NewPatternFilter(replication.FilterItemKindTag, "library/ubuntu:release-*", nil) + +func TestPatternFilterInit(t *testing.T) { + assert.Nil(t, pfilter.Init()) +} + +func TestPatternFilterGetConvertor(t *testing.T) { + assert.Nil(t, pfilter.GetConvertor()) +} + +func TestPatternFilterDoFilter(t *testing.T) { + items := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindProject, + }, + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:release-14.04", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:release-16.04", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:test", + }, + } + result := pfilter.DoFilter(items) + assert.Equal(t, 2, len(result)) + assert.Equal(t, replication.FilterItemKindTag, result[0].Kind) + assert.Equal(t, "library/ubuntu:release-14.04", result[0].Value) + assert.Equal(t, replication.FilterItemKindTag, result[1].Kind) + assert.Equal(t, "library/ubuntu:release-16.04", result[1].Value) + +} diff --git a/src/replication/source/tag_combination_filter.go b/src/replication/source/tag_combination_filter.go new file mode 100644 index 000000000..ced506e44 --- /dev/null +++ b/src/replication/source/tag_combination_filter.go @@ -0,0 +1,75 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "strings" + + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +// TagCombinationFilter implements Filter interface for merging tag filter items +// whose repository are same into one repository filter item +type TagCombinationFilter struct{} + +// NewTagCombinationFilter returns an instance of TagCombinationFilter +func NewTagCombinationFilter() *TagCombinationFilter { + return &TagCombinationFilter{} +} + +// Init the filter. nil implement for now +func (t *TagCombinationFilter) Init() error { + return nil +} + +// GetConvertor returns the convertor +func (t *TagCombinationFilter) GetConvertor() Convertor { + return nil +} + +// DoFilter filters resources +func (t *TagCombinationFilter) DoFilter(filterItems []models.FilterItem) []models.FilterItem { + repos := map[string][]string{} + for _, item := range filterItems { + if item.Kind != replication.FilterItemKindTag { + log.Warningf("unexpected filter item kind, expected: %s, got: %s, skip", + replication.FilterItemKindTag, item.Kind) + continue + } + + strs := strings.Split(item.Value, ":") + if len(strs) != 2 { + log.Warningf("unexpected image format: %s, skip", item.Value) + continue + } + + repos[strs[0]] = append(repos[strs[0]], strs[1]) + } + + items := []models.FilterItem{} + for repo, tags := range repos { + items = append(items, models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: repo, + Metadata: map[string]interface{}{ + "tags": tags, + }, + }) + } + + return items +} diff --git a/src/replication/source/tag_combination_filter_test.go b/src/replication/source/tag_combination_filter_test.go new file mode 100644 index 000000000..c3bfefff8 --- /dev/null +++ b/src/replication/source/tag_combination_filter_test.go @@ -0,0 +1,83 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + + "testing" +) + +var tcfilter = NewTagCombinationFilter() + +func TestTagCombinationFilteInit(t *testing.T) { + assert.Nil(t, tcfilter.Init()) +} + +func TestTagCombinationFilteGetConvertor(t *testing.T) { + assert.Nil(t, tcfilter.GetConvertor()) +} + +func TestTagCombinationFilteDoFilter(t *testing.T) { + items := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindProject, + }, + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:invalid_tag:latest", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:14.04", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:16.04", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/centos:7", + }, + } + result := tcfilter.DoFilter(items) + assert.Equal(t, 2, len(result)) + + var ubuntu, centos models.FilterItem + if result[0].Value == "library/ubuntu" { + ubuntu = result[0] + centos = result[1] + } else { + centos = result[0] + ubuntu = result[1] + } + + assert.Equal(t, replication.FilterItemKindRepository, ubuntu.Kind) + assert.Equal(t, "library/ubuntu", ubuntu.Value) + metadata, ok := ubuntu.Metadata["tags"].([]string) + assert.True(t, ok) + assert.EqualValues(t, []string{"14.04", "16.04"}, metadata) + + assert.Equal(t, replication.FilterItemKindRepository, centos.Kind) + assert.Equal(t, "library/centos", centos.Value) + metadata, ok = centos.Metadata["tags"].([]string) + assert.True(t, ok) + assert.EqualValues(t, []string{"7"}, metadata) +} From 51d5df0849dec1207c73e5179b0836b3c82eaba3 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 2 Nov 2017 12:53:01 +0800 Subject: [PATCH 04/37] Update replication policy API to support trigger and filter --- docs/swagger.yaml | 44 ++++++++++- make/common/db/registry.sql | 2 + make/common/db/registry_sqlite.sql | 2 + src/common/dao/replication_job.go | 65 ++++++++++++----- src/common/models/replicate_test.go | 43 +++++++++++ src/common/models/replication_job.go | 93 +++++++++++++++++++----- src/ui/api/harborapi_test.go | 5 +- src/ui/api/replication_policy_test.go | 29 ++++++-- tests/apitests/apilib/rep_policy_post.go | 11 ++- tools/migration/changelog.md | 5 ++ 10 files changed, 252 insertions(+), 47 deletions(-) create mode 100644 src/common/models/replicate_test.go diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 1a4143473..f787b66df 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2397,9 +2397,18 @@ definitions: description: type: string description: The description of the policy. - cron_str: + trigger: type: string - description: The cron string for schedule job. + description: The trigger for schedule job. + filters: + type: array + description: >- + The replication policy filter array. + items: + $ref: '#/definitions/RepFilter' + replicate_deletion: + type: string + description: Whether replication deletion operation. start_time: type: string description: The start time of the policy. @@ -2428,6 +2437,18 @@ definitions: name: type: string description: The policy name. + trigger: + type: string + description: The trigger for schedule job. + filters: + type: array + description: >- + The replication policy filter array. + items: + $ref: '#/definitions/RepFilter' + replicate_deletion: + type: string + description: Whether replication deletion operation. enabled: type: integer format: int @@ -2449,9 +2470,26 @@ definitions: description: type: string description: The description of the policy. - cron_str: + trigger: type: string description: The cron string for schedule job. + filters: + type: array + description: The replication policy filter array. + items: + $ref: '#/definitions/RepFilter' + replicate_deletion: + type: string + description: Whether replication deletion operation. + RepFilter: + type: object + properties: + type: + type: string + description: The replication policy filter type. + value: + type: string + description: The replication policy filter value. RepPolicyEnablementReq: type: object properties: diff --git a/make/common/db/registry.sql b/make/common/db/registry.sql index 446627971..994b108d7 100644 --- a/make/common/db/registry.sql +++ b/make/common/db/registry.sql @@ -145,6 +145,8 @@ create table replication_policy ( description text, deleted tinyint (1) DEFAULT 0 NOT NULL, cron_str varchar(256), + filters varchar(1024), + replicate_deletion tinyint (1) DEFAULT 0 NOT NULL, start_time timestamp NULL, creation_time timestamp default CURRENT_TIMESTAMP, update_time timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, diff --git a/make/common/db/registry_sqlite.sql b/make/common/db/registry_sqlite.sql index ce2cb9c20..2528a845d 100644 --- a/make/common/db/registry_sqlite.sql +++ b/make/common/db/registry_sqlite.sql @@ -141,6 +141,8 @@ create table replication_policy ( description text, deleted tinyint (1) DEFAULT 0 NOT NULL, cron_str varchar(256), + filters varchar(1024), + replicate_deletion tinyint (1) DEFAULT 0 NOT NULL, start_time timestamp NULL, creation_time timestamp default CURRENT_TIMESTAMP, update_time timestamp default CURRENT_TIMESTAMP diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index eb6593259..b9997838e 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -104,29 +104,18 @@ func FilterRepTargets(name string) ([]*models.RepTarget, error) { // AddRepPolicy ... func AddRepPolicy(policy models.RepPolicy) (int64, error) { - o := GetOrmer() - sql := `insert into replication_policy (name, project_id, target_id, enabled, description, cron_str, start_time, creation_time, update_time ) values (?, ?, ?, ?, ?, ?, ?, ?, ?)` - p, err := o.Raw(sql).Prepare() - if err != nil { + if err := policy.MarshalFilter(); err != nil { return 0, err } - - params := []interface{}{} - params = append(params, policy.Name, policy.ProjectID, policy.TargetID, policy.Enabled, policy.Description, policy.CronStr) now := time.Now() + policy.CreationTime = now + policy.UpdateTime = now if policy.Enabled == 1 { - params = append(params, now) - } else { - params = append(params, nil) + policy.StartTime = now } - params = append(params, now, now) + policy.Deleted = 0 - r, err := p.Exec(params...) - if err != nil { - return 0, err - } - id, err := r.LastInsertId() - return id, err + return GetOrmer().Insert(&policy) } // GetRepPolicy ... @@ -143,6 +132,10 @@ func GetRepPolicy(id int64) (*models.RepPolicy, error) { return nil, err } + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + return &policy, nil } @@ -154,7 +147,8 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error sql := `select rp.id, rp.project_id, rp.target_id, rt.name as target_name, rp.name, rp.enabled, rp.description, - rp.cron_str, rp.start_time, rp.creation_time, rp.update_time, + rp.cron_str, rp.filters, rp.replicate_deletion,rp.start_time, + rp.creation_time, rp.update_time, count(rj.status) as error_job_count from replication_policy rp left join replication_target rt on rp.target_id=rt.id @@ -180,6 +174,13 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error if _, err := o.Raw(sql, args).QueryRows(&policies); err != nil { return nil, err } + + for _, policy := range policies { + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + } + return policies, nil } @@ -197,6 +198,10 @@ func GetRepPolicyByName(name string) (*models.RepPolicy, error) { return nil, err } + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + return &policy, nil } @@ -211,6 +216,12 @@ func GetRepPolicyByProject(projectID int64) ([]*models.RepPolicy, error) { return nil, err } + for _, policy := range policies { + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + } + return policies, nil } @@ -225,6 +236,12 @@ func GetRepPolicyByTarget(targetID int64) ([]*models.RepPolicy, error) { return nil, err } + for _, policy := range policies { + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + } + return policies, nil } @@ -239,14 +256,24 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol return nil, err } + for _, policy := range policies { + if err := policy.UnmarshalFilter(); err != nil { + return nil, err + } + } + return policies, nil } // UpdateRepPolicy ... func UpdateRepPolicy(policy *models.RepPolicy) error { + if err := policy.MarshalFilter(); err != nil { + return err + } o := GetOrmer() policy.UpdateTime = time.Now() - _, err := o.Update(policy, "TargetID", "Name", "Enabled", "Description", "CronStr", "UpdateTime") + _, err := o.Update(policy, "TargetID", "Name", "Enabled", "Description", + "Trigger", "FiltersInDB", "ReplicateDeletion", "UpdateTime") return err } diff --git a/src/common/models/replicate_test.go b/src/common/models/replicate_test.go new file mode 100644 index 000000000..142242aee --- /dev/null +++ b/src/common/models/replicate_test.go @@ -0,0 +1,43 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestMarshalAndUnmarshalFilter(t *testing.T) { + filters := []*RepFilter{ + &RepFilter{ + Type: "repository", + Value: "library/ubuntu*", + }, + } + policy := &RepPolicy{ + Filters: filters, + } + + err := policy.MarshalFilter() + require.Nil(t, err) + + policy.Filters = nil + err = policy.UnmarshalFilter() + require.Nil(t, err) + + assert.EqualValues(t, filters, policy.Filters) +} diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index 255fc1d9a..f17ec5875 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -15,10 +15,13 @@ package models import ( + "encoding/json" + "fmt" "time" "github.com/astaxie/beego/validation" "github.com/vmware/harbor/src/common/utils" + "github.com/vmware/harbor/src/replication" ) const ( @@ -38,21 +41,23 @@ const ( // RepPolicy is the model for a replication policy, which associate to a project and a target (destination) type RepPolicy struct { - ID int64 `orm:"pk;auto;column(id)" json:"id"` - ProjectID int64 `orm:"column(project_id)" json:"project_id"` - ProjectName string `json:"project_name,omitempty"` - TargetID int64 `orm:"column(target_id)" json:"target_id"` - TargetName string `json:"target_name,omitempty"` - Name string `orm:"column(name)" json:"name"` - // Target RepTarget `orm:"-" json:"target"` - Enabled int `orm:"column(enabled)" json:"enabled"` - Description string `orm:"column(description)" json:"description"` - CronStr string `orm:"column(cron_str)" json:"cron_str"` - StartTime time.Time `orm:"column(start_time)" json:"start_time"` - CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"` - UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"` - ErrorJobCount int `json:"error_job_count"` - Deleted int `orm:"column(deleted)" json:"deleted"` + ID int64 `orm:"pk;auto;column(id)" json:"id"` + ProjectID int64 `orm:"column(project_id)" json:"project_id"` + ProjectName string `orm:"-" json:"project_name,omitempty"` + TargetID int64 `orm:"column(target_id)" json:"target_id"` + TargetName string `orm:"-" json:"target_name,omitempty"` + Name string `orm:"column(name)" json:"name"` + Enabled int `orm:"column(enabled)" json:"enabled"` + Description string `orm:"column(description)" json:"description"` + Trigger string `orm:"column(cron_str)" json:"trigger"` + Filters []*RepFilter `orm:"-" json:"filters"` + FiltersInDB string `orm:"column(filters)" json:"-"` + ReplicateDeletion bool `orm:"column(replicate_deletion)" json:"replicate_deletion"` + StartTime time.Time `orm:"column(start_time)" json:"start_time"` + CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"` + UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"` + ErrorJobCount int `orm:"-" json:"error_job_count"` + Deleted int `orm:"column(deleted)" json:"deleted"` } // Valid ... @@ -77,8 +82,62 @@ func (r *RepPolicy) Valid(v *validation.Validation) { v.SetError("enabled", "must be 0 or 1") } - if len(r.CronStr) > 256 { - v.SetError("cron_str", "max length is 256") + if len(r.Trigger) > 256 { + v.SetError("trigger", "max length is 256") + } + + for _, filter := range r.Filters { + filter.Valid(v) + } + + if err := r.MarshalFilter(); err != nil { + v.SetError("filters", err.Error()) + } + if len(r.Filters) > 1024 { + v.SetError("filters", "max length is 1024") + } +} + +// MarshalFilter marshal RepFilter array to json string +func (r *RepPolicy) MarshalFilter() error { + if r.Filters != nil { + b, err := json.Marshal(r.Filters) + if err != nil { + return err + } + r.FiltersInDB = string(b) + } + return nil +} + +// UnmarshalFilter unmarshal json string to RepFilter array +func (r *RepPolicy) UnmarshalFilter() error { + if len(r.FiltersInDB) > 0 { + filter := []*RepFilter{} + if err := json.Unmarshal([]byte(r.FiltersInDB), &filter); err != nil { + return err + } + r.Filters = filter + } + return nil +} + +// RepFilter holds information for the replication policy filter +type RepFilter struct { + Type string `json:"type"` + Value string `json:"value"` +} + +// Valid ... +func (r *RepFilter) Valid(v *validation.Validation) { + if !(r.Type == replication.FilterItemKindProject || + r.Type == replication.FilterItemKindRepository || + r.Type == replication.FilterItemKindTag) { + v.SetError("filter.type", fmt.Sprintf("invalid filter type: %s", r.Type)) + } + + if len(r.Value) == 0 { + v.SetError("filter.value", "can not be empty") } } diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index ef754bad0..fa60ec3c9 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -711,7 +711,10 @@ func (a testapi) AddPolicy(authInfo usrInfo, repPolicy apilib.RepPolicyPost) (in _sling = _sling.Path(path) _sling = _sling.BodyJSON(repPolicy) - httpStatusCode, _, err := request(_sling, jsonAcceptHeader, authInfo) + httpStatusCode, body, err := request(_sling, jsonAcceptHeader, authInfo) + if httpStatusCode != http.StatusCreated { + log.Println(string(body)) + } return httpStatusCode, err } diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index f518537a2..622cbecb3 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -15,10 +15,14 @@ package api import ( "fmt" - "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/tests/apitests/apilib" "strconv" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/tests/apitests/apilib" ) const ( @@ -37,7 +41,12 @@ func TestPoliciesPost(t *testing.T) { //add target CommonAddTarget() targetID := int64(CommonGetTarget()) - repPolicy := &apilib.RepPolicyPost{int64(1), targetID, addPolicyName} + repPolicy := &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, []*models.RepFilter{ + &models.RepFilter{ + Type: replication.FilterItemKindRepository, + Value: "library/ubuntu*", + }, + }} fmt.Println("Testing Policies Post API") @@ -52,7 +61,7 @@ func TestPoliciesPost(t *testing.T) { } //-------------------case 2 : response code = 409------------------------// - fmt.Println("case 1 : response code = 409:policy already exists") + fmt.Println("case 2 : response code = 409:policy already exists") httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) if err != nil { t.Error("Error while add policy", err.Error()) @@ -108,7 +117,7 @@ func TestPoliciesPost(t *testing.T) { } //-------------------case 7 : response code = 400------------------------// - fmt.Println("case 6 : response code = 400:target_id does not exist.") + fmt.Println("case 7 : response code = 400:target_id does not exist.") repPolicy.TargetId = int64(1111) httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) @@ -119,6 +128,16 @@ func TestPoliciesPost(t *testing.T) { assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") } + fmt.Println("case 8 : response code = 400: invalid filter") + repPolicy = &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, []*models.RepFilter{ + &models.RepFilter{ + Type: "replication", + Value: "", + }, + }} + httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) + require.Nil(t, err) + assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") } func TestPoliciesList(t *testing.T) { diff --git a/tests/apitests/apilib/rep_policy_post.go b/tests/apitests/apilib/rep_policy_post.go index 6b8d42731..a78b01aa6 100644 --- a/tests/apitests/apilib/rep_policy_post.go +++ b/tests/apitests/apilib/rep_policy_post.go @@ -1,10 +1,10 @@ -/* +/* * Harbor API * * These APIs provide services for manipulating Harbor project. * * OpenAPI spec version: 0.3.0 - * + * * Generated by: https://github.com/swagger-api/swagger-codegen.git * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,6 +22,10 @@ package apilib +import ( + "github.com/vmware/harbor/src/common/models" +) + type RepPolicyPost struct { // The project ID. @@ -32,4 +36,7 @@ type RepPolicyPost struct { // The policy name. Name string `json:"name,omitempty"` + + // Filters + Filters []*models.RepFilter `json:"filters"` } diff --git a/tools/migration/changelog.md b/tools/migration/changelog.md index 8c40e5986..d2e9a0b70 100644 --- a/tools/migration/changelog.md +++ b/tools/migration/changelog.md @@ -56,3 +56,8 @@ Changelog for harbor database schema - insert data into table `project_metadata` - delete column `public` from table `project` - add column `insecure` to table `replication_target` + +## 1.3.1 + + - add column `filters` to table `replication_policy` + - add column `replicate_deletion` to table `replication_policy` From abe3d37a33bf46d6d5ae83328b98886cbf44525a Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Thu, 2 Nov 2017 17:10:15 +0800 Subject: [PATCH 05/37] Add registry adaptor interface and sourcer definitions --- src/replication/consts.go | 3 ++ src/replication/models/registry_models.go | 34 +++++++++++++++++ src/replication/registry/adaptor.go | 34 +++++++++++++++++ src/replication/registry/harbor_adaptor.go | 44 ++++++++++++++++++++++ src/replication/source/sourcer.go | 44 ++++++++++++++++++++++ src/replication/source/sourcer_test.go | 24 ++++++++++++ 6 files changed, 183 insertions(+) create mode 100644 src/replication/models/registry_models.go create mode 100644 src/replication/registry/adaptor.go create mode 100644 src/replication/registry/harbor_adaptor.go create mode 100644 src/replication/source/sourcer.go create mode 100644 src/replication/source/sourcer_test.go diff --git a/src/replication/consts.go b/src/replication/consts.go index 76926f224..150937585 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -7,4 +7,7 @@ const ( FilterItemKindRepository = "repository" //FilterItemKindTag : Kind of filter item is 'tag' FilterItemKindTag = "tag" + + //AdaptorKindHarbor : Kind of adaptor of Harbor + AdaptorKindHarbor = "Harbor" ) diff --git a/src/replication/models/registry_models.go b/src/replication/models/registry_models.go new file mode 100644 index 000000000..69be2268c --- /dev/null +++ b/src/replication/models/registry_models.go @@ -0,0 +1,34 @@ +package models + +//Namespace is the resource group/scope like project in Harbor and organization in docker hub. +type Namespace struct { + //Name of the namespace + Name string + + //Extensions to provide flexibility + Metadata map[string]interface{} +} + +//Repository is to keep the info of image repository. +type Repository struct { + //Name of the repository + Name string + + //Project reference of this repository belongs to + Namespace Namespace + + //Extensions to provide flexibility + Metadata map[string]interface{} +} + +//Tag keeps the info of image with specified version +type Tag struct { + //Name of the tag + Name string + + //The repository reference of this tag belongs to + Repository Repository + + //Extensions to provide flexibility + Metadata map[string]interface{} +} diff --git a/src/replication/registry/adaptor.go b/src/replication/registry/adaptor.go new file mode 100644 index 000000000..29b3cf138 --- /dev/null +++ b/src/replication/registry/adaptor.go @@ -0,0 +1,34 @@ +package registry + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +//Adaptor defines the unified operations for all the supported registries such as Harbor or DockerHub. +//It's used to adapt the different interfaces provied by the different registry providers. +//Use external registry with restful api providing as example, these intrefaces may depends on the +//related restful apis like: +// /api/vx/repositories/{namespace}/{repositoryName}/tags/{name} +// /api/v0/accounts/{namespace} +type Adaptor interface { + //Return the unique kind identifier of the adaptor + Kind() string + + //Get all the namespaces + GetNamespaces() []models.Namespace + + //Get the namespace with the specified name + GetNamespace(name string) models.Namespace + + //Get all the repositories under the specified namespace + GetRepositories(namespace string) []models.Repository + + //Get the repository with the specified name under the specified namespace + GetRepository(name string, namespace string) models.Repository + + //Get all the tags of the specified repository under the namespace + GetTags(repositoryName string, namespace string) []models.Tag + + //Get the tag with the specified name of the repository under the namespace + GetTag(name string, repositoryName string, namespace string) models.Tag +} diff --git a/src/replication/registry/harbor_adaptor.go b/src/replication/registry/harbor_adaptor.go new file mode 100644 index 000000000..6c7ffe09d --- /dev/null +++ b/src/replication/registry/harbor_adaptor.go @@ -0,0 +1,44 @@ +package registry + +import ( + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +//HarborAdaptor is defined to adapt the Harbor registry +type HarborAdaptor struct{} + +//Kind returns the unique kind identifier of the adaptor +func (ha *HarborAdaptor) Kind() string { + return replication.AdaptorKindHarbor +} + +//GetNamespaces is ued to get all the namespaces +func (ha *HarborAdaptor) GetNamespaces() []models.Namespace { + return nil +} + +//GetNamespace is used to get the namespace with the specified name +func (ha *HarborAdaptor) GetNamespace(name string) models.Namespace { + return models.Namespace{} +} + +//GetRepositories is used to get all the repositories under the specified namespace +func (ha *HarborAdaptor) GetRepositories(namespace string) []models.Repository { + return nil +} + +//GetRepository is used to get the repository with the specified name under the specified namespace +func (ha *HarborAdaptor) GetRepository(name string, namespace string) models.Repository { + return models.Repository{} +} + +//GetTags is used to get all the tags of the specified repository under the namespace +func (ha *HarborAdaptor) GetTags(repositoryName string, namespace string) []models.Tag { + return nil +} + +//GetTag is used to get the tag with the specified name of the repository under the namespace +func (ha *HarborAdaptor) GetTag(name string, repositoryName string, namespace string) models.Tag { + return models.Tag{} +} diff --git a/src/replication/source/sourcer.go b/src/replication/source/sourcer.go new file mode 100644 index 000000000..4bbfc2c44 --- /dev/null +++ b/src/replication/source/sourcer.go @@ -0,0 +1,44 @@ +package source + +import ( + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/registry" +) + +//Sourcer is used to manage and/or handle all the artifacts and information related with source registry. +//All the things with replication source should be covered in this object. +type Sourcer struct { + //Keep the adaptors we support now + adaptors map[string]registry.Adaptor +} + +//ReplicationSourcer is default sourcer for replication service. +var ReplicationSourcer = NewSourcer() + +//NewSourcer is the constructor of Sourcer +func NewSourcer() *Sourcer { + return &Sourcer{ + adaptors: make(map[string]registry.Adaptor), + } +} + +//Init will do some initialization work like registrying all the adaptors we support +func (sc *Sourcer) Init() { + //Register Harbor adaptor + sc.adaptors[replication.AdaptorKindHarbor] = ®istry.HarborAdaptor{} +} + +//GetAdaptor returns the required adaptor with the specified kind. +//If no adaptor with the specified kind existing, nil will be returned. +func (sc *Sourcer) GetAdaptor(kind string) registry.Adaptor { + if len(kind) == 0 { + return nil + } + + return sc.adaptors[kind] +} + +//Init the adaptors +func Init() { + ReplicationSourcer.Init() +} diff --git a/src/replication/source/sourcer_test.go b/src/replication/source/sourcer_test.go new file mode 100644 index 000000000..1cf9b0a90 --- /dev/null +++ b/src/replication/source/sourcer_test.go @@ -0,0 +1,24 @@ +package source + +import ( + "testing" + + "github.com/vmware/harbor/src/replication" +) + +func TestReplicationSourcer(t *testing.T) { + testingSourcer := NewSourcer() + if testingSourcer == nil { + t.Fatal("Failed to create sourcer") + } + + testingSourcer.Init() + + if testingSourcer.GetAdaptor("") != nil { + t.Fatal("Empty kind should not be supported") + } + + if testingSourcer.GetAdaptor(replication.AdaptorKindHarbor) == nil { + t.Fatalf("%s adaptor should be existing", replication.AdaptorKindHarbor) + } +} From f86a4be84d7b152aafdc9d10ef2b0c293f556978 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 3 Nov 2017 14:21:32 +0800 Subject: [PATCH 06/37] Implement Convert interface --- .../source/repository_convertor.go | 59 ++++++++++ .../source/repository_convertor_test.go | 101 ++++++++++++++++++ .../source/tag_combination_filter_test.go | 6 +- src/replication/source/tag_convertor.go | 59 ++++++++++ src/replication/source/tag_convertor_test.go | 57 ++++++++++ 5 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 src/replication/source/repository_convertor.go create mode 100644 src/replication/source/repository_convertor_test.go create mode 100644 src/replication/source/tag_convertor.go create mode 100644 src/replication/source/tag_convertor_test.go diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go new file mode 100644 index 000000000..12e5bda28 --- /dev/null +++ b/src/replication/source/repository_convertor.go @@ -0,0 +1,59 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +// RepositoryConvertor implement Convertor interface, convert projects to repositories +type RepositoryConvertor struct { + registry registry.Adaptor +} + +// NewRepositoryConvertor returns an instance of RepositoryConvertor +func NewRepositoryConvertor(registry registry.Adaptor) *RepositoryConvertor { + return &RepositoryConvertor{ + registry: registry, + } +} + +// Convert projects to repositories +func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem { + result := []models.FilterItem{} + for _, item := range items { + if item.Kind != replication.FilterItemKindProject { + log.Warningf("unexpected filter item kind for repository convertor, expected %s got %s, skip", + replication.FilterItemKindProject, item.Kind) + continue + } + + repositories := r.registry.GetRepositories(item.Value) + for _, repository := range repositories { + result = append(result, models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: repository.Name, + // public is used to create project if it does not exist when replicating + Metadata: map[string]interface{}{ + "public": item.Metadata["public"], + }, + }) + } + } + return result +} diff --git a/src/replication/source/repository_convertor_test.go b/src/replication/source/repository_convertor_test.go new file mode 100644 index 000000000..48e223232 --- /dev/null +++ b/src/replication/source/repository_convertor_test.go @@ -0,0 +1,101 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +func TestRepositoryConvert(t *testing.T) { + items := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindProject, + Value: "library", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + }, + } + expected := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "library/ubuntu", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "library/centos", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + } + + convertor := NewRepositoryConvertor(&fakeRegistryAdaptor{}) + assert.EqualValues(t, expected, convertor.Convert(items)) +} + +type fakeRegistryAdaptor struct{} + +func (f *fakeRegistryAdaptor) Kind() string { + return "fake" +} + +func (f *fakeRegistryAdaptor) GetNamespaces() []models.Namespace { + return nil +} + +func (f *fakeRegistryAdaptor) GetNamespace(name string) models.Namespace { + return models.Namespace{} +} + +func (f *fakeRegistryAdaptor) GetRepositories(namespace string) []models.Repository { + return []models.Repository{ + models.Repository{ + Name: "library/ubuntu", + }, + models.Repository{ + Name: "library/centos", + }, + } +} + +func (f *fakeRegistryAdaptor) GetRepository(name string, namespace string) models.Repository { + return models.Repository{} +} + +func (f *fakeRegistryAdaptor) GetTags(repositoryName string, namespace string) []models.Tag { + return []models.Tag{ + models.Tag{ + Name: "library/ubuntu:14.04", + }, + models.Tag{ + Name: "library/ubuntu:16.04", + }, + } +} + +func (f *fakeRegistryAdaptor) GetTag(name string, repositoryName string, namespace string) models.Tag { + return models.Tag{} +} diff --git a/src/replication/source/tag_combination_filter_test.go b/src/replication/source/tag_combination_filter_test.go index c3bfefff8..8a84218b6 100644 --- a/src/replication/source/tag_combination_filter_test.go +++ b/src/replication/source/tag_combination_filter_test.go @@ -24,15 +24,15 @@ import ( var tcfilter = NewTagCombinationFilter() -func TestTagCombinationFilteInit(t *testing.T) { +func TestTagCombinationFilterInit(t *testing.T) { assert.Nil(t, tcfilter.Init()) } -func TestTagCombinationFilteGetConvertor(t *testing.T) { +func TestTagCombinationFilterGetConvertor(t *testing.T) { assert.Nil(t, tcfilter.GetConvertor()) } -func TestTagCombinationFilteDoFilter(t *testing.T) { +func TestTagCombinationFilterDoFilter(t *testing.T) { items := []models.FilterItem{ models.FilterItem{ Kind: replication.FilterItemKindProject, diff --git a/src/replication/source/tag_convertor.go b/src/replication/source/tag_convertor.go new file mode 100644 index 000000000..236e04e3c --- /dev/null +++ b/src/replication/source/tag_convertor.go @@ -0,0 +1,59 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +// TagConvertor implement Convertor interface, convert repositories to tags +type TagConvertor struct { + registry registry.Adaptor +} + +// NewTagConvertor returns an instance of TagConvertor +func NewTagConvertor(registry registry.Adaptor) *TagConvertor { + return &TagConvertor{ + registry: registry, + } +} + +//Convert repositories to tags +func (t *TagConvertor) Convert(items []models.FilterItem) []models.FilterItem { + result := []models.FilterItem{} + for _, item := range items { + if item.Kind != replication.FilterItemKindRepository { + log.Warningf("unexpected filter item kind for tag convertor, expected %s got %s, skip", + replication.FilterItemKindRepository, item.Kind) + continue + } + + tags := t.registry.GetTags(item.Value, "") + for _, tag := range tags { + result = append(result, models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: tag.Name, + // public is used to create project if it does not exist when replicating + Metadata: map[string]interface{}{ + "public": item.Metadata["public"], + }, + }) + } + } + return result +} diff --git a/src/replication/source/tag_convertor_test.go b/src/replication/source/tag_convertor_test.go new file mode 100644 index 000000000..151192bbb --- /dev/null +++ b/src/replication/source/tag_convertor_test.go @@ -0,0 +1,57 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +func TestTagConvert(t *testing.T) { + items := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "library/ubuntu", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + models.FilterItem{ + Kind: replication.FilterItemKindProject, + }, + } + expected := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:14.04", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/ubuntu:16.04", + Metadata: map[string]interface{}{ + "public": true, + }, + }, + } + + convertor := NewTagConvertor(&fakeRegistryAdaptor{}) + assert.EqualValues(t, expected, convertor.Convert(items)) +} From 049642e894f93d8eda1ff533e79ded6feaaf4b49 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 2 Nov 2017 18:22:06 +0800 Subject: [PATCH 07/37] Implement filter chain --- .../source/default_filter_chain.go | 57 ++++++++++++++ .../source/default_filter_chain_test.go | 75 +++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 src/replication/source/default_filter_chain.go create mode 100644 src/replication/source/default_filter_chain_test.go diff --git a/src/replication/source/default_filter_chain.go b/src/replication/source/default_filter_chain.go new file mode 100644 index 000000000..1acd29bf8 --- /dev/null +++ b/src/replication/source/default_filter_chain.go @@ -0,0 +1,57 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +// DefaultFilterChain provides a default implement for interface FilterChain +type DefaultFilterChain struct { + filters []Filter +} + +// NewDefaultFilterChain returns an instance of DefaultFilterChain +func NewDefaultFilterChain(filters []Filter) *DefaultFilterChain { + return &DefaultFilterChain{ + filters: filters, + } +} + +// Build nil implement now +func (d *DefaultFilterChain) Build(filters []Filter) error { + return nil +} + +// Filters returns the filter list +func (d *DefaultFilterChain) Filters() []Filter { + return d.filters +} + +// DoFilter does the filter works for filterItems +func (d *DefaultFilterChain) DoFilter(filterItems []models.FilterItem) []models.FilterItem { + if len(filterItems) == 0 { + return []models.FilterItem{} + } + + for _, filter := range d.filters { + convertor := filter.GetConvertor() + if convertor != nil { + filterItems = convertor.Convert(filterItems) + } + filterItems = filter.DoFilter(filterItems) + } + return filterItems +} diff --git a/src/replication/source/default_filter_chain_test.go b/src/replication/source/default_filter_chain_test.go new file mode 100644 index 000000000..ee1eec79a --- /dev/null +++ b/src/replication/source/default_filter_chain_test.go @@ -0,0 +1,75 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +func TestBuild(t *testing.T) { + chain := NewDefaultFilterChain(nil) + require.Nil(t, chain.Build(nil)) +} + +func TestFilters(t *testing.T) { + filters := []Filter{NewPatternFilter("project", "*")} + chain := NewDefaultFilterChain(filters) + assert.EqualValues(t, filters, chain.Filters()) +} + +func TestDoFilter(t *testing.T) { + projectFilter := NewPatternFilter(replication.FilterItemKindProject, "library*") + repositoryFilter := NewPatternFilter(replication.FilterItemKindRepository, + "library/ubuntu*", &fakeRepositoryConvertor{}) + filters := []Filter{projectFilter, repositoryFilter} + + items := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindProject, + Value: "library", + }, + models.FilterItem{ + Kind: replication.FilterItemKindProject, + Value: "test", + }, + } + chain := NewDefaultFilterChain(filters) + items = chain.DoFilter(items) + assert.EqualValues(t, []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "library/ubuntu", + }, + }, items) + +} + +type fakeRepositoryConvertor struct{} + +func (f *fakeRepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem { + result := []models.FilterItem{} + for _, item := range items { + result = append(result, models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: item.Value + "/ubuntu", + }) + } + return result +} From 5cef58baa1c1390bf20099675b4f779c16ad35e4 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 8 Nov 2017 17:53:06 +0800 Subject: [PATCH 08/37] update according to the comments --- docs/swagger.yaml | 40 +++++++-- src/common/dao/replication_job.go | 18 ++-- src/common/models/replication_job.go | 90 +++++++++++++------ ...{replicate_test.go => replication_test.go} | 13 ++- src/replication/consts.go | 6 ++ src/ui/api/replication_policy_test.go | 31 ++++--- tests/apitests/apilib/rep_policy_post.go | 3 + 7 files changed, 144 insertions(+), 57 deletions(-) rename src/common/models/{replicate_test.go => replication_test.go} (77%) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index f787b66df..c6de6a1c1 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2398,17 +2398,21 @@ definitions: type: string description: The description of the policy. trigger: - type: string + type: object description: The trigger for schedule job. + items: + $ref: '#/definitions/RepTrigger' filters: type: array - description: >- - The replication policy filter array. + description: The replication policy filter array. items: $ref: '#/definitions/RepFilter' + replicate_existing_image_now: + type: string + description: Whether to replicate the existing images now. replicate_deletion: type: string - description: Whether replication deletion operation. + description: Whether to replicate the deletion operation. start_time: type: string description: The start time of the policy. @@ -2438,14 +2442,18 @@ definitions: type: string description: The policy name. trigger: - type: string + type: object description: The trigger for schedule job. + items: + $ref: '#/definitions/RepTrigger' filters: type: array - description: >- - The replication policy filter array. + description: The replication policy filter array. items: $ref: '#/definitions/RepFilter' + replicate_existing_image_now: + type: string + description: Whether to replicate the existing images now. replicate_deletion: type: string description: Whether replication deletion operation. @@ -2471,16 +2479,30 @@ definitions: type: string description: The description of the policy. trigger: - type: string - description: The cron string for schedule job. + type: object + description: The trigger for schedule job. + items: + $ref: '#/definitions/RepTrigger' filters: type: array description: The replication policy filter array. items: $ref: '#/definitions/RepFilter' + replicate_existing_image_now: + type: string + description: Whether to replicate the existing images now. replicate_deletion: type: string description: Whether replication deletion operation. + RepTrigger: + type: object + properties: + type: + type: string + description: The replication policy trigger type. + params: + type: object + description: The map is the replication policy trigger parameters. RepFilter: type: object properties: diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index b9997838e..8771b179c 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -104,7 +104,7 @@ func FilterRepTargets(name string) ([]*models.RepTarget, error) { // AddRepPolicy ... func AddRepPolicy(policy models.RepPolicy) (int64, error) { - if err := policy.MarshalFilter(); err != nil { + if err := policy.Marshal(); err != nil { return 0, err } now := time.Now() @@ -132,7 +132,7 @@ func GetRepPolicy(id int64) (*models.RepPolicy, error) { return nil, err } - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } @@ -176,7 +176,7 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error } for _, policy := range policies { - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } } @@ -198,7 +198,7 @@ func GetRepPolicyByName(name string) (*models.RepPolicy, error) { return nil, err } - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } @@ -217,7 +217,7 @@ func GetRepPolicyByProject(projectID int64) ([]*models.RepPolicy, error) { } for _, policy := range policies { - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } } @@ -237,7 +237,7 @@ func GetRepPolicyByTarget(targetID int64) ([]*models.RepPolicy, error) { } for _, policy := range policies { - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } } @@ -257,7 +257,7 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol } for _, policy := range policies { - if err := policy.UnmarshalFilter(); err != nil { + if err := policy.Unmarshal(); err != nil { return nil, err } } @@ -267,13 +267,13 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol // UpdateRepPolicy ... func UpdateRepPolicy(policy *models.RepPolicy) error { - if err := policy.MarshalFilter(); err != nil { + if err := policy.Marshal(); err != nil { return err } o := GetOrmer() policy.UpdateTime = time.Now() _, err := o.Update(policy, "TargetID", "Name", "Enabled", "Description", - "Trigger", "FiltersInDB", "ReplicateDeletion", "UpdateTime") + "TriggerInDB", "FiltersInDB", "ReplicateDeletion", "UpdateTime") return err } diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index f17ec5875..55d726c99 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -41,23 +41,25 @@ const ( // RepPolicy is the model for a replication policy, which associate to a project and a target (destination) type RepPolicy struct { - ID int64 `orm:"pk;auto;column(id)" json:"id"` - ProjectID int64 `orm:"column(project_id)" json:"project_id"` - ProjectName string `orm:"-" json:"project_name,omitempty"` - TargetID int64 `orm:"column(target_id)" json:"target_id"` - TargetName string `orm:"-" json:"target_name,omitempty"` - Name string `orm:"column(name)" json:"name"` - Enabled int `orm:"column(enabled)" json:"enabled"` - Description string `orm:"column(description)" json:"description"` - Trigger string `orm:"column(cron_str)" json:"trigger"` - Filters []*RepFilter `orm:"-" json:"filters"` - FiltersInDB string `orm:"column(filters)" json:"-"` - ReplicateDeletion bool `orm:"column(replicate_deletion)" json:"replicate_deletion"` - StartTime time.Time `orm:"column(start_time)" json:"start_time"` - CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"` - UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"` - ErrorJobCount int `orm:"-" json:"error_job_count"` - Deleted int `orm:"column(deleted)" json:"deleted"` + ID int64 `orm:"pk;auto;column(id)" json:"id"` + ProjectID int64 `orm:"column(project_id)" json:"project_id"` + ProjectName string `orm:"-" json:"project_name,omitempty"` + TargetID int64 `orm:"column(target_id)" json:"target_id"` + TargetName string `orm:"-" json:"target_name,omitempty"` + Name string `orm:"column(name)" json:"name"` + Enabled int `orm:"column(enabled)" json:"enabled"` + Description string `orm:"column(description)" json:"description"` + Trigger *RepTrigger `orm:"-" json:"trigger"` + TriggerInDB string `orm:"column(cron_str)" json:"-"` + Filters []*RepFilter `orm:"-" json:"filters"` + FiltersInDB string `orm:"column(filters)" json:"-"` + ReplicateExistingImageNow bool `orm:"-" json:"replicate_existing_image_now"` + ReplicateDeletion bool `orm:"column(replicate_deletion)" json:"replicate_deletion"` + StartTime time.Time `orm:"column(start_time)" json:"start_time"` + CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"` + UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"` + ErrorJobCount int `orm:"-" json:"error_job_count"` + Deleted int `orm:"column(deleted)" json:"deleted"` } // Valid ... @@ -82,24 +84,37 @@ func (r *RepPolicy) Valid(v *validation.Validation) { v.SetError("enabled", "must be 0 or 1") } - if len(r.Trigger) > 256 { - v.SetError("trigger", "max length is 256") + if r.Trigger != nil { + r.Trigger.Valid(v) } for _, filter := range r.Filters { filter.Valid(v) } - if err := r.MarshalFilter(); err != nil { - v.SetError("filters", err.Error()) + if err := r.Marshal(); err != nil { + v.SetError("trigger or filters", err.Error()) } - if len(r.Filters) > 1024 { + + if len(r.TriggerInDB) > 256 { + v.SetError("trigger", "max length is 256") + } + + if len(r.FiltersInDB) > 1024 { v.SetError("filters", "max length is 1024") } } -// MarshalFilter marshal RepFilter array to json string -func (r *RepPolicy) MarshalFilter() error { +// Marshal marshal RepTrigger and RepFilter array to json string +func (r *RepPolicy) Marshal() error { + if r.Trigger != nil { + b, err := json.Marshal(r.Trigger) + if err != nil { + return err + } + r.TriggerInDB = string(b) + } + if r.Filters != nil { b, err := json.Marshal(r.Filters) if err != nil { @@ -110,8 +125,16 @@ func (r *RepPolicy) MarshalFilter() error { return nil } -// UnmarshalFilter unmarshal json string to RepFilter array -func (r *RepPolicy) UnmarshalFilter() error { +// Unmarshal unmarshal json string to RepTrigger and RepFilter array +func (r *RepPolicy) Unmarshal() error { + if len(r.TriggerInDB) > 0 { + trigger := &RepTrigger{} + if err := json.Unmarshal([]byte(r.TriggerInDB), &trigger); err != nil { + return err + } + r.Trigger = trigger + } + if len(r.FiltersInDB) > 0 { filter := []*RepFilter{} if err := json.Unmarshal([]byte(r.FiltersInDB), &filter); err != nil { @@ -141,6 +164,21 @@ func (r *RepFilter) Valid(v *validation.Validation) { } } +// RepTrigger holds information for the replication policy trigger +type RepTrigger struct { + Type string `json:"type"` + Params map[string]interface{} `json:"params"` +} + +// Valid ... +func (r *RepTrigger) Valid(v *validation.Validation) { + if !(r.Type == replication.TriggerKindManually || + r.Type == replication.TriggerKindSchedule || + r.Type == replication.TriggerKindImmediately) { + v.SetError("trigger.type", fmt.Sprintf("invalid trigger type: %s", r.Type)) + } +} + // RepJob is the model for a replication job, which is the execution unit on job service, currently it is used to transfer/remove // a repository to/from a remote registry instance. type RepJob struct { diff --git a/src/common/models/replicate_test.go b/src/common/models/replication_test.go similarity index 77% rename from src/common/models/replicate_test.go rename to src/common/models/replication_test.go index 142242aee..52978f983 100644 --- a/src/common/models/replicate_test.go +++ b/src/common/models/replication_test.go @@ -21,7 +21,11 @@ import ( "github.com/stretchr/testify/require" ) -func TestMarshalAndUnmarshalFilter(t *testing.T) { +func TestMarshalAndUnmarshal(t *testing.T) { + trigger := &RepTrigger{ + Type: "schedule", + Params: map[string]interface{}{"date": "2:00"}, + } filters := []*RepFilter{ &RepFilter{ Type: "repository", @@ -29,15 +33,18 @@ func TestMarshalAndUnmarshalFilter(t *testing.T) { }, } policy := &RepPolicy{ + Trigger: trigger, Filters: filters, } - err := policy.MarshalFilter() + err := policy.Marshal() require.Nil(t, err) + policy.Trigger = nil policy.Filters = nil - err = policy.UnmarshalFilter() + err = policy.Unmarshal() require.Nil(t, err) assert.EqualValues(t, filters, policy.Filters) + assert.EqualValues(t, trigger, policy.Trigger) } diff --git a/src/replication/consts.go b/src/replication/consts.go index 76926f224..7b4be836c 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -7,4 +7,10 @@ const ( FilterItemKindRepository = "repository" //FilterItemKindTag : Kind of filter item is 'tag' FilterItemKindTag = "tag" + //TriggerKindManually : kind of trigger is 'manully' + TriggerKindManually = "manually" + //TriggerKindSchedule : kind of trigger is 'schedule' + TriggerKindSchedule = "schedule" + //TriggerKindImmediately : kind of trigger is 'immediately' + TriggerKindImmediately = "immediately" ) diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index 622cbecb3..f3db26711 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -41,12 +41,19 @@ func TestPoliciesPost(t *testing.T) { //add target CommonAddTarget() targetID := int64(CommonGetTarget()) - repPolicy := &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, []*models.RepFilter{ - &models.RepFilter{ - Type: replication.FilterItemKindRepository, - Value: "library/ubuntu*", + repPolicy := &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, + &models.RepTrigger{ + Type: replication.TriggerKindSchedule, + Params: map[string]interface{}{ + "date": "2:00", + }, }, - }} + []*models.RepFilter{ + &models.RepFilter{ + Type: replication.FilterItemKindRepository, + Value: "library/ubuntu*", + }, + }} fmt.Println("Testing Policies Post API") @@ -129,12 +136,16 @@ func TestPoliciesPost(t *testing.T) { } fmt.Println("case 8 : response code = 400: invalid filter") - repPolicy = &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, []*models.RepFilter{ - &models.RepFilter{ - Type: "replication", - Value: "", + repPolicy = &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, + &models.RepTrigger{ + Type: replication.TriggerKindManually, }, - }} + []*models.RepFilter{ + &models.RepFilter{ + Type: "replication", + Value: "", + }, + }} httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) require.Nil(t, err) assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") diff --git a/tests/apitests/apilib/rep_policy_post.go b/tests/apitests/apilib/rep_policy_post.go index a78b01aa6..365070539 100644 --- a/tests/apitests/apilib/rep_policy_post.go +++ b/tests/apitests/apilib/rep_policy_post.go @@ -37,6 +37,9 @@ type RepPolicyPost struct { // The policy name. Name string `json:"name,omitempty"` + // Trigger + Trigger *models.RepTrigger `json:"trigger"` + // Filters Filters []*models.RepFilter `json:"filters"` } From 149b6282920532727424c3bce088f603c429b3d9 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 9 Nov 2017 13:43:46 +0800 Subject: [PATCH 09/37] update --- src/common/dao/replication_job.go | 27 +++++++++++++++++++-------- src/common/models/replication_job.go | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index 8771b179c..6fd4e17c6 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -107,15 +107,26 @@ func AddRepPolicy(policy models.RepPolicy) (int64, error) { if err := policy.Marshal(); err != nil { return 0, err } - now := time.Now() - policy.CreationTime = now - policy.UpdateTime = now - if policy.Enabled == 1 { - policy.StartTime = now - } - policy.Deleted = 0 - return GetOrmer().Insert(&policy) + o := GetOrmer() + sql := `insert into replication_policy (name, project_id, target_id, enabled, description, cron_str, start_time, creation_time, update_time, filters, replicate_deletion) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + params := []interface{}{} + params = append(params, policy.Name, policy.ProjectID, policy.TargetID, policy.Enabled, policy.Description, policy.TriggerInDB) + now := time.Now() + if policy.Enabled == 1 { + params = append(params, now) + } else { + params = append(params, nil) + } + params = append(params, now, now, policy.FiltersInDB, policy.ReplicateDeletion) + + result, err := o.Raw(sql, params...).Exec() + if err != nil { + return 0, err + } + + return result.LastInsertId() } // GetRepPolicy ... diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index 55d726c99..09cfa2169 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -45,7 +45,7 @@ type RepPolicy struct { ProjectID int64 `orm:"column(project_id)" json:"project_id"` ProjectName string `orm:"-" json:"project_name,omitempty"` TargetID int64 `orm:"column(target_id)" json:"target_id"` - TargetName string `orm:"-" json:"target_name,omitempty"` + TargetName string `json:"target_name,omitempty"` Name string `orm:"column(name)" json:"name"` Enabled int `orm:"column(enabled)" json:"enabled"` Description string `orm:"column(description)" json:"description"` From c2e0c8d1f2a20be526c1782b5ea58c1268c91a6d Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Thu, 9 Nov 2017 22:27:54 +0800 Subject: [PATCH 10/37] Define the related interfaces for triggers and core controllers of replication service --- src/common/notifier/init.go | 13 ++ src/common/notifier/notifier_test.go | 20 +- src/replication/consts.go | 15 +- src/replication/core/controller.go | 121 ++++++++++ src/replication/event/on_deletion_handler.go | 57 +++++ src/replication/event/on_push_handler.go | 56 +++++ .../event/start_replication_handler.go | 45 ++++ src/replication/event/topics.go | 12 + src/replication/models/policy.go | 28 +++ src/replication/models/trigger.go | 10 + src/replication/policy/manager.go | 42 ++++ src/replication/source/sourcer.go | 8 - src/replication/trigger/cache.go | 212 ++++++++++++++++++ src/replication/trigger/cache_test.go | 53 +++++ src/replication/trigger/immediate.go | 47 ++++ src/replication/trigger/interface.go | 13 ++ src/replication/trigger/manager.go | 136 +++++++++++ src/replication/trigger/param_immediate.go | 26 +++ src/replication/trigger/param_schedule.go | 30 +++ src/replication/trigger/schedule.go | 34 +++ src/replication/trigger/trigger_param.go | 17 ++ src/replication/trigger/watch_list.go | 43 ++++ 22 files changed, 1020 insertions(+), 18 deletions(-) create mode 100644 src/common/notifier/init.go create mode 100644 src/replication/core/controller.go create mode 100644 src/replication/event/on_deletion_handler.go create mode 100644 src/replication/event/on_push_handler.go create mode 100644 src/replication/event/start_replication_handler.go create mode 100644 src/replication/event/topics.go create mode 100644 src/replication/models/policy.go create mode 100644 src/replication/models/trigger.go create mode 100644 src/replication/policy/manager.go create mode 100644 src/replication/trigger/cache.go create mode 100644 src/replication/trigger/cache_test.go create mode 100644 src/replication/trigger/immediate.go create mode 100644 src/replication/trigger/interface.go create mode 100644 src/replication/trigger/manager.go create mode 100644 src/replication/trigger/param_immediate.go create mode 100644 src/replication/trigger/param_schedule.go create mode 100644 src/replication/trigger/schedule.go create mode 100644 src/replication/trigger/trigger_param.go create mode 100644 src/replication/trigger/watch_list.go diff --git a/src/common/notifier/init.go b/src/common/notifier/init.go new file mode 100644 index 000000000..b36d1f8de --- /dev/null +++ b/src/common/notifier/init.go @@ -0,0 +1,13 @@ +package notifier + +import ( + "github.com/vmware/harbor/src/replication/event" +) + +//Subscribe related topics +func init() { + //Listen the related event topics + Subscribe(event.StartReplicationTopic, &event.StartReplicationHandler{}) + Subscribe(event.ReplicationEventTopicOnPush, &event.OnPushHandler{}) + Subscribe(event.ReplicationEventTopicOnDeletion, &event.OnDeletionHandler{}) +} diff --git a/src/common/notifier/notifier_test.go b/src/common/notifier/notifier_test.go index 9f98679ce..8bb93c59d 100644 --- a/src/common/notifier/notifier_test.go +++ b/src/common/notifier/notifier_test.go @@ -39,6 +39,7 @@ func (fsh *fakeStatelessHandler) Handle(v interface{}) error { } func TestSubscribeAndUnSubscribe(t *testing.T) { + count := len(notificationWatcher.handlers) err := Subscribe("topic1", &fakeStatefulHandler{0}) if err != nil { t.Fatal(err) @@ -59,7 +60,7 @@ func TestSubscribeAndUnSubscribe(t *testing.T) { t.Fatal(err) } - if len(notificationWatcher.handlers) != 2 { + if len(notificationWatcher.handlers) != (count + 2) { t.Fail() } @@ -94,7 +95,7 @@ func TestSubscribeAndUnSubscribe(t *testing.T) { t.Fatal(err) } - if len(notificationWatcher.handlers) != 1 { + if len(notificationWatcher.handlers) != (count + 1) { t.Fail() } @@ -103,12 +104,13 @@ func TestSubscribeAndUnSubscribe(t *testing.T) { t.Fatal(err) } - if len(notificationWatcher.handlers) != 0 { + if len(notificationWatcher.handlers) != count { t.Fail() } } func TestPublish(t *testing.T) { + count := len(notificationWatcher.handlers) err := Subscribe("topic1", &fakeStatefulHandler{0}) if err != nil { t.Fatal(err) @@ -119,7 +121,7 @@ func TestPublish(t *testing.T) { t.Fatal(err) } - if len(notificationWatcher.handlers) != 2 { + if len(notificationWatcher.handlers) != (count + 2) { t.Fail() } @@ -149,12 +151,13 @@ func TestPublish(t *testing.T) { } func TestConcurrentPublish(t *testing.T) { + count := len(notificationWatcher.handlers) err := Subscribe("topic1", &fakeStatefulHandler{0}) if err != nil { t.Fatal(err) } - if len(notificationWatcher.handlers) != 1 { + if len(notificationWatcher.handlers) != (count + 1) { t.Fail() } @@ -186,11 +189,12 @@ func TestConcurrentPublishWithScanPolicyHandler(t *testing.T) { t.Fatal("Policy scheduler is not started") } + count := len(notificationWatcher.handlers) if err := Subscribe("testing_topic", &ScanPolicyNotificationHandler{}); err != nil { t.Fatal(err.Error()) } - if len(notificationWatcher.handlers) != 1 { - t.Fatal("Handler is not registered") + if len(notificationWatcher.handlers) != (count + 1) { + t.Fatalf("Handler is not registered") } utcTime := time.Now().UTC().Unix() @@ -209,7 +213,7 @@ func TestConcurrentPublishWithScanPolicyHandler(t *testing.T) { t.Fatal(err.Error()) } - if len(notificationWatcher.handlers) != 0 { + if len(notificationWatcher.handlers) != count { t.Fatal("Handler is not unregistered") } diff --git a/src/replication/consts.go b/src/replication/consts.go index c9407cbd9..64800b994 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -8,13 +8,24 @@ const ( //FilterItemKindTag : Kind of filter item is 'tag' FilterItemKindTag = "tag" + //TODO: Refactor constants + //TriggerKindManually : kind of trigger is 'manully' TriggerKindManually = "manually" - //TriggerKindSchedule : kind of trigger is 'schedule' - TriggerKindSchedule = "schedule" //TriggerKindImmediately : kind of trigger is 'immediately' TriggerKindImmediately = "immediately" //AdaptorKindHarbor : Kind of adaptor of Harbor AdaptorKindHarbor = "Harbor" + + //TriggerKindImmediate : Kind of trigger is 'Immediate' + TriggerKindImmediate = "Immediate" + //TriggerKindSchedule : Kind of trigger is 'Schedule' + TriggerKindSchedule = "Schedule" + //TriggerKindManual : Kind of trigger is 'Manual' + TriggerKindManual = "Manual" + //TriggerScheduleDaily : type of scheduling is 'daily' + TriggerScheduleDaily = "daily" + //TriggerScheduleWeekly : type of scheduling is 'weekly' + TriggerScheduleWeekly = "weekly" ) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go new file mode 100644 index 000000000..24430e7ef --- /dev/null +++ b/src/replication/core/controller.go @@ -0,0 +1,121 @@ +package core + +import ( + "fmt" + + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/policy" + "github.com/vmware/harbor/src/replication/source" + "github.com/vmware/harbor/src/replication/trigger" +) + +//Controller is core module to cordinate and control the overall workflow of the +//replication modules. +type Controller struct { + //Indicate whether the controller has been initialized or not + initialized bool + + //Manage the policies + policyManager *policy.Manager + + //Handle the things related with source + sourcer *source.Sourcer + + //Manage the triggers of policies + triggerManager *trigger.Manager +} + +//Keep controller as singleton instance +var ( + DefaultController = NewController(ControllerConfig{}) //Use default data +) + +//ControllerConfig includes related configurations required by the controller +type ControllerConfig struct { + //The capacity of the cache storing enabled triggers + CacheCapacity int +} + +//NewController is the constructor of Controller. +func NewController(config ControllerConfig) *Controller { + //Controller refer the default instances + return &Controller{ + policyManager: policy.NewManager(), + sourcer: source.NewSourcer(), + triggerManager: trigger.NewManager(config.CacheCapacity), + } +} + +//Init will initialize the controller and the sub components +func (ctl *Controller) Init() error { + if ctl.initialized { + return nil + } + + //Build query parameters + triggerNames := []string{ + replication.TriggerKindImmediate, + replication.TriggerKindSchedule, + } + queryName := "" + for _, name := range triggerNames { + queryName = fmt.Sprintf("%s,%s", queryName, name) + } + //Enable the triggers + query := models.QueryParameter{ + TriggerName: queryName, + } + + policies := ctl.policyManager.GetPolicies(query) + if policies != nil && len(policies) > 0 { + for _, policy := range policies { + if err := ctl.triggerManager.SetupTrigger(policy.ID, policy.Trigger); err != nil { + //TODO: Log error + fmt.Printf("Error: %s", err) + //TODO:Update the status of policy + } + } + } + + //Initialize sourcer + ctl.sourcer.Init() + + ctl.initialized = true + + return nil +} + +//CreatePolicy is used to create a new policy and enable it if necessary +func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) error { + //Validate policy + //TODO: + return nil +} + +//UpdatePolicy will update the policy with new content. +//Parameter updatedPolicy must have the ID of the updated policy. +func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { + return nil +} + +//RemovePolicy will remove the specified policy and clean the related settings +func (ctl *Controller) RemovePolicy(policyID int) error { + return nil +} + +//GetPolicy is delegation of GetPolicy of Policy.Manager +func (ctl *Controller) GetPolicy(policyID int) models.ReplicationPolicy { + return models.ReplicationPolicy{} +} + +//GetPolicies is delegation of GetPolicies of Policy.Manager +func (ctl *Controller) GetPolicies(query models.QueryParameter) []models.ReplicationPolicy { + return nil +} + +//Replicate starts one replication defined in the specified policy; +//Can be launched by the API layer and related triggers. +func (ctl *Controller) Replicate(policyID int) error { + return nil +} diff --git a/src/replication/event/on_deletion_handler.go b/src/replication/event/on_deletion_handler.go new file mode 100644 index 000000000..c3b76e299 --- /dev/null +++ b/src/replication/event/on_deletion_handler.go @@ -0,0 +1,57 @@ +package event + +import ( + "errors" + "fmt" + "reflect" + + "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/replication/models" +) + +//OnDeletionHandler implements the notification handler interface to handle image on push event. +type OnDeletionHandler struct{} + +//OnDeletionNotification contains the data required by this handler +type OnDeletionNotification struct { + //The name of the project where the being pushed images are located + ProjectName string +} + +//Handle implements the same method of notification handler interface +func (oph *OnDeletionHandler) Handle(value interface{}) error { + if value == nil { + return errors.New("OnDeletionHandler can not handle nil value") + } + + vType := reflect.TypeOf(value) + if vType.Kind() != reflect.Struct || vType.String() != "event.OnDeletionNotification" { + return fmt.Errorf("Mismatch value type of OnDeletionHandler, expect %s but got %s", "event.OnDeletionNotification", vType.String()) + } + + notification := value.(OnDeletionNotification) + //TODO:Call projectManager to get the projectID + fmt.Println(notification.ProjectName) + query := models.QueryParameter{ + ProjectID: 0, + } + + policies := core.DefaultController.GetPolicies(query) + if policies != nil && len(policies) > 0 { + for _, p := range policies { + //Error accumulated and then return? + if err := core.DefaultController.Replicate(p.ID); err != nil { + //TODO:Log error + fmt.Println(err.Error()) + } + } + } + + return nil +} + +//IsStateful implements the same method of notification handler interface +func (oph *OnDeletionHandler) IsStateful() bool { + //Statless + return false +} diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go new file mode 100644 index 000000000..ba6eae4df --- /dev/null +++ b/src/replication/event/on_push_handler.go @@ -0,0 +1,56 @@ +package event + +import ( + "errors" + "fmt" + "reflect" + + "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/replication/models" +) + +//OnPushHandler implements the notification handler interface to handle image on push event. +type OnPushHandler struct{} + +//OnPushNotification contains the data required by this handler +type OnPushNotification struct { + //The ID of the project where the being pushed images are located + ProjectID int +} + +//Handle implements the same method of notification handler interface +func (oph *OnPushHandler) Handle(value interface{}) error { + if value == nil { + return errors.New("OnPushHandler can not handle nil value") + } + + vType := reflect.TypeOf(value) + if vType.Kind() != reflect.Struct || vType.String() != "event.OnPushNotification" { + return fmt.Errorf("Mismatch value type of OnPushHandler, expect %s but got %s", "event.OnPushNotification", vType.String()) + } + + notification := value.(OnDeletionNotification) + //TODO:Call projectManager to get the projectID + fmt.Println(notification.ProjectName) + query := models.QueryParameter{ + ProjectID: 0, + } + + policies := core.DefaultController.GetPolicies(query) + if policies != nil && len(policies) > 0 { + for _, p := range policies { + if err := core.DefaultController.Replicate(p.ID); err != nil { + //TODO:Log error + fmt.Println(err.Error()) + } + } + } + + return nil +} + +//IsStateful implements the same method of notification handler interface +func (oph *OnPushHandler) IsStateful() bool { + //Statless + return false +} diff --git a/src/replication/event/start_replication_handler.go b/src/replication/event/start_replication_handler.go new file mode 100644 index 000000000..aee83d576 --- /dev/null +++ b/src/replication/event/start_replication_handler.go @@ -0,0 +1,45 @@ +package event + +import ( + "errors" + "fmt" + "reflect" + + "github.com/vmware/harbor/src/replication/core" +) + +//StartReplicationHandler implements the notification handler interface to handle start replication requests. +type StartReplicationHandler struct{} + +//StartReplicationNotification contains data required by this handler +type StartReplicationNotification struct { + //ID of the policy + PolicyID int +} + +//Handle implements the same method of notification handler interface +func (srh *StartReplicationHandler) Handle(value interface{}) error { + if value == nil { + return errors.New("StartReplicationHandler can not handle nil value") + } + + vType := reflect.TypeOf(value) + if vType.Kind() != reflect.Struct || vType.String() != "core.StartReplicationNotification" { + return fmt.Errorf("Mismatch value type of StartReplicationHandler, expect %s but got %s", "core.StartReplicationNotification", vType.String()) + } + + notification := value.(StartReplicationNotification) + if notification.PolicyID <= 0 { + return errors.New("Invalid policy") + } + + //Start replication + //TODO: + return core.DefaultController.Replicate(notification.PolicyID) +} + +//IsStateful implements the same method of notification handler interface +func (srh *StartReplicationHandler) IsStateful() bool { + //Stateless + return false +} diff --git a/src/replication/event/topics.go b/src/replication/event/topics.go new file mode 100644 index 000000000..5a6aa954e --- /dev/null +++ b/src/replication/event/topics.go @@ -0,0 +1,12 @@ +package event + +const ( + //ReplicationEventTopicOnPush : OnPush event + ReplicationEventTopicOnPush = "OnPush" + + //ReplicationEventTopicOnDeletion : OnDeletion event + ReplicationEventTopicOnDeletion = "OnDeletion" + + //StartReplicationTopic : Start application request + StartReplicationTopic = "StartReplication" +) diff --git a/src/replication/models/policy.go b/src/replication/models/policy.go new file mode 100644 index 000000000..47f1867fb --- /dev/null +++ b/src/replication/models/policy.go @@ -0,0 +1,28 @@ +package models + +//ReplicationPolicy defines the structure of a replication policy. +type ReplicationPolicy struct { + //UUID of the policy + ID int + + //Projects attached to this policy + RelevantProjects []int + + //The trigger of the replication + Trigger Trigger +} + +//QueryParameter defines the parameters used to do query selection. +type QueryParameter struct { + //Query by page, couple with pageSize + Page int + + //Size of each page, couple with page + PageSize int + + //Query by the name of trigger + TriggerName string + + //Query by project ID + ProjectID int +} diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go new file mode 100644 index 000000000..f8a06b4e5 --- /dev/null +++ b/src/replication/models/trigger.go @@ -0,0 +1,10 @@ +package models + +//Trigger is replication launching approach definition +type Trigger struct { + //The name of the trigger + Name string + + //The parameters with json text format required by the trigger + Param string +} diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go new file mode 100644 index 000000000..22890ec73 --- /dev/null +++ b/src/replication/policy/manager.go @@ -0,0 +1,42 @@ +package policy + +import ( + "github.com/vmware/harbor/src/replication/models" +) + +//Manager provides replication policy CURD capabilities. +type Manager struct{} + +//NewManager is the constructor of Manager. +func NewManager() *Manager { + return &Manager{} +} + +//GetPolicies returns all the policies +func (m *Manager) GetPolicies(query models.QueryParameter) []models.ReplicationPolicy { + return []models.ReplicationPolicy{} +} + +//GetPolicy returns the policy with the specified ID +func (m *Manager) GetPolicy(policyID int) models.ReplicationPolicy { + return models.ReplicationPolicy{} +} + +//CreatePolicy creates a new policy with the provided data; +//If creating failed, error will be returned; +//If creating succeed, ID of the new created policy will be returned. +func (m *Manager) CreatePolicy(policy models.ReplicationPolicy) (int, error) { + return 0, nil +} + +//UpdatePolicy updates the policy; +//If updating failed, error will be returned. +func (m *Manager) UpdatePolicy(policy models.ReplicationPolicy) error { + return nil +} + +//RemovePolicy removes the specified policy; +//If removing failed, error will be returned. +func (m *Manager) RemovePolicy(policyID int) error { + return nil +} diff --git a/src/replication/source/sourcer.go b/src/replication/source/sourcer.go index 4bbfc2c44..9322bb50e 100644 --- a/src/replication/source/sourcer.go +++ b/src/replication/source/sourcer.go @@ -12,9 +12,6 @@ type Sourcer struct { adaptors map[string]registry.Adaptor } -//ReplicationSourcer is default sourcer for replication service. -var ReplicationSourcer = NewSourcer() - //NewSourcer is the constructor of Sourcer func NewSourcer() *Sourcer { return &Sourcer{ @@ -37,8 +34,3 @@ func (sc *Sourcer) GetAdaptor(kind string) registry.Adaptor { return sc.adaptors[kind] } - -//Init the adaptors -func Init() { - ReplicationSourcer.Init() -} diff --git a/src/replication/trigger/cache.go b/src/replication/trigger/cache.go new file mode 100644 index 000000000..0f74bc79d --- /dev/null +++ b/src/replication/trigger/cache.go @@ -0,0 +1,212 @@ +package trigger + +import ( + "container/heap" + "fmt" + "sync" + "time" +) + +const ( + //The max count of items the cache can keep + defaultCapacity = 1000 +) + +//Item keeps more metadata of the triggers which are stored in the heap. +type Item struct { + //Which policy the trigger belong to + policyID int + + //Frequency of cache querying + //First compration factor + frequency int + + //The timestamp of being put into heap + //Second compration factor + timestamp int64 + + //The index in the heap + index int +} + +//MetaQueue implements heap.Interface and holds items which are metadata of trigger +type MetaQueue []*Item + +//Len return the size of the queue +func (mq MetaQueue) Len() int { + return len(mq) +} + +//Less is a comparator of heap +func (mq MetaQueue) Less(i, j int) bool { + return mq[i].frequency < mq[j].frequency || + (mq[i].frequency == mq[j].frequency && + mq[i].timestamp < mq[j].timestamp) +} + +//Swap the items to rebuild heap +func (mq MetaQueue) Swap(i, j int) { + mq[i], mq[j] = mq[j], mq[i] + mq[i].index = i + mq[j].index = j +} + +//Push item into heap +func (mq *MetaQueue) Push(x interface{}) { + item := x.(*Item) + n := len(*mq) + item.index = n + item.timestamp = time.Now().UTC().UnixNano() + *mq = append(*mq, item) +} + +//Pop smallest item from heap +func (mq *MetaQueue) Pop() interface{} { + old := *mq + n := len(old) + item := old[n-1] //Smallest item + item.index = -1 //For safety + *mq = old[:n-1] + return item +} + +//Update the frequency of item +func (mq *MetaQueue) Update(item *Item) { + item.frequency++ + heap.Fix(mq, item.index) +} + +//CacheItem is the data stored in the cache. +//It contains trigger and heap item references. +type CacheItem struct { + //The trigger reference + trigger Interface + + //The heap item reference + item *Item +} + +//Cache is used to cache the enabled triggers with specified capacity. +//If exceed the capacity, cached items will be adjusted with the following rules: +// The item with least usage frequency will be replaced; +// If multiple items with same usage frequency, the oldest one will be replaced. +type Cache struct { + //The max count of items this cache can keep + capacity int + + //Lock to handle concurrent case + lock *sync.RWMutex + + //Hash map for quick locating cached item + hash map[string]CacheItem + + //Heap for quick locating the trigger with least usage + queue *MetaQueue +} + +//NewCache is constructor of cache +func NewCache(capacity int) *Cache { + cap := capacity + if cap <= 0 { + cap = defaultCapacity + } + + //Initialize heap + mq := make(MetaQueue, 0) + heap.Init(&mq) + + return &Cache{ + capacity: cap, + lock: new(sync.RWMutex), + hash: make(map[string]CacheItem), + queue: &mq, + } +} + +//Get the trigger interface with the specified policy ID +func (c *Cache) Get(policyID int) Interface { + if policyID <= 0 { + return nil + } + + c.lock.RLock() + defer c.lock.RUnlock() + + k := c.key(policyID) + + if cacheItem, ok := c.hash[k]; ok { + //Update frequency + c.queue.Update(cacheItem.item) + return cacheItem.trigger + } + + return nil +} + +//Put the item into cache with ID of ploicy as key +func (c *Cache) Put(policyID int, trigger Interface) { + if policyID <= 0 || trigger == nil { + return + } + + c.lock.Lock() + defer c.lock.Unlock() + + //Exceed the capacity? + if c.Size() >= c.capacity { + //Pop one for the new one + v := heap.Pop(c.queue) + item := v.(*Item) + //Remove from hash + delete(c.hash, c.key(item.policyID)) + } + + //Add to meta queue + item := &Item{ + policyID: policyID, + frequency: 1, + } + heap.Push(c.queue, item) + + //Cache + cacheItem := CacheItem{ + trigger: trigger, + item: item, + } + + k := c.key(policyID) + c.hash[k] = cacheItem +} + +//Remove the trigger attached to the specified policy +func (c *Cache) Remove(policyID int) Interface { + if policyID > 0 { + c.lock.Lock() + defer c.lock.Unlock() + + //If existing + k := c.key(policyID) + if cacheItem, ok := c.hash[k]; ok { + //Remove from heap + heap.Remove(c.queue, cacheItem.item.index) + + //Remove from hash + delete(c.hash, k) + + return cacheItem.trigger + } + + } + + return nil +} + +//Size return the count of triggers in the cache +func (c *Cache) Size() int { + return len(c.hash) +} + +//Generate a hash key with the policy ID +func (c *Cache) key(policyID int) string { + return fmt.Sprintf("trigger-%d", policyID) +} diff --git a/src/replication/trigger/cache_test.go b/src/replication/trigger/cache_test.go new file mode 100644 index 000000000..b7348cf26 --- /dev/null +++ b/src/replication/trigger/cache_test.go @@ -0,0 +1,53 @@ +package trigger + +import "testing" +import "time" + +func TestCache(t *testing.T) { + cache := NewCache(10) + trigger := NewImmediateTrigger(ImmediateParam{}) + + cache.Put(1, trigger) + if cache.Size() != 1 { + t.Fatalf("Invalid size, expect 1 but got %d", cache.Size()) + } + + tr := cache.Get(1) + if tr == nil { + t.Fatal("Should not get nil item") + } + + tri := cache.Remove(1) + if tri == nil || cache.Size() > 0 { + t.Fatal("Failed to remove") + } +} + +func TestCacheChange(t *testing.T) { + cache := NewCache(2) + trigger1 := NewImmediateTrigger(ImmediateParam{}) + trigger2 := NewImmediateTrigger(ImmediateParam{}) + cache.Put(1, trigger1) + cache.Put(2, trigger2) + + if cache.Size() != 2 { + t.Fatalf("Invalid size, expect 2 but got %d", cache.Size()) + } + + if tr := cache.Get(2); tr == nil { + t.Fatal("Should not get nil item") + } + + time.Sleep(100 * time.Microsecond) + + trigger3 := NewImmediateTrigger(ImmediateParam{}) + cache.Put(3, trigger3) + if cache.Size() != 2 { + t.Fatalf("Invalid size, expect 2 but got %d", cache.Size()) + } + + if tr := cache.Get(1); tr != nil { + t.Fatal("item1 should not exist") + } + +} diff --git a/src/replication/trigger/immediate.go b/src/replication/trigger/immediate.go new file mode 100644 index 000000000..af4ba3b2b --- /dev/null +++ b/src/replication/trigger/immediate.go @@ -0,0 +1,47 @@ +package trigger + +import ( + "errors" + + "github.com/vmware/harbor/src/replication" +) + +//ImmediateTrigger will setup watcher at the image pushing action to fire +//replication event at pushing happening time. +type ImmediateTrigger struct { + params ImmediateParam +} + +//NewImmediateTrigger is constructor of ImmediateTrigger +func NewImmediateTrigger(params ImmediateParam) *ImmediateTrigger { + return &ImmediateTrigger{ + params: params, + } +} + +//Kind is the implementation of same method defined in Trigger interface +func (st *ImmediateTrigger) Kind() string { + return replication.TriggerKindImmediate +} + +//Setup is the implementation of same method defined in Trigger interface +func (st *ImmediateTrigger) Setup() error { + if st.params.PolicyID <= 0 || len(st.params.Namespace) == 0 { + return errors.New("Invalid parameters for Immediate trigger") + } + + //TODO: Need more complicated logic here to handle partial updates + wt := WatchItem{ + PolicyID: st.params.PolicyID, + Namespace: st.params.Namespace, + OnDeletion: st.params.OnDeletion, + OnPush: true, + } + + return DefaultWatchList.Add(wt) +} + +//Unset is the implementation of same method defined in Trigger interface +func (st *ImmediateTrigger) Unset() error { + return errors.New("Not implemented") +} diff --git a/src/replication/trigger/interface.go b/src/replication/trigger/interface.go new file mode 100644 index 000000000..d08e75137 --- /dev/null +++ b/src/replication/trigger/interface.go @@ -0,0 +1,13 @@ +package trigger + +//Interface is certian mechanism to know when fire the replication operation. +type Interface interface { + //Kind indicates what type of the trigger is. + Kind() string + + //Setup/enable the trigger; if failed, an error would be returned. + Setup() error + + //Remove/disable the trigger; if failed, an error would be returned. + Unset() error +} diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go new file mode 100644 index 000000000..daed480e0 --- /dev/null +++ b/src/replication/trigger/manager.go @@ -0,0 +1,136 @@ +package trigger + +import ( + "errors" + + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +//Manager provides unified methods to manage the triggers of policies; +//Cache the enabled triggers, setup/unset the trigger based on the parameters +//with json format. +type Manager struct { + //Cache for triggers + cache *Cache +} + +//NewManager is the constructor of trigger manager. +//capacity is the max number of trigger references manager can keep in memory +func NewManager(capacity int) *Manager { + return &Manager{ + cache: NewCache(capacity), + } +} + +//GetTrigger returns the enabled trigger reference if existing in the cache. +func (m *Manager) GetTrigger(policyID int) Interface { + return m.cache.Get(policyID) +} + +//RemoveTrigger will disable the trigger and remove it from the cache if existing. +func (m *Manager) RemoveTrigger(policyID int) error { + trigger := m.cache.Get(policyID) + if trigger == nil { + return errors.New("Trigger is not cached, please use UnsetTrigger to disable the trigger") + } + + //Unset trigger + if err := trigger.Unset(); err != nil { + return err + } + + //Remove from cache + //No need to check the return of remove because the dirty item cached in the cache + //will be removed out finally after a certain while + m.cache.Remove(policyID) + + return nil +} + +//SetupTrigger will create the new trigger based on the provided json parameters. +//If failed, an error will be returned. +func (m *Manager) SetupTrigger(policyID int, trigger models.Trigger) error { + if policyID <= 0 { + return errors.New("Invalid policy ID") + } + + if len(trigger.Name) == 0 { + return errors.New("Invalid replication trigger definition") + } + + switch trigger.Name { + case replication.TriggerKindSchedule: + param := ScheduleParam{} + if err := param.Parse(trigger.Param); err != nil { + return err + } + //Append policy ID info + param.PolicyID = policyID + + newTrigger := NewScheduleTrigger(param) + if err := newTrigger.Setup(); err != nil { + return err + } + case replication.TriggerKindImmediate: + param := ImmediateParam{} + if err := param.Parse(trigger.Param); err != nil { + return err + } + //Append policy ID info + param.PolicyID = policyID + + newTrigger := NewImmediateTrigger(param) + if err := newTrigger.Setup(); err != nil { + return err + } + default: + //Treat as manual trigger + break + } + + return nil +} + +//UnsetTrigger will disable the trigger which is not cached in the trigger cache. +func (m *Manager) UnsetTrigger(policyID int, trigger models.Trigger) error { + if policyID <= 0 { + return errors.New("Invalid policy ID") + } + + if len(trigger.Name) == 0 { + return errors.New("Invalid replication trigger definition") + } + + switch trigger.Name { + case replication.TriggerKindSchedule: + param := ScheduleParam{} + if err := param.Parse(trigger.Param); err != nil { + return err + } + //Append policy ID info + param.PolicyID = policyID + + newTrigger := NewScheduleTrigger(param) + if err := newTrigger.Unset(); err != nil { + return err + } + case replication.TriggerKindImmediate: + param := ImmediateParam{} + if err := param.Parse(trigger.Param); err != nil { + return err + } + //Append policy ID info + param.PolicyID = policyID + + newTrigger := NewImmediateTrigger(param) + if err := newTrigger.Unset(); err != nil { + return err + } + default: + //Treat as manual trigger + break + } + + return nil +} diff --git a/src/replication/trigger/param_immediate.go b/src/replication/trigger/param_immediate.go new file mode 100644 index 000000000..492c65872 --- /dev/null +++ b/src/replication/trigger/param_immediate.go @@ -0,0 +1,26 @@ +package trigger + +import ( + "errors" +) + +//NOTES: Whether replicate the existing images when the type of trigger is +//'Immediate' is a once-effective setting which will not be persisted +// and kept as one parameter of 'Immediate' trigger. It will only be +//covered by the UI logic. + +//ImmediateParam defines the parameter of immediate trigger +type ImmediateParam struct { + //Basic parameters + BasicParam + + //Namepace + Namespace string +} + +//Parse is the implementation of same method in TriggerParam interface +//NOTES: No need to implement this method for 'Immediate' trigger as +//it does not have any parameters with json format. +func (ip ImmediateParam) Parse(param string) error { + return errors.New("Should NOT be called as it's not implemented") +} diff --git a/src/replication/trigger/param_schedule.go b/src/replication/trigger/param_schedule.go new file mode 100644 index 000000000..84ca46f44 --- /dev/null +++ b/src/replication/trigger/param_schedule.go @@ -0,0 +1,30 @@ +package trigger + +import ( + "encoding/json" + "errors" +) + +//ScheduleParam defines the parameter of schedule trigger +type ScheduleParam struct { + //Basic parameters + BasicParam + + //Daily or weekly + Type string + + //Optional, only used when type is 'weekly' + Weekday int8 + + //The time offset with the UTC 00:00 in seconds + Offtime int64 +} + +//Parse is the implementation of same method in TriggerParam interface +func (stp ScheduleParam) Parse(param string) error { + if len(param) == 0 { + return errors.New("Parameter of schedule trigger should not be empty") + } + + return json.Unmarshal([]byte(param), &stp) +} diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go new file mode 100644 index 000000000..d7c07cadd --- /dev/null +++ b/src/replication/trigger/schedule.go @@ -0,0 +1,34 @@ +package trigger + +import ( + "errors" + + "github.com/vmware/harbor/src/replication" +) + +//ScheduleTrigger will schedule a alternate policy to provide 'daily' and 'weekly' trigger ways. +type ScheduleTrigger struct { + params ScheduleParam +} + +//NewScheduleTrigger is constructor of ScheduleTrigger +func NewScheduleTrigger(params ScheduleParam) *ScheduleTrigger { + return &ScheduleTrigger{ + params: params, + } +} + +//Kind is the implementation of same method defined in Trigger interface +func (st *ScheduleTrigger) Kind() string { + return replication.TriggerKindSchedule +} + +//Setup is the implementation of same method defined in Trigger interface +func (st *ScheduleTrigger) Setup() error { + return errors.New("Not implemented") +} + +//Unset is the implementation of same method defined in Trigger interface +func (st *ScheduleTrigger) Unset() error { + return errors.New("Not implemented") +} diff --git a/src/replication/trigger/trigger_param.go b/src/replication/trigger/trigger_param.go new file mode 100644 index 000000000..10420ef5b --- /dev/null +++ b/src/replication/trigger/trigger_param.go @@ -0,0 +1,17 @@ +package trigger + +//BasicParam contains the general parameters for all triggers +type BasicParam struct { + //ID of the related policy + PolicyID int + + //Whether delete remote replicated images if local ones are deleted + OnDeletion bool +} + +//Parameter defines operation of doing initialization from parameter json text +type Parameter interface { + //Decode parameter with json style to the owner struct + //If failed, an error will be returned + Parse(param string) error +} diff --git a/src/replication/trigger/watch_list.go b/src/replication/trigger/watch_list.go new file mode 100644 index 000000000..6a2009f29 --- /dev/null +++ b/src/replication/trigger/watch_list.go @@ -0,0 +1,43 @@ +package trigger + +//DefaultWatchList is the default instance of WatchList +var DefaultWatchList = &WatchList{} + +//WatchList contains the items which should be evaluated for replication +//when image pushing or deleting happens. +type WatchList struct{} + +//WatchItem keeps the related data for evaluation in WatchList. +type WatchItem struct { + //ID of policy + PolicyID int + + //Corresponding namespace + Namespace string + + //For deletion event + OnDeletion bool + + //For pushing event + OnPush bool +} + +//Add item to the list and persist into DB +func (wl *WatchList) Add(item WatchItem) error { + return nil +} + +//Remove the specified watch item from list +func (wl *WatchList) Remove() WatchItem { + return WatchItem{} +} + +//Update the watch item in the list +func (wl *WatchList) Update(updatedItem WatchItem) error { + return nil +} + +//Get the specified watch item +func (wl *WatchList) Get(namespace string) WatchItem { + return WatchItem{} +} From 31cf6c078ed32fdf4d2abf81d43909b7926229d6 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 15 Nov 2017 14:41:26 +0800 Subject: [PATCH 11/37] Implement replication policy manager --- src/common/dao/replication_job.go | 47 +- src/common/models/replication_job.go | 152 +--- src/common/models/replication_test.go | 50 -- src/replication/core/controller.go | 34 +- src/replication/event/on_deletion_handler.go | 5 +- src/replication/event/on_push_handler.go | 5 +- .../event/start_replication_handler.go | 2 +- src/replication/models/filter_item.go | 26 +- src/replication/models/policy.go | 31 +- src/replication/models/trigger.go | 20 +- src/replication/policy/manager.go | 129 +++- src/replication/trigger/cache.go | 10 +- src/replication/trigger/manager.go | 16 +- src/replication/trigger/trigger_param.go | 2 +- src/replication/trigger/watch_list.go | 2 +- src/ui/api/api_test.go | 195 +++++ src/ui/api/harborapi_test.go | 1 - src/ui/api/models/replication_policy.go | 66 ++ src/ui/api/replication_policy.go | 414 ++++------ src/ui/api/replication_policy_test.go | 722 +++++++++++------- src/ui/router.go | 1 - tests/apitests/apilib/rep_policy_post.go | 10 - 22 files changed, 1111 insertions(+), 829 deletions(-) delete mode 100644 src/common/models/replication_test.go create mode 100644 src/ui/api/api_test.go create mode 100644 src/ui/api/models/replication_policy.go diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index 6fd4e17c6..a8f1ce512 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -104,22 +104,18 @@ func FilterRepTargets(name string) ([]*models.RepTarget, error) { // AddRepPolicy ... func AddRepPolicy(policy models.RepPolicy) (int64, error) { - if err := policy.Marshal(); err != nil { - return 0, err - } - o := GetOrmer() sql := `insert into replication_policy (name, project_id, target_id, enabled, description, cron_str, start_time, creation_time, update_time, filters, replicate_deletion) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` params := []interface{}{} - params = append(params, policy.Name, policy.ProjectID, policy.TargetID, policy.Enabled, policy.Description, policy.TriggerInDB) + params = append(params, policy.Name, policy.ProjectID, policy.TargetID, policy.Enabled, policy.Description, policy.Trigger) now := time.Now() if policy.Enabled == 1 { params = append(params, now) } else { params = append(params, nil) } - params = append(params, now, now, policy.FiltersInDB, policy.ReplicateDeletion) + params = append(params, now, now, policy.Filters, policy.ReplicateDeletion) result, err := o.Raw(sql, params...).Exec() if err != nil { @@ -132,7 +128,7 @@ func AddRepPolicy(policy models.RepPolicy) (int64, error) { // GetRepPolicy ... func GetRepPolicy(id int64) (*models.RepPolicy, error) { o := GetOrmer() - sql := `select * from replication_policy where id = ?` + sql := `select * from replication_policy where id = ? and deleted = 0` var policy models.RepPolicy @@ -143,10 +139,6 @@ func GetRepPolicy(id int64) (*models.RepPolicy, error) { return nil, err } - if err := policy.Unmarshal(); err != nil { - return nil, err - } - return &policy, nil } @@ -186,12 +178,6 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error return nil, err } - for _, policy := range policies { - if err := policy.Unmarshal(); err != nil { - return nil, err - } - } - return policies, nil } @@ -209,10 +195,6 @@ func GetRepPolicyByName(name string) (*models.RepPolicy, error) { return nil, err } - if err := policy.Unmarshal(); err != nil { - return nil, err - } - return &policy, nil } @@ -227,12 +209,6 @@ func GetRepPolicyByProject(projectID int64) ([]*models.RepPolicy, error) { return nil, err } - for _, policy := range policies { - if err := policy.Unmarshal(); err != nil { - return nil, err - } - } - return policies, nil } @@ -247,12 +223,6 @@ func GetRepPolicyByTarget(targetID int64) ([]*models.RepPolicy, error) { return nil, err } - for _, policy := range policies { - if err := policy.Unmarshal(); err != nil { - return nil, err - } - } - return policies, nil } @@ -267,24 +237,15 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol return nil, err } - for _, policy := range policies { - if err := policy.Unmarshal(); err != nil { - return nil, err - } - } - return policies, nil } // UpdateRepPolicy ... func UpdateRepPolicy(policy *models.RepPolicy) error { - if err := policy.Marshal(); err != nil { - return err - } o := GetOrmer() policy.UpdateTime = time.Now() _, err := o.Update(policy, "TargetID", "Name", "Enabled", "Description", - "TriggerInDB", "FiltersInDB", "ReplicateDeletion", "UpdateTime") + "Trigger", "Filters", "ReplicateDeletion", "UpdateTime") return err } diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index 09cfa2169..abf011a34 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -15,13 +15,10 @@ package models import ( - "encoding/json" - "fmt" "time" "github.com/astaxie/beego/validation" "github.com/vmware/harbor/src/common/utils" - "github.com/vmware/harbor/src/replication" ) const ( @@ -41,142 +38,19 @@ const ( // RepPolicy is the model for a replication policy, which associate to a project and a target (destination) type RepPolicy struct { - ID int64 `orm:"pk;auto;column(id)" json:"id"` - ProjectID int64 `orm:"column(project_id)" json:"project_id"` - ProjectName string `orm:"-" json:"project_name,omitempty"` - TargetID int64 `orm:"column(target_id)" json:"target_id"` - TargetName string `json:"target_name,omitempty"` - Name string `orm:"column(name)" json:"name"` - Enabled int `orm:"column(enabled)" json:"enabled"` - Description string `orm:"column(description)" json:"description"` - Trigger *RepTrigger `orm:"-" json:"trigger"` - TriggerInDB string `orm:"column(cron_str)" json:"-"` - Filters []*RepFilter `orm:"-" json:"filters"` - FiltersInDB string `orm:"column(filters)" json:"-"` - ReplicateExistingImageNow bool `orm:"-" json:"replicate_existing_image_now"` - ReplicateDeletion bool `orm:"column(replicate_deletion)" json:"replicate_deletion"` - StartTime time.Time `orm:"column(start_time)" json:"start_time"` - CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"` - UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"` - ErrorJobCount int `orm:"-" json:"error_job_count"` - Deleted int `orm:"column(deleted)" json:"deleted"` -} - -// Valid ... -func (r *RepPolicy) Valid(v *validation.Validation) { - if len(r.Name) == 0 { - v.SetError("name", "can not be empty") - } - - if len(r.Name) > 256 { - v.SetError("name", "max length is 256") - } - - if r.ProjectID <= 0 { - v.SetError("project_id", "invalid") - } - - if r.TargetID <= 0 { - v.SetError("target_id", "invalid") - } - - if r.Enabled != 0 && r.Enabled != 1 { - v.SetError("enabled", "must be 0 or 1") - } - - if r.Trigger != nil { - r.Trigger.Valid(v) - } - - for _, filter := range r.Filters { - filter.Valid(v) - } - - if err := r.Marshal(); err != nil { - v.SetError("trigger or filters", err.Error()) - } - - if len(r.TriggerInDB) > 256 { - v.SetError("trigger", "max length is 256") - } - - if len(r.FiltersInDB) > 1024 { - v.SetError("filters", "max length is 1024") - } -} - -// Marshal marshal RepTrigger and RepFilter array to json string -func (r *RepPolicy) Marshal() error { - if r.Trigger != nil { - b, err := json.Marshal(r.Trigger) - if err != nil { - return err - } - r.TriggerInDB = string(b) - } - - if r.Filters != nil { - b, err := json.Marshal(r.Filters) - if err != nil { - return err - } - r.FiltersInDB = string(b) - } - return nil -} - -// Unmarshal unmarshal json string to RepTrigger and RepFilter array -func (r *RepPolicy) Unmarshal() error { - if len(r.TriggerInDB) > 0 { - trigger := &RepTrigger{} - if err := json.Unmarshal([]byte(r.TriggerInDB), &trigger); err != nil { - return err - } - r.Trigger = trigger - } - - if len(r.FiltersInDB) > 0 { - filter := []*RepFilter{} - if err := json.Unmarshal([]byte(r.FiltersInDB), &filter); err != nil { - return err - } - r.Filters = filter - } - return nil -} - -// RepFilter holds information for the replication policy filter -type RepFilter struct { - Type string `json:"type"` - Value string `json:"value"` -} - -// Valid ... -func (r *RepFilter) Valid(v *validation.Validation) { - if !(r.Type == replication.FilterItemKindProject || - r.Type == replication.FilterItemKindRepository || - r.Type == replication.FilterItemKindTag) { - v.SetError("filter.type", fmt.Sprintf("invalid filter type: %s", r.Type)) - } - - if len(r.Value) == 0 { - v.SetError("filter.value", "can not be empty") - } -} - -// RepTrigger holds information for the replication policy trigger -type RepTrigger struct { - Type string `json:"type"` - Params map[string]interface{} `json:"params"` -} - -// Valid ... -func (r *RepTrigger) Valid(v *validation.Validation) { - if !(r.Type == replication.TriggerKindManually || - r.Type == replication.TriggerKindSchedule || - r.Type == replication.TriggerKindImmediately) { - v.SetError("trigger.type", fmt.Sprintf("invalid trigger type: %s", r.Type)) - } + ID int64 `orm:"pk;auto;column(id)"` + ProjectID int64 `orm:"column(project_id)" ` + TargetID int64 `orm:"column(target_id)"` + Name string `orm:"column(name)"` + Enabled int `orm:"column(enabled)"` + Description string `orm:"column(description)"` + Trigger string `orm:"column(cron_str)"` + Filters string `orm:"column(filters)"` + ReplicateDeletion bool `orm:"column(replicate_deletion)"` + StartTime time.Time `orm:"column(start_time)"` + CreationTime time.Time `orm:"column(creation_time);auto_now_add"` + UpdateTime time.Time `orm:"column(update_time);auto_now"` + Deleted int `orm:"column(deleted)"` } // RepJob is the model for a replication job, which is the execution unit on job service, currently it is used to transfer/remove diff --git a/src/common/models/replication_test.go b/src/common/models/replication_test.go deleted file mode 100644 index 52978f983..000000000 --- a/src/common/models/replication_test.go +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package models - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestMarshalAndUnmarshal(t *testing.T) { - trigger := &RepTrigger{ - Type: "schedule", - Params: map[string]interface{}{"date": "2:00"}, - } - filters := []*RepFilter{ - &RepFilter{ - Type: "repository", - Value: "library/ubuntu*", - }, - } - policy := &RepPolicy{ - Trigger: trigger, - Filters: filters, - } - - err := policy.Marshal() - require.Nil(t, err) - - policy.Trigger = nil - policy.Filters = nil - err = policy.Unmarshal() - require.Nil(t, err) - - assert.EqualValues(t, filters, policy.Filters) - assert.EqualValues(t, trigger, policy.Trigger) -} diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 24430e7ef..eb18f6ada 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -67,10 +67,13 @@ func (ctl *Controller) Init() error { TriggerName: queryName, } - policies := ctl.policyManager.GetPolicies(query) + policies, err := ctl.policyManager.GetPolicies(query) + if err != nil { + return err + } if policies != nil && len(policies) > 0 { for _, policy := range policies { - if err := ctl.triggerManager.SetupTrigger(policy.ID, policy.Trigger); err != nil { + if err := ctl.triggerManager.SetupTrigger(policy.ID, *policy.Trigger); err != nil { //TODO: Log error fmt.Printf("Error: %s", err) //TODO:Update the status of policy @@ -87,35 +90,38 @@ func (ctl *Controller) Init() error { } //CreatePolicy is used to create a new policy and enable it if necessary -func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) error { +func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, error) { //Validate policy - //TODO: - return nil + // TODO + + return ctl.policyManager.CreatePolicy(newPolicy) } //UpdatePolicy will update the policy with new content. //Parameter updatedPolicy must have the ID of the updated policy. func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { - return nil + // TODO check pre-conditions + return ctl.policyManager.UpdatePolicy(updatedPolicy) } //RemovePolicy will remove the specified policy and clean the related settings -func (ctl *Controller) RemovePolicy(policyID int) error { - return nil +func (ctl *Controller) RemovePolicy(policyID int64) error { + // TODO check pre-conditions + return ctl.policyManager.RemovePolicy(policyID) } //GetPolicy is delegation of GetPolicy of Policy.Manager -func (ctl *Controller) GetPolicy(policyID int) models.ReplicationPolicy { - return models.ReplicationPolicy{} +func (ctl *Controller) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { + return ctl.policyManager.GetPolicy(policyID) } -//GetPolicies is delegation of GetPolicies of Policy.Manager -func (ctl *Controller) GetPolicies(query models.QueryParameter) []models.ReplicationPolicy { - return nil +//GetPolicies is delegation of GetPoliciemodels.ReplicationPolicy{}s of Policy.Manager +func (ctl *Controller) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { + return ctl.policyManager.GetPolicies(query) } //Replicate starts one replication defined in the specified policy; //Can be launched by the API layer and related triggers. -func (ctl *Controller) Replicate(policyID int) error { +func (ctl *Controller) Replicate(policyID int64) error { return nil } diff --git a/src/replication/event/on_deletion_handler.go b/src/replication/event/on_deletion_handler.go index c3b76e299..e16af893c 100644 --- a/src/replication/event/on_deletion_handler.go +++ b/src/replication/event/on_deletion_handler.go @@ -36,7 +36,10 @@ func (oph *OnDeletionHandler) Handle(value interface{}) error { ProjectID: 0, } - policies := core.DefaultController.GetPolicies(query) + policies, err := core.DefaultController.GetPolicies(query) + if err != nil { + return err + } if policies != nil && len(policies) > 0 { for _, p := range policies { //Error accumulated and then return? diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go index ba6eae4df..d8c4d3aae 100644 --- a/src/replication/event/on_push_handler.go +++ b/src/replication/event/on_push_handler.go @@ -36,7 +36,10 @@ func (oph *OnPushHandler) Handle(value interface{}) error { ProjectID: 0, } - policies := core.DefaultController.GetPolicies(query) + policies, err := core.DefaultController.GetPolicies(query) + if err != nil { + return err + } if policies != nil && len(policies) > 0 { for _, p := range policies { if err := core.DefaultController.Replicate(p.ID); err != nil { diff --git a/src/replication/event/start_replication_handler.go b/src/replication/event/start_replication_handler.go index aee83d576..93658a593 100644 --- a/src/replication/event/start_replication_handler.go +++ b/src/replication/event/start_replication_handler.go @@ -14,7 +14,7 @@ type StartReplicationHandler struct{} //StartReplicationNotification contains data required by this handler type StartReplicationNotification struct { //ID of the policy - PolicyID int + PolicyID int64 } //Handle implements the same method of notification handler interface diff --git a/src/replication/models/filter_item.go b/src/replication/models/filter_item.go index 038287c78..d142fb70f 100644 --- a/src/replication/models/filter_item.go +++ b/src/replication/models/filter_item.go @@ -1,19 +1,39 @@ package models +import ( + "fmt" + + "github.com/astaxie/beego/validation" + "github.com/vmware/harbor/src/replication" +) + //FilterItem is the general data model represents the filtering resources which are used as input and output for the filters. type FilterItem struct { //The kind of the filtering resources. Support 'project','repository' and 'tag' etc. - Kind string + Kind string `json:"kind"` //The key value of resource which can be used to filter out the resource matched with specified pattern. //E.g: //kind == 'project', value will be project name; //kind == 'repository', value will be repository name //kind == 'tag', value will be tag name. - Value string + Value string `json:"value"` //Extension placeholder. //To append more additional information if required by the filter. - Metadata map[string]interface{} + Metadata map[string]interface{} `json:"metadata"` +} + +// Valid ... +func (f *FilterItem) Valid(v *validation.Validation) { + if !(f.Kind == replication.FilterItemKindProject || + f.Kind == replication.FilterItemKindRepository || + f.Kind == replication.FilterItemKindTag) { + v.SetError("kind", fmt.Sprintf("invalid filter kind: %s", f.Kind)) + } + + if len(f.Value) == 0 { + v.SetError("value", "filter value can not be empty") + } } diff --git a/src/replication/models/policy.go b/src/replication/models/policy.go index 47f1867fb..faa0295b1 100644 --- a/src/replication/models/policy.go +++ b/src/replication/models/policy.go @@ -1,28 +1,37 @@ package models +import ( + "time" +) + //ReplicationPolicy defines the structure of a replication policy. type ReplicationPolicy struct { - //UUID of the policy - ID int - - //Projects attached to this policy - RelevantProjects []int - - //The trigger of the replication - Trigger Trigger + ID int64 //UUID of the policy + Name string + Description string + Filters []FilterItem + ReplicateDeletion bool + Trigger *Trigger //The trigger of the replication + ProjectIDs []int64 //Projects attached to this policy + TargetIDs []int64 + CreationTime time.Time + UpdateTime time.Time } //QueryParameter defines the parameters used to do query selection. type QueryParameter struct { //Query by page, couple with pageSize - Page int + Page int64 //Size of each page, couple with page - PageSize int + PageSize int64 //Query by the name of trigger TriggerName string //Query by project ID - ProjectID int + ProjectID int64 + + //Query by name + Name string } diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go index f8a06b4e5..4477f6363 100644 --- a/src/replication/models/trigger.go +++ b/src/replication/models/trigger.go @@ -1,10 +1,26 @@ package models +import ( + "fmt" + + "github.com/astaxie/beego/validation" + "github.com/vmware/harbor/src/replication" +) + //Trigger is replication launching approach definition type Trigger struct { //The name of the trigger - Name string + Kind string `json:"kind"` //The parameters with json text format required by the trigger - Param string + Param string `json:"param"` +} + +// Valid ... +func (t *Trigger) Valid(v *validation.Validation) { + if !(t.Kind == replication.TriggerKindImmediately || + t.Kind == replication.TriggerKindManually || + t.Kind == replication.TriggerKindSchedule) { + v.SetError("kind", fmt.Sprintf("invalid trigger kind: %s", t.Kind)) + } } diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go index 22890ec73..dcd8a13df 100644 --- a/src/replication/policy/manager.go +++ b/src/replication/policy/manager.go @@ -1,6 +1,11 @@ package policy import ( + "encoding/json" + "time" + + "github.com/vmware/harbor/src/common/dao" + persist_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/replication/models" ) @@ -13,30 +18,136 @@ func NewManager() *Manager { } //GetPolicies returns all the policies -func (m *Manager) GetPolicies(query models.QueryParameter) []models.ReplicationPolicy { - return []models.ReplicationPolicy{} +func (m *Manager) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { + result := []models.ReplicationPolicy{} + //TODO support more query conditions other than name and project ID + policies, err := dao.FilterRepPolicies(query.Name, query.ProjectID) + if err != nil { + return result, err + } + + for _, policy := range policies { + ply, err := convertFromPersistModel(policy) + if err != nil { + return []models.ReplicationPolicy{}, err + } + result = append(result, ply) + } + + return result, nil } //GetPolicy returns the policy with the specified ID -func (m *Manager) GetPolicy(policyID int) models.ReplicationPolicy { - return models.ReplicationPolicy{} +func (m *Manager) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { + policy, err := dao.GetRepPolicy(policyID) + if err != nil { + return models.ReplicationPolicy{}, err + } + + return convertFromPersistModel(policy) +} + +// TODO add UT +func convertFromPersistModel(policy *persist_models.RepPolicy) (models.ReplicationPolicy, error) { + if policy == nil { + return models.ReplicationPolicy{}, nil + } + + ply := models.ReplicationPolicy{ + ID: policy.ID, + Name: policy.Name, + Description: policy.Description, + ReplicateDeletion: policy.ReplicateDeletion, + ProjectIDs: []int64{policy.ProjectID}, + TargetIDs: []int64{policy.TargetID}, + CreationTime: policy.CreationTime, + UpdateTime: policy.UpdateTime, + } + + if len(policy.Filters) > 0 { + filters := []models.FilterItem{} + if err := json.Unmarshal([]byte(policy.Filters), &filters); err != nil { + return models.ReplicationPolicy{}, err + } + ply.Filters = filters + } + + if len(policy.Trigger) > 0 { + trigger := &models.Trigger{} + if err := json.Unmarshal([]byte(policy.Trigger), trigger); err != nil { + return models.ReplicationPolicy{}, err + } + ply.Trigger = trigger + } + + return ply, nil +} + +// TODO add ut +func convertToPersistModel(policy models.ReplicationPolicy) (*persist_models.RepPolicy, error) { + ply := &persist_models.RepPolicy{ + ID: policy.ID, + Name: policy.Name, + Description: policy.Description, + ReplicateDeletion: policy.ReplicateDeletion, + CreationTime: policy.CreationTime, + UpdateTime: policy.UpdateTime, + } + + if len(policy.ProjectIDs) > 0 { + ply.ProjectID = policy.ProjectIDs[0] + } + + if len(policy.TargetIDs) > 0 { + ply.TargetID = policy.TargetIDs[0] + } + + if policy.Trigger != nil { + trigger, err := json.Marshal(policy.Trigger) + if err != nil { + return nil, err + } + ply.Trigger = string(trigger) + } + + if len(policy.Filters) > 0 { + filters, err := json.Marshal(policy.Filters) + if err != nil { + return nil, err + } + ply.Filters = string(filters) + } + + return ply, nil } //CreatePolicy creates a new policy with the provided data; //If creating failed, error will be returned; //If creating succeed, ID of the new created policy will be returned. -func (m *Manager) CreatePolicy(policy models.ReplicationPolicy) (int, error) { - return 0, nil +func (m *Manager) CreatePolicy(policy models.ReplicationPolicy) (int64, error) { + now := time.Now() + policy.CreationTime = now + policy.UpdateTime = now + ply, err := convertToPersistModel(policy) + if err != nil { + return 0, err + } + return dao.AddRepPolicy(*ply) } //UpdatePolicy updates the policy; //If updating failed, error will be returned. func (m *Manager) UpdatePolicy(policy models.ReplicationPolicy) error { - return nil + policy.UpdateTime = time.Now() + ply, err := convertToPersistModel(policy) + if err != nil { + return err + } + return dao.UpdateRepPolicy(ply) } //RemovePolicy removes the specified policy; //If removing failed, error will be returned. -func (m *Manager) RemovePolicy(policyID int) error { - return nil +func (m *Manager) RemovePolicy(policyID int64) error { + return dao.DeleteRepPolicy(policyID) } diff --git a/src/replication/trigger/cache.go b/src/replication/trigger/cache.go index 0f74bc79d..ea694f3eb 100644 --- a/src/replication/trigger/cache.go +++ b/src/replication/trigger/cache.go @@ -15,7 +15,7 @@ const ( //Item keeps more metadata of the triggers which are stored in the heap. type Item struct { //Which policy the trigger belong to - policyID int + policyID int64 //Frequency of cache querying //First compration factor @@ -124,7 +124,7 @@ func NewCache(capacity int) *Cache { } //Get the trigger interface with the specified policy ID -func (c *Cache) Get(policyID int) Interface { +func (c *Cache) Get(policyID int64) Interface { if policyID <= 0 { return nil } @@ -144,7 +144,7 @@ func (c *Cache) Get(policyID int) Interface { } //Put the item into cache with ID of ploicy as key -func (c *Cache) Put(policyID int, trigger Interface) { +func (c *Cache) Put(policyID int64, trigger Interface) { if policyID <= 0 || trigger == nil { return } @@ -179,7 +179,7 @@ func (c *Cache) Put(policyID int, trigger Interface) { } //Remove the trigger attached to the specified policy -func (c *Cache) Remove(policyID int) Interface { +func (c *Cache) Remove(policyID int64) Interface { if policyID > 0 { c.lock.Lock() defer c.lock.Unlock() @@ -207,6 +207,6 @@ func (c *Cache) Size() int { } //Generate a hash key with the policy ID -func (c *Cache) key(policyID int) string { +func (c *Cache) key(policyID int64) string { return fmt.Sprintf("trigger-%d", policyID) } diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go index daed480e0..636fd8632 100644 --- a/src/replication/trigger/manager.go +++ b/src/replication/trigger/manager.go @@ -24,12 +24,12 @@ func NewManager(capacity int) *Manager { } //GetTrigger returns the enabled trigger reference if existing in the cache. -func (m *Manager) GetTrigger(policyID int) Interface { +func (m *Manager) GetTrigger(policyID int64) Interface { return m.cache.Get(policyID) } //RemoveTrigger will disable the trigger and remove it from the cache if existing. -func (m *Manager) RemoveTrigger(policyID int) error { +func (m *Manager) RemoveTrigger(policyID int64) error { trigger := m.cache.Get(policyID) if trigger == nil { return errors.New("Trigger is not cached, please use UnsetTrigger to disable the trigger") @@ -50,16 +50,16 @@ func (m *Manager) RemoveTrigger(policyID int) error { //SetupTrigger will create the new trigger based on the provided json parameters. //If failed, an error will be returned. -func (m *Manager) SetupTrigger(policyID int, trigger models.Trigger) error { +func (m *Manager) SetupTrigger(policyID int64, trigger models.Trigger) error { if policyID <= 0 { return errors.New("Invalid policy ID") } - if len(trigger.Name) == 0 { + if len(trigger.Kind) == 0 { return errors.New("Invalid replication trigger definition") } - switch trigger.Name { + switch trigger.Kind { case replication.TriggerKindSchedule: param := ScheduleParam{} if err := param.Parse(trigger.Param); err != nil { @@ -93,16 +93,16 @@ func (m *Manager) SetupTrigger(policyID int, trigger models.Trigger) error { } //UnsetTrigger will disable the trigger which is not cached in the trigger cache. -func (m *Manager) UnsetTrigger(policyID int, trigger models.Trigger) error { +func (m *Manager) UnsetTrigger(policyID int64, trigger models.Trigger) error { if policyID <= 0 { return errors.New("Invalid policy ID") } - if len(trigger.Name) == 0 { + if len(trigger.Kind) == 0 { return errors.New("Invalid replication trigger definition") } - switch trigger.Name { + switch trigger.Kind { case replication.TriggerKindSchedule: param := ScheduleParam{} if err := param.Parse(trigger.Param); err != nil { diff --git a/src/replication/trigger/trigger_param.go b/src/replication/trigger/trigger_param.go index 10420ef5b..cccf3fca3 100644 --- a/src/replication/trigger/trigger_param.go +++ b/src/replication/trigger/trigger_param.go @@ -3,7 +3,7 @@ package trigger //BasicParam contains the general parameters for all triggers type BasicParam struct { //ID of the related policy - PolicyID int + PolicyID int64 //Whether delete remote replicated images if local ones are deleted OnDeletion bool diff --git a/src/replication/trigger/watch_list.go b/src/replication/trigger/watch_list.go index 6a2009f29..ca6e44cee 100644 --- a/src/replication/trigger/watch_list.go +++ b/src/replication/trigger/watch_list.go @@ -10,7 +10,7 @@ type WatchList struct{} //WatchItem keeps the related data for evaluation in WatchList. type WatchItem struct { //ID of policy - PolicyID int + PolicyID int64 //Corresponding namespace Namespace string diff --git a/src/ui/api/api_test.go b/src/ui/api/api_test.go new file mode 100644 index 000000000..de9956954 --- /dev/null +++ b/src/ui/api/api_test.go @@ -0,0 +1,195 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package api + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "os" + "strconv" + "strings" + "testing" + + "github.com/astaxie/beego" + "github.com/dghubble/sling" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/models" +) + +var ( + nonSysAdminID int64 + sysAdmin = &usrInfo{ + Name: "admin", + Passwd: "Harbor12345", + } + nonSysAdmin = &usrInfo{ + Name: "non_admin", + Passwd: "Harbor12345", + } +) + +type testingRequest struct { + method string + url string + header http.Header + queryStruct interface{} + bodyJSON interface{} + credential *usrInfo +} + +type codeCheckingCase struct { + request *testingRequest + code int + postFunc func(*httptest.ResponseRecorder) error +} + +func newRequest(r *testingRequest) (*http.Request, error) { + if r == nil { + return nil, nil + } + + reqBuilder := sling.New() + switch strings.ToUpper(r.method) { + case "", http.MethodGet: + reqBuilder = reqBuilder.Get(r.url) + case http.MethodPost: + reqBuilder = reqBuilder.Post(r.url) + case http.MethodPut: + reqBuilder = reqBuilder.Put(r.url) + case http.MethodDelete: + reqBuilder = reqBuilder.Delete(r.url) + case http.MethodHead: + reqBuilder = reqBuilder.Head(r.url) + case http.MethodPatch: + reqBuilder = reqBuilder.Patch(r.url) + default: + return nil, fmt.Errorf("unsupported method %s", r.method) + } + + for key, values := range r.header { + for _, value := range values { + reqBuilder = reqBuilder.Add(key, value) + } + } + + if r.queryStruct != nil { + reqBuilder = reqBuilder.QueryStruct(r.queryStruct) + } + + if r.bodyJSON != nil { + reqBuilder = reqBuilder.BodyJSON(r.bodyJSON) + } + + if r.credential != nil { + reqBuilder = reqBuilder.SetBasicAuth(r.credential.Name, r.credential.Passwd) + } + + return reqBuilder.Request() +} + +func handle(r *testingRequest) (*httptest.ResponseRecorder, error) { + req, err := newRequest(r) + if err != nil { + return nil, err + } + + resp := httptest.NewRecorder() + beego.BeeApp.Handlers.ServeHTTP(resp, req) + return resp, nil +} + +func handleAndParse(r *testingRequest, v interface{}) (*httptest.ResponseRecorder, error) { + req, err := newRequest(r) + if err != nil { + return nil, err + } + + resp := httptest.NewRecorder() + beego.BeeApp.Handlers.ServeHTTP(resp, req) + + if resp.Code >= 200 && resp.Code <= 299 { + if err := json.NewDecoder(resp.Body).Decode(v); err != nil { + return nil, err + } + } + + return resp, nil +} + +func runCodeCheckingCases(t *testing.T, cases ...*codeCheckingCase) { + for _, c := range cases { + resp, err := handle(c.request) + require.Nil(t, err) + equal := assert.Equal(t, c.code, resp.Code) + if !equal { + if resp.Body.Len() > 0 { + t.Log(resp.Body.String()) + } + continue + } + + if c.postFunc != nil { + if err := c.postFunc(resp); err != nil { + t.Logf("error in running post function: %v", err) + } + } + } +} + +func parseResourceID(resp *httptest.ResponseRecorder) (int64, error) { + location := resp.Header().Get(http.CanonicalHeaderKey("location")) + if len(location) == 0 { + return 0, fmt.Errorf("empty location header") + } + index := strings.LastIndex(location, "/") + if index == -1 { + return 0, fmt.Errorf("location header %s contains no /", location) + } + + id := strings.TrimPrefix(location, location[:index+1]) + if len(id) == 0 { + return 0, fmt.Errorf("location header %s contains no resource ID", location) + } + + return strconv.ParseInt(id, 10, 64) +} + +func TestMain(m *testing.M) { + if err := prepare(); err != nil { + panic(err) + } + defer clean() + + os.Exit(m.Run()) +} + +func prepare() error { + id, err := dao.Register(models.User{ + Username: nonSysAdmin.Name, + Password: nonSysAdmin.Passwd, + }) + if err != nil { + return err + } + nonSysAdminID = id + return nil +} + +func clean() error { + return dao.DeleteUser(int(nonSysAdminID)) +} diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index fa60ec3c9..10a54b096 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -122,7 +122,6 @@ func init() { beego.Router("/api/policies/replication/:id([0-9]+)", &RepPolicyAPI{}) beego.Router("/api/policies/replication", &RepPolicyAPI{}, "get:List") beego.Router("/api/policies/replication", &RepPolicyAPI{}, "post:Post;delete:Delete") - beego.Router("/api/policies/replication/:id([0-9]+)/enablement", &RepPolicyAPI{}, "put:UpdateEnablement") beego.Router("/api/systeminfo", &SystemInfoAPI{}, "get:GetGeneralInfo") beego.Router("/api/systeminfo/volumes", &SystemInfoAPI{}, "get:GetVolumeInfo") beego.Router("/api/systeminfo/getcert", &SystemInfoAPI{}, "get:GetCert") diff --git a/src/ui/api/models/replication_policy.go b/src/ui/api/models/replication_policy.go new file mode 100644 index 000000000..34fa38a7b --- /dev/null +++ b/src/ui/api/models/replication_policy.go @@ -0,0 +1,66 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "time" + + "github.com/astaxie/beego/validation" + common_models "github.com/vmware/harbor/src/common/models" + rep_models "github.com/vmware/harbor/src/replication/models" +) + +// ReplicationPolicy defines the data model used in API level +type ReplicationPolicy struct { + ID int64 `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + Filters []rep_models.FilterItem `json:"filters"` + ReplicateDeletion bool `json:"replicate_deletion"` + Trigger *rep_models.Trigger `json:"trigger"` + Projects []*common_models.Project `json:"projects"` + Targets []*common_models.RepTarget `json:"targets"` + CreationTime time.Time `json:"creation_time"` + UpdateTime time.Time `json:"update_time"` + ReplicateExistingImageNow bool `json:"replicate_existing_image_now"` + ErrorJobCount int64 `json:"error_job_count"` +} + +// Valid ... +func (r *ReplicationPolicy) Valid(v *validation.Validation) { + if len(r.Name) == 0 { + v.SetError("name", "can not be empty") + } + + if len(r.Name) > 256 { + v.SetError("name", "max length is 256") + } + + if len(r.Projects) == 0 { + v.SetError("projects", "can not be empty") + } + + if len(r.Targets) == 0 { + v.SetError("targets", "can not be empty") + } + + for _, filter := range r.Filters { + filter.Valid(v) + } + + if r.Trigger != nil { + r.Trigger.Valid(v) + } +} diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index ebde92340..79b889b8b 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -23,6 +23,10 @@ import ( "github.com/vmware/harbor/src/common/dao" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication/core" + rep_models "github.com/vmware/harbor/src/replication/models" + api_models "github.com/vmware/harbor/src/ui/api/models" + "github.com/vmware/harbor/src/ui/promgr" ) // RepPolicyAPI handles /api/replicationPolicies /api/replicationPolicies/:id/enablement @@ -47,344 +51,144 @@ func (pa *RepPolicyAPI) Prepare() { // Get ... func (pa *RepPolicyAPI) Get() { id := pa.GetIDFromURL() - policy, err := dao.GetRepPolicy(id) + policy, err := core.DefaultController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) } - if policy == nil { + if policy.ID == 0 { pa.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } - pa.Data["json"] = policy + ply, err := convertFromRepPolicy(pa.ProjectMgr, policy) + if err != nil { + pa.ParseAndHandleError(fmt.Sprintf("failed to convert from replication policy"), err) + return + } + + pa.Data["json"] = ply pa.ServeJSON() } -// List filters policies by name and project_id, if name and project_id -// are nil, List returns all policies +// List ... func (pa *RepPolicyAPI) List() { - name := pa.GetString("name") + queryParam := rep_models.QueryParameter{ + Name: pa.GetString("name"), + } projectIDStr := pa.GetString("project_id") - - var projectID int64 - var err error - - if len(projectIDStr) != 0 { - projectID, err = strconv.ParseInt(projectIDStr, 10, 64) + if len(projectIDStr) > 0 { + projectID, err := strconv.ParseInt(projectIDStr, 10, 64) if err != nil || projectID <= 0 { pa.CustomAbort(http.StatusBadRequest, "invalid project ID") } + queryParam.ProjectID = projectID } - policies, err := dao.FilterRepPolicies(name, projectID) + result := []*api_models.ReplicationPolicy{} + + policies, err := core.DefaultController.GetPolicies(queryParam) if err != nil { - log.Errorf("failed to filter policies %s project ID %d: %v", name, projectID, err) + log.Errorf("failed to get policies: %v, query parameters: %v", err, queryParam) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) } for _, policy := range policies { - project, err := pa.ProjectMgr.Get(policy.ProjectID) + ply, err := convertFromRepPolicy(pa.ProjectMgr, policy) if err != nil { - pa.ParseAndHandleError(fmt.Sprintf( - "failed to get project %d", policy.ProjectID), err) + pa.ParseAndHandleError(fmt.Sprintf("failed to convert from replication policy"), err) return } - if project != nil { - policy.ProjectName = project.Name - } + result = append(result, ply) } - pa.Data["json"] = policies + pa.Data["json"] = result pa.ServeJSON() } -// Post creates a policy, and if it is enbled, the replication will be triggered right now. +// Post creates a replicartion policy func (pa *RepPolicyAPI) Post() { - policy := &models.RepPolicy{} + policy := &api_models.ReplicationPolicy{} pa.DecodeJSONReqAndValidate(policy) - /* - po, err := dao.GetRepPolicyByName(policy.Name) + // check the existence of projects + for _, project := range policy.Projects { + exist, err := pa.ProjectMgr.Exists(project.ProjectID) if err != nil { - log.Errorf("failed to get policy %s: %v", policy.Name, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) + pa.ParseAndHandleError(fmt.Sprintf("failed to check the existence of project %d", project.ProjectID), err) + return + } + if !exist { + pa.HandleNotFound(fmt.Sprintf("project %d not found", project.ProjectID)) + return + } + } + + // check the existence of targets + for _, target := range policy.Targets { + t, err := dao.GetRepTarget(target.ID) + if err != nil { + pa.HandleInternalServerError(fmt.Sprintf("failed to get target %d: %v", target.ID, err)) + return } - if po != nil { - pa.CustomAbort(http.StatusConflict, "name is already used") + if t == nil { + pa.HandleNotFound(fmt.Sprintf("target %d not found", target.ID)) + return } - */ + } - project, err := pa.ProjectMgr.Get(policy.ProjectID) + id, err := core.DefaultController.CreatePolicy(convertToRepPolicy(policy)) if err != nil { - pa.ParseAndHandleError(fmt.Sprintf("failed to get project %d", policy.ProjectID), err) + pa.HandleInternalServerError(fmt.Sprintf("failed to create policy: %v", err)) return } - if project == nil { - pa.CustomAbort(http.StatusBadRequest, fmt.Sprintf("project %d does not exist", policy.ProjectID)) - } + // TODO trigger a replication if ReplicateExistingImageNow is true - target, err := dao.GetRepTarget(policy.TargetID) - if err != nil { - log.Errorf("failed to get target %d: %v", policy.TargetID, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if target == nil { - pa.CustomAbort(http.StatusBadRequest, fmt.Sprintf("target %d does not exist", policy.TargetID)) - } - - policies, err := dao.GetRepPolicyByProjectAndTarget(policy.ProjectID, policy.TargetID) - if err != nil { - log.Errorf("failed to get policy [project ID: %d,targetID: %d]: %v", policy.ProjectID, policy.TargetID, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if len(policies) > 0 { - pa.CustomAbort(http.StatusConflict, "policy already exists with the same project and target") - } - - pid, err := dao.AddRepPolicy(*policy) - if err != nil { - log.Errorf("Failed to add policy to DB, error: %v", err) - pa.RenderError(http.StatusInternalServerError, "Internal Error") - return - } - - if policy.Enabled == 1 { - go func() { - if err := TriggerReplication(pid, "", nil, models.RepOpTransfer); err != nil { - log.Errorf("failed to trigger replication of %d: %v", pid, err) - } else { - log.Infof("replication of %d triggered", pid) - } - }() - } - - pa.Redirect(http.StatusCreated, strconv.FormatInt(pid, 10)) + pa.Redirect(http.StatusCreated, strconv.FormatInt(id, 10)) } -// Put modifies name, description, target and enablement of policy +// Put updates the replication policy func (pa *RepPolicyAPI) Put() { id := pa.GetIDFromURL() - originalPolicy, err := dao.GetRepPolicy(id) + + originalPolicy, err := core.DefaultController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) } - if originalPolicy == nil { + if originalPolicy.ID == 0 { pa.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } - policy := &models.RepPolicy{} - pa.DecodeJSONReq(policy) - policy.ProjectID = originalPolicy.ProjectID - pa.Validate(policy) - - /* - // check duplicate name - if policy.Name != originalPolicy.Name { - po, err := dao.GetRepPolicyByName(policy.Name) - if err != nil { - log.Errorf("failed to get policy %s: %v", policy.Name, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if po != nil { - pa.CustomAbort(http.StatusConflict, "name is already used") - } - } - */ - - if policy.TargetID != originalPolicy.TargetID { - //target of policy can not be modified when the policy is enabled - if originalPolicy.Enabled == 1 { - pa.CustomAbort(http.StatusBadRequest, "target of policy can not be modified when the policy is enabled") - } - - // check the existance of target - target, err := dao.GetRepTarget(policy.TargetID) - if err != nil { - log.Errorf("failed to get target %d: %v", policy.TargetID, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if target == nil { - pa.CustomAbort(http.StatusBadRequest, fmt.Sprintf("target %d does not exist", policy.TargetID)) - } - - // check duplicate policy with the same project and target - policies, err := dao.GetRepPolicyByProjectAndTarget(policy.ProjectID, policy.TargetID) - if err != nil { - log.Errorf("failed to get policy [project ID: %d,targetID: %d]: %v", policy.ProjectID, policy.TargetID, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if len(policies) > 0 { - pa.CustomAbort(http.StatusConflict, "policy already exists with the same project and target") - } - } + policy := &api_models.ReplicationPolicy{} + pa.DecodeJSONReqAndValidate(policy) policy.ID = id - /* - isTargetChanged := !(policy.TargetID == originalPolicy.TargetID) - isEnablementChanged := !(policy.Enabled == policy.Enabled) - - var shouldStop, shouldTrigger bool - - // if target and enablement are not changed, do nothing - if !isTargetChanged && !isEnablementChanged { - shouldStop = false - shouldTrigger = false - } else if !isTargetChanged && isEnablementChanged { - // target is not changed, but enablement is changed - if policy.Enabled == 0 { - shouldStop = true - shouldTrigger = false - } else { - shouldStop = false - shouldTrigger = true - } - } else if isTargetChanged && !isEnablementChanged { - // target is changed, but enablement is not changed - if policy.Enabled == 0 { - // enablement is 0, do nothing - shouldStop = false - shouldTrigger = false - } else { - // enablement is 1, so stop original target's jobs - // and trigger new target's jobs - shouldStop = true - shouldTrigger = true - } - } else { - // both target and enablement are changed - - // enablement: 1 -> 0 - if policy.Enabled == 0 { - shouldStop = true - shouldTrigger = false - } else { - shouldStop = false - shouldTrigger = true - } - } - - if shouldStop { - if err := postReplicationAction(id, "stop"); err != nil { - log.Errorf("failed to stop replication of %d: %v", id, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - log.Infof("replication of %d has been stopped", id) - } - - if err = dao.UpdateRepPolicy(policy); err != nil { - log.Errorf("failed to update policy %d: %v", id, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if shouldTrigger { - go func() { - if err := TriggerReplication(id, "", nil, models.RepOpTransfer); err != nil { - log.Errorf("failed to trigger replication of %d: %v", id, err) - } else { - log.Infof("replication of %d triggered", id) - } - }() - } - */ - - if err = dao.UpdateRepPolicy(policy); err != nil { - log.Errorf("failed to update policy %d: %v", id, err) - pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - if policy.Enabled != originalPolicy.Enabled && policy.Enabled == 1 { - go func() { - if err := TriggerReplication(id, "", nil, models.RepOpTransfer); err != nil { - log.Errorf("failed to trigger replication of %d: %v", id, err) - } else { - log.Infof("replication of %d triggered", id) - } - }() + if err = core.DefaultController.UpdatePolicy(convertToRepPolicy(policy)); err != nil { + pa.HandleInternalServerError(fmt.Sprintf("failed to update policy %d: %v", id, err)) + return } } -type enablementReq struct { - Enabled int `json:"enabled"` -} - -// UpdateEnablement changes the enablement of the policy -func (pa *RepPolicyAPI) UpdateEnablement() { +// Delete the replication policy +func (pa *RepPolicyAPI) Delete() { id := pa.GetIDFromURL() - policy, err := dao.GetRepPolicy(id) + + policy, err := core.DefaultController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) } - if policy == nil { + if policy.ID == 0 { pa.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } - e := enablementReq{} - pa.DecodeJSONReq(&e) - if e.Enabled != 0 && e.Enabled != 1 { - pa.RenderError(http.StatusBadRequest, "invalid enabled value") - return - } - - if policy.Enabled == e.Enabled { - return - } - - if err := dao.UpdateRepPolicyEnablement(id, e.Enabled); err != nil { - log.Errorf("Failed to update policy enablement in DB, error: %v", err) - pa.RenderError(http.StatusInternalServerError, "Internal Error") - return - } - - if e.Enabled == 1 { - go func() { - if err := TriggerReplication(id, "", nil, models.RepOpTransfer); err != nil { - log.Errorf("failed to trigger replication of %d: %v", id, err) - } else { - log.Infof("replication of %d triggered", id) - } - }() - } else { - go func() { - if err := postReplicationAction(id, "stop"); err != nil { - log.Errorf("failed to stop replication of %d: %v", id, err) - } else { - log.Infof("try to stop replication of %d", id) - } - }() - } -} - -// Delete : policies which are disabled and have no running jobs -// can be deleted -func (pa *RepPolicyAPI) Delete() { - id := pa.GetIDFromURL() - policy, err := dao.GetRepPolicy(id) - if err != nil { - log.Errorf("failed to get policy %d: %v", id, err) - pa.CustomAbort(http.StatusInternalServerError, "") - } - - if policy == nil || policy.Deleted == 1 { - pa.CustomAbort(http.StatusNotFound, "") - } - - if policy.Enabled == 1 { - pa.CustomAbort(http.StatusPreconditionFailed, "plicy is enabled, can not be deleted") - } - + // TODO jobs, err := dao.GetRepJobByPolicy(id) if err != nil { log.Errorf("failed to get jobs of policy %d: %v", id, err) @@ -399,8 +203,82 @@ func (pa *RepPolicyAPI) Delete() { } } - if err = dao.DeleteRepPolicy(id); err != nil { + if err = core.DefaultController.RemovePolicy(id); err != nil { log.Errorf("failed to delete policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, "") } } + +func convertFromRepPolicy(projectMgr promgr.ProjectManager, policy rep_models.ReplicationPolicy) (*api_models.ReplicationPolicy, error) { + if policy.ID == 0 { + return nil, nil + } + + // populate simple properties + ply := &api_models.ReplicationPolicy{ + ID: policy.ID, + Name: policy.Name, + Description: policy.Description, + Filters: policy.Filters, + ReplicateDeletion: policy.ReplicateDeletion, + Trigger: policy.Trigger, + CreationTime: policy.CreationTime, + UpdateTime: policy.UpdateTime, + } + + // populate projects + for _, projectID := range policy.ProjectIDs { + project, err := projectMgr.Get(projectID) + if err != nil { + return nil, err + } + + ply.Projects = append(ply.Projects, project) + } + + // populate targets + for _, targetID := range policy.TargetIDs { + target, err := dao.GetRepTarget(targetID) + if err != nil { + return nil, err + } + target.Password = "" + ply.Targets = append(ply.Targets, target) + } + + // TODO call the method from replication controller + _, errJobCount, err := dao.FilterRepJobs(policy.ID, "", "error", nil, nil, 0, 0) + if err != nil { + return nil, err + } + ply.ErrorJobCount = errJobCount + + return ply, nil +} + +func convertToRepPolicy(policy *api_models.ReplicationPolicy) rep_models.ReplicationPolicy { + if policy == nil { + return rep_models.ReplicationPolicy{} + } + + ply := rep_models.ReplicationPolicy{ + ID: policy.ID, + Name: policy.Name, + Description: policy.Description, + Filters: policy.Filters, + ReplicateDeletion: policy.ReplicateDeletion, + Trigger: policy.Trigger, + CreationTime: policy.CreationTime, + UpdateTime: policy.UpdateTime, + } + + for _, project := range policy.Projects { + ply.ProjectIDs = append(ply.ProjectIDs, project.ProjectID) + } + + for _, target := range policy.Targets { + ply.TargetIDs = append(ply.TargetIDs, target.ID) + } + + return ply +} diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index f3db26711..aca8b1bc2 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -15,296 +15,498 @@ package api import ( "fmt" - "strconv" + "net/http" + "net/http/httptest" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/tests/apitests/apilib" + rep_models "github.com/vmware/harbor/src/replication/models" + api_models "github.com/vmware/harbor/src/ui/api/models" ) -const ( - addPolicyName = "testPolicy" +var ( + repPolicyAPIBasePath = "/api/policies/replication" + policyName = "testPolicy" + projectID int64 = 1 + targetID int64 + policyID int64 ) -var addPolicyID int +func TestRepPolicyAPIPost(t *testing.T) { + postFunc := func(resp *httptest.ResponseRecorder) error { + id, err := parseResourceID(resp) + if err != nil { + return err + } + policyID = id + return nil + } -func TestPoliciesPost(t *testing.T) { - var httpStatusCode int - var err error - - assert := assert.New(t) - apiTest := newHarborAPI() - - //add target CommonAddTarget() - targetID := int64(CommonGetTarget()) - repPolicy := &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, - &models.RepTrigger{ - Type: replication.TriggerKindSchedule, - Params: map[string]interface{}{ - "date": "2:00", + targetID = int64(CommonGetTarget()) + + cases := []*codeCheckingCase{ + // 401 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, }, + code: http.StatusUnauthorized, }, - []*models.RepFilter{ - &models.RepFilter{ - Type: replication.FilterItemKindRepository, - Value: "library/ubuntu*", + // 403 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + credential: nonSysAdmin, }, - }} - - fmt.Println("Testing Policies Post API") - - //-------------------case 1 : response code = 201------------------------// - fmt.Println("case 1 : response code = 201") - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(201), httpStatusCode, "httpStatusCode should be 201") - } - - //-------------------case 2 : response code = 409------------------------// - fmt.Println("case 2 : response code = 409:policy already exists") - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(409), httpStatusCode, "httpStatusCode should be 409") - } - - //-------------------case 3 : response code = 401------------------------// - fmt.Println("case 3 : response code = 401: User need to log in first.") - httpStatusCode, err = apiTest.AddPolicy(*unknownUsr, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(401), httpStatusCode, "httpStatusCode should be 401") - } - - //-------------------case 4 : response code = 400------------------------// - fmt.Println("case 4 : response code = 400:project_id invalid.") - - repPolicy = &apilib.RepPolicyPost{TargetId: targetID, Name: addPolicyName} - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") - } - - //-------------------case 5 : response code = 400------------------------// - fmt.Println("case 5 : response code = 400:project_id does not exist.") - - repPolicy.ProjectId = int64(1111) - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") - } - - //-------------------case 6 : response code = 400------------------------// - fmt.Println("case 6 : response code = 400:target_id invalid.") - - repPolicy = &apilib.RepPolicyPost{ProjectId: int64(1), Name: addPolicyName} - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") - } - - //-------------------case 7 : response code = 400------------------------// - fmt.Println("case 7 : response code = 400:target_id does not exist.") - - repPolicy.TargetId = int64(1111) - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) - if err != nil { - t.Error("Error while add policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") - } - - fmt.Println("case 8 : response code = 400: invalid filter") - repPolicy = &apilib.RepPolicyPost{int64(1), targetID, addPolicyName, - &models.RepTrigger{ - Type: replication.TriggerKindManually, + code: http.StatusForbidden, }, - []*models.RepFilter{ - &models.RepFilter{ - Type: "replication", - Value: "", + + // 400, invalid name + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{}, + credential: sysAdmin, }, - }} - httpStatusCode, err = apiTest.AddPolicy(*admin, *repPolicy) + code: http.StatusBadRequest, + }, + // 400, invalid projects + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }, + // 400, invalid targets + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }, + // 400, invalid filters + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: "invalid_filter_kind", + Value: "", + }, + }, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }, + // 400, invalid trigger + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: "invalid_trigger_kind", + }, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }, + // 404, project not found + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: 10000, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: replication.TriggerKindManually, + }, + }, + credential: sysAdmin, + }, + code: http.StatusNotFound, + }, + // 404, target not found + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: 10000, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: replication.TriggerKindManually, + }, + }, + credential: sysAdmin, + }, + code: http.StatusNotFound, + }, + // 201 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: repPolicyAPIBasePath, + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: replication.TriggerKindManually, + }, + }, + credential: sysAdmin, + }, + code: http.StatusCreated, + postFunc: postFunc, + }, + } + + runCodeCheckingCases(t, cases...) +} + +func TestRepPolicyAPIGet(t *testing.T) { + // 404 + runCodeCheckingCases(t, &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodGet, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, 10000), + credential: sysAdmin, + }, + code: http.StatusNotFound, + }) + + // 200 + policy := &api_models.ReplicationPolicy{} + resp, err := handleAndParse( + &testingRequest{ + method: http.MethodGet, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, policyID), + credential: sysAdmin, + }, policy) require.Nil(t, err) - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") + assert.Equal(t, http.StatusOK, resp.Code) + assert.Equal(t, policyID, policy.ID) + assert.Equal(t, policyName, policy.Name) } -func TestPoliciesList(t *testing.T) { - var httpStatusCode int - var err error - var reslut []apilib.RepPolicy +func TestRepPolicyAPIList(t *testing.T) { + // 400: invalid project ID + runCodeCheckingCases(t, &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodGet, + url: repPolicyAPIBasePath, + queryStruct: struct { + ProjectID int64 `url:"project_id"` + }{ + ProjectID: -1, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }) - assert := assert.New(t) - apiTest := newHarborAPI() - - fmt.Println("Testing Policies Get/List API") - - //-------------------case 1 : response code = 200------------------------// - fmt.Println("case 1 : response code = 200") - projectID := "1" - httpStatusCode, reslut, err = apiTest.ListPolicies(*admin, addPolicyName, projectID) - if err != nil { - t.Error("Error while get policies", err.Error()) - t.Log(err) - } else { - assert.Equal(int(200), httpStatusCode, "httpStatusCode should be 200") - addPolicyID = int(reslut[0].Id) - } - - //-------------------case 2 : response code = 400------------------------// - fmt.Println("case 2 : response code = 400:invalid projectID") - projectID = "cc" - httpStatusCode, reslut, err = apiTest.ListPolicies(*admin, addPolicyName, projectID) - if err != nil { - t.Error("Error while get policies", err.Error()) - t.Log(err) - } else { - assert.Equal(int(400), httpStatusCode, "httpStatusCode should be 400") - } + // 200 + policies := []*api_models.ReplicationPolicy{} + resp, err := handleAndParse( + &testingRequest{ + method: http.MethodGet, + url: repPolicyAPIBasePath, + queryStruct: struct { + ProjectID int64 `url:"project_id"` + Name string `url:"name"` + }{ + ProjectID: projectID, + Name: policyName, + }, + credential: sysAdmin, + }, &policies) + require.Nil(t, err) + assert.Equal(t, http.StatusOK, resp.Code) + require.Equal(t, 1, len(policies)) + assert.Equal(t, policyID, policies[0].ID) + assert.Equal(t, policyName, policies[0].Name) + // 200 + policies = []*api_models.ReplicationPolicy{} + resp, err = handleAndParse( + &testingRequest{ + method: http.MethodGet, + url: repPolicyAPIBasePath, + queryStruct: struct { + ProjectID int64 `url:"project_id"` + Name string `url:"name"` + }{ + ProjectID: projectID, + Name: "non_exist_policy", + }, + credential: sysAdmin, + }, &policies) + require.Nil(t, err) + assert.Equal(t, http.StatusOK, resp.Code) + require.Equal(t, 0, len(policies)) } -func TestPolicyGet(t *testing.T) { - var httpStatusCode int - var err error - - assert := assert.New(t) - apiTest := newHarborAPI() - - fmt.Println("Testing Policy Get API by PolicyID") - - //-------------------case 1 : response code = 200------------------------// - fmt.Println("case 1 : response code = 200") - - policyID := strconv.Itoa(addPolicyID) - httpStatusCode, err = apiTest.GetPolicyByID(*admin, policyID) - if err != nil { - t.Error("Error while get policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(200), httpStatusCode, "httpStatusCode should be 200") +func TestRepPolicyAPIPut(t *testing.T) { + cases := []*codeCheckingCase{ + // 404 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPut, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, 10000), + credential: sysAdmin, + }, + code: http.StatusNotFound, + }, + // 400, invalid trigger + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPut, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, policyID), + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: "invalid_trigger_kind", + }, + }, + credential: sysAdmin, + }, + code: http.StatusBadRequest, + }, + // 200 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPut, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, policyID), + bodyJSON: &api_models.ReplicationPolicy{ + Name: policyName, + Projects: []*models.Project{ + &models.Project{ + ProjectID: projectID, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: targetID, + }, + }, + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "*", + }, + }, + Trigger: &rep_models.Trigger{ + Kind: replication.TriggerKindImmediately, + }, + }, + credential: sysAdmin, + }, + code: http.StatusOK, + }, } + + runCodeCheckingCases(t, cases...) } -func TestPolicyUpdateInfo(t *testing.T) { - var httpStatusCode int - var err error - - targetID := int64(CommonGetTarget()) - policyInfo := &apilib.RepPolicyUpdate{TargetId: targetID, Name: "testNewName"} - - assert := assert.New(t) - apiTest := newHarborAPI() - - fmt.Println("Testing Policy PUT API to update policyInfo") - - //-------------------case 1 : response code = 200------------------------// - fmt.Println("case 1 : response code = 200") - - policyID := strconv.Itoa(addPolicyID) - httpStatusCode, err = apiTest.PutPolicyInfoByID(*admin, policyID, *policyInfo) - if err != nil { - t.Error("Error while update policyInfo", err.Error()) - t.Log(err) - } else { - assert.Equal(int(200), httpStatusCode, "httpStatusCode should be 200") +func TestRepPolicyAPIDelete(t *testing.T) { + cases := []*codeCheckingCase{ + // 404 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodDelete, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, 10000), + credential: sysAdmin, + }, + code: http.StatusNotFound, + }, + // 200 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodDelete, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, policyID), + credential: sysAdmin, + }, + code: http.StatusOK, + }, } + + runCodeCheckingCases(t, cases...) } -func TestPolicyUpdateEnablement(t *testing.T) { - var httpStatusCode int - var err error - - enablement := &apilib.RepPolicyEnablementReq{int32(0)} - - assert := assert.New(t) - apiTest := newHarborAPI() - - fmt.Println("Testing Policy PUT API to update policy enablement") - - //-------------------case 1 : response code = 200------------------------// - fmt.Println("case 1 : response code = 200") - - policyID := strconv.Itoa(addPolicyID) - httpStatusCode, err = apiTest.PutPolicyEnableByID(*admin, policyID, *enablement) - if err != nil { - t.Error("Error while put policy enablement", err.Error()) - t.Log(err) - } else { - assert.Equal(int(200), httpStatusCode, "httpStatusCode should be 200") - } - //-------------------case 2 : response code = 404------------------------// - fmt.Println("case 2 : response code = 404,Not Found") - - policyID = "111" - httpStatusCode, err = apiTest.PutPolicyEnableByID(*admin, policyID, *enablement) - if err != nil { - t.Error("Error while put policy enablement", err.Error()) - t.Log(err) - } else { - assert.Equal(int(404), httpStatusCode, "httpStatusCode should be 404") +func TestConvertToRepPolicy(t *testing.T) { + cases := []struct { + input *api_models.ReplicationPolicy + expected rep_models.ReplicationPolicy + }{ + { + input: nil, + expected: rep_models.ReplicationPolicy{}, + }, + { + input: &api_models.ReplicationPolicy{ + ID: 1, + Name: "policy", + Description: "description", + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: "filter_kind_01", + Value: "*", + }, + }, + ReplicateDeletion: true, + Trigger: &rep_models.Trigger{ + Kind: "trigger_kind_01", + Param: "{param}", + }, + Projects: []*models.Project{ + &models.Project{ + ProjectID: 1, + }, + }, + Targets: []*models.RepTarget{ + &models.RepTarget{ + ID: 1, + }, + }, + }, + expected: rep_models.ReplicationPolicy{ + ID: 1, + Name: "policy", + Description: "description", + Filters: []rep_models.FilterItem{ + rep_models.FilterItem{ + Kind: "filter_kind_01", + Value: "*", + }, + }, + ReplicateDeletion: true, + Trigger: &rep_models.Trigger{ + Kind: "trigger_kind_01", + Param: "{param}", + }, + ProjectIDs: []int64{1}, + TargetIDs: []int64{1}, + }, + }, } -} - -func TestPolicyDelete(t *testing.T) { - var httpStatusCode int - var err error - - assert := assert.New(t) - apiTest := newHarborAPI() - - fmt.Println("Testing Policy Delete API") - - //-------------------case 1 : response code = 412------------------------// - fmt.Println("case 1 : response code = 412:policy is enabled, can not be deleted") - - CommonPolicyEabled(addPolicyID, 1) - policyID := strconv.Itoa(addPolicyID) - - httpStatusCode, err = apiTest.DeletePolicyByID(*admin, policyID) - if err != nil { - t.Error("Error while delete policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(412), httpStatusCode, "httpStatusCode should be 412") - } - - //-------------------case 2 : response code = 200------------------------// - fmt.Println("case 2 : response code = 200") - - CommonPolicyEabled(addPolicyID, 0) - policyID = strconv.Itoa(addPolicyID) - - httpStatusCode, err = apiTest.DeletePolicyByID(*admin, policyID) - if err != nil { - t.Error("Error while delete policy", err.Error()) - t.Log(err) - } else { - assert.Equal(int(200), httpStatusCode, "httpStatusCode should be 200") - } - - CommonDelTarget() + for _, c := range cases { + assert.EqualValues(t, c.expected, convertToRepPolicy(c.input)) + } } diff --git a/src/ui/router.go b/src/ui/router.go index 0e0298fa6..aaa46f5ae 100644 --- a/src/ui/router.go +++ b/src/ui/router.go @@ -108,7 +108,6 @@ func initRouters() { beego.Router("/api/policies/replication/:id([0-9]+)", &api.RepPolicyAPI{}) beego.Router("/api/policies/replication", &api.RepPolicyAPI{}, "get:List") beego.Router("/api/policies/replication", &api.RepPolicyAPI{}, "post:Post") - beego.Router("/api/policies/replication/:id([0-9]+)/enablement", &api.RepPolicyAPI{}, "put:UpdateEnablement") beego.Router("/api/targets/", &api.TargetAPI{}, "get:List") beego.Router("/api/targets/", &api.TargetAPI{}, "post:Post") beego.Router("/api/targets/:id([0-9]+)", &api.TargetAPI{}) diff --git a/tests/apitests/apilib/rep_policy_post.go b/tests/apitests/apilib/rep_policy_post.go index 365070539..567bab7a4 100644 --- a/tests/apitests/apilib/rep_policy_post.go +++ b/tests/apitests/apilib/rep_policy_post.go @@ -22,10 +22,6 @@ package apilib -import ( - "github.com/vmware/harbor/src/common/models" -) - type RepPolicyPost struct { // The project ID. @@ -36,10 +32,4 @@ type RepPolicyPost struct { // The policy name. Name string `json:"name,omitempty"` - - // Trigger - Trigger *models.RepTrigger `json:"trigger"` - - // Filters - Filters []*models.RepFilter `json:"filters"` } From 59c1160edd90dabf51b71def50c16aff4fd1f5fd Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Mon, 20 Nov 2017 15:47:44 +0800 Subject: [PATCH 12/37] Setup/Unset trigger when CURD policies --- src/replication/core/controller.go | 52 ++++++++++++++-- src/replication/trigger/immediate.go | 2 +- src/replication/trigger/manager.go | 6 +- src/replication/trigger/watch_list.go | 13 ++-- src/ui/api/repository.go | 2 +- src/ui/api/utils.go | 59 ++++++++++++------- .../service/notifications/registry/handler.go | 2 +- 7 files changed, 97 insertions(+), 39 deletions(-) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index eb18f6ada..5135510e7 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -91,22 +91,61 @@ func (ctl *Controller) Init() error { //CreatePolicy is used to create a new policy and enable it if necessary func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, error) { - //Validate policy - // TODO + id, err := ctl.policyManager.CreatePolicy(newPolicy) + if err != nil { + return 0, err + } - return ctl.policyManager.CreatePolicy(newPolicy) + if err = ctl.triggerManager.SetupTrigger(id, *newPolicy.Trigger); err != nil { + return 0, err + } + + return id, nil } //UpdatePolicy will update the policy with new content. //Parameter updatedPolicy must have the ID of the updated policy. func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { // TODO check pre-conditions - return ctl.policyManager.UpdatePolicy(updatedPolicy) + + id := updatedPolicy.ID + originPolicy, err := ctl.policyManager.GetPolicy(id) + if err != nil { + return err + } + + if originPolicy.ID == 0 { + return fmt.Errorf("policy %d not found", id) + } + + if err = ctl.triggerManager.UnsetTrigger(id, *originPolicy.Trigger); err != nil { + return err + } + + if err = ctl.policyManager.UpdatePolicy(updatedPolicy); err != nil { + return err + } + + return ctl.triggerManager.SetupTrigger(id, *updatedPolicy.Trigger) } //RemovePolicy will remove the specified policy and clean the related settings func (ctl *Controller) RemovePolicy(policyID int64) error { // TODO check pre-conditions + + policy, err := ctl.policyManager.GetPolicy(policyID) + if err != nil { + return err + } + + if policy.ID == 0 { + return fmt.Errorf("policy %d not found", policyID) + } + + if err = ctl.triggerManager.UnsetTrigger(policyID, *policy.Trigger); err != nil { + return err + } + return ctl.policyManager.RemovePolicy(policyID) } @@ -122,6 +161,9 @@ func (ctl *Controller) GetPolicies(query models.QueryParameter) ([]models.Replic //Replicate starts one replication defined in the specified policy; //Can be launched by the API layer and related triggers. -func (ctl *Controller) Replicate(policyID int64) error { +func (ctl *Controller) Replicate(policyID int64, item ...*models.FilterItem) error { + + fmt.Printf("replicating %d ...\n", policyID) + return nil } diff --git a/src/replication/trigger/immediate.go b/src/replication/trigger/immediate.go index af4ba3b2b..d73c989b3 100644 --- a/src/replication/trigger/immediate.go +++ b/src/replication/trigger/immediate.go @@ -43,5 +43,5 @@ func (st *ImmediateTrigger) Setup() error { //Unset is the implementation of same method defined in Trigger interface func (st *ImmediateTrigger) Unset() error { - return errors.New("Not implemented") + return DefaultWatchList.Remove(st.params.PolicyID) } diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go index 636fd8632..ac1e08628 100644 --- a/src/replication/trigger/manager.go +++ b/src/replication/trigger/manager.go @@ -12,17 +12,18 @@ import ( //with json format. type Manager struct { //Cache for triggers - cache *Cache + //cache *Cache } //NewManager is the constructor of trigger manager. //capacity is the max number of trigger references manager can keep in memory func NewManager(capacity int) *Manager { return &Manager{ - cache: NewCache(capacity), + //cache: NewCache(capacity), } } +/* //GetTrigger returns the enabled trigger reference if existing in the cache. func (m *Manager) GetTrigger(policyID int64) Interface { return m.cache.Get(policyID) @@ -47,6 +48,7 @@ func (m *Manager) RemoveTrigger(policyID int64) error { return nil } +*/ //SetupTrigger will create the new trigger based on the provided json parameters. //If failed, an error will be returned. diff --git a/src/replication/trigger/watch_list.go b/src/replication/trigger/watch_list.go index ca6e44cee..76b3eb8bd 100644 --- a/src/replication/trigger/watch_list.go +++ b/src/replication/trigger/watch_list.go @@ -28,16 +28,11 @@ func (wl *WatchList) Add(item WatchItem) error { } //Remove the specified watch item from list -func (wl *WatchList) Remove() WatchItem { - return WatchItem{} -} - -//Update the watch item in the list -func (wl *WatchList) Update(updatedItem WatchItem) error { +func (wl *WatchList) Remove(policyID int64) error { return nil } -//Get the specified watch item -func (wl *WatchList) Get(namespace string) WatchItem { - return WatchItem{} +//Get the watch items according to the namespace and operation +func (wl *WatchList) Get(namespace, operation string) ([]WatchItem, error) { + return []WatchItem{}, nil } diff --git a/src/ui/api/repository.go b/src/ui/api/repository.go index 7d01cd45e..958a6f5ef 100644 --- a/src/ui/api/repository.go +++ b/src/ui/api/repository.go @@ -255,7 +255,7 @@ func (ra *RepositoryAPI) Delete() { } log.Infof("delete tag: %s:%s", repoName, t) - go TriggerReplicationByRepository(project.ProjectID, repoName, []string{t}, models.RepOpDelete) + go CheckAndTriggerReplication(repoName+":"+t, "delete") go func(tag string) { if err := dao.AddAccessLog(models.AccessLog{ diff --git a/src/ui/api/utils.go b/src/ui/api/utils.go index a0bb4fb39..b66990155 100644 --- a/src/ui/api/utils.go +++ b/src/ui/api/utils.go @@ -32,6 +32,10 @@ import ( "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/common/utils/registry" "github.com/vmware/harbor/src/common/utils/registry/auth" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/core" + rep_models "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/trigger" "github.com/vmware/harbor/src/ui/config" "github.com/vmware/harbor/src/ui/promgr" "github.com/vmware/harbor/src/ui/service/token" @@ -77,7 +81,41 @@ func checkUserExists(name string) int { return 0 } +// CheckAndTriggerReplication checks whether replication policy is set +// on the resource, if is, trigger the replication +func CheckAndTriggerReplication(image, operation string) { + project, _ := utils.ParseRepository(image) + watchItems, err := trigger.DefaultWatchList.Get(project, operation) + if err != nil { + log.Errorf("failed to get watch list for resource %s, operation %s: %v", image, operation, err) + return + } + if len(watchItems) == 0 { + log.Debugf("no replication should be triggered for resource %s, operation %s, skip", image, operation) + return + } + + for _, watchItem := range watchItems { + // TODO define a new type ReplicationItem to wrap FilterItem and operation. + // Maybe change the FilterItem to interface and define a type Resource to + // implement FilterItem is better? + item := &rep_models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: image, + Metadata: map[string]interface{}{ + "operation": operation, + }, + } + if err := core.DefaultController.Replicate(watchItem.PolicyID, item); err != nil { + log.Errorf("failed to trigger replication for resource: %s, operation: %s: %v", image, operation, err) + return + } + log.Infof("replication for resource: %s, operation: %s triggered", image, operation) + } +} + // TriggerReplication triggers the replication according to the policy +// TODO remove func TriggerReplication(policyID int64, repository string, tags []string, operation string) error { data := struct { @@ -101,26 +139,7 @@ func TriggerReplication(policyID int64, repository string, return uiutils.RequestAsUI("POST", url, bytes.NewBuffer(b), uiutils.NewStatusRespHandler(http.StatusOK)) } -// TriggerReplicationByRepository triggers the replication according to the repository -func TriggerReplicationByRepository(projectID int64, repository string, tags []string, operation string) { - policies, err := dao.GetRepPolicyByProject(projectID) - if err != nil { - log.Errorf("failed to get policies for repository %s: %v", repository, err) - return - } - - for _, policy := range policies { - if policy.Enabled == 0 { - continue - } - if err := TriggerReplication(policy.ID, repository, tags, operation); err != nil { - log.Errorf("failed to trigger replication of policy %d for %s: %v", policy.ID, repository, err) - } else { - log.Infof("replication of policy %d for %s triggered", policy.ID, repository) - } - } -} - +// TODO remove func postReplicationAction(policyID int64, acton string) error { data := struct { PolicyID int64 `json:"policy_id"` diff --git a/src/ui/service/notifications/registry/handler.go b/src/ui/service/notifications/registry/handler.go index 4e532242c..6cfc2433d 100644 --- a/src/ui/service/notifications/registry/handler.go +++ b/src/ui/service/notifications/registry/handler.go @@ -104,7 +104,7 @@ func (n *NotificationHandler) Post() { } }() - go api.TriggerReplicationByRepository(pro.ProjectID, repository, []string{tag}, models.RepOpTransfer) + go api.CheckAndTriggerReplication(repository+":"+tag, "push") if autoScanEnabled(pro) { last, err := clairdao.GetLastUpdate() From 1c338ed30becdb3b4b427d8fc28baf39d5a0b58e Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 23 Nov 2017 13:47:56 +0800 Subject: [PATCH 13/37] Add replication manual trigger API & update replication/policy API docs --- docs/swagger.yaml | 165 ++++++++----------------------- src/ui/api/harborapi_test.go | 1 + src/ui/api/models/replication.go | 31 ++++++ src/ui/api/replication.go | 63 ++++++++++++ src/ui/api/replication_test.go | 92 +++++++++++++++++ src/ui/router.go | 1 + 6 files changed, 229 insertions(+), 124 deletions(-) create mode 100644 src/ui/api/models/replication.go create mode 100644 src/ui/api/replication.go create mode 100644 src/ui/api/replication_test.go diff --git a/docs/swagger.yaml b/docs/swagger.yaml index c6de6a1c1..9120fc964 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1484,7 +1484,7 @@ paths: description: Create new policy. required: true schema: - $ref: '#/definitions/RepPolicyPost' + $ref: '#/definitions/RepPolicy' tags: - Products responses: @@ -1539,10 +1539,10 @@ paths: description: policy ID - name: policyupdate in: body - description: 'Update policy name, description, target and enablement.' + description: 'Updated properties of the replication policy.' required: true schema: - $ref: '#/definitions/RepPolicyUpdate' + $ref: '#/definitions/RepPolicy' tags: - Products responses: @@ -1560,35 +1560,27 @@ paths: project and target. '500': description: Unexpected internal errors. - /policies/replication/{id}/enablement: - put: - summary: Put modifies enablement of the policy. + /replications: + post: + summary: Trigger the replication according to the specified policy. description: | - This endpoint let user update policy enablement flag. + This endpoint is used to trigger a replication. parameters: - - name: id - in: path - type: integer - format: int64 - required: true - description: policy ID - - name: enabledflag + - name: policy ID in: body - description: The policy enablement flag. + description: The ID of replication policy. required: true schema: - $ref: '#/definitions/RepPolicyEnablementReq' + $ref: '#/definitions/Replication' tags: - Products responses: '200': - description: Update job policy enablement successfully. - '400': - description: Invalid enabled value. + description: Trigger the replication successfully. '401': description: User need to log in first. '404': - description: The specific repository ID's policy does not exist. + description: The policy does not exist. '500': description: Unexpected internal errors. /targets: @@ -2376,27 +2368,22 @@ definitions: type: integer format: int64 description: The policy ID. - project_id: - type: integer - format: int64 - description: The project ID. - project_name: - type: string - description: The project name. - target_id: - type: integer - format: int64 - description: The target ID. name: type: string description: The policy name. - enabled: - type: integer - format: int - description: The policy's enabled status. description: type: string description: The description of the policy. + projects: + type: object + description: The project list that the policy applys to. + items: + $ref: '#/definitions/Project' + targets: + type: object + description: The target list. + items: + $ref: '#/definitions/RepTarget' trigger: type: object description: The trigger for schedule job. @@ -2408,14 +2395,11 @@ definitions: items: $ref: '#/definitions/RepFilter' replicate_existing_image_now: - type: string + type: boolean description: Whether to replicate the existing images now. replicate_deletion: - type: string + type: boolean description: Whether to replicate the deletion operation. - start_time: - type: string - description: The start time of the policy. creation_time: type: string description: The create time of the policy. @@ -2425,100 +2409,27 @@ definitions: error_job_count: format: int description: The error job count number for the policy. - deleted: - type: integer - RepPolicyPost: - type: object - properties: - project_id: - type: integer - format: int64 - description: The project ID. - target_id: - type: integer - format: int64 - description: The target ID. - name: - type: string - description: The policy name. - trigger: - type: object - description: The trigger for schedule job. - items: - $ref: '#/definitions/RepTrigger' - filters: - type: array - description: The replication policy filter array. - items: - $ref: '#/definitions/RepFilter' - replicate_existing_image_now: - type: string - description: Whether to replicate the existing images now. - replicate_deletion: - type: string - description: Whether replication deletion operation. - enabled: - type: integer - format: int - description: '1-enable, 0-disable' - RepPolicyUpdate: - type: object - properties: - target_id: - type: integer - format: int64 - description: The target ID. - name: - type: string - description: The policy name. - enabled: - type: integer - format: int - description: The policy's enabled status. - description: - type: string - description: The description of the policy. - trigger: - type: object - description: The trigger for schedule job. - items: - $ref: '#/definitions/RepTrigger' - filters: - type: array - description: The replication policy filter array. - items: - $ref: '#/definitions/RepFilter' - replicate_existing_image_now: - type: string - description: Whether to replicate the existing images now. - replicate_deletion: - type: string - description: Whether replication deletion operation. RepTrigger: type: object properties: - type: + kind: type: string - description: The replication policy trigger type. - params: - type: object - description: The map is the replication policy trigger parameters. + description: The replication policy trigger kind. + param: + type: string + description: The replication policy trigger parameters. RepFilter: type: object properties: - type: + kind: type: string - description: The replication policy filter type. + description: The replication policy filter kind. value: type: string description: The replication policy filter value. - RepPolicyEnablementReq: - type: object - properties: - enabled: - type: integer - format: int - description: The policy enablement flag. + metadata: + type: object + description: This map object is the replication policy filter metadata. RepTarget: type: object properties: @@ -3001,6 +2912,12 @@ definitions: type: integer description: The offest in seconds of UTC 0 o'clock, only valid when the policy type is "daily" description: The parameters of the policy, the values are dependant on the type of the policy. - + Replication: + type: object + properties: + policy_id: + type: integer + description: The ID of replication policy + diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index 10a54b096..a62e11816 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -129,6 +129,7 @@ func init() { beego.Router("/api/configurations", &ConfigAPI{}) beego.Router("/api/configurations/reset", &ConfigAPI{}, "post:Reset") beego.Router("/api/email/ping", &EmailAPI{}, "post:Ping") + beego.Router("/api/replications", &ReplicationAPI{}) _ = updateInitPassword(1, "Harbor12345") diff --git a/src/ui/api/models/replication.go b/src/ui/api/models/replication.go new file mode 100644 index 000000000..c19584ea2 --- /dev/null +++ b/src/ui/api/models/replication.go @@ -0,0 +1,31 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "github.com/astaxie/beego/validation" +) + +// Replication defines the properties of model used in replication API +type Replication struct { + PolicyID int64 `json:"policy_id"` +} + +// Valid ... +func (r *Replication) Valid(v *validation.Validation) { + if r.PolicyID <= 0 { + v.SetError("policy_id", "invalid value") + } +} diff --git a/src/ui/api/replication.go b/src/ui/api/replication.go new file mode 100644 index 000000000..49e1b80dc --- /dev/null +++ b/src/ui/api/replication.go @@ -0,0 +1,63 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package api + +import ( + "fmt" + + "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/ui/api/models" +) + +// ReplicationAPI handles API calls for replication +type ReplicationAPI struct { + BaseController +} + +// Prepare does authentication and authorization works +func (r *ReplicationAPI) Prepare() { + r.BaseController.Prepare() + if !r.SecurityCtx.IsAuthenticated() { + r.HandleUnauthorized() + return + } + + if !r.SecurityCtx.IsSysAdmin() { + r.HandleForbidden(r.SecurityCtx.GetUsername()) + return + } +} + +// Post trigger a replication according to the specified policy +func (r *ReplicationAPI) Post() { + replication := &models.Replication{} + r.DecodeJSONReqAndValidate(replication) + + policy, err := core.DefaultController.GetPolicy(replication.PolicyID) + if err != nil { + r.HandleInternalServerError(fmt.Sprintf("failed to get replication policy %d: %v", replication.PolicyID, err)) + return + } + + if policy.ID == 0 { + r.HandleNotFound(fmt.Sprintf("replication policy %d not found", replication.PolicyID)) + return + } + + if err = core.DefaultController.Replicate(replication.PolicyID); err != nil { + r.HandleInternalServerError(fmt.Sprintf("failed to trigger the replication policy %d: %v", replication.PolicyID, err)) + return + } +} diff --git a/src/ui/api/replication_test.go b/src/ui/api/replication_test.go new file mode 100644 index 000000000..ce9330f44 --- /dev/null +++ b/src/ui/api/replication_test.go @@ -0,0 +1,92 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package api + +import ( + "fmt" + "net/http" + "testing" + + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/replication" + api_models "github.com/vmware/harbor/src/ui/api/models" +) + +const ( + replicationAPIBaseURL = "/api/replications" +) + +func TestReplicationAPIPost(t *testing.T) { + targetID, err := dao.AddRepTarget( + models.RepTarget{ + Name: "test_replication_target", + URL: "127.0.0.1", + Username: "username", + Password: "password", + }) + require.Nil(t, err) + defer dao.DeleteRepTarget(targetID) + + policyID, err := dao.AddRepPolicy( + models.RepPolicy{ + Name: "test_replication_policy", + ProjectID: 1, + TargetID: targetID, + Trigger: fmt.Sprintf("{\"kind\":\"%s\"}", replication.TriggerKindManual), + }) + require.Nil(t, err) + defer dao.DeleteRepPolicy(policyID) + + cases := []*codeCheckingCase{ + // 401 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: replicationAPIBaseURL, + bodyJSON: &api_models.Replication{ + PolicyID: policyID, + }, + }, + code: http.StatusUnauthorized, + }, + // 404 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: replicationAPIBaseURL, + bodyJSON: &api_models.Replication{ + PolicyID: 10000, + }, + credential: admin, + }, + code: http.StatusNotFound, + }, + // 200 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodPost, + url: replicationAPIBaseURL, + bodyJSON: &api_models.Replication{ + PolicyID: policyID, + }, + credential: admin, + }, + code: http.StatusOK, + }, + } + + runCodeCheckingCases(t, cases...) +} diff --git a/src/ui/router.go b/src/ui/router.go index aaa46f5ae..fc243afcf 100644 --- a/src/ui/router.go +++ b/src/ui/router.go @@ -118,6 +118,7 @@ func initRouters() { beego.Router("/api/configurations", &api.ConfigAPI{}) beego.Router("/api/configurations/reset", &api.ConfigAPI{}, "post:Reset") beego.Router("/api/statistics", &api.StatisticAPI{}) + beego.Router("/api/replications", &api.ReplicationAPI{}) beego.Router("/api/systeminfo", &api.SystemInfoAPI{}, "get:GetGeneralInfo") beego.Router("/api/systeminfo/volumes", &api.SystemInfoAPI{}, "get:GetVolumeInfo") From 6b0ee138e50852aa86dee919eb8031fde0794dda Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 21 Nov 2017 13:08:09 +0800 Subject: [PATCH 14/37] Implement immediate trigger and the methods of WatchList --- make/common/db/registry.sql | 11 +++ make/common/db/registry_sqlite.sql | 10 ++ src/common/dao/watch_item.go | 62 ++++++++++++ src/common/dao/watch_item_test.go | 71 ++++++++++++++ src/common/models/base.go | 3 +- src/common/models/watch_item.go | 35 +++++++ src/replication/consts.go | 14 +-- src/replication/core/controller.go | 35 +++++-- src/replication/models/policy.go | 1 + src/replication/models/trigger.go | 4 +- src/replication/trigger/immediate.go | 25 +++-- src/replication/trigger/manager.go | 32 +++--- src/replication/trigger/param_immediate.go | 10 +- src/replication/trigger/watch_list.go | 33 ++++++- src/replication/trigger/watch_list_test.go | 108 +++++++++++++++++++++ src/ui/api/replication_policy.go | 34 ++++++- src/ui/api/replication_policy_test.go | 10 +- tools/migration/changelog.md | 1 + 18 files changed, 435 insertions(+), 64 deletions(-) create mode 100644 src/common/dao/watch_item.go create mode 100644 src/common/dao/watch_item_test.go create mode 100644 src/common/models/watch_item.go create mode 100644 src/replication/trigger/watch_list_test.go diff --git a/make/common/db/registry.sql b/make/common/db/registry.sql index 994b108d7..37d3e1072 100644 --- a/make/common/db/registry.sql +++ b/make/common/db/registry.sql @@ -184,6 +184,17 @@ create table replication_job ( INDEX policy (policy_id), INDEX poid_uptime (policy_id, update_time) ); + +create table replication_immediate_trigger ( + id int NOT NULL AUTO_INCREMENT, + policy_id int NOT NULL, + namespace varchar(256) NOT NULL, + on_push tinyint(1) NOT NULL DEFAULT 0, + on_deletion tinyint(1) NOT NULL DEFAULT 0, + creation_time timestamp default CURRENT_TIMESTAMP, + update_time timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (id) + ); create table img_scan_job ( id int NOT NULL AUTO_INCREMENT, diff --git a/make/common/db/registry_sqlite.sql b/make/common/db/registry_sqlite.sql index 2528a845d..efe0f09fd 100644 --- a/make/common/db/registry_sqlite.sql +++ b/make/common/db/registry_sqlite.sql @@ -176,6 +176,16 @@ create table replication_job ( update_time timestamp default CURRENT_TIMESTAMP ); +create table replication_immediate_trigger ( + id INTEGER PRIMARY KEY, + policy_id int NOT NULL, + namespace varchar(256) NOT NULL, + on_push tinyint(1) NOT NULL DEFAULT 0, + on_deletion tinyint(1) NOT NULL DEFAULT 0, + creation_time timestamp default CURRENT_TIMESTAMP, + update_time timestamp default CURRENT_TIMESTAMP + ); + create table img_scan_job ( id INTEGER PRIMARY KEY, diff --git a/src/common/dao/watch_item.go b/src/common/dao/watch_item.go new file mode 100644 index 000000000..dd16ae66b --- /dev/null +++ b/src/common/dao/watch_item.go @@ -0,0 +1,62 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package dao + +import ( + "time" + + "github.com/vmware/harbor/src/common/models" +) + +// DefaultDatabaseWatchItemDAO is an instance of DatabaseWatchItemDAO +var DefaultDatabaseWatchItemDAO WatchItemDAO = &DatabaseWatchItemDAO{} + +// WatchItemDAO defines operations about WatchItem +type WatchItemDAO interface { + Add(*models.WatchItem) (int64, error) + DeleteByPolicyID(int64) error + Get(namespace, operation string) ([]models.WatchItem, error) +} + +// DatabaseWatchItemDAO implements interface WatchItemDAO for database +type DatabaseWatchItemDAO struct{} + +// Add a WatchItem +func (d *DatabaseWatchItemDAO) Add(item *models.WatchItem) (int64, error) { + now := time.Now() + item.CreationTime = now + item.UpdateTime = now + return GetOrmer().Insert(item) +} + +// DeleteByPolicyID deletes the WatchItem specified by policy ID +func (d *DatabaseWatchItemDAO) DeleteByPolicyID(policyID int64) error { + _, err := GetOrmer().QueryTable(&models.WatchItem{}).Filter("PolicyID", policyID).Delete() + return err +} + +// Get returns WatchItem list according to the namespace and operation +func (d *DatabaseWatchItemDAO) Get(namespace, operation string) ([]models.WatchItem, error) { + qs := GetOrmer().QueryTable(&models.WatchItem{}).Filter("Namespace", namespace) + if operation == "push" { + qs = qs.Filter("OnPush", 1) + } else if operation == "delete" { + qs = qs.Filter("OnDeletion", 1) + } + + items := []models.WatchItem{} + _, err := qs.All(&items) + return items, err +} diff --git a/src/common/dao/watch_item_test.go b/src/common/dao/watch_item_test.go new file mode 100644 index 000000000..b5b9b1b84 --- /dev/null +++ b/src/common/dao/watch_item_test.go @@ -0,0 +1,71 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package dao + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/models" +) + +func TestMethodsOfWatchItem(t *testing.T) { + targetID, err := AddRepTarget(models.RepTarget{ + Name: "test_target_for_watch_item", + URL: "http://127.0.0.1", + }) + require.Nil(t, err) + defer DeleteRepTarget(targetID) + + policyID, err := AddRepPolicy(models.RepPolicy{ + Name: "test_policy_for_watch_item", + ProjectID: 1, + TargetID: targetID, + }) + require.Nil(t, err) + defer DeleteRepPolicy(policyID) + + item := &models.WatchItem{ + PolicyID: policyID, + Namespace: "library", + OnPush: false, + OnDeletion: true, + } + + // test Add + id, err := DefaultDatabaseWatchItemDAO.Add(item) + require.Nil(t, err) + + // test Get: operation-push + items, err := DefaultDatabaseWatchItemDAO.Get("library", "push") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) + + // test Get: operation-delete + items, err = DefaultDatabaseWatchItemDAO.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 1, len(items)) + assert.Equal(t, id, items[0].ID) + assert.Equal(t, "library", items[0].Namespace) + assert.True(t, items[0].OnDeletion) + + // test DeleteByPolicyID + err = DefaultDatabaseWatchItemDAO.DeleteByPolicyID(policyID) + require.Nil(t, err) + items, err = DefaultDatabaseWatchItemDAO.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) +} diff --git a/src/common/models/base.go b/src/common/models/base.go index f3cbfb935..202e24961 100644 --- a/src/common/models/base.go +++ b/src/common/models/base.go @@ -29,5 +29,6 @@ func init() { new(ScanJob), new(RepoRecord), new(ImgScanOverview), - new(ClairVulnTimestamp)) + new(ClairVulnTimestamp), + new(WatchItem)) } diff --git a/src/common/models/watch_item.go b/src/common/models/watch_item.go new file mode 100644 index 000000000..75f22dcbe --- /dev/null +++ b/src/common/models/watch_item.go @@ -0,0 +1,35 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "time" +) + +// WatchItem ... +type WatchItem struct { + ID int64 `orm:"pk;auto;column(id)" json:"id"` + PolicyID int64 `orm:"column(policy_id)" json:"policy_id"` + Namespace string `orm:"column(namespace)" json:"namespace"` + OnDeletion bool `orm:"column(on_deletion)" json:"on_deletion"` + OnPush bool `orm:"column(on_push)" json:"on_push"` + CreationTime time.Time `orm:"column(creation_time)" json:"creation_time"` + UpdateTime time.Time `orm:"column(update_time)" json:"update_time"` +} + +//TableName ... +func (w *WatchItem) TableName() string { + return "replication_immediate_trigger" +} diff --git a/src/replication/consts.go b/src/replication/consts.go index 64800b994..b9a8a36a7 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -8,22 +8,16 @@ const ( //FilterItemKindTag : Kind of filter item is 'tag' FilterItemKindTag = "tag" - //TODO: Refactor constants - - //TriggerKindManually : kind of trigger is 'manully' - TriggerKindManually = "manually" - //TriggerKindImmediately : kind of trigger is 'immediately' - TriggerKindImmediately = "immediately" - //AdaptorKindHarbor : Kind of adaptor of Harbor AdaptorKindHarbor = "Harbor" //TriggerKindImmediate : Kind of trigger is 'Immediate' - TriggerKindImmediate = "Immediate" + TriggerKindImmediate = "immediate" //TriggerKindSchedule : Kind of trigger is 'Schedule' - TriggerKindSchedule = "Schedule" + TriggerKindSchedule = "schedule" //TriggerKindManual : Kind of trigger is 'Manual' - TriggerKindManual = "Manual" + TriggerKindManual = "manual" + //TriggerScheduleDaily : type of scheduling is 'daily' TriggerScheduleDaily = "daily" //TriggerScheduleWeekly : type of scheduling is 'weekly' diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 5135510e7..ad2cf67ee 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -55,7 +55,6 @@ func (ctl *Controller) Init() error { //Build query parameters triggerNames := []string{ - replication.TriggerKindImmediate, replication.TriggerKindSchedule, } queryName := "" @@ -73,7 +72,7 @@ func (ctl *Controller) Init() error { } if policies != nil && len(policies) > 0 { for _, policy := range policies { - if err := ctl.triggerManager.SetupTrigger(policy.ID, *policy.Trigger); err != nil { + if err := ctl.triggerManager.SetupTrigger(&policy); err != nil { //TODO: Log error fmt.Printf("Error: %s", err) //TODO:Update the status of policy @@ -96,7 +95,8 @@ func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, return 0, err } - if err = ctl.triggerManager.SetupTrigger(id, *newPolicy.Trigger); err != nil { + newPolicy.ID = id + if err = ctl.triggerManager.SetupTrigger(&newPolicy); err != nil { return 0, err } @@ -118,15 +118,34 @@ func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) erro return fmt.Errorf("policy %d not found", id) } - if err = ctl.triggerManager.UnsetTrigger(id, *originPolicy.Trigger); err != nil { - return err + reset := false + if updatedPolicy.Trigger.Kind != originPolicy.Trigger.Kind { + reset = true + } else { + switch updatedPolicy.Trigger.Kind { + case replication.TriggerKindSchedule: + if updatedPolicy.Trigger.Param != originPolicy.Trigger.Param { + reset = true + } + case replication.TriggerKindImmediate: + // Always reset immediate trigger as it is relevent with namespaces + reset = true + default: + // manual trigger, no need to reset + } } - if err = ctl.policyManager.UpdatePolicy(updatedPolicy); err != nil { - return err + if reset { + if err = ctl.triggerManager.UnsetTrigger(id, *originPolicy.Trigger); err != nil { + return err + } + if err = ctl.policyManager.UpdatePolicy(updatedPolicy); err != nil { + return err + } + return ctl.triggerManager.SetupTrigger(&updatedPolicy) } - return ctl.triggerManager.SetupTrigger(id, *updatedPolicy.Trigger) + return ctl.policyManager.UpdatePolicy(updatedPolicy) } //RemovePolicy will remove the specified policy and clean the related settings diff --git a/src/replication/models/policy.go b/src/replication/models/policy.go index faa0295b1..27c157a64 100644 --- a/src/replication/models/policy.go +++ b/src/replication/models/policy.go @@ -14,6 +14,7 @@ type ReplicationPolicy struct { Trigger *Trigger //The trigger of the replication ProjectIDs []int64 //Projects attached to this policy TargetIDs []int64 + Namespaces []string // The namespaces are used to set immediate trigger CreationTime time.Time UpdateTime time.Time } diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go index 4477f6363..fa62166cb 100644 --- a/src/replication/models/trigger.go +++ b/src/replication/models/trigger.go @@ -18,8 +18,8 @@ type Trigger struct { // Valid ... func (t *Trigger) Valid(v *validation.Validation) { - if !(t.Kind == replication.TriggerKindImmediately || - t.Kind == replication.TriggerKindManually || + if !(t.Kind == replication.TriggerKindImmediate || + t.Kind == replication.TriggerKindManual || t.Kind == replication.TriggerKindSchedule) { v.SetError("kind", fmt.Sprintf("invalid trigger kind: %s", t.Kind)) } diff --git a/src/replication/trigger/immediate.go b/src/replication/trigger/immediate.go index d73c989b3..f10753a95 100644 --- a/src/replication/trigger/immediate.go +++ b/src/replication/trigger/immediate.go @@ -1,8 +1,6 @@ package trigger import ( - "errors" - "github.com/vmware/harbor/src/replication" ) @@ -26,19 +24,20 @@ func (st *ImmediateTrigger) Kind() string { //Setup is the implementation of same method defined in Trigger interface func (st *ImmediateTrigger) Setup() error { - if st.params.PolicyID <= 0 || len(st.params.Namespace) == 0 { - return errors.New("Invalid parameters for Immediate trigger") - } - //TODO: Need more complicated logic here to handle partial updates - wt := WatchItem{ - PolicyID: st.params.PolicyID, - Namespace: st.params.Namespace, - OnDeletion: st.params.OnDeletion, - OnPush: true, - } + for _, namespace := range st.params.Namespaces { + wt := WatchItem{ + PolicyID: st.params.PolicyID, + Namespace: namespace, + OnDeletion: st.params.OnDeletion, + OnPush: true, + } - return DefaultWatchList.Add(wt) + if err := DefaultWatchList.Add(wt); err != nil { + return err + } + } + return nil } //Unset is the implementation of same method defined in Trigger interface diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go index ac1e08628..83969855c 100644 --- a/src/replication/trigger/manager.go +++ b/src/replication/trigger/manager.go @@ -2,7 +2,9 @@ package trigger import ( "errors" + "fmt" + "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" ) @@ -50,25 +52,24 @@ func (m *Manager) RemoveTrigger(policyID int64) error { } */ -//SetupTrigger will create the new trigger based on the provided json parameters. +//SetupTrigger will create the new trigger based on the provided policy. //If failed, an error will be returned. -func (m *Manager) SetupTrigger(policyID int64, trigger models.Trigger) error { - if policyID <= 0 { - return errors.New("Invalid policy ID") - } - - if len(trigger.Kind) == 0 { - return errors.New("Invalid replication trigger definition") +func (m *Manager) SetupTrigger(policy *models.ReplicationPolicy) error { + if policy == nil || policy.Trigger == nil { + log.Debug("empty policy or trigger, skip trigger setup") + return nil } + trigger := policy.Trigger switch trigger.Kind { case replication.TriggerKindSchedule: param := ScheduleParam{} if err := param.Parse(trigger.Param); err != nil { return err } - //Append policy ID info - param.PolicyID = policyID + //Append policy ID and whether replicate deletion + param.PolicyID = policy.ID + param.OnDeletion = policy.ReplicateDeletion newTrigger := NewScheduleTrigger(param) if err := newTrigger.Setup(); err != nil { @@ -79,16 +80,19 @@ func (m *Manager) SetupTrigger(policyID int64, trigger models.Trigger) error { if err := param.Parse(trigger.Param); err != nil { return err } - //Append policy ID info - param.PolicyID = policyID + //Append policy ID and whether replicate deletion + param.PolicyID = policy.ID + param.OnDeletion = policy.ReplicateDeletion + param.Namespaces = policy.Namespaces newTrigger := NewImmediateTrigger(param) if err := newTrigger.Setup(); err != nil { return err } + case replication.TriggerKindManual: + // do nothing default: - //Treat as manual trigger - break + return fmt.Errorf("invalid trigger type: %s", policy.Trigger.Kind) } return nil diff --git a/src/replication/trigger/param_immediate.go b/src/replication/trigger/param_immediate.go index 492c65872..bb9b248a5 100644 --- a/src/replication/trigger/param_immediate.go +++ b/src/replication/trigger/param_immediate.go @@ -1,9 +1,5 @@ package trigger -import ( - "errors" -) - //NOTES: Whether replicate the existing images when the type of trigger is //'Immediate' is a once-effective setting which will not be persisted // and kept as one parameter of 'Immediate' trigger. It will only be @@ -14,13 +10,13 @@ type ImmediateParam struct { //Basic parameters BasicParam - //Namepace - Namespace string + //Namepaces + Namespaces []string } //Parse is the implementation of same method in TriggerParam interface //NOTES: No need to implement this method for 'Immediate' trigger as //it does not have any parameters with json format. func (ip ImmediateParam) Parse(param string) error { - return errors.New("Should NOT be called as it's not implemented") + return nil } diff --git a/src/replication/trigger/watch_list.go b/src/replication/trigger/watch_list.go index 76b3eb8bd..95f902179 100644 --- a/src/replication/trigger/watch_list.go +++ b/src/replication/trigger/watch_list.go @@ -1,5 +1,10 @@ package trigger +import ( + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/models" +) + //DefaultWatchList is the default instance of WatchList var DefaultWatchList = &WatchList{} @@ -24,15 +29,37 @@ type WatchItem struct { //Add item to the list and persist into DB func (wl *WatchList) Add(item WatchItem) error { - return nil + _, err := dao.DefaultDatabaseWatchItemDAO.Add( + &models.WatchItem{ + PolicyID: item.PolicyID, + Namespace: item.Namespace, + OnPush: item.OnPush, + OnDeletion: item.OnDeletion, + }) + return err } //Remove the specified watch item from list func (wl *WatchList) Remove(policyID int64) error { - return nil + return dao.DefaultDatabaseWatchItemDAO.DeleteByPolicyID(policyID) } //Get the watch items according to the namespace and operation func (wl *WatchList) Get(namespace, operation string) ([]WatchItem, error) { - return []WatchItem{}, nil + items, err := dao.DefaultDatabaseWatchItemDAO.Get(namespace, operation) + if err != nil { + return nil, err + } + + watchItems := []WatchItem{} + for _, item := range items { + watchItems = append(watchItems, WatchItem{ + PolicyID: item.PolicyID, + Namespace: item.Namespace, + OnPush: item.OnPush, + OnDeletion: item.OnDeletion, + }) + } + + return watchItems, nil } diff --git a/src/replication/trigger/watch_list_test.go b/src/replication/trigger/watch_list_test.go new file mode 100644 index 000000000..2e5c4e3a5 --- /dev/null +++ b/src/replication/trigger/watch_list_test.go @@ -0,0 +1,108 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package trigger + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/models" +) + +type fakeWatchItemDAO struct { + items []models.WatchItem +} + +func (f *fakeWatchItemDAO) Add(item *models.WatchItem) (int64, error) { + f.items = append(f.items, *item) + return int64(len(f.items) + 1), nil +} + +// Delete the WatchItem specified by policy ID +func (f *fakeWatchItemDAO) DeleteByPolicyID(policyID int64) error { + for i, item := range f.items { + if item.PolicyID == policyID { + f.items = append(f.items[:i], f.items[i+1:]...) + break + } + } + return nil +} + +// Get returns WatchItem list according to the namespace and operation +func (f *fakeWatchItemDAO) Get(namespace, operation string) ([]models.WatchItem, error) { + items := []models.WatchItem{} + for _, item := range f.items { + if item.Namespace != namespace { + continue + } + + if operation == "push" { + if item.OnPush { + items = append(items, item) + } + } + + if operation == "delete" { + if item.OnDeletion { + items = append(items, item) + } + } + } + + return items, nil +} + +func TestMethodsOfWatchList(t *testing.T) { + dao.DefaultDatabaseWatchItemDAO = &fakeWatchItemDAO{} + + var policyID int64 = 1 + + // test Add + item := WatchItem{ + PolicyID: policyID, + Namespace: "library", + OnDeletion: true, + OnPush: false, + } + + err := DefaultWatchList.Add(item) + require.Nil(t, err) + + // test Get: non-exist namespace + items, err := DefaultWatchList.Get("non-exist-namespace", "delete") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) + + // test Get: non-exist operation + items, err = DefaultWatchList.Get("library", "non-exist-operation") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) + + // test Get: valid params + items, err = DefaultWatchList.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 1, len(items)) + assert.Equal(t, policyID, items[0].PolicyID) + + // test Remove + err = DefaultWatchList.Remove(policyID) + require.Nil(t, err) + items, err = DefaultWatchList.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) +} diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index 79b889b8b..955ed2fec 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -113,15 +113,16 @@ func (pa *RepPolicyAPI) Post() { // check the existence of projects for _, project := range policy.Projects { - exist, err := pa.ProjectMgr.Exists(project.ProjectID) + pro, err := pa.ProjectMgr.Get(project.ProjectID) if err != nil { pa.ParseAndHandleError(fmt.Sprintf("failed to check the existence of project %d", project.ProjectID), err) return } - if !exist { + if pro == nil { pa.HandleNotFound(fmt.Sprintf("project %d not found", project.ProjectID)) return } + project.Name = pro.Name } // check the existence of targets @@ -168,6 +169,34 @@ func (pa *RepPolicyAPI) Put() { policy.ID = id + // check the existence of projects + for _, project := range policy.Projects { + pro, err := pa.ProjectMgr.Get(project.ProjectID) + if err != nil { + pa.ParseAndHandleError(fmt.Sprintf("failed to check the existence of project %d", project.ProjectID), err) + return + } + if pro == nil { + pa.HandleNotFound(fmt.Sprintf("project %d not found", project.ProjectID)) + return + } + project.Name = pro.Name + } + + // check the existence of targets + for _, target := range policy.Targets { + t, err := dao.GetRepTarget(target.ID) + if err != nil { + pa.HandleInternalServerError(fmt.Sprintf("failed to get target %d: %v", target.ID, err)) + return + } + + if t == nil { + pa.HandleNotFound(fmt.Sprintf("target %d not found", target.ID)) + return + } + } + if err = core.DefaultController.UpdatePolicy(convertToRepPolicy(policy)); err != nil { pa.HandleInternalServerError(fmt.Sprintf("failed to update policy %d: %v", id, err)) return @@ -274,6 +303,7 @@ func convertToRepPolicy(policy *api_models.ReplicationPolicy) rep_models.Replica for _, project := range policy.Projects { ply.ProjectIDs = append(ply.ProjectIDs, project.ProjectID) + ply.Namespaces = append(ply.Namespaces, project.Name) } for _, target := range policy.Targets { diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index aca8b1bc2..5e2b2f2f5 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -189,7 +189,7 @@ func TestRepPolicyAPIPost(t *testing.T) { }, }, Trigger: &rep_models.Trigger{ - Kind: replication.TriggerKindManually, + Kind: replication.TriggerKindManual, }, }, credential: sysAdmin, @@ -220,7 +220,7 @@ func TestRepPolicyAPIPost(t *testing.T) { }, }, Trigger: &rep_models.Trigger{ - Kind: replication.TriggerKindManually, + Kind: replication.TriggerKindManual, }, }, credential: sysAdmin, @@ -251,7 +251,7 @@ func TestRepPolicyAPIPost(t *testing.T) { }, }, Trigger: &rep_models.Trigger{ - Kind: replication.TriggerKindManually, + Kind: replication.TriggerKindManual, }, }, credential: sysAdmin, @@ -412,7 +412,7 @@ func TestRepPolicyAPIPut(t *testing.T) { }, }, Trigger: &rep_models.Trigger{ - Kind: replication.TriggerKindImmediately, + Kind: replication.TriggerKindImmediate, }, }, credential: sysAdmin, @@ -477,6 +477,7 @@ func TestConvertToRepPolicy(t *testing.T) { Projects: []*models.Project{ &models.Project{ ProjectID: 1, + Name: "library", }, }, Targets: []*models.RepTarget{ @@ -501,6 +502,7 @@ func TestConvertToRepPolicy(t *testing.T) { Param: "{param}", }, ProjectIDs: []int64{1}, + Namespaces: []string{"library"}, TargetIDs: []int64{1}, }, }, diff --git a/tools/migration/changelog.md b/tools/migration/changelog.md index d2e9a0b70..8cebdb593 100644 --- a/tools/migration/changelog.md +++ b/tools/migration/changelog.md @@ -61,3 +61,4 @@ Changelog for harbor database schema - add column `filters` to table `replication_policy` - add column `replicate_deletion` to table `replication_policy` + - create table `replication_immediate_trigger` \ No newline at end of file From 4902fdf2ef26431ca1cbe6e955cc4ab1a463e0d9 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Mon, 27 Nov 2017 16:12:10 +0800 Subject: [PATCH 15/37] Implement schedual trigger for replication --- src/replication/trigger/schedule.go | 29 +++++++++-- src/replication/trigger/schedule_test.go | 63 ++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 src/replication/trigger/schedule_test.go diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go index d7c07cadd..3178b4d57 100644 --- a/src/replication/trigger/schedule.go +++ b/src/replication/trigger/schedule.go @@ -1,8 +1,11 @@ package trigger import ( - "errors" + "fmt" + "github.com/vmware/harbor/src/common/scheduler" + "github.com/vmware/harbor/src/common/scheduler/policy" + "github.com/vmware/harbor/src/common/scheduler/task" "github.com/vmware/harbor/src/replication" ) @@ -25,10 +28,30 @@ func (st *ScheduleTrigger) Kind() string { //Setup is the implementation of same method defined in Trigger interface func (st *ScheduleTrigger) Setup() error { - return errors.New("Not implemented") + config := &policy.AlternatePolicyConfiguration{} + switch st.params.Type { + case replication.TriggerScheduleDaily: + config.Duration = 24 * 3600 + config.OffsetTime = st.params.Offtime + case replication.TriggerScheduleWeekly: + config.Duration = 7 * 24 * 3600 + config.OffsetTime = st.params.Offtime + config.Weekday = st.params.Weekday + default: + return fmt.Errorf("unsupported schedual trigger type: %s", st.params.Type) + } + + schedulePolicy := policy.NewAlternatePolicy(assembleName(st.params.PolicyID), config) + attachTask := task.NewReplicationTask() + schedulePolicy.AttachTasks(attachTask) + return scheduler.DefaultScheduler.Schedule(schedulePolicy) } //Unset is the implementation of same method defined in Trigger interface func (st *ScheduleTrigger) Unset() error { - return errors.New("Not implemented") + return scheduler.DefaultScheduler.UnSchedule(assembleName(st.params.PolicyID)) +} + +func assembleName(policyID int64) string { + return fmt.Sprintf("replication_policy_%d", policyID) } diff --git a/src/replication/trigger/schedule_test.go b/src/replication/trigger/schedule_test.go new file mode 100644 index 000000000..5fecd934b --- /dev/null +++ b/src/replication/trigger/schedule_test.go @@ -0,0 +1,63 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package trigger + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/scheduler" + "github.com/vmware/harbor/src/replication" +) + +func TestAssembleName(t *testing.T) { + assert.Equal(t, "replication_policy_1", assembleName(1)) +} + +func TestKindOfScheduleTrigger(t *testing.T) { + trigger := NewScheduleTrigger(ScheduleParam{}) + assert.Equal(t, replication.TriggerKindSchedule, trigger.Kind()) +} + +func TestSetupAndUnSetOfScheduleTrigger(t *testing.T) { + // invalid schedule param + trigger := NewScheduleTrigger(ScheduleParam{}) + assert.NotNil(t, trigger.Setup()) + + // valid schedule param + var policyID int64 = 1 + trigger = NewScheduleTrigger(ScheduleParam{ + BasicParam: BasicParam{ + PolicyID: policyID, + }, + Type: replication.TriggerScheduleWeekly, + Weekday: (int8(time.Now().Weekday()) + 1) % 7, + Offtime: 0, + }) + + count := scheduler.DefaultScheduler.PolicyCount() + require.Nil(t, scheduler.DefaultScheduler.GetPolicy(assembleName(policyID))) + + require.Nil(t, trigger.Setup()) + + assert.Equal(t, count+1, scheduler.DefaultScheduler.PolicyCount()) + assert.NotNil(t, scheduler.DefaultScheduler.GetPolicy(assembleName(policyID))) + + require.Nil(t, trigger.Unset()) + assert.Equal(t, count, scheduler.DefaultScheduler.PolicyCount()) + assert.Nil(t, scheduler.DefaultScheduler.GetPolicy(assembleName(policyID))) +} From 594d2136307f01ebdfa3c2ed9ae27eaa670d965f Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 28 Nov 2017 14:38:24 +0800 Subject: [PATCH 16/37] Publish replication notification for manual, scheduel and immediate trigger --- src/common/notifier/init.go | 13 --- .../task/replication/replication_task.go | 31 +++++++ .../replication_task_test.go | 6 +- src/common/scheduler/task/replication_task.go | 24 ----- src/common/utils/test/watch_item.go | 65 +++++++++++++ src/replication/consts.go | 5 + src/replication/core/controller.go | 14 +-- src/replication/event/init.go | 39 ++++++++ .../event/notification/notification.go | 34 +++++++ src/replication/event/on_deletion_handler.go | 52 ++++------- .../event/on_deletion_handler_test.go | 43 +++++++++ src/replication/event/on_push_handler.go | 91 +++++++++++++------ src/replication/event/on_push_handler_test.go | 43 +++++++++ .../event/start_replication_handler.go | 31 ++++--- .../event/start_replication_handler_test.go | 41 +++++++++ src/replication/event/{ => topic}/topics.go | 2 +- src/replication/trigger/schedule.go | 4 +- src/replication/trigger/watch_list_test.go | 48 +--------- src/ui/api/harborapi_test.go | 1 + src/ui/api/replication.go | 11 ++- src/ui/api/repository.go | 15 ++- src/ui/api/utils.go | 37 -------- src/ui/main.go | 1 + .../service/notifications/registry/handler.go | 15 ++- 24 files changed, 458 insertions(+), 208 deletions(-) delete mode 100644 src/common/notifier/init.go create mode 100644 src/common/scheduler/task/replication/replication_task.go rename src/common/scheduler/task/{ => replication}/replication_task_test.go (54%) delete mode 100644 src/common/scheduler/task/replication_task.go create mode 100644 src/common/utils/test/watch_item.go create mode 100644 src/replication/event/init.go create mode 100644 src/replication/event/notification/notification.go create mode 100644 src/replication/event/on_deletion_handler_test.go create mode 100644 src/replication/event/on_push_handler_test.go create mode 100644 src/replication/event/start_replication_handler_test.go rename src/replication/event/{ => topic}/topics.go (95%) diff --git a/src/common/notifier/init.go b/src/common/notifier/init.go deleted file mode 100644 index b36d1f8de..000000000 --- a/src/common/notifier/init.go +++ /dev/null @@ -1,13 +0,0 @@ -package notifier - -import ( - "github.com/vmware/harbor/src/replication/event" -) - -//Subscribe related topics -func init() { - //Listen the related event topics - Subscribe(event.StartReplicationTopic, &event.StartReplicationHandler{}) - Subscribe(event.ReplicationEventTopicOnPush, &event.OnPushHandler{}) - Subscribe(event.ReplicationEventTopicOnDeletion, &event.OnDeletionHandler{}) -} diff --git a/src/common/scheduler/task/replication/replication_task.go b/src/common/scheduler/task/replication/replication_task.go new file mode 100644 index 000000000..1d4917420 --- /dev/null +++ b/src/common/scheduler/task/replication/replication_task.go @@ -0,0 +1,31 @@ +package replication + +import ( + "github.com/vmware/harbor/src/common/notifier" + "github.com/vmware/harbor/src/replication/event/notification" + "github.com/vmware/harbor/src/replication/event/topic" +) + +//Task is the task for triggering one replication +type Task struct { + PolicyID int64 +} + +//NewTask is constructor of creating ReplicationTask +func NewTask(policyID int64) *Task { + return &Task{ + PolicyID: policyID, + } +} + +//Name returns the name of this task +func (t *Task) Name() string { + return "replication" +} + +//Run the actions here +func (t *Task) Run() error { + return notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ + PolicyID: t.PolicyID, + }) +} diff --git a/src/common/scheduler/task/replication_task_test.go b/src/common/scheduler/task/replication/replication_task_test.go similarity index 54% rename from src/common/scheduler/task/replication_task_test.go rename to src/common/scheduler/task/replication/replication_task_test.go index cd0acd2c0..a914b46f9 100644 --- a/src/common/scheduler/task/replication_task_test.go +++ b/src/common/scheduler/task/replication/replication_task_test.go @@ -1,9 +1,9 @@ -package task +package replication import "testing" -func TestReplicationTask(t *testing.T) { - tk := NewReplicationTask() +func TestTask(t *testing.T) { + tk := NewTask(1) if tk == nil { t.Fail() } diff --git a/src/common/scheduler/task/replication_task.go b/src/common/scheduler/task/replication_task.go deleted file mode 100644 index aaefcc571..000000000 --- a/src/common/scheduler/task/replication_task.go +++ /dev/null @@ -1,24 +0,0 @@ -package task - -import ( - "errors" -) - -//ReplicationTask is the task for triggering one replication -type ReplicationTask struct{} - -//NewReplicationTask is constructor of creating ReplicationTask -func NewReplicationTask() *ReplicationTask { - return &ReplicationTask{} -} - -//Name returns the name of this task -func (rt *ReplicationTask) Name() string { - return "replication" -} - -//Run the actions here -func (rt *ReplicationTask) Run() error { - //Trigger the replication here - return errors.New("Not implemented") -} diff --git a/src/common/utils/test/watch_item.go b/src/common/utils/test/watch_item.go new file mode 100644 index 000000000..c801a9761 --- /dev/null +++ b/src/common/utils/test/watch_item.go @@ -0,0 +1,65 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package test + +import ( + "github.com/vmware/harbor/src/common/models" +) + +// FakeWatchItemDAO is the fake implement for the dao.WatchItemDAO +type FakeWatchItemDAO struct { + items []models.WatchItem +} + +// Add ... +func (f *FakeWatchItemDAO) Add(item *models.WatchItem) (int64, error) { + f.items = append(f.items, *item) + return int64(len(f.items) + 1), nil +} + +// DeleteByPolicyID : delete the WatchItem specified by policy ID +func (f *FakeWatchItemDAO) DeleteByPolicyID(policyID int64) error { + for i, item := range f.items { + if item.PolicyID == policyID { + f.items = append(f.items[:i], f.items[i+1:]...) + break + } + } + return nil +} + +// Get returns WatchItem list according to the namespace and operation +func (f *FakeWatchItemDAO) Get(namespace, operation string) ([]models.WatchItem, error) { + items := []models.WatchItem{} + for _, item := range f.items { + if item.Namespace != namespace { + continue + } + + if operation == "push" { + if item.OnPush { + items = append(items, item) + } + } + + if operation == "delete" { + if item.OnDeletion { + items = append(items, item) + } + } + } + + return items, nil +} diff --git a/src/replication/consts.go b/src/replication/consts.go index b9a8a36a7..813988d54 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -22,4 +22,9 @@ const ( TriggerScheduleDaily = "daily" //TriggerScheduleWeekly : type of scheduling is 'weekly' TriggerScheduleWeekly = "weekly" + + //OperationPush : operation for pushing images + OperationPush = "push" + //OperationDelete : operation for deleting images + OperationDelete = "delete" ) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index ad2cf67ee..d06727380 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -135,17 +135,19 @@ func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) erro } } + if err = ctl.policyManager.UpdatePolicy(updatedPolicy); err != nil { + return err + } + if reset { if err = ctl.triggerManager.UnsetTrigger(id, *originPolicy.Trigger); err != nil { return err } - if err = ctl.policyManager.UpdatePolicy(updatedPolicy); err != nil { - return err - } + return ctl.triggerManager.SetupTrigger(&updatedPolicy) } - return ctl.policyManager.UpdatePolicy(updatedPolicy) + return nil } //RemovePolicy will remove the specified policy and clean the related settings @@ -180,9 +182,9 @@ func (ctl *Controller) GetPolicies(query models.QueryParameter) ([]models.Replic //Replicate starts one replication defined in the specified policy; //Can be launched by the API layer and related triggers. -func (ctl *Controller) Replicate(policyID int64, item ...*models.FilterItem) error { +func (ctl *Controller) Replicate(policyID int64, metadate ...map[string]interface{}) error { - fmt.Printf("replicating %d ...\n", policyID) + fmt.Printf("replicating %d, metadata: %v ...\n", policyID, metadate) return nil } diff --git a/src/replication/event/init.go b/src/replication/event/init.go new file mode 100644 index 000000000..0f79739e3 --- /dev/null +++ b/src/replication/event/init.go @@ -0,0 +1,39 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package event + +import ( + "github.com/vmware/harbor/src/common/notifier" + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication/event/topic" +) + +//Subscribe related topics +func init() { + //Listen the related event topics + handlers := map[string]notifier.NotificationHandler{ + topic.StartReplicationTopic: &StartReplicationHandler{}, + topic.ReplicationEventTopicOnPush: &OnPushHandler{}, + topic.ReplicationEventTopicOnDeletion: &OnDeletionHandler{}, + } + + for topic, handler := range handlers { + if err := notifier.Subscribe(topic, handler); err != nil { + log.Errorf("failed to subscribe topic %s: %v", topic, err) + continue + } + log.Debugf("topic %s is subscribed", topic) + } +} diff --git a/src/replication/event/notification/notification.go b/src/replication/event/notification/notification.go new file mode 100644 index 000000000..fa2309b78 --- /dev/null +++ b/src/replication/event/notification/notification.go @@ -0,0 +1,34 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package notification + +//OnPushNotification contains the data required by this handler +type OnPushNotification struct { + //The name of the image that is being pushed + Image string +} + +//OnDeletionNotification contains the data required by this handler +type OnDeletionNotification struct { + //The name of the image that is being deleted + Image string +} + +//StartReplicationNotification contains data required by this handler +type StartReplicationNotification struct { + //ID of the policy + PolicyID int64 + Metadata map[string]interface{} +} diff --git a/src/replication/event/on_deletion_handler.go b/src/replication/event/on_deletion_handler.go index e16af893c..356b34d25 100644 --- a/src/replication/event/on_deletion_handler.go +++ b/src/replication/event/on_deletion_handler.go @@ -1,3 +1,17 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package event import ( @@ -5,19 +19,13 @@ import ( "fmt" "reflect" - "github.com/vmware/harbor/src/replication/core" - "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/event/notification" ) //OnDeletionHandler implements the notification handler interface to handle image on push event. type OnDeletionHandler struct{} -//OnDeletionNotification contains the data required by this handler -type OnDeletionNotification struct { - //The name of the project where the being pushed images are located - ProjectName string -} - //Handle implements the same method of notification handler interface func (oph *OnDeletionHandler) Handle(value interface{}) error { if value == nil { @@ -25,32 +33,12 @@ func (oph *OnDeletionHandler) Handle(value interface{}) error { } vType := reflect.TypeOf(value) - if vType.Kind() != reflect.Struct || vType.String() != "event.OnDeletionNotification" { - return fmt.Errorf("Mismatch value type of OnDeletionHandler, expect %s but got %s", "event.OnDeletionNotification", vType.String()) + if vType.Kind() != reflect.Struct || vType.String() != "notification.OnDeletionNotification" { + return fmt.Errorf("Mismatch value type of OnDeletionHandler, expect %s but got %s", "notification.OnDeletionNotification", vType.String()) } - notification := value.(OnDeletionNotification) - //TODO:Call projectManager to get the projectID - fmt.Println(notification.ProjectName) - query := models.QueryParameter{ - ProjectID: 0, - } - - policies, err := core.DefaultController.GetPolicies(query) - if err != nil { - return err - } - if policies != nil && len(policies) > 0 { - for _, p := range policies { - //Error accumulated and then return? - if err := core.DefaultController.Replicate(p.ID); err != nil { - //TODO:Log error - fmt.Println(err.Error()) - } - } - } - - return nil + notification := value.(notification.OnDeletionNotification) + return checkAndTriggerReplication(notification.Image, replication.OperationDelete) } //IsStateful implements the same method of notification handler interface diff --git a/src/replication/event/on_deletion_handler_test.go b/src/replication/event/on_deletion_handler_test.go new file mode 100644 index 000000000..e34792f07 --- /dev/null +++ b/src/replication/event/on_deletion_handler_test.go @@ -0,0 +1,43 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package event + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/replication/event/notification" +) + +func TestHandleOfOnDeletionHandler(t *testing.T) { + dao.DefaultDatabaseWatchItemDAO = &test.FakeWatchItemDAO{} + + handler := &OnDeletionHandler{} + + assert.NotNil(t, handler.Handle(nil)) + assert.NotNil(t, handler.Handle(map[string]string{})) + assert.NotNil(t, handler.Handle(struct{}{})) + + assert.Nil(t, handler.Handle(notification.OnDeletionNotification{ + Image: "library/hello-world:latest", + })) +} + +func TestIsStatefulOfOnDeletionHandler(t *testing.T) { + handler := &OnDeletionHandler{} + assert.False(t, handler.IsStateful()) +} diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go index d8c4d3aae..306a52341 100644 --- a/src/replication/event/on_push_handler.go +++ b/src/replication/event/on_push_handler.go @@ -1,3 +1,17 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package event import ( @@ -5,19 +19,19 @@ import ( "fmt" "reflect" - "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/common/notifier" + "github.com/vmware/harbor/src/common/utils" + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/event/notification" + "github.com/vmware/harbor/src/replication/event/topic" "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/trigger" ) //OnPushHandler implements the notification handler interface to handle image on push event. type OnPushHandler struct{} -//OnPushNotification contains the data required by this handler -type OnPushNotification struct { - //The ID of the project where the being pushed images are located - ProjectID int -} - //Handle implements the same method of notification handler interface func (oph *OnPushHandler) Handle(value interface{}) error { if value == nil { @@ -25,31 +39,13 @@ func (oph *OnPushHandler) Handle(value interface{}) error { } vType := reflect.TypeOf(value) - if vType.Kind() != reflect.Struct || vType.String() != "event.OnPushNotification" { - return fmt.Errorf("Mismatch value type of OnPushHandler, expect %s but got %s", "event.OnPushNotification", vType.String()) + if vType.Kind() != reflect.Struct || vType.String() != "notification.OnPushNotification" { + return fmt.Errorf("Mismatch value type of OnPushHandler, expect %s but got %s", "notification.OnPushNotification", vType.String()) } - notification := value.(OnDeletionNotification) - //TODO:Call projectManager to get the projectID - fmt.Println(notification.ProjectName) - query := models.QueryParameter{ - ProjectID: 0, - } + notification := value.(notification.OnPushNotification) - policies, err := core.DefaultController.GetPolicies(query) - if err != nil { - return err - } - if policies != nil && len(policies) > 0 { - for _, p := range policies { - if err := core.DefaultController.Replicate(p.ID); err != nil { - //TODO:Log error - fmt.Println(err.Error()) - } - } - } - - return nil + return checkAndTriggerReplication(notification.Image, replication.OperationPush) } //IsStateful implements the same method of notification handler interface @@ -57,3 +53,40 @@ func (oph *OnPushHandler) IsStateful() bool { //Statless return false } + +// checks whether replication policy is set on the resource, if is, trigger the replication +func checkAndTriggerReplication(image, operation string) error { + project, _ := utils.ParseRepository(image) + watchItems, err := trigger.DefaultWatchList.Get(project, operation) + if err != nil { + return fmt.Errorf("failed to get watch list for resource %s, operation %s: %v", + image, operation, err) + } + if len(watchItems) == 0 { + log.Debugf("no replication should be triggered for resource %s, operation %s, skip", image, operation) + return nil + } + + for _, watchItem := range watchItems { + item := &models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: image, + Metadata: map[string]interface{}{ + "operation": operation, + }, + } + + if err := notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ + PolicyID: watchItem.PolicyID, + Metadata: map[string]interface{}{ + "": []*models.FilterItem{item}, + }, + }); err != nil { + return fmt.Errorf("failed to publish replication topic for resource %s, operation %s, policy %d: %v", + image, operation, watchItem.PolicyID, err) + } + log.Infof("replication topic for resource %s, operation %s, policy %d triggered", + image, operation, watchItem.PolicyID) + } + return nil +} diff --git a/src/replication/event/on_push_handler_test.go b/src/replication/event/on_push_handler_test.go new file mode 100644 index 000000000..bcd57605c --- /dev/null +++ b/src/replication/event/on_push_handler_test.go @@ -0,0 +1,43 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package event + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/replication/event/notification" +) + +func TestHandleOfOnPushHandler(t *testing.T) { + dao.DefaultDatabaseWatchItemDAO = &test.FakeWatchItemDAO{} + + handler := &OnPushHandler{} + + assert.NotNil(t, handler.Handle(nil)) + assert.NotNil(t, handler.Handle(map[string]string{})) + assert.NotNil(t, handler.Handle(struct{}{})) + + assert.Nil(t, handler.Handle(notification.OnPushNotification{ + Image: "library/hello-world:latest", + })) +} + +func TestIsStatefulOfOnPushHandler(t *testing.T) { + handler := &OnPushHandler{} + assert.False(t, handler.IsStateful()) +} diff --git a/src/replication/event/start_replication_handler.go b/src/replication/event/start_replication_handler.go index 93658a593..82b8bce40 100644 --- a/src/replication/event/start_replication_handler.go +++ b/src/replication/event/start_replication_handler.go @@ -1,3 +1,17 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package event import ( @@ -6,17 +20,12 @@ import ( "reflect" "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/replication/event/notification" ) //StartReplicationHandler implements the notification handler interface to handle start replication requests. type StartReplicationHandler struct{} -//StartReplicationNotification contains data required by this handler -type StartReplicationNotification struct { - //ID of the policy - PolicyID int64 -} - //Handle implements the same method of notification handler interface func (srh *StartReplicationHandler) Handle(value interface{}) error { if value == nil { @@ -24,18 +33,18 @@ func (srh *StartReplicationHandler) Handle(value interface{}) error { } vType := reflect.TypeOf(value) - if vType.Kind() != reflect.Struct || vType.String() != "core.StartReplicationNotification" { - return fmt.Errorf("Mismatch value type of StartReplicationHandler, expect %s but got %s", "core.StartReplicationNotification", vType.String()) + if vType.Kind() != reflect.Struct || vType.String() != "notification.StartReplicationNotification" { + return fmt.Errorf("Mismatch value type of StartReplicationHandler, expect %s but got %s", "notification.StartReplicationNotification", vType.String()) } - notification := value.(StartReplicationNotification) + notification := value.(notification.StartReplicationNotification) if notification.PolicyID <= 0 { return errors.New("Invalid policy") } //Start replication - //TODO: - return core.DefaultController.Replicate(notification.PolicyID) + + return core.DefaultController.Replicate(notification.PolicyID, notification.Metadata) } //IsStateful implements the same method of notification handler interface diff --git a/src/replication/event/start_replication_handler_test.go b/src/replication/event/start_replication_handler_test.go new file mode 100644 index 000000000..30404b270 --- /dev/null +++ b/src/replication/event/start_replication_handler_test.go @@ -0,0 +1,41 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package event + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication/event/notification" +) + +func TestHandle(t *testing.T) { + handler := &StartReplicationHandler{} + + assert.NotNil(t, handler.Handle(nil)) + assert.NotNil(t, handler.Handle(map[string]string{})) + assert.NotNil(t, handler.Handle(struct{}{})) + assert.NotNil(t, handler.Handle(notification.StartReplicationNotification{ + PolicyID: -1, + })) + assert.Nil(t, handler.Handle(notification.StartReplicationNotification{ + PolicyID: 1, + })) +} + +func TestIsStateful(t *testing.T) { + handler := &StartReplicationHandler{} + assert.False(t, handler.IsStateful()) +} diff --git a/src/replication/event/topics.go b/src/replication/event/topic/topics.go similarity index 95% rename from src/replication/event/topics.go rename to src/replication/event/topic/topics.go index 5a6aa954e..fce3b9c81 100644 --- a/src/replication/event/topics.go +++ b/src/replication/event/topic/topics.go @@ -1,4 +1,4 @@ -package event +package topic const ( //ReplicationEventTopicOnPush : OnPush event diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go index 3178b4d57..3a8480919 100644 --- a/src/replication/trigger/schedule.go +++ b/src/replication/trigger/schedule.go @@ -5,7 +5,7 @@ import ( "github.com/vmware/harbor/src/common/scheduler" "github.com/vmware/harbor/src/common/scheduler/policy" - "github.com/vmware/harbor/src/common/scheduler/task" + replication_task "github.com/vmware/harbor/src/common/scheduler/task/replication" "github.com/vmware/harbor/src/replication" ) @@ -42,7 +42,7 @@ func (st *ScheduleTrigger) Setup() error { } schedulePolicy := policy.NewAlternatePolicy(assembleName(st.params.PolicyID), config) - attachTask := task.NewReplicationTask() + attachTask := replication_task.NewTask(st.params.PolicyID) schedulePolicy.AttachTasks(attachTask) return scheduler.DefaultScheduler.Schedule(schedulePolicy) } diff --git a/src/replication/trigger/watch_list_test.go b/src/replication/trigger/watch_list_test.go index 2e5c4e3a5..e8f1b9aed 100644 --- a/src/replication/trigger/watch_list_test.go +++ b/src/replication/trigger/watch_list_test.go @@ -20,55 +20,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vmware/harbor/src/common/dao" - "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/common/utils/test" ) -type fakeWatchItemDAO struct { - items []models.WatchItem -} - -func (f *fakeWatchItemDAO) Add(item *models.WatchItem) (int64, error) { - f.items = append(f.items, *item) - return int64(len(f.items) + 1), nil -} - -// Delete the WatchItem specified by policy ID -func (f *fakeWatchItemDAO) DeleteByPolicyID(policyID int64) error { - for i, item := range f.items { - if item.PolicyID == policyID { - f.items = append(f.items[:i], f.items[i+1:]...) - break - } - } - return nil -} - -// Get returns WatchItem list according to the namespace and operation -func (f *fakeWatchItemDAO) Get(namespace, operation string) ([]models.WatchItem, error) { - items := []models.WatchItem{} - for _, item := range f.items { - if item.Namespace != namespace { - continue - } - - if operation == "push" { - if item.OnPush { - items = append(items, item) - } - } - - if operation == "delete" { - if item.OnDeletion { - items = append(items, item) - } - } - } - - return items, nil -} - func TestMethodsOfWatchList(t *testing.T) { - dao.DefaultDatabaseWatchItemDAO = &fakeWatchItemDAO{} + dao.DefaultDatabaseWatchItemDAO = &test.FakeWatchItemDAO{} var policyID int64 = 1 diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index a62e11816..d521f6883 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -40,6 +40,7 @@ import ( "github.com/dghubble/sling" //for test env prepare + _ "github.com/vmware/harbor/src/replication/event" _ "github.com/vmware/harbor/src/ui/auth/db" _ "github.com/vmware/harbor/src/ui/auth/ldap" ) diff --git a/src/ui/api/replication.go b/src/ui/api/replication.go index 49e1b80dc..43bd2289c 100644 --- a/src/ui/api/replication.go +++ b/src/ui/api/replication.go @@ -17,7 +17,11 @@ package api import ( "fmt" + "github.com/vmware/harbor/src/common/notifier" + "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication/core" + "github.com/vmware/harbor/src/replication/event/notification" + "github.com/vmware/harbor/src/replication/event/topic" "github.com/vmware/harbor/src/ui/api/models" ) @@ -56,8 +60,11 @@ func (r *ReplicationAPI) Post() { return } - if err = core.DefaultController.Replicate(replication.PolicyID); err != nil { - r.HandleInternalServerError(fmt.Sprintf("failed to trigger the replication policy %d: %v", replication.PolicyID, err)) + if err = notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ + PolicyID: replication.PolicyID, + }); err != nil { + r.HandleInternalServerError(fmt.Sprintf("failed to publish replication topic for policy %d: %v", replication.PolicyID, err)) return } + log.Infof("replication topic for policy %d triggered", replication.PolicyID) } diff --git a/src/ui/api/repository.go b/src/ui/api/repository.go index 958a6f5ef..4a56e379d 100644 --- a/src/ui/api/repository.go +++ b/src/ui/api/repository.go @@ -26,12 +26,15 @@ import ( "github.com/docker/distribution/manifest/schema2" "github.com/vmware/harbor/src/common/dao" "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/common/notifier" "github.com/vmware/harbor/src/common/utils" "github.com/vmware/harbor/src/common/utils/clair" registry_error "github.com/vmware/harbor/src/common/utils/error" "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/common/utils/notary" "github.com/vmware/harbor/src/common/utils/registry" + "github.com/vmware/harbor/src/replication/event/notification" + "github.com/vmware/harbor/src/replication/event/topic" "github.com/vmware/harbor/src/ui/config" uiutils "github.com/vmware/harbor/src/ui/utils" ) @@ -255,7 +258,17 @@ func (ra *RepositoryAPI) Delete() { } log.Infof("delete tag: %s:%s", repoName, t) - go CheckAndTriggerReplication(repoName+":"+t, "delete") + go func() { + image := repoName + ":" + t + err := notifier.Publish(topic.ReplicationEventTopicOnDeletion, notification.OnDeletionNotification{ + Image: image, + }) + if err != nil { + log.Errorf("failed to publish on deletion topic for resource %s: %v", image, err) + return + } + log.Debugf("the on deletion topic for resource %s published", image) + }() go func(tag string) { if err := dao.AddAccessLog(models.AccessLog{ diff --git a/src/ui/api/utils.go b/src/ui/api/utils.go index b66990155..5ef259aeb 100644 --- a/src/ui/api/utils.go +++ b/src/ui/api/utils.go @@ -32,10 +32,6 @@ import ( "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/common/utils/registry" "github.com/vmware/harbor/src/common/utils/registry/auth" - "github.com/vmware/harbor/src/replication" - "github.com/vmware/harbor/src/replication/core" - rep_models "github.com/vmware/harbor/src/replication/models" - "github.com/vmware/harbor/src/replication/trigger" "github.com/vmware/harbor/src/ui/config" "github.com/vmware/harbor/src/ui/promgr" "github.com/vmware/harbor/src/ui/service/token" @@ -81,39 +77,6 @@ func checkUserExists(name string) int { return 0 } -// CheckAndTriggerReplication checks whether replication policy is set -// on the resource, if is, trigger the replication -func CheckAndTriggerReplication(image, operation string) { - project, _ := utils.ParseRepository(image) - watchItems, err := trigger.DefaultWatchList.Get(project, operation) - if err != nil { - log.Errorf("failed to get watch list for resource %s, operation %s: %v", image, operation, err) - return - } - if len(watchItems) == 0 { - log.Debugf("no replication should be triggered for resource %s, operation %s, skip", image, operation) - return - } - - for _, watchItem := range watchItems { - // TODO define a new type ReplicationItem to wrap FilterItem and operation. - // Maybe change the FilterItem to interface and define a type Resource to - // implement FilterItem is better? - item := &rep_models.FilterItem{ - Kind: replication.FilterItemKindTag, - Value: image, - Metadata: map[string]interface{}{ - "operation": operation, - }, - } - if err := core.DefaultController.Replicate(watchItem.PolicyID, item); err != nil { - log.Errorf("failed to trigger replication for resource: %s, operation: %s: %v", image, operation, err) - return - } - log.Infof("replication for resource: %s, operation: %s triggered", image, operation) - } -} - // TriggerReplication triggers the replication according to the policy // TODO remove func TriggerReplication(policyID int64, repository string, diff --git a/src/ui/main.go b/src/ui/main.go index a9f7fb859..26f7ff5a4 100644 --- a/src/ui/main.go +++ b/src/ui/main.go @@ -29,6 +29,7 @@ import ( "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/notifier" "github.com/vmware/harbor/src/common/scheduler" + _ "github.com/vmware/harbor/src/replication/event" "github.com/vmware/harbor/src/ui/api" _ "github.com/vmware/harbor/src/ui/auth/db" _ "github.com/vmware/harbor/src/ui/auth/ldap" diff --git a/src/ui/service/notifications/registry/handler.go b/src/ui/service/notifications/registry/handler.go index 6cfc2433d..750bbf47b 100644 --- a/src/ui/service/notifications/registry/handler.go +++ b/src/ui/service/notifications/registry/handler.go @@ -23,8 +23,11 @@ import ( "github.com/vmware/harbor/src/common/dao" clairdao "github.com/vmware/harbor/src/common/dao/clair" "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/common/notifier" "github.com/vmware/harbor/src/common/utils" "github.com/vmware/harbor/src/common/utils/log" + rep_notification "github.com/vmware/harbor/src/replication/event/notification" + "github.com/vmware/harbor/src/replication/event/topic" "github.com/vmware/harbor/src/ui/api" "github.com/vmware/harbor/src/ui/config" uiutils "github.com/vmware/harbor/src/ui/utils" @@ -104,7 +107,17 @@ func (n *NotificationHandler) Post() { } }() - go api.CheckAndTriggerReplication(repository+":"+tag, "push") + go func() { + image := repository + ":" + tag + err := notifier.Publish(topic.ReplicationEventTopicOnPush, rep_notification.OnPushNotification{ + Image: image, + }) + if err != nil { + log.Errorf("failed to publish on push topic for resource %s: %v", image, err) + return + } + log.Debugf("the on push topic for resource %s published", image) + }() if autoScanEnabled(pro) { last, err := clairdao.GetLastUpdate() From 2ba3758472e0cf88e3367446ba92d0cbcad396f7 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Mon, 4 Dec 2017 15:39:40 +0800 Subject: [PATCH 17/37] Update the replicatoin APIs in swagger.yaml --- docs/swagger.yaml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 9120fc964..af2356bcf 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2375,20 +2375,17 @@ definitions: type: string description: The description of the policy. projects: - type: object + type: array description: The project list that the policy applys to. items: $ref: '#/definitions/Project' targets: - type: object + type: array description: The target list. items: $ref: '#/definitions/RepTarget' trigger: - type: object - description: The trigger for schedule job. - items: - $ref: '#/definitions/RepTrigger' + $ref: '#/definitions/RepTrigger' filters: type: array description: The replication policy filter array. @@ -2407,14 +2404,14 @@ definitions: type: string description: The update time of the policy. error_job_count: - format: int + type: integer description: The error job count number for the policy. RepTrigger: type: object properties: kind: type: string - description: The replication policy trigger kind. + description: The replication policy trigger kind. The valid values are manual, immediate and schedule. param: type: string description: The replication policy trigger parameters. @@ -2423,10 +2420,10 @@ definitions: properties: kind: type: string - description: The replication policy filter kind. - value: + description: The replication policy filter kind. The valid values are project, repository and tag. + pattern: type: string - description: The replication policy filter value. + description: The replication policy filter pattern. metadata: type: object description: This map object is the replication policy filter metadata. From a384325a1ea19b77fb2bb4ee31e7c513de4aca2b Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 28 Nov 2017 14:38:24 +0800 Subject: [PATCH 18/37] Publish replication notification for manual, scheduel and immediate trigger --- src/ui/api/utils.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/ui/api/utils.go b/src/ui/api/utils.go index 5ef259aeb..76a0cabf5 100644 --- a/src/ui/api/utils.go +++ b/src/ui/api/utils.go @@ -77,6 +77,50 @@ func checkUserExists(name string) int { return 0 } +<<<<<<< HEAD +======= +// CheckAndTriggerReplication checks whether replication policy is set +// on the resource, if is, trigger the replication +func CheckAndTriggerReplication(image, operation string) { + project, _ := utils.ParseRepository(image) + watchItems, err := trigger.DefaultWatchList.Get(project, operation) + if err != nil { + log.Errorf("failed to get watch list for resource %s, operation %s: %v", image, operation, err) + return + } + if len(watchItems) == 0 { + log.Debugf("no replication should be triggered for resource %s, operation %s, skip", image, operation) + return + } + + for _, watchItem := range watchItems { + // TODO define a new type ReplicationItem to wrap FilterItem and operation. + // Maybe change the FilterItem to interface and define a type Resource to + // implement FilterItem is better? + item := &rep_models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: image, + Metadata: map[string]interface{}{ + "operation": operation, + }, + } + + if err := notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ + PolicyID: watchItem.PolicyID, + Metadata: map[string]interface{}{ + "": []*rep_models.FilterItem{item}, + }, + }); err != nil { + log.Errorf("failed to publish replication topic for resource %s, operation %s, policy %d: %v", + image, operation, watchItem.PolicyID, err) + return + } + log.Infof("replication topic for resource %s, operation %s, policy %d triggered", + image, operation, watchItem.PolicyID) + } +} + +>>>>>>> 3409fa1... Publish replication notification for manual, scheduel and immediate trigger // TriggerReplication triggers the replication according to the policy // TODO remove func TriggerReplication(policyID int64, repository string, From c5ccb7e53c286b7c21f32f2c8e5201c86385aa80 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 29 Nov 2017 15:14:13 +0800 Subject: [PATCH 19/37] Enable filter chain in replication --- src/replication/consts.go | 7 +- src/replication/core/controller.go | 111 ++++++++++++++++- src/replication/models/filter.go | 41 ++++++ src/replication/models/filter_item.go | 2 + src/replication/models/policy.go | 2 +- src/replication/policy/manager.go | 9 +- src/replication/registry/harbor_adaptor.go | 40 +++++- .../source/repository_convertor.go | 11 +- .../source/tag_combination_filter.go | 1 + src/replication/source/tag_convertor.go | 9 +- src/ui/api/models/replication_policy.go | 2 +- src/ui/api/utils.go | 117 ------------------ src/ui/main.go | 5 + 13 files changed, 219 insertions(+), 138 deletions(-) create mode 100644 src/replication/models/filter.go diff --git a/src/replication/consts.go b/src/replication/consts.go index 813988d54..a2148823b 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -23,8 +23,11 @@ const ( //TriggerScheduleWeekly : type of scheduling is 'weekly' TriggerScheduleWeekly = "weekly" - //OperationPush : operation for pushing images + //OperationPush : push operation OperationPush = "push" - //OperationDelete : operation for deleting images + //OperationDelete : delete operation OperationDelete = "delete" + + // PatternMatchAll : the pattern that match all + PatternMatchAll = ".*" ) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index d06727380..1bcc094a8 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -3,6 +3,9 @@ package core import ( "fmt" + "github.com/vmware/harbor/src/common/dao" + common_models "github.com/vmware/harbor/src/common/models" + "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/policy" @@ -182,9 +185,113 @@ func (ctl *Controller) GetPolicies(query models.QueryParameter) ([]models.Replic //Replicate starts one replication defined in the specified policy; //Can be launched by the API layer and related triggers. -func (ctl *Controller) Replicate(policyID int64, metadate ...map[string]interface{}) error { +func (ctl *Controller) Replicate(policyID int64, metadata ...map[string]interface{}) error { + policy, err := ctl.GetPolicy(policyID) + if err != nil { + return err + } + if policy.ID == 0 { + return fmt.Errorf("policy %d not found", policyID) + } - fmt.Printf("replicating %d, metadata: %v ...\n", policyID, metadate) + candidates := []models.FilterItem{} + if len(metadata) > 0 { + meta := metadata[0]["candidates"] + if meta != nil { + cands, ok := meta.([]models.FilterItem) + if ok { + candidates = append(candidates, cands...) + } + } + } + + // prepare candidates for replication + candidates = getCandidates(&policy, ctl.sourcer, candidates...) + + targets := []*common_models.RepTarget{} + for _, targetID := range policy.TargetIDs { + target, err := dao.GetRepTarget(targetID) + if err != nil { + return err + } + targets = append(targets, target) + } + + // TODO merge tags whose repository is same into one struct + + // call job service to do the replication + return replicate(candidates, targets) +} + +func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, candidates ...models.FilterItem) []models.FilterItem { + if len(candidates) == 0 { + for _, namespace := range policy.Namespaces { + candidates = append(candidates, models.FilterItem{ + Kind: replication.FilterItemKindProject, + Value: namespace, + Operation: replication.OperationPush, + }) + } + } + + filterChain := buildFilterChain(policy, sourcer) + + return filterChain.DoFilter(candidates) +} + +func buildFilterChain(policy *models.ReplicationPolicy, sourcer *source.Sourcer) source.FilterChain { + filters := []source.Filter{} + + patternMap := map[string]string{} + for _, f := range policy.Filters { + patternMap[f.Kind] = f.Pattern + } + + // TODO convert wildcard to regex expression + projectPattern, exist := patternMap[replication.FilterItemKindProject] + if !exist { + projectPattern = replication.PatternMatchAll + } + + repositoryPattern, exist := patternMap[replication.FilterItemKindRepository] + if !exist { + repositoryPattern = replication.PatternMatchAll + } + repositoryPattern = fmt.Sprintf("%s/%s", projectPattern, repositoryPattern) + + tagPattern, exist := patternMap[replication.FilterItemKindProject] + if !exist { + tagPattern = replication.PatternMatchAll + } + tagPattern = fmt.Sprintf("%s:%s", repositoryPattern, tagPattern) + + if policy.Trigger.Kind == replication.TriggerKindImmediate { + // build filter chain for immediate trigger policy + filters = append(filters, + source.NewPatternFilter(replication.FilterItemKindTag, tagPattern)) + } else { + // build filter chain for manual and schedule trigger policy + + // append project filter + filters = append(filters, + source.NewPatternFilter(replication.FilterItemKindProject, projectPattern)) + // append repository filter + filters = append(filters, + source.NewPatternFilter(replication.FilterItemKindRepository, + repositoryPattern, source.NewRepositoryConvertor(sourcer.GetAdaptor(replication.AdaptorKindHarbor)))) + // append tag filter + filters = append(filters, + source.NewPatternFilter(replication.FilterItemKindTag, + tagPattern, source.NewTagConvertor(sourcer.GetAdaptor(replication.AdaptorKindHarbor)))) + } + + return source.NewDefaultFilterChain(filters) +} + +func replicate(candidates []models.FilterItem, targets []*common_models.RepTarget) error { + // TODO + + log.Infof("replicate candidates %v to targets %v", candidates, targets) return nil } diff --git a/src/replication/models/filter.go b/src/replication/models/filter.go new file mode 100644 index 000000000..648d6247c --- /dev/null +++ b/src/replication/models/filter.go @@ -0,0 +1,41 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "fmt" + + "github.com/astaxie/beego/validation" + "github.com/vmware/harbor/src/replication" +) + +// Filter is the data model represents the filter defined by user. +type Filter struct { + Kind string `json:"kind"` + Pattern string `json:"pattern"` +} + +// Valid ... +func (f *Filter) Valid(v *validation.Validation) { + if !(f.Kind == replication.FilterItemKindProject || + f.Kind == replication.FilterItemKindRepository || + f.Kind == replication.FilterItemKindTag) { + v.SetError("kind", fmt.Sprintf("invalid filter kind: %s", f.Kind)) + } + + if len(f.Pattern) == 0 { + v.SetError("pattern", "filter pattern can not be empty") + } +} diff --git a/src/replication/models/filter_item.go b/src/replication/models/filter_item.go index d142fb70f..101fd6438 100644 --- a/src/replication/models/filter_item.go +++ b/src/replication/models/filter_item.go @@ -20,6 +20,8 @@ type FilterItem struct { //kind == 'tag', value will be tag name. Value string `json:"value"` + Operation string `json:"operation"` + //Extension placeholder. //To append more additional information if required by the filter. Metadata map[string]interface{} `json:"metadata"` diff --git a/src/replication/models/policy.go b/src/replication/models/policy.go index 27c157a64..5e6777703 100644 --- a/src/replication/models/policy.go +++ b/src/replication/models/policy.go @@ -9,7 +9,7 @@ type ReplicationPolicy struct { ID int64 //UUID of the policy Name string Description string - Filters []FilterItem + Filters []Filter ReplicateDeletion bool Trigger *Trigger //The trigger of the replication ProjectIDs []int64 //Projects attached to this policy diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go index dcd8a13df..3f8a35f17 100644 --- a/src/replication/policy/manager.go +++ b/src/replication/policy/manager.go @@ -7,6 +7,7 @@ import ( "github.com/vmware/harbor/src/common/dao" persist_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/ui/config" ) //Manager provides replication policy CURD capabilities. @@ -64,8 +65,14 @@ func convertFromPersistModel(policy *persist_models.RepPolicy) (models.Replicati UpdateTime: policy.UpdateTime, } + project, err := config.GlobalProjectMgr.Get(policy.ProjectID) + if err != nil { + return models.ReplicationPolicy{}, err + } + ply.Namespaces = []string{project.Name} + if len(policy.Filters) > 0 { - filters := []models.FilterItem{} + filters := []models.Filter{} if err := json.Unmarshal([]byte(policy.Filters), &filters); err != nil { return models.ReplicationPolicy{}, err } diff --git a/src/replication/registry/harbor_adaptor.go b/src/replication/registry/harbor_adaptor.go index 6c7ffe09d..e28622f93 100644 --- a/src/replication/registry/harbor_adaptor.go +++ b/src/replication/registry/harbor_adaptor.go @@ -1,10 +1,15 @@ package registry import ( + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/ui/utils" ) +// TODO refacotor the methods of HarborAdaptor by caling Harbor's API + //HarborAdaptor is defined to adapt the Harbor registry type HarborAdaptor struct{} @@ -25,7 +30,19 @@ func (ha *HarborAdaptor) GetNamespace(name string) models.Namespace { //GetRepositories is used to get all the repositories under the specified namespace func (ha *HarborAdaptor) GetRepositories(namespace string) []models.Repository { - return nil + repos, err := dao.GetRepositoryByProjectName(namespace) + if err != nil { + log.Errorf("failed to get repositories under namespace %s: %v", namespace, err) + return nil + } + + repositories := []models.Repository{} + for _, repo := range repos { + repositories = append(repositories, models.Repository{ + Name: repo.Name, + }) + } + return repositories } //GetRepository is used to get the repository with the specified name under the specified namespace @@ -35,7 +52,26 @@ func (ha *HarborAdaptor) GetRepository(name string, namespace string) models.Rep //GetTags is used to get all the tags of the specified repository under the namespace func (ha *HarborAdaptor) GetTags(repositoryName string, namespace string) []models.Tag { - return nil + client, err := utils.NewRepositoryClientForUI("harbor-ui", repositoryName) + if err != nil { + log.Errorf("failed to create registry client: %v", err) + return nil + } + + ts, err := client.ListTag() + if err != nil { + log.Errorf("failed to get tags of repository %s: %v", repositoryName, err) + return nil + } + + tags := []models.Tag{} + for _, t := range ts { + tags = append(tags, models.Tag{ + Name: t, + }) + } + + return tags } //GetTag is used to get the tag with the specified name of the repository under the namespace diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go index 12e5bda28..b2ff6cd58 100644 --- a/src/replication/source/repository_convertor.go +++ b/src/replication/source/repository_convertor.go @@ -35,6 +35,8 @@ func NewRepositoryConvertor(registry registry.Adaptor) *RepositoryConvertor { // Convert projects to repositories func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem { + // TODO get repositories from database where the push/deletion operations are recorded + // if support replicate deletion result := []models.FilterItem{} for _, item := range items { if item.Kind != replication.FilterItemKindProject { @@ -46,12 +48,9 @@ func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.Filter repositories := r.registry.GetRepositories(item.Value) for _, repository := range repositories { result = append(result, models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: repository.Name, - // public is used to create project if it does not exist when replicating - Metadata: map[string]interface{}{ - "public": item.Metadata["public"], - }, + Kind: replication.FilterItemKindRepository, + Value: repository.Name, + Operation: item.Operation, }) } } diff --git a/src/replication/source/tag_combination_filter.go b/src/replication/source/tag_combination_filter.go index ced506e44..8bdddadd6 100644 --- a/src/replication/source/tag_combination_filter.go +++ b/src/replication/source/tag_combination_filter.go @@ -60,6 +60,7 @@ func (t *TagCombinationFilter) DoFilter(filterItems []models.FilterItem) []model repos[strs[0]] = append(repos[strs[0]], strs[1]) } + // TODO append operation items := []models.FilterItem{} for repo, tags := range repos { items = append(items, models.FilterItem{ diff --git a/src/replication/source/tag_convertor.go b/src/replication/source/tag_convertor.go index 236e04e3c..09adcecf9 100644 --- a/src/replication/source/tag_convertor.go +++ b/src/replication/source/tag_convertor.go @@ -46,12 +46,9 @@ func (t *TagConvertor) Convert(items []models.FilterItem) []models.FilterItem { tags := t.registry.GetTags(item.Value, "") for _, tag := range tags { result = append(result, models.FilterItem{ - Kind: replication.FilterItemKindTag, - Value: tag.Name, - // public is used to create project if it does not exist when replicating - Metadata: map[string]interface{}{ - "public": item.Metadata["public"], - }, + Kind: replication.FilterItemKindTag, + Value: item.Value + ":" + tag.Name, + Operation: item.Operation, }) } } diff --git a/src/ui/api/models/replication_policy.go b/src/ui/api/models/replication_policy.go index 34fa38a7b..c8da8a03a 100644 --- a/src/ui/api/models/replication_policy.go +++ b/src/ui/api/models/replication_policy.go @@ -27,7 +27,7 @@ type ReplicationPolicy struct { ID int64 `json:"id"` Name string `json:"name"` Description string `json:"description"` - Filters []rep_models.FilterItem `json:"filters"` + Filters []rep_models.Filter `json:"filters"` ReplicateDeletion bool `json:"replicate_deletion"` Trigger *rep_models.Trigger `json:"trigger"` Projects []*common_models.Project `json:"projects"` diff --git a/src/ui/api/utils.go b/src/ui/api/utils.go index 76a0cabf5..7f883109b 100644 --- a/src/ui/api/utils.go +++ b/src/ui/api/utils.go @@ -15,10 +15,7 @@ package api import ( - "bytes" - "encoding/json" "fmt" - "io/ioutil" "net/http" "sort" "strings" @@ -77,120 +74,6 @@ func checkUserExists(name string) int { return 0 } -<<<<<<< HEAD -======= -// CheckAndTriggerReplication checks whether replication policy is set -// on the resource, if is, trigger the replication -func CheckAndTriggerReplication(image, operation string) { - project, _ := utils.ParseRepository(image) - watchItems, err := trigger.DefaultWatchList.Get(project, operation) - if err != nil { - log.Errorf("failed to get watch list for resource %s, operation %s: %v", image, operation, err) - return - } - if len(watchItems) == 0 { - log.Debugf("no replication should be triggered for resource %s, operation %s, skip", image, operation) - return - } - - for _, watchItem := range watchItems { - // TODO define a new type ReplicationItem to wrap FilterItem and operation. - // Maybe change the FilterItem to interface and define a type Resource to - // implement FilterItem is better? - item := &rep_models.FilterItem{ - Kind: replication.FilterItemKindTag, - Value: image, - Metadata: map[string]interface{}{ - "operation": operation, - }, - } - - if err := notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ - PolicyID: watchItem.PolicyID, - Metadata: map[string]interface{}{ - "": []*rep_models.FilterItem{item}, - }, - }); err != nil { - log.Errorf("failed to publish replication topic for resource %s, operation %s, policy %d: %v", - image, operation, watchItem.PolicyID, err) - return - } - log.Infof("replication topic for resource %s, operation %s, policy %d triggered", - image, operation, watchItem.PolicyID) - } -} - ->>>>>>> 3409fa1... Publish replication notification for manual, scheduel and immediate trigger -// TriggerReplication triggers the replication according to the policy -// TODO remove -func TriggerReplication(policyID int64, repository string, - tags []string, operation string) error { - data := struct { - PolicyID int64 `json:"policy_id"` - Repo string `json:"repository"` - Operation string `json:"operation"` - TagList []string `json:"tags"` - }{ - PolicyID: policyID, - Repo: repository, - TagList: tags, - Operation: operation, - } - - b, err := json.Marshal(&data) - if err != nil { - return err - } - url := buildReplicationURL() - - return uiutils.RequestAsUI("POST", url, bytes.NewBuffer(b), uiutils.NewStatusRespHandler(http.StatusOK)) -} - -// TODO remove -func postReplicationAction(policyID int64, acton string) error { - data := struct { - PolicyID int64 `json:"policy_id"` - Action string `json:"action"` - }{ - PolicyID: policyID, - Action: acton, - } - - b, err := json.Marshal(&data) - if err != nil { - return err - } - - url := buildReplicationActionURL() - - req, err := http.NewRequest("POST", url, bytes.NewBuffer(b)) - if err != nil { - return err - } - - uiutils.AddUISecret(req) - - client := &http.Client{} - - resp, err := client.Do(req) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode == http.StatusOK { - return nil - } - - b, err = ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - - return fmt.Errorf("%d %s", resp.StatusCode, string(b)) -} - // SyncRegistry syncs the repositories of registry with database. func SyncRegistry(pm promgr.ProjectManager) error { diff --git a/src/ui/main.go b/src/ui/main.go index 8a47ecca5..e25a10e29 100644 --- a/src/ui/main.go +++ b/src/ui/main.go @@ -29,6 +29,7 @@ import ( "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/notifier" "github.com/vmware/harbor/src/common/scheduler" + "github.com/vmware/harbor/src/replication/core" _ "github.com/vmware/harbor/src/replication/event" "github.com/vmware/harbor/src/ui/api" _ "github.com/vmware/harbor/src/ui/auth/db" @@ -131,6 +132,10 @@ func main() { notifier.Publish(notifier.ScanAllPolicyTopic, notifier.ScanPolicyNotification{Type: scanAllPolicy.Type, DailyTime: (int64)(dailyTime)}) } + if err := core.DefaultController.Init(); err != nil { + log.Errorf("failed to initialize DefaultContorllter: %v", err) + } + filter.Init() beego.InsertFilter("/*", beego.BeforeRouter, filter.SecurityFilter) beego.InsertFilter("/api/*", beego.BeforeRouter, filter.MediaTypeFilter("application/json")) From 8b4fdfc2cc0a05e7953b6a9c3ede73a0d7042b34 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 5 Dec 2017 14:13:01 +0800 Subject: [PATCH 20/37] Add unit tests for replication related methods --- .travis.yml | 4 +- src/common/utils/test/policy_manager.go | 45 ++++++ .../utils/test/replication_controllter.go | 26 ++++ src/replication/core/controller.go | 63 +++++--- src/replication/core/controller_test.go | 144 ++++++++++++++++++ .../event/start_replication_handler.go | 3 +- .../event/start_replication_handler_test.go | 4 + src/replication/models/filter_item.go | 34 ++--- src/replication/models/filter_test.go | 45 ++++++ src/replication/models/trigger.go | 14 ++ src/replication/models/trigger_test.go | 41 +++++ src/replication/policy/manager.go | 45 ++++-- src/replication/policy/manager_test.go | 60 ++++++++ .../source/repository_convertor_test.go | 13 +- src/replication/source/tag_convertor_test.go | 9 -- src/replication/target/target.go | 38 +++++ src/ui/api/harborapi_test.go | 5 + src/ui/api/replication.go | 2 +- src/ui/api/replication_policy.go | 14 +- src/ui/api/replication_policy_test.go | 72 ++++----- src/ui/main.go | 4 +- 21 files changed, 564 insertions(+), 121 deletions(-) create mode 100644 src/common/utils/test/policy_manager.go create mode 100644 src/common/utils/test/replication_controllter.go create mode 100644 src/replication/core/controller_test.go create mode 100644 src/replication/models/filter_test.go create mode 100644 src/replication/models/trigger_test.go create mode 100644 src/replication/policy/manager_test.go create mode 100644 src/replication/target/target.go diff --git a/.travis.yml b/.travis.yml index 849deb7f3..294124bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,8 +89,8 @@ script: - sudo mkdir -p ./make/common/config/registry/ - sudo mv ./tests/reg_config.yml ./make/common/config/registry/config.yml - sudo docker-compose -f ./make/docker-compose.test.yml up -d - - go list ./... | grep -v -E 'vendor|tests' | xargs -L1 fgt golint - - go list ./... | grep -v -E 'vendor|tests' | xargs -L1 go vet + - go list ./... | grep -v -E 'vendor|tests|test' | xargs -L1 fgt golint + - go list ./... | grep -v -E 'vendor|tests|test' | xargs -L1 go vet - export MYSQL_HOST=$IP - export REGISTRY_URL=$IP:5000 - echo $REGISTRY_URL diff --git a/src/common/utils/test/policy_manager.go b/src/common/utils/test/policy_manager.go new file mode 100644 index 000000000..492c88e00 --- /dev/null +++ b/src/common/utils/test/policy_manager.go @@ -0,0 +1,45 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package test + +import ( + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +type FakePolicyManager struct { +} + +func (f *FakePolicyManager) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { + return []models.ReplicationPolicy{}, nil +} + +func (f *FakePolicyManager) GetPolicy(id int64) (models.ReplicationPolicy, error) { + return models.ReplicationPolicy{ + ID: 1, + Trigger: &models.Trigger{ + Kind: replication.TriggerKindManual, + }, + }, nil +} +func (f *FakePolicyManager) CreatePolicy(policy models.ReplicationPolicy) (int64, error) { + return 1, nil +} +func (f *FakePolicyManager) UpdatePolicy(models.ReplicationPolicy) error { + return nil +} +func (f *FakePolicyManager) RemovePolicy(int64) error { + return nil +} diff --git a/src/common/utils/test/replication_controllter.go b/src/common/utils/test/replication_controllter.go new file mode 100644 index 000000000..adff7ae7a --- /dev/null +++ b/src/common/utils/test/replication_controllter.go @@ -0,0 +1,26 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package test + +type FakeReplicatoinController struct { + FakePolicyManager +} + +func (f *FakeReplicatoinController) Init() error { + return nil +} +func (f *FakeReplicatoinController) Replicate(policyID int64, metadata ...map[string]interface{}) error { + return nil +} diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 1bcc094a8..a3db273c9 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -1,26 +1,50 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package core import ( "fmt" - "github.com/vmware/harbor/src/common/dao" common_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/policy" "github.com/vmware/harbor/src/replication/source" + "github.com/vmware/harbor/src/replication/target" "github.com/vmware/harbor/src/replication/trigger" ) -//Controller is core module to cordinate and control the overall workflow of the +// Controller defines the methods that a replicatoin controllter should implement +type Controller interface { + policy.Manager + Init() error + Replicate(policyID int64, metadata ...map[string]interface{}) error +} + +//DefaultController is core module to cordinate and control the overall workflow of the //replication modules. -type Controller struct { +type DefaultController struct { //Indicate whether the controller has been initialized or not initialized bool //Manage the policies - policyManager *policy.Manager + policyManager policy.Manager + + //Manage the targets + targetManager target.Manager //Handle the things related with source sourcer *source.Sourcer @@ -31,7 +55,7 @@ type Controller struct { //Keep controller as singleton instance var ( - DefaultController = NewController(ControllerConfig{}) //Use default data + GlobalController Controller = NewDefaultController(ControllerConfig{}) //Use default data ) //ControllerConfig includes related configurations required by the controller @@ -40,18 +64,19 @@ type ControllerConfig struct { CacheCapacity int } -//NewController is the constructor of Controller. -func NewController(config ControllerConfig) *Controller { +//NewDefaultController is the constructor of DefaultController. +func NewDefaultController(config ControllerConfig) *DefaultController { //Controller refer the default instances - return &Controller{ - policyManager: policy.NewManager(), + return &DefaultController{ + policyManager: policy.NewDefaultManager(), + targetManager: target.NewDefaultManager(), sourcer: source.NewSourcer(), triggerManager: trigger.NewManager(config.CacheCapacity), } } //Init will initialize the controller and the sub components -func (ctl *Controller) Init() error { +func (ctl *DefaultController) Init() error { if ctl.initialized { return nil } @@ -92,7 +117,7 @@ func (ctl *Controller) Init() error { } //CreatePolicy is used to create a new policy and enable it if necessary -func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, error) { +func (ctl *DefaultController) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, error) { id, err := ctl.policyManager.CreatePolicy(newPolicy) if err != nil { return 0, err @@ -108,7 +133,7 @@ func (ctl *Controller) CreatePolicy(newPolicy models.ReplicationPolicy) (int64, //UpdatePolicy will update the policy with new content. //Parameter updatedPolicy must have the ID of the updated policy. -func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { +func (ctl *DefaultController) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { // TODO check pre-conditions id := updatedPolicy.ID @@ -154,7 +179,7 @@ func (ctl *Controller) UpdatePolicy(updatedPolicy models.ReplicationPolicy) erro } //RemovePolicy will remove the specified policy and clean the related settings -func (ctl *Controller) RemovePolicy(policyID int64) error { +func (ctl *DefaultController) RemovePolicy(policyID int64) error { // TODO check pre-conditions policy, err := ctl.policyManager.GetPolicy(policyID) @@ -174,18 +199,18 @@ func (ctl *Controller) RemovePolicy(policyID int64) error { } //GetPolicy is delegation of GetPolicy of Policy.Manager -func (ctl *Controller) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { +func (ctl *DefaultController) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { return ctl.policyManager.GetPolicy(policyID) } //GetPolicies is delegation of GetPoliciemodels.ReplicationPolicy{}s of Policy.Manager -func (ctl *Controller) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { +func (ctl *DefaultController) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { return ctl.policyManager.GetPolicies(query) } //Replicate starts one replication defined in the specified policy; //Can be launched by the API layer and related triggers. -func (ctl *Controller) Replicate(policyID int64, metadata ...map[string]interface{}) error { +func (ctl *DefaultController) Replicate(policyID int64, metadata ...map[string]interface{}) error { policy, err := ctl.GetPolicy(policyID) if err != nil { return err @@ -210,7 +235,7 @@ func (ctl *Controller) Replicate(policyID int64, metadata ...map[string]interfac targets := []*common_models.RepTarget{} for _, targetID := range policy.TargetIDs { - target, err := dao.GetRepTarget(targetID) + target, err := ctl.targetManager.GetTarget(targetID) if err != nil { return err } @@ -259,13 +284,13 @@ func buildFilterChain(policy *models.ReplicationPolicy, sourcer *source.Sourcer) } repositoryPattern = fmt.Sprintf("%s/%s", projectPattern, repositoryPattern) - tagPattern, exist := patternMap[replication.FilterItemKindProject] + tagPattern, exist := patternMap[replication.FilterItemKindTag] if !exist { tagPattern = replication.PatternMatchAll } tagPattern = fmt.Sprintf("%s:%s", repositoryPattern, tagPattern) - if policy.Trigger.Kind == replication.TriggerKindImmediate { + if policy.Trigger != nil && policy.Trigger.Kind == replication.TriggerKindImmediate { // build filter chain for immediate trigger policy filters = append(filters, source.NewPatternFilter(replication.FilterItemKindTag, tagPattern)) diff --git a/src/replication/core/controller_test.go b/src/replication/core/controller_test.go new file mode 100644 index 000000000..bbfa671f8 --- /dev/null +++ b/src/replication/core/controller_test.go @@ -0,0 +1,144 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package core + +import ( + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/source" +) + +func TestMain(m *testing.M) { + // set the policy manager used by GlobalController with a fake policy manager + controller := GlobalController.(*DefaultController) + controller.policyManager = &test.FakePolicyManager{} + os.Exit(m.Run()) +} + +func TestNewDefaultController(t *testing.T) { + controller := NewDefaultController(ControllerConfig{}) + assert.NotNil(t, controller) +} + +func TestInit(t *testing.T) { + assert.Nil(t, GlobalController.Init()) +} + +func TestCreatePolicy(t *testing.T) { + _, err := GlobalController.CreatePolicy(models.ReplicationPolicy{}) + assert.Nil(t, err) +} + +func TestUpdatePolicy(t *testing.T) { + assert.Nil(t, GlobalController.UpdatePolicy(models.ReplicationPolicy{ + ID: 2, + Trigger: &models.Trigger{ + Kind: replication.TriggerKindManual, + }, + })) +} + +func TestRemovePolicy(t *testing.T) { + assert.Nil(t, GlobalController.RemovePolicy(1)) +} + +func TestGetPolicy(t *testing.T) { + _, err := GlobalController.GetPolicy(1) + assert.Nil(t, err) +} + +func TestGetPolicies(t *testing.T) { + _, err := GlobalController.GetPolicies(models.QueryParameter{}) + assert.Nil(t, err) +} + +func TestReplicate(t *testing.T) { + // TODO +} + +func TestGetCandidates(t *testing.T) { + policy := &models.ReplicationPolicy{ + ID: 1, + Filters: []models.Filter{ + models.Filter{ + Kind: replication.FilterItemKindTag, + Pattern: ".*", + }, + }, + Trigger: &models.Trigger{ + Kind: replication.TriggerKindImmediate, + }, + } + + sourcer := source.NewSourcer() + + candidates := []models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:release-1.0", + }, + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + } + result := getCandidates(policy, sourcer, candidates...) + assert.Equal(t, 2, len(result)) + + policy.Filters = []models.Filter{ + models.Filter{ + Kind: replication.FilterItemKindTag, + Pattern: "release-.*", + }, + } + result = getCandidates(policy, sourcer, candidates...) + assert.Equal(t, 1, len(result)) +} + +func TestBuildFilterChain(t *testing.T) { + policy := &models.ReplicationPolicy{ + ID: 1, + Filters: []models.Filter{ + models.Filter{ + Kind: replication.FilterItemKindProject, + Pattern: "*", + }, + models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", + }, + models.Filter{ + Kind: replication.FilterItemKindTag, + Pattern: "*", + }, + }, + } + + sourcer := source.NewSourcer() + + chain := buildFilterChain(policy, sourcer) + assert.Equal(t, 3, len(chain.Filters())) + + policy.Trigger = &models.Trigger{ + Kind: replication.TriggerKindImmediate, + } + chain = buildFilterChain(policy, sourcer) + assert.Equal(t, 1, len(chain.Filters())) +} diff --git a/src/replication/event/start_replication_handler.go b/src/replication/event/start_replication_handler.go index 82b8bce40..7e29ef542 100644 --- a/src/replication/event/start_replication_handler.go +++ b/src/replication/event/start_replication_handler.go @@ -43,8 +43,7 @@ func (srh *StartReplicationHandler) Handle(value interface{}) error { } //Start replication - - return core.DefaultController.Replicate(notification.PolicyID, notification.Metadata) + return core.GlobalController.Replicate(notification.PolicyID, notification.Metadata) } //IsStateful implements the same method of notification handler interface diff --git a/src/replication/event/start_replication_handler_test.go b/src/replication/event/start_replication_handler_test.go index 30404b270..88ba61fbc 100644 --- a/src/replication/event/start_replication_handler_test.go +++ b/src/replication/event/start_replication_handler_test.go @@ -18,10 +18,14 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/replication/core" "github.com/vmware/harbor/src/replication/event/notification" ) func TestHandle(t *testing.T) { + core.GlobalController = &test.FakeReplicatoinController{} + handler := &StartReplicationHandler{} assert.NotNil(t, handler.Handle(nil)) diff --git a/src/replication/models/filter_item.go b/src/replication/models/filter_item.go index 101fd6438..82497dd90 100644 --- a/src/replication/models/filter_item.go +++ b/src/replication/models/filter_item.go @@ -1,12 +1,19 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package models -import ( - "fmt" - - "github.com/astaxie/beego/validation" - "github.com/vmware/harbor/src/replication" -) - //FilterItem is the general data model represents the filtering resources which are used as input and output for the filters. type FilterItem struct { @@ -26,16 +33,3 @@ type FilterItem struct { //To append more additional information if required by the filter. Metadata map[string]interface{} `json:"metadata"` } - -// Valid ... -func (f *FilterItem) Valid(v *validation.Validation) { - if !(f.Kind == replication.FilterItemKindProject || - f.Kind == replication.FilterItemKindRepository || - f.Kind == replication.FilterItemKindTag) { - v.SetError("kind", fmt.Sprintf("invalid filter kind: %s", f.Kind)) - } - - if len(f.Value) == 0 { - v.SetError("value", "filter value can not be empty") - } -} diff --git a/src/replication/models/filter_test.go b/src/replication/models/filter_test.go new file mode 100644 index 000000000..4026f0e20 --- /dev/null +++ b/src/replication/models/filter_test.go @@ -0,0 +1,45 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "testing" + + "github.com/astaxie/beego/validation" + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" +) + +func TestValid(t *testing.T) { + cases := map[*Filter]bool{ + &Filter{}: true, + &Filter{ + Kind: "invalid_kind", + }: true, + &Filter{ + Kind: replication.FilterItemKindRepository, + }: true, + &Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", + }: false, + } + + for filter, hasError := range cases { + v := &validation.Validation{} + filter.Valid(v) + assert.Equal(t, hasError, v.HasErrors()) + } +} diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go index fa62166cb..27c2afa69 100644 --- a/src/replication/models/trigger.go +++ b/src/replication/models/trigger.go @@ -1,3 +1,17 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package models import ( diff --git a/src/replication/models/trigger_test.go b/src/replication/models/trigger_test.go new file mode 100644 index 000000000..b591995e9 --- /dev/null +++ b/src/replication/models/trigger_test.go @@ -0,0 +1,41 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "testing" + + "github.com/astaxie/beego/validation" + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" +) + +func TestValidOfTrigger(t *testing.T) { + cases := map[*Trigger]bool{ + &Trigger{}: true, + &Trigger{ + Kind: "invalid_kind", + }: true, + &Trigger{ + Kind: replication.TriggerKindImmediate, + }: false, + } + + for filter, hasError := range cases { + v := &validation.Validation{} + filter.Valid(v) + assert.Equal(t, hasError, v.HasErrors()) + } +} diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go index 3f8a35f17..bdce2740a 100644 --- a/src/replication/policy/manager.go +++ b/src/replication/policy/manager.go @@ -1,3 +1,17 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package policy import ( @@ -10,16 +24,25 @@ import ( "github.com/vmware/harbor/src/ui/config" ) -//Manager provides replication policy CURD capabilities. -type Manager struct{} +// Manager defines the method a policy manger should implement +type Manager interface { + GetPolicies(models.QueryParameter) ([]models.ReplicationPolicy, error) + GetPolicy(int64) (models.ReplicationPolicy, error) + CreatePolicy(models.ReplicationPolicy) (int64, error) + UpdatePolicy(models.ReplicationPolicy) error + RemovePolicy(int64) error +} -//NewManager is the constructor of Manager. -func NewManager() *Manager { - return &Manager{} +//DefaultManager provides replication policy CURD capabilities. +type DefaultManager struct{} + +//NewDefaultManager is the constructor of DefaultManager. +func NewDefaultManager() *DefaultManager { + return &DefaultManager{} } //GetPolicies returns all the policies -func (m *Manager) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { +func (m *DefaultManager) GetPolicies(query models.QueryParameter) ([]models.ReplicationPolicy, error) { result := []models.ReplicationPolicy{} //TODO support more query conditions other than name and project ID policies, err := dao.FilterRepPolicies(query.Name, query.ProjectID) @@ -39,7 +62,7 @@ func (m *Manager) GetPolicies(query models.QueryParameter) ([]models.Replication } //GetPolicy returns the policy with the specified ID -func (m *Manager) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { +func (m *DefaultManager) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { policy, err := dao.GetRepPolicy(policyID) if err != nil { return models.ReplicationPolicy{}, err @@ -48,7 +71,6 @@ func (m *Manager) GetPolicy(policyID int64) (models.ReplicationPolicy, error) { return convertFromPersistModel(policy) } -// TODO add UT func convertFromPersistModel(policy *persist_models.RepPolicy) (models.ReplicationPolicy, error) { if policy == nil { return models.ReplicationPolicy{}, nil @@ -90,7 +112,6 @@ func convertFromPersistModel(policy *persist_models.RepPolicy) (models.Replicati return ply, nil } -// TODO add ut func convertToPersistModel(policy models.ReplicationPolicy) (*persist_models.RepPolicy, error) { ply := &persist_models.RepPolicy{ ID: policy.ID, @@ -131,7 +152,7 @@ func convertToPersistModel(policy models.ReplicationPolicy) (*persist_models.Rep //CreatePolicy creates a new policy with the provided data; //If creating failed, error will be returned; //If creating succeed, ID of the new created policy will be returned. -func (m *Manager) CreatePolicy(policy models.ReplicationPolicy) (int64, error) { +func (m *DefaultManager) CreatePolicy(policy models.ReplicationPolicy) (int64, error) { now := time.Now() policy.CreationTime = now policy.UpdateTime = now @@ -144,7 +165,7 @@ func (m *Manager) CreatePolicy(policy models.ReplicationPolicy) (int64, error) { //UpdatePolicy updates the policy; //If updating failed, error will be returned. -func (m *Manager) UpdatePolicy(policy models.ReplicationPolicy) error { +func (m *DefaultManager) UpdatePolicy(policy models.ReplicationPolicy) error { policy.UpdateTime = time.Now() ply, err := convertToPersistModel(policy) if err != nil { @@ -155,6 +176,6 @@ func (m *Manager) UpdatePolicy(policy models.ReplicationPolicy) error { //RemovePolicy removes the specified policy; //If removing failed, error will be returned. -func (m *Manager) RemovePolicy(policyID int64) error { +func (m *DefaultManager) RemovePolicy(policyID int64) error { return dao.DeleteRepPolicy(policyID) } diff --git a/src/replication/policy/manager_test.go b/src/replication/policy/manager_test.go new file mode 100644 index 000000000..62337aff7 --- /dev/null +++ b/src/replication/policy/manager_test.go @@ -0,0 +1,60 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package policy + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/replication/models" +) + +func TestConvertToPersistModel(t *testing.T) { + var id, projectID, targetID int64 = 1, 1, 1 + name := "policy01" + replicateDeletion := true + trigger := &models.Trigger{ + Kind: "trigger_kind", + } + filters := []models.Filter{ + models.Filter{ + Kind: "filter_kind", + Pattern: "filter_pattern", + }, + } + policy := models.ReplicationPolicy{ + ID: id, + Name: name, + ReplicateDeletion: replicateDeletion, + ProjectIDs: []int64{projectID}, + TargetIDs: []int64{targetID}, + Trigger: trigger, + Filters: filters, + } + + ply, err := convertToPersistModel(policy) + require.Nil(t, err) + assert.Equal(t, id, ply.ID) + assert.Equal(t, name, ply.Name) + assert.Equal(t, replicateDeletion, ply.ReplicateDeletion) + assert.Equal(t, projectID, ply.ProjectID) + assert.Equal(t, targetID, ply.TargetID) + tg, _ := json.Marshal(trigger) + assert.Equal(t, string(tg), ply.Trigger) + ft, _ := json.Marshal(filters) + assert.Equal(t, string(ft), ply.Filters) +} diff --git a/src/replication/source/repository_convertor_test.go b/src/replication/source/repository_convertor_test.go index 48e223232..f260f113d 100644 --- a/src/replication/source/repository_convertor_test.go +++ b/src/replication/source/repository_convertor_test.go @@ -27,9 +27,6 @@ func TestRepositoryConvert(t *testing.T) { models.FilterItem{ Kind: replication.FilterItemKindProject, Value: "library", - Metadata: map[string]interface{}{ - "public": true, - }, }, models.FilterItem{ Kind: replication.FilterItemKindRepository, @@ -39,16 +36,10 @@ func TestRepositoryConvert(t *testing.T) { models.FilterItem{ Kind: replication.FilterItemKindRepository, Value: "library/ubuntu", - Metadata: map[string]interface{}{ - "public": true, - }, }, models.FilterItem{ Kind: replication.FilterItemKindRepository, Value: "library/centos", - Metadata: map[string]interface{}{ - "public": true, - }, }, } @@ -88,10 +79,10 @@ func (f *fakeRegistryAdaptor) GetRepository(name string, namespace string) model func (f *fakeRegistryAdaptor) GetTags(repositoryName string, namespace string) []models.Tag { return []models.Tag{ models.Tag{ - Name: "library/ubuntu:14.04", + Name: "14.04", }, models.Tag{ - Name: "library/ubuntu:16.04", + Name: "16.04", }, } } diff --git a/src/replication/source/tag_convertor_test.go b/src/replication/source/tag_convertor_test.go index 151192bbb..6e64f86d2 100644 --- a/src/replication/source/tag_convertor_test.go +++ b/src/replication/source/tag_convertor_test.go @@ -27,9 +27,6 @@ func TestTagConvert(t *testing.T) { models.FilterItem{ Kind: replication.FilterItemKindRepository, Value: "library/ubuntu", - Metadata: map[string]interface{}{ - "public": true, - }, }, models.FilterItem{ Kind: replication.FilterItemKindProject, @@ -39,16 +36,10 @@ func TestTagConvert(t *testing.T) { models.FilterItem{ Kind: replication.FilterItemKindTag, Value: "library/ubuntu:14.04", - Metadata: map[string]interface{}{ - "public": true, - }, }, models.FilterItem{ Kind: replication.FilterItemKindTag, Value: "library/ubuntu:16.04", - Metadata: map[string]interface{}{ - "public": true, - }, }, } diff --git a/src/replication/target/target.go b/src/replication/target/target.go new file mode 100644 index 000000000..ab8e815e5 --- /dev/null +++ b/src/replication/target/target.go @@ -0,0 +1,38 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package target + +import ( + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/models" +) + +// Manager defines the methods that a target manager should implement +type Manager interface { + GetTarget(int64) (*models.RepTarget, error) +} + +// DefaultManager implement the Manager interface +type DefaultManager struct{} + +// NewDefaultManager returns an instance of DefaultManger +func NewDefaultManager() *DefaultManager { + return &DefaultManager{} +} + +// GetTarget ... +func (d *DefaultManager) GetTarget(id int64) (*models.RepTarget, error) { + return dao.GetRepTarget(id) +} diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index 987b69ca2..7e62499c5 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -40,6 +40,7 @@ import ( "github.com/dghubble/sling" //for test env prepare + "github.com/vmware/harbor/src/replication/core" _ "github.com/vmware/harbor/src/replication/event" _ "github.com/vmware/harbor/src/ui/auth/db" _ "github.com/vmware/harbor/src/ui/auth/ldap" @@ -133,6 +134,10 @@ func init() { _ = updateInitPassword(1, "Harbor12345") + if err := core.GlobalController.Init(); err != nil { + log.Fatalf("failed to initialize GlobalController: %v", err) + } + //syncRegistry if err := SyncRegistry(config.GlobalProjectMgr); err != nil { log.Fatalf("failed to sync repositories from registry: %v", err) diff --git a/src/ui/api/replication.go b/src/ui/api/replication.go index 43bd2289c..37a8ec6ce 100644 --- a/src/ui/api/replication.go +++ b/src/ui/api/replication.go @@ -49,7 +49,7 @@ func (r *ReplicationAPI) Post() { replication := &models.Replication{} r.DecodeJSONReqAndValidate(replication) - policy, err := core.DefaultController.GetPolicy(replication.PolicyID) + policy, err := core.GlobalController.GetPolicy(replication.PolicyID) if err != nil { r.HandleInternalServerError(fmt.Sprintf("failed to get replication policy %d: %v", replication.PolicyID, err)) return diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index 955ed2fec..da452331b 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -51,7 +51,7 @@ func (pa *RepPolicyAPI) Prepare() { // Get ... func (pa *RepPolicyAPI) Get() { id := pa.GetIDFromURL() - policy, err := core.DefaultController.GetPolicy(id) + policy, err := core.GlobalController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) @@ -87,7 +87,7 @@ func (pa *RepPolicyAPI) List() { result := []*api_models.ReplicationPolicy{} - policies, err := core.DefaultController.GetPolicies(queryParam) + policies, err := core.GlobalController.GetPolicies(queryParam) if err != nil { log.Errorf("failed to get policies: %v, query parameters: %v", err, queryParam) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) @@ -139,7 +139,7 @@ func (pa *RepPolicyAPI) Post() { } } - id, err := core.DefaultController.CreatePolicy(convertToRepPolicy(policy)) + id, err := core.GlobalController.CreatePolicy(convertToRepPolicy(policy)) if err != nil { pa.HandleInternalServerError(fmt.Sprintf("failed to create policy: %v", err)) return @@ -154,7 +154,7 @@ func (pa *RepPolicyAPI) Post() { func (pa *RepPolicyAPI) Put() { id := pa.GetIDFromURL() - originalPolicy, err := core.DefaultController.GetPolicy(id) + originalPolicy, err := core.GlobalController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) @@ -197,7 +197,7 @@ func (pa *RepPolicyAPI) Put() { } } - if err = core.DefaultController.UpdatePolicy(convertToRepPolicy(policy)); err != nil { + if err = core.GlobalController.UpdatePolicy(convertToRepPolicy(policy)); err != nil { pa.HandleInternalServerError(fmt.Sprintf("failed to update policy %d: %v", id, err)) return } @@ -207,7 +207,7 @@ func (pa *RepPolicyAPI) Put() { func (pa *RepPolicyAPI) Delete() { id := pa.GetIDFromURL() - policy, err := core.DefaultController.GetPolicy(id) + policy, err := core.GlobalController.GetPolicy(id) if err != nil { log.Errorf("failed to get policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) @@ -232,7 +232,7 @@ func (pa *RepPolicyAPI) Delete() { } } - if err = core.DefaultController.RemovePolicy(id); err != nil { + if err = core.GlobalController.RemovePolicy(id); err != nil { log.Errorf("failed to delete policy %d: %v", id, err) pa.CustomAbort(http.StatusInternalServerError, "") } diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index 5e2b2f2f5..0bf688105 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -123,10 +123,10 @@ func TestRepPolicyAPIPost(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: "invalid_filter_kind", - Value: "", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: "invalid_filter_kind", + Pattern: "", }, }, }, @@ -151,10 +151,10 @@ func TestRepPolicyAPIPost(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -182,10 +182,10 @@ func TestRepPolicyAPIPost(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -213,10 +213,10 @@ func TestRepPolicyAPIPost(t *testing.T) { ID: 10000, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -244,10 +244,10 @@ func TestRepPolicyAPIPost(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -374,10 +374,10 @@ func TestRepPolicyAPIPut(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -405,10 +405,10 @@ func TestRepPolicyAPIPut(t *testing.T) { ID: targetID, }, }, - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: replication.FilterItemKindRepository, - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: replication.FilterItemKindRepository, + Pattern: "*", }, }, Trigger: &rep_models.Trigger{ @@ -463,10 +463,10 @@ func TestConvertToRepPolicy(t *testing.T) { ID: 1, Name: "policy", Description: "description", - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: "filter_kind_01", - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: "filter_kind_01", + Pattern: "*", }, }, ReplicateDeletion: true, @@ -490,10 +490,10 @@ func TestConvertToRepPolicy(t *testing.T) { ID: 1, Name: "policy", Description: "description", - Filters: []rep_models.FilterItem{ - rep_models.FilterItem{ - Kind: "filter_kind_01", - Value: "*", + Filters: []rep_models.Filter{ + rep_models.Filter{ + Kind: "filter_kind_01", + Pattern: "*", }, }, ReplicateDeletion: true, diff --git a/src/ui/main.go b/src/ui/main.go index e25a10e29..12f500de3 100644 --- a/src/ui/main.go +++ b/src/ui/main.go @@ -132,8 +132,8 @@ func main() { notifier.Publish(notifier.ScanAllPolicyTopic, notifier.ScanPolicyNotification{Type: scanAllPolicy.Type, DailyTime: (int64)(dailyTime)}) } - if err := core.DefaultController.Init(); err != nil { - log.Errorf("failed to initialize DefaultContorllter: %v", err) + if err := core.GlobalController.Init(); err != nil { + log.Errorf("failed to initialize the replication controller: %v", err) } filter.Init() From fe10c2e7f5e187ab5584f8526309359fed2feece Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 7 Dec 2017 19:07:51 +0800 Subject: [PATCH 21/37] Create replicator to submit replication job to jobservice --- src/adminserver/client/client.go | 19 ++-- src/adminserver/client/client_test.go | 3 +- src/common/http/client/auth/auth.go | 73 +++++++++++++++ src/common/http/client/auth/auth_test.go | 56 ++++++++++++ src/common/http/client/client.go | 56 ++++++++++++ .../auth/auth.go => common/http/error.go} | 38 ++------ src/jobservice/client/client.go | 88 +++++++++++++++++++ src/jobservice/client/client_test.go | 55 ++++++++++++ src/jobservice/config/config.go | 7 +- src/replication/consts.go | 5 -- src/replication/core/controller.go | 80 +++++++++++------ src/replication/event/on_deletion_handler.go | 4 +- src/replication/event/on_push_handler.go | 7 +- src/replication/models/policy.go | 4 +- src/replication/policy/manager.go | 7 ++ src/replication/replicator/replicator.go | 43 +++++++++ .../replicator/replicator_test.go} | 31 +++---- src/ui/config/config.go | 7 +- 18 files changed, 476 insertions(+), 107 deletions(-) create mode 100644 src/common/http/client/auth/auth.go create mode 100644 src/common/http/client/auth/auth_test.go create mode 100644 src/common/http/client/client.go rename src/{adminserver/client/auth/auth.go => common/http/error.go} (51%) create mode 100644 src/jobservice/client/client.go create mode 100644 src/jobservice/client/client_test.go create mode 100644 src/replication/replicator/replicator.go rename src/{adminserver/client/auth/auth_test.go => replication/replicator/replicator_test.go} (57%) diff --git a/src/adminserver/client/client.go b/src/adminserver/client/client.go index 95fbdf0f8..ba82d283c 100644 --- a/src/adminserver/client/client.go +++ b/src/adminserver/client/client.go @@ -23,8 +23,8 @@ import ( "net/http" "strings" - "github.com/vmware/harbor/src/adminserver/client/auth" "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" + httpclient "github.com/vmware/harbor/src/common/http/client" "github.com/vmware/harbor/src/common/utils" ) @@ -43,22 +43,20 @@ type Client interface { } // NewClient return an instance of Adminserver client -func NewClient(baseURL string, authorizer auth.Authorizer) Client { +func NewClient(baseURL string, c httpclient.Client) Client { baseURL = strings.TrimRight(baseURL, "/") if !strings.Contains(baseURL, "://") { baseURL = "http://" + baseURL } return &client{ - baseURL: baseURL, - client: &http.Client{}, - authorizer: authorizer, + baseURL: baseURL, + client: c, } } type client struct { - baseURL string - client *http.Client - authorizer auth.Authorizer + baseURL string + client httpclient.Client } // do creates request and authorizes it if authorizer is not nil @@ -69,11 +67,6 @@ func (c *client) do(method, relativePath string, body io.Reader) (*http.Response return nil, err } - if c.authorizer != nil { - if err := c.authorizer.Authorize(req); err != nil { - return nil, err - } - } return c.client.Do(req) } diff --git a/src/adminserver/client/client_test.go b/src/adminserver/client/client_test.go index c232288c1..b74c187b4 100644 --- a/src/adminserver/client/client_test.go +++ b/src/adminserver/client/client_test.go @@ -16,6 +16,7 @@ package client import ( "fmt" + "net/http" "os" "testing" @@ -34,7 +35,7 @@ func TestMain(m *testing.M) { os.Exit(1) } - c = NewClient(server.URL, nil) + c = NewClient(server.URL, &http.Client{}) os.Exit(m.Run()) } diff --git a/src/common/http/client/auth/auth.go b/src/common/http/client/auth/auth.go new file mode 100644 index 000000000..7106a7df6 --- /dev/null +++ b/src/common/http/client/auth/auth.go @@ -0,0 +1,73 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package auth + +import ( + "errors" + "net/http" +) + +const ( + secretCookieName = "secret" +) + +// Authorizer authorizes the requests +type Authorizer interface { + Authorize(*http.Request) error +} + +// CookieAuthorizer authorizes the requests by adding cookie specified by name and value +type CookieAuthorizer struct { + name string + value string +} + +// NewCookieAuthorizer returns an instance of CookieAuthorizer +func NewCookieAuthorizer(name, value string) *CookieAuthorizer { + return &CookieAuthorizer{ + name: name, + value: value, + } +} + +// Authorize the request with the cookie +func (c *CookieAuthorizer) Authorize(req *http.Request) error { + if req == nil { + return errors.New("the request is null") + } + + req.AddCookie(&http.Cookie{ + Name: c.name, + Value: c.value, + }) + return nil +} + +// SecretAuthorizer authorizes the requests with the specified secret +type SecretAuthorizer struct { + authorizer *CookieAuthorizer +} + +// NewSecretAuthorizer returns an instance of SecretAuthorizer +func NewSecretAuthorizer(secret string) *SecretAuthorizer { + return &SecretAuthorizer{ + authorizer: NewCookieAuthorizer(secretCookieName, secret), + } +} + +// Authorize the request with the secret +func (s *SecretAuthorizer) Authorize(req *http.Request) error { + return s.authorizer.Authorize(req) +} diff --git a/src/common/http/client/auth/auth_test.go b/src/common/http/client/auth/auth_test.go new file mode 100644 index 000000000..7754a663b --- /dev/null +++ b/src/common/http/client/auth/auth_test.go @@ -0,0 +1,56 @@ +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package auth + +import ( + "net/http" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestAuthorizeOfCookieAuthorizer(t *testing.T) { + name, value := "name", "value" + authorizer := NewCookieAuthorizer(name, value) + + // nil request + require.NotNil(t, authorizer.Authorize(nil)) + + // valid request + req, err := http.NewRequest("", "", nil) + require.Nil(t, err) + require.Nil(t, authorizer.Authorize(req)) + require.Equal(t, 1, len(req.Cookies())) + v, err := req.Cookie(name) + require.Nil(t, err) + assert.Equal(t, value, v.Value) +} + +func TestAuthorizeOfSecretAuthorizer(t *testing.T) { + secret := "secret" + authorizer := NewSecretAuthorizer(secret) + + // nil request + require.NotNil(t, authorizer.Authorize(nil)) + + // valid request + req, err := http.NewRequest("", "", nil) + require.Nil(t, err) + require.Nil(t, authorizer.Authorize(req)) + require.Equal(t, 1, len(req.Cookies())) + v, err := req.Cookie(secretCookieName) + require.Nil(t, err) + assert.Equal(t, secret, v.Value) +} diff --git a/src/common/http/client/client.go b/src/common/http/client/client.go new file mode 100644 index 000000000..b8e86a596 --- /dev/null +++ b/src/common/http/client/client.go @@ -0,0 +1,56 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package client + +import ( + "net/http" + + "github.com/vmware/harbor/src/common/http/client/auth" +) + +// Client defines the method that a HTTP client should implement +type Client interface { + Do(*http.Request) (*http.Response, error) +} + +// AuthorizedClient authorizes the requests before sending them +type AuthorizedClient struct { + client *http.Client + authorizer auth.Authorizer +} + +// NewAuthorizedClient returns an instance of the AuthorizedClient +func NewAuthorizedClient(authorizer auth.Authorizer, client ...*http.Client) *AuthorizedClient { + c := &AuthorizedClient{ + authorizer: authorizer, + } + if len(client) > 0 { + c.client = client[0] + } + if c.client == nil { + c.client = &http.Client{} + } + return c +} + +// Do authorizes the request before sending it +func (a *AuthorizedClient) Do(req *http.Request) (*http.Response, error) { + if a.authorizer != nil { + if err := a.authorizer.Authorize(req); err != nil { + return nil, err + } + } + return a.client.Do(req) +} diff --git a/src/adminserver/client/auth/auth.go b/src/common/http/error.go similarity index 51% rename from src/adminserver/client/auth/auth.go rename to src/common/http/error.go index 038a8c122..67e5da8e0 100644 --- a/src/adminserver/client/auth/auth.go +++ b/src/common/http/error.go @@ -12,39 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package auth +package http import ( - "net/http" + "fmt" ) -// Authorizer authorizes request -type Authorizer interface { - Authorize(*http.Request) error +// Error wrap HTTP status code and message as an error +type Error struct { + Code int + Message string } -// NewSecretAuthorizer returns an instance of secretAuthorizer -func NewSecretAuthorizer(cookieName, secret string) Authorizer { - return &secretAuthorizer{ - cookieName: cookieName, - secret: secret, - } -} - -type secretAuthorizer struct { - cookieName string - secret string -} - -func (s *secretAuthorizer) Authorize(req *http.Request) error { - if req == nil { - return nil - } - - req.AddCookie(&http.Cookie{ - Name: s.cookieName, - Value: s.secret, - }) - - return nil +// Error ... +func (e *Error) Error() string { + return fmt.Sprintf("http error: code %d, message %s", e.Code, e.Message) } diff --git a/src/jobservice/client/client.go b/src/jobservice/client/client.go new file mode 100644 index 000000000..5288a2f92 --- /dev/null +++ b/src/jobservice/client/client.go @@ -0,0 +1,88 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package client + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "net/http" + + commonhttp "github.com/vmware/harbor/src/common/http" + "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/jobservice/api" +) + +// Client defines the methods that a jobservice client should implement +type Client interface { + SubmitReplicationJob(*api.ReplicationReq) error +} + +// DefaultClient provides a default implement for the interface Client +type DefaultClient struct { + endpoint string + client client.Client +} + +// NewDefaultClient returns an instance of DefaultClient +func NewDefaultClient(endpoint string, client ...client.Client) *DefaultClient { + c := &DefaultClient{ + endpoint: endpoint, + } + + if len(client) > 0 { + c.client = client[0] + } + + if c.client == nil { + c.client = &http.Client{} + } + + return c +} + +// SubmitReplicationJob submits a replication job to the jobservice +func (d *DefaultClient) SubmitReplicationJob(replication *api.ReplicationReq) error { + url := d.endpoint + "/api/jobs/replication" + + buffer := &bytes.Buffer{} + if err := json.NewEncoder(buffer).Encode(replication); err != nil { + return err + } + + req, err := http.NewRequest(http.MethodPost, url, buffer) + if err != nil { + return err + } + + resp, err := d.client.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + message, err := ioutil.ReadAll(resp.Body) + if err != nil { + return err + } + return &commonhttp.Error{ + Code: resp.StatusCode, + Message: string(message), + } + } + + return nil +} diff --git a/src/jobservice/client/client_test.go b/src/jobservice/client/client_test.go new file mode 100644 index 000000000..0cde379cf --- /dev/null +++ b/src/jobservice/client/client_test.go @@ -0,0 +1,55 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package client + +import ( + "encoding/json" + "net/http" + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/jobservice/api" +) + +var url string + +func TestMain(m *testing.M) { + requestMapping := []*test.RequestHandlerMapping{ + &test.RequestHandlerMapping{ + Method: http.MethodPost, + Pattern: "/api/jobs/replication", + Handler: func(w http.ResponseWriter, r *http.Request) { + replication := &api.ReplicationReq{} + if err := json.NewDecoder(r.Body).Decode(replication); err != nil { + w.WriteHeader(http.StatusInternalServerError) + } + }, + }, + } + server := test.NewServer(requestMapping...) + defer server.Close() + + url = server.URL + + os.Exit(m.Run()) +} + +func TestSubmitReplicationJob(t *testing.T) { + client := NewDefaultClient(url) + err := client.SubmitReplicationJob(&api.ReplicationReq{}) + assert.Nil(t, err) +} diff --git a/src/jobservice/config/config.go b/src/jobservice/config/config.go index 674cd058d..4ece1a814 100644 --- a/src/jobservice/config/config.go +++ b/src/jobservice/config/config.go @@ -20,9 +20,10 @@ import ( "strings" "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/adminserver/client/auth" "github.com/vmware/harbor/src/common" comcfg "github.com/vmware/harbor/src/common/config" + httpclient "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/common/http/client/auth" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" ) @@ -50,8 +51,8 @@ func Init() error { adminServerURL = "http://adminserver" } log.Infof("initializing client for adminserver %s ...", adminServerURL) - authorizer := auth.NewSecretAuthorizer(secretCookieName, UISecret()) - AdminserverClient = client.NewClient(adminServerURL, authorizer) + authorizer := auth.NewSecretAuthorizer(UISecret()) + AdminserverClient = client.NewClient(adminServerURL, httpclient.NewAuthorizedClient(authorizer)) if err := AdminserverClient.Ping(); err != nil { return fmt.Errorf("failed to ping adminserver: %v", err) } diff --git a/src/replication/consts.go b/src/replication/consts.go index a2148823b..e7c142110 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -23,11 +23,6 @@ const ( //TriggerScheduleWeekly : type of scheduling is 'weekly' TriggerScheduleWeekly = "weekly" - //OperationPush : push operation - OperationPush = "push" - //OperationDelete : delete operation - OperationDelete = "delete" - // PatternMatchAll : the pattern that match all PatternMatchAll = ".*" ) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index a3db273c9..17e40d8fd 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -16,15 +16,21 @@ package core import ( "fmt" + "strings" + "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/common/http/client/auth" common_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/jobservice/api" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/policy" + "github.com/vmware/harbor/src/replication/replicator" "github.com/vmware/harbor/src/replication/source" "github.com/vmware/harbor/src/replication/target" "github.com/vmware/harbor/src/replication/trigger" + "github.com/vmware/harbor/src/ui/config" ) // Controller defines the methods that a replicatoin controllter should implement @@ -51,6 +57,9 @@ type DefaultController struct { //Manage the triggers of policies triggerManager *trigger.Manager + + //Handle the replication work + replicator replicator.Replicator } //Keep controller as singleton instance @@ -65,14 +74,20 @@ type ControllerConfig struct { } //NewDefaultController is the constructor of DefaultController. -func NewDefaultController(config ControllerConfig) *DefaultController { +func NewDefaultController(cfg ControllerConfig) *DefaultController { //Controller refer the default instances - return &DefaultController{ + ctl := &DefaultController{ policyManager: policy.NewDefaultManager(), targetManager: target.NewDefaultManager(), sourcer: source.NewSourcer(), - triggerManager: trigger.NewManager(config.CacheCapacity), + triggerManager: trigger.NewManager(cfg.CacheCapacity), } + + endpoint := config.InternalJobServiceURL() + client := client.NewAuthorizedClient(auth.NewSecretAuthorizer(config.UISecret())) + ctl.replicator = replicator.NewDefaultReplicator(endpoint, client) + + return ctl } //Init will initialize the controller and the sub components @@ -82,16 +97,8 @@ func (ctl *DefaultController) Init() error { } //Build query parameters - triggerNames := []string{ - replication.TriggerKindSchedule, - } - queryName := "" - for _, name := range triggerNames { - queryName = fmt.Sprintf("%s,%s", queryName, name) - } - //Enable the triggers query := models.QueryParameter{ - TriggerName: queryName, + TriggerType: replication.TriggerKindSchedule, } policies, err := ctl.policyManager.GetPolicies(query) @@ -233,19 +240,22 @@ func (ctl *DefaultController) Replicate(policyID int64, metadata ...map[string]i // prepare candidates for replication candidates = getCandidates(&policy, ctl.sourcer, candidates...) - targets := []*common_models.RepTarget{} - for _, targetID := range policy.TargetIDs { - target, err := ctl.targetManager.GetTarget(targetID) - if err != nil { - return err + // TODO + /* + targets := []*common_models.RepTarget{} + for _, targetID := range policy.TargetIDs { + target, err := ctl.targetManager.GetTarget(targetID) + if err != nil { + return err + } + targets = append(targets, target) } - targets = append(targets, target) - } + */ // TODO merge tags whose repository is same into one struct - // call job service to do the replication - return replicate(candidates, targets) + // submit the replication + return replicate(ctl.replicator, policyID, candidates) } func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, candidates ...models.FilterItem) []models.FilterItem { @@ -254,7 +264,7 @@ func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, ca candidates = append(candidates, models.FilterItem{ Kind: replication.FilterItemKindProject, Value: namespace, - Operation: replication.OperationPush, + Operation: common_models.RepOpTransfer, }) } } @@ -313,10 +323,28 @@ func buildFilterChain(policy *models.ReplicationPolicy, sourcer *source.Sourcer) return source.NewDefaultFilterChain(filters) } -func replicate(candidates []models.FilterItem, targets []*common_models.RepTarget) error { - // TODO - - log.Infof("replicate candidates %v to targets %v", candidates, targets) +func replicate(replicator replicator.Replicator, policyID int64, candidates []models.FilterItem) error { + repositories := map[string][]string{} + // TODO the operation of all candidates are same for now. Update it after supporting + // replicate deletion + operation := "" + for _, candidate := range candidates { + strs := strings.SplitN(candidate.Value, ":", 2) + repositories[strs[0]] = append(repositories[strs[0]], strs[1]) + operation = candidate.Operation + } + for repository, tags := range repositories { + replication := &api.ReplicationReq{ + PolicyID: policyID, + Repo: repository, + Operation: operation, + TagList: tags, + } + log.Debugf("submiting replication job to jobservice: %v", replication) + if err := replicator.Replicate(replication); err != nil { + return err + } + } return nil } diff --git a/src/replication/event/on_deletion_handler.go b/src/replication/event/on_deletion_handler.go index 356b34d25..ac7b9697b 100644 --- a/src/replication/event/on_deletion_handler.go +++ b/src/replication/event/on_deletion_handler.go @@ -19,7 +19,7 @@ import ( "fmt" "reflect" - "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/replication/event/notification" ) @@ -38,7 +38,7 @@ func (oph *OnDeletionHandler) Handle(value interface{}) error { } notification := value.(notification.OnDeletionNotification) - return checkAndTriggerReplication(notification.Image, replication.OperationDelete) + return checkAndTriggerReplication(notification.Image, models.RepOpDelete) } //IsStateful implements the same method of notification handler interface diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go index 306a52341..30ae3447a 100644 --- a/src/replication/event/on_push_handler.go +++ b/src/replication/event/on_push_handler.go @@ -19,6 +19,7 @@ import ( "fmt" "reflect" + common_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/notifier" "github.com/vmware/harbor/src/common/utils" "github.com/vmware/harbor/src/common/utils/log" @@ -45,7 +46,7 @@ func (oph *OnPushHandler) Handle(value interface{}) error { notification := value.(notification.OnPushNotification) - return checkAndTriggerReplication(notification.Image, replication.OperationPush) + return checkAndTriggerReplication(notification.Image, common_models.RepOpTransfer) } //IsStateful implements the same method of notification handler interface @@ -68,7 +69,7 @@ func checkAndTriggerReplication(image, operation string) error { } for _, watchItem := range watchItems { - item := &models.FilterItem{ + item := models.FilterItem{ Kind: replication.FilterItemKindTag, Value: image, Metadata: map[string]interface{}{ @@ -79,7 +80,7 @@ func checkAndTriggerReplication(image, operation string) error { if err := notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ PolicyID: watchItem.PolicyID, Metadata: map[string]interface{}{ - "": []*models.FilterItem{item}, + "candidates": []models.FilterItem{item}, }, }); err != nil { return fmt.Errorf("failed to publish replication topic for resource %s, operation %s, policy %d: %v", diff --git a/src/replication/models/policy.go b/src/replication/models/policy.go index 5e6777703..f6ab0217d 100644 --- a/src/replication/models/policy.go +++ b/src/replication/models/policy.go @@ -27,8 +27,8 @@ type QueryParameter struct { //Size of each page, couple with page PageSize int64 - //Query by the name of trigger - TriggerName string + //Query by the type of trigger + TriggerType string //Query by project ID ProjectID int64 diff --git a/src/replication/policy/manager.go b/src/replication/policy/manager.go index bdce2740a..a6049dbfe 100644 --- a/src/replication/policy/manager.go +++ b/src/replication/policy/manager.go @@ -55,6 +55,13 @@ func (m *DefaultManager) GetPolicies(query models.QueryParameter) ([]models.Repl if err != nil { return []models.ReplicationPolicy{}, err } + + if len(query.TriggerType) > 0 { + if ply.Trigger.Kind != query.TriggerType { + continue + } + } + result = append(result, ply) } diff --git a/src/replication/replicator/replicator.go b/src/replication/replicator/replicator.go new file mode 100644 index 000000000..e27ba4da2 --- /dev/null +++ b/src/replication/replicator/replicator.go @@ -0,0 +1,43 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package replicator + +import ( + "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/jobservice/api" + jobserviceclient "github.com/vmware/harbor/src/jobservice/client" +) + +// Replicator submits the replication work to the jobservice +type Replicator interface { + Replicate(*api.ReplicationReq) error +} + +// DefaultReplicator provides a default implement for Replicator +type DefaultReplicator struct { + client jobserviceclient.Client +} + +// NewDefaultReplicator returns an instance of DefaultReplicator +func NewDefaultReplicator(endpoint string, client ...client.Client) *DefaultReplicator { + return &DefaultReplicator{ + client: jobserviceclient.NewDefaultClient(endpoint, client...), + } +} + +// Replicate ... +func (d *DefaultReplicator) Replicate(replication *api.ReplicationReq) error { + return d.client.SubmitReplicationJob(replication) +} diff --git a/src/adminserver/client/auth/auth_test.go b/src/replication/replicator/replicator_test.go similarity index 57% rename from src/adminserver/client/auth/auth_test.go rename to src/replication/replicator/replicator_test.go index f5743cccc..b2a229cce 100644 --- a/src/adminserver/client/auth/auth_test.go +++ b/src/replication/replicator/replicator_test.go @@ -12,32 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package auth +package replicator import ( - "net/http" "testing" "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/jobservice/api" ) -func TestAuthorize(t *testing.T) { - cookieName := "secret" - secret := "secret" - authorizer := NewSecretAuthorizer(cookieName, secret) - req, err := http.NewRequest("", "", nil) - if !assert.Nil(t, err, "unexpected error") { - return - } +type fakeJobserviceClient struct{} - err = authorizer.Authorize(req) - if !assert.Nil(t, err, "unexpected error") { - return - } - - cookie, err := req.Cookie(cookieName) - if !assert.Nil(t, err, "unexpected error") { - return - } - assert.Equal(t, secret, cookie.Value, "unexpected cookie") +func (f *fakeJobserviceClient) SubmitReplicationJob(replication *api.ReplicationReq) error { + return nil +} + +func TestReplicate(t *testing.T) { + replicator := NewDefaultReplicator("http://jobservice") + replicator.client = &fakeJobserviceClient{} + assert.Nil(t, replicator.Replicate(&api.ReplicationReq{})) } diff --git a/src/ui/config/config.go b/src/ui/config/config.go index 1fdb34c13..1b798115a 100644 --- a/src/ui/config/config.go +++ b/src/ui/config/config.go @@ -23,9 +23,10 @@ import ( "strings" "github.com/vmware/harbor/src/adminserver/client" - "github.com/vmware/harbor/src/adminserver/client/auth" "github.com/vmware/harbor/src/common" comcfg "github.com/vmware/harbor/src/common/config" + httpclient "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/common/http/client/auth" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/secret" "github.com/vmware/harbor/src/common/utils/log" @@ -73,8 +74,8 @@ func Init() error { // InitByURL Init configurations with given url func InitByURL(adminServerURL string) error { log.Infof("initializing client for adminserver %s ...", adminServerURL) - authorizer := auth.NewSecretAuthorizer(secretCookieName, UISecret()) - AdminserverClient = client.NewClient(adminServerURL, authorizer) + authorizer := auth.NewSecretAuthorizer(UISecret()) + AdminserverClient = client.NewClient(adminServerURL, httpclient.NewAuthorizedClient(authorizer)) if err := AdminserverClient.Ping(); err != nil { return fmt.Errorf("failed to ping adminserver: %v", err) } From 76c88d8d49edf2d288a064912a1cd6e00f32a1de Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 8 Dec 2017 15:30:41 +0800 Subject: [PATCH 22/37] Fix bugs of replicaton --- src/replication/core/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 17e40d8fd..638c41553 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -83,7 +83,7 @@ func NewDefaultController(cfg ControllerConfig) *DefaultController { triggerManager: trigger.NewManager(cfg.CacheCapacity), } - endpoint := config.InternalJobServiceURL() + endpoint := "http://jobservice" client := client.NewAuthorizedClient(auth.NewSecretAuthorizer(config.UISecret())) ctl.replicator = replicator.NewDefaultReplicator(endpoint, client) From 1d2e206ce43c64922dcb21d3ac810e4a1a2c5773 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Mon, 11 Dec 2017 17:11:50 +0800 Subject: [PATCH 23/37] Refactor replication filter chain --- src/replication/consts.go | 3 - src/replication/core/controller.go | 83 ++++++------------ src/replication/core/controller_test.go | 23 ++--- src/replication/source/match.go | 23 +++++ .../source/repository_convertor.go | 5 +- .../source/repository_convertor_test.go | 3 + src/replication/source/repository_filter.go | 80 +++++++++++++++++ .../source/repository_filter_test.go | 75 ++++++++++++++++ src/replication/source/tag_convertor.go | 5 +- src/replication/source/tag_convertor_test.go | 3 + src/replication/source/tag_filter.go | 78 +++++++++++++++++ src/replication/source/tag_filter_test.go | 85 +++++++++++++++++++ 12 files changed, 387 insertions(+), 79 deletions(-) create mode 100644 src/replication/source/match.go create mode 100644 src/replication/source/repository_filter.go create mode 100644 src/replication/source/repository_filter_test.go create mode 100644 src/replication/source/tag_filter.go create mode 100644 src/replication/source/tag_filter_test.go diff --git a/src/replication/consts.go b/src/replication/consts.go index e7c142110..b9a8a36a7 100644 --- a/src/replication/consts.go +++ b/src/replication/consts.go @@ -22,7 +22,4 @@ const ( TriggerScheduleDaily = "daily" //TriggerScheduleWeekly : type of scheduling is 'weekly' TriggerScheduleWeekly = "weekly" - - // PatternMatchAll : the pattern that match all - PatternMatchAll = ".*" ) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 638c41553..33b486003 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -83,7 +83,8 @@ func NewDefaultController(cfg ControllerConfig) *DefaultController { triggerManager: trigger.NewManager(cfg.CacheCapacity), } - endpoint := "http://jobservice" + // TODO read from configuration + endpoint := "http://jobservice:8080" client := client.NewAuthorizedClient(auth.NewSecretAuthorizer(config.UISecret())) ctl.replicator = replicator.NewDefaultReplicator(endpoint, client) @@ -226,19 +227,8 @@ func (ctl *DefaultController) Replicate(policyID int64, metadata ...map[string]i return fmt.Errorf("policy %d not found", policyID) } - candidates := []models.FilterItem{} - if len(metadata) > 0 { - meta := metadata[0]["candidates"] - if meta != nil { - cands, ok := meta.([]models.FilterItem) - if ok { - candidates = append(candidates, cands...) - } - } - } - // prepare candidates for replication - candidates = getCandidates(&policy, ctl.sourcer, candidates...) + candidates := getCandidates(&policy, ctl.sourcer, metadata...) // TODO /* @@ -252,13 +242,23 @@ func (ctl *DefaultController) Replicate(policyID int64, metadata ...map[string]i } */ - // TODO merge tags whose repository is same into one struct - // submit the replication return replicate(ctl.replicator, policyID, candidates) } -func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, candidates ...models.FilterItem) []models.FilterItem { +func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, + metadata ...map[string]interface{}) []models.FilterItem { + candidates := []models.FilterItem{} + if len(metadata) > 0 { + meta := metadata[0]["candidates"] + if meta != nil { + cands, ok := meta.([]models.FilterItem) + if ok { + candidates = append(candidates, cands...) + } + } + } + if len(candidates) == 0 { for _, namespace := range policy.Namespaces { candidates = append(candidates, models.FilterItem{ @@ -277,53 +277,26 @@ func getCandidates(policy *models.ReplicationPolicy, sourcer *source.Sourcer, ca func buildFilterChain(policy *models.ReplicationPolicy, sourcer *source.Sourcer) source.FilterChain { filters := []source.Filter{} - patternMap := map[string]string{} + patterns := map[string]string{} for _, f := range policy.Filters { - patternMap[f.Kind] = f.Pattern + patterns[f.Kind] = f.Pattern } - // TODO convert wildcard to regex expression - projectPattern, exist := patternMap[replication.FilterItemKindProject] - if !exist { - projectPattern = replication.PatternMatchAll - } - - repositoryPattern, exist := patternMap[replication.FilterItemKindRepository] - if !exist { - repositoryPattern = replication.PatternMatchAll - } - repositoryPattern = fmt.Sprintf("%s/%s", projectPattern, repositoryPattern) - - tagPattern, exist := patternMap[replication.FilterItemKindTag] - if !exist { - tagPattern = replication.PatternMatchAll - } - tagPattern = fmt.Sprintf("%s:%s", repositoryPattern, tagPattern) - - if policy.Trigger != nil && policy.Trigger.Kind == replication.TriggerKindImmediate { - // build filter chain for immediate trigger policy - filters = append(filters, - source.NewPatternFilter(replication.FilterItemKindTag, tagPattern)) - } else { - // build filter chain for manual and schedule trigger policy - - // append project filter - filters = append(filters, - source.NewPatternFilter(replication.FilterItemKindProject, projectPattern)) - // append repository filter - filters = append(filters, - source.NewPatternFilter(replication.FilterItemKindRepository, - repositoryPattern, source.NewRepositoryConvertor(sourcer.GetAdaptor(replication.AdaptorKindHarbor)))) - // append tag filter - filters = append(filters, - source.NewPatternFilter(replication.FilterItemKindTag, - tagPattern, source.NewTagConvertor(sourcer.GetAdaptor(replication.AdaptorKindHarbor)))) - } + registry := sourcer.GetAdaptor(replication.AdaptorKindHarbor) + // only support repository and tag filter for now + filters = append(filters, + source.NewRepositoryFilter(patterns[replication.FilterItemKindRepository], registry)) + filters = append(filters, + source.NewTagFilter(patterns[replication.FilterItemKindTag], registry)) return source.NewDefaultFilterChain(filters) } func replicate(replicator replicator.Replicator, policyID int64, candidates []models.FilterItem) error { + if len(candidates) == 0 { + log.Debugf("replicaton candidates are null, no further action needed") + } + repositories := map[string][]string{} // TODO the operation of all candidates are same for now. Update it after supporting // replicate deletion diff --git a/src/replication/core/controller_test.go b/src/replication/core/controller_test.go index bbfa671f8..2404ebed7 100644 --- a/src/replication/core/controller_test.go +++ b/src/replication/core/controller_test.go @@ -79,7 +79,7 @@ func TestGetCandidates(t *testing.T) { Filters: []models.Filter{ models.Filter{ Kind: replication.FilterItemKindTag, - Pattern: ".*", + Pattern: "*", }, }, Trigger: &models.Trigger{ @@ -99,16 +99,19 @@ func TestGetCandidates(t *testing.T) { Value: "library/hello-world:latest", }, } - result := getCandidates(policy, sourcer, candidates...) + metadata := map[string]interface{}{ + "candidates": candidates, + } + result := getCandidates(policy, sourcer, metadata) assert.Equal(t, 2, len(result)) policy.Filters = []models.Filter{ models.Filter{ Kind: replication.FilterItemKindTag, - Pattern: "release-.*", + Pattern: "release-*", }, } - result = getCandidates(policy, sourcer, candidates...) + result = getCandidates(policy, sourcer, metadata) assert.Equal(t, 1, len(result)) } @@ -116,10 +119,6 @@ func TestBuildFilterChain(t *testing.T) { policy := &models.ReplicationPolicy{ ID: 1, Filters: []models.Filter{ - models.Filter{ - Kind: replication.FilterItemKindProject, - Pattern: "*", - }, models.Filter{ Kind: replication.FilterItemKindRepository, Pattern: "*", @@ -134,11 +133,5 @@ func TestBuildFilterChain(t *testing.T) { sourcer := source.NewSourcer() chain := buildFilterChain(policy, sourcer) - assert.Equal(t, 3, len(chain.Filters())) - - policy.Trigger = &models.Trigger{ - Kind: replication.TriggerKindImmediate, - } - chain = buildFilterChain(policy, sourcer) - assert.Equal(t, 1, len(chain.Filters())) + assert.Equal(t, 2, len(chain.Filters())) } diff --git a/src/replication/source/match.go b/src/replication/source/match.go new file mode 100644 index 000000000..9e09dcbd2 --- /dev/null +++ b/src/replication/source/match.go @@ -0,0 +1,23 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "path/filepath" +) + +func match(pattern, str string) (bool, error) { + return filepath.Match(pattern, str) +} diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go index b2ff6cd58..db39d775d 100644 --- a/src/replication/source/repository_convertor.go +++ b/src/replication/source/repository_convertor.go @@ -15,7 +15,6 @@ package source import ( - "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/registry" @@ -39,9 +38,9 @@ func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.Filter // if support replicate deletion result := []models.FilterItem{} for _, item := range items { + // just put it to the result list if the item is not a project if item.Kind != replication.FilterItemKindProject { - log.Warningf("unexpected filter item kind for repository convertor, expected %s got %s, skip", - replication.FilterItemKindProject, item.Kind) + result = append(result, item) continue } diff --git a/src/replication/source/repository_convertor_test.go b/src/replication/source/repository_convertor_test.go index f260f113d..2ee1f5183 100644 --- a/src/replication/source/repository_convertor_test.go +++ b/src/replication/source/repository_convertor_test.go @@ -41,6 +41,9 @@ func TestRepositoryConvert(t *testing.T) { Kind: replication.FilterItemKindRepository, Value: "library/centos", }, + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + }, } convertor := NewRepositoryConvertor(&fakeRegistryAdaptor{}) diff --git a/src/replication/source/repository_filter.go b/src/replication/source/repository_filter.go new file mode 100644 index 000000000..48af422cc --- /dev/null +++ b/src/replication/source/repository_filter.go @@ -0,0 +1,80 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "strings" + + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +// RepositoryFilter implement Filter interface to filter repository +type RepositoryFilter struct { + pattern string + convertor Convertor +} + +// NewRepositoryFilter returns an instance of RepositoryFilter +func NewRepositoryFilter(pattern string, registry registry.Adaptor) *RepositoryFilter { + return &RepositoryFilter{ + pattern: pattern, + convertor: NewRepositoryConvertor(registry), + } +} + +// Init ... +func (r *RepositoryFilter) Init() error { + return nil +} + +// GetConvertor ... +func (r *RepositoryFilter) GetConvertor() Convertor { + return r.convertor +} + +// DoFilter filters repository and image(according to the repository part) and drops any other resource types +func (r *RepositoryFilter) DoFilter(items []models.FilterItem) []models.FilterItem { + result := []models.FilterItem{} + for _, item := range items { + if item.Kind != replication.FilterItemKindRepository && item.Kind != replication.FilterItemKindTag { + log.Warningf("unsupported type %s for repository filter, drop", item.Kind) + continue + } + + repository := item.Value + if item.Kind == replication.FilterItemKindTag { + repository = strings.SplitN(repository, ":", 2)[0] + } + + if len(r.pattern) == 0 { + log.Debugf("pattern is null, add %s to the repository filter result list", item.Value) + result = append(result, item) + } else { + matched, err := match(r.pattern, repository) + if err != nil { + log.Errorf("failed to match pattern %s to value %s: %v", r.pattern, repository, err) + break + } + if matched { + log.Debugf("pattern %s matched, add %s to the repository filter result list", r.pattern, item.Value) + result = append(result, item) + } + } + } + return result +} diff --git a/src/replication/source/repository_filter_test.go b/src/replication/source/repository_filter_test.go new file mode 100644 index 000000000..6ab515323 --- /dev/null +++ b/src/replication/source/repository_filter_test.go @@ -0,0 +1,75 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +func TestInitOfRepositoryFilter(t *testing.T) { + filter := NewRepositoryFilter("", ®istry.HarborAdaptor{}) + assert.Nil(t, filter.Init()) +} + +func TestGetConvertorOfRepositoryFilter(t *testing.T) { + filter := NewRepositoryFilter("", ®istry.HarborAdaptor{}) + assert.NotNil(t, filter.GetConvertor()) +} + +func TestDoFilterOfRepositoryFilter(t *testing.T) { + // invalid filter item type + filter := NewRepositoryFilter("", ®istry.HarborAdaptor{}) + items := filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: "invalid_type", + }, + }) + assert.Equal(t, 0, len(items)) + + // empty pattern + filter = NewRepositoryFilter("", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindRepository, + Value: "library/hello-world", + }, + }) + assert.Equal(t, 1, len(items)) + + // non-empty pattern + filter = NewRepositoryFilter("library/*", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world", + }, + }) + assert.Equal(t, 1, len(items)) + + // non-empty pattern + filter = NewRepositoryFilter("library/*", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + }) + assert.Equal(t, 1, len(items)) +} diff --git a/src/replication/source/tag_convertor.go b/src/replication/source/tag_convertor.go index 09adcecf9..80e7f29f7 100644 --- a/src/replication/source/tag_convertor.go +++ b/src/replication/source/tag_convertor.go @@ -15,7 +15,6 @@ package source import ( - "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/registry" @@ -38,8 +37,8 @@ func (t *TagConvertor) Convert(items []models.FilterItem) []models.FilterItem { result := []models.FilterItem{} for _, item := range items { if item.Kind != replication.FilterItemKindRepository { - log.Warningf("unexpected filter item kind for tag convertor, expected %s got %s, skip", - replication.FilterItemKindRepository, item.Kind) + // just put it to the result list if the item is not a repository + result = append(result, item) continue } diff --git a/src/replication/source/tag_convertor_test.go b/src/replication/source/tag_convertor_test.go index 6e64f86d2..17c244c1d 100644 --- a/src/replication/source/tag_convertor_test.go +++ b/src/replication/source/tag_convertor_test.go @@ -41,6 +41,9 @@ func TestTagConvert(t *testing.T) { Kind: replication.FilterItemKindTag, Value: "library/ubuntu:16.04", }, + models.FilterItem{ + Kind: replication.FilterItemKindProject, + }, } convertor := NewTagConvertor(&fakeRegistryAdaptor{}) diff --git a/src/replication/source/tag_filter.go b/src/replication/source/tag_filter.go new file mode 100644 index 000000000..bdf9158e0 --- /dev/null +++ b/src/replication/source/tag_filter.go @@ -0,0 +1,78 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "strings" + + "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +// TagFilter implements Filter interface to filter tag +type TagFilter struct { + pattern string + convertor Convertor +} + +// NewTagFilter returns an instance of TagFilter +func NewTagFilter(pattern string, registry registry.Adaptor) *TagFilter { + return &TagFilter{ + pattern: pattern, + convertor: NewTagConvertor(registry), + } +} + +// Init ... +func (t *TagFilter) Init() error { + return nil +} + +// GetConvertor ... +func (t *TagFilter) GetConvertor() Convertor { + return t.convertor +} + +// DoFilter filters tag of the image +func (t *TagFilter) DoFilter(items []models.FilterItem) []models.FilterItem { + result := []models.FilterItem{} + for _, item := range items { + if item.Kind != replication.FilterItemKindTag { + log.Warningf("unsupported type %s for tag filter, dropped", item.Kind) + continue + } + + if len(t.pattern) == 0 { + log.Debugf("pattern is null, add %s to the tag filter result list", item.Value) + result = append(result, item) + continue + } + + tag := strings.SplitN(item.Value, ":", 2)[1] + matched, err := match(t.pattern, tag) + if err != nil { + log.Errorf("failed to match pattern %s to value %s: %v", t.pattern, tag, err) + continue + } + + if matched { + log.Debugf("pattern %s matched, add %s to the tag filter result list", t.pattern, item.Value) + result = append(result, item) + } + } + return result +} diff --git a/src/replication/source/tag_filter_test.go b/src/replication/source/tag_filter_test.go new file mode 100644 index 000000000..8114852ce --- /dev/null +++ b/src/replication/source/tag_filter_test.go @@ -0,0 +1,85 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" + "github.com/vmware/harbor/src/replication/registry" +) + +func TestInitOfTagFilter(t *testing.T) { + filter := NewTagFilter("", ®istry.HarborAdaptor{}) + assert.Nil(t, filter.Init()) +} + +func TestGetConvertorOfTagFilter(t *testing.T) { + filter := NewTagFilter("", ®istry.HarborAdaptor{}) + assert.NotNil(t, filter.GetConvertor()) +} + +func TestDoFilterOfTagFilter(t *testing.T) { + // invalid filter item type + filter := NewTagFilter("", ®istry.HarborAdaptor{}) + items := filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: "invalid_type", + }, + }) + assert.Equal(t, 0, len(items)) + + // empty pattern + filter = NewTagFilter("", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + }) + assert.Equal(t, 1, len(items)) + + // non-empty pattern + filter = NewTagFilter("l*t", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + }) + assert.Equal(t, 1, len(items)) + + // non-empty pattern + filter = NewTagFilter("lates?", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + }) + assert.Equal(t, 1, len(items)) + + // non-empty pattern + filter = NewTagFilter("latest?", ®istry.HarborAdaptor{}) + items = filter.DoFilter([]models.FilterItem{ + models.FilterItem{ + Kind: replication.FilterItemKindTag, + Value: "library/hello-world:latest", + }, + }) + assert.Equal(t, 0, len(items)) +} From 055ab0ba15d49b0fecae3afe9109bcf728fb9d78 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 12 Dec 2017 15:56:46 +0800 Subject: [PATCH 24/37] Refine replication schedule trigger API --- src/replication/core/controller.go | 7 +- src/replication/core/controller_test.go | 6 +- src/replication/models/trigger.go | 49 ++++++++- src/replication/models/trigger_test.go | 36 ++++++ src/replication/source/repository_filter.go | 6 + src/replication/source/tag_filter.go | 6 + src/replication/trigger/manager.go | 116 +++++++++----------- src/replication/trigger/schedule.go | 5 +- src/ui/api/replication_policy_test.go | 6 +- 9 files changed, 154 insertions(+), 83 deletions(-) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 33b486003..38a0a93f9 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -160,7 +160,7 @@ func (ctl *DefaultController) UpdatePolicy(updatedPolicy models.ReplicationPolic } else { switch updatedPolicy.Trigger.Kind { case replication.TriggerKindSchedule: - if updatedPolicy.Trigger.Param != originPolicy.Trigger.Param { + if !originPolicy.Trigger.ScheduleParam.Equal(updatedPolicy.Trigger.ScheduleParam) { reset = true } case replication.TriggerKindImmediate: @@ -176,7 +176,7 @@ func (ctl *DefaultController) UpdatePolicy(updatedPolicy models.ReplicationPolic } if reset { - if err = ctl.triggerManager.UnsetTrigger(id, *originPolicy.Trigger); err != nil { + if err = ctl.triggerManager.UnsetTrigger(&originPolicy); err != nil { return err } @@ -199,7 +199,7 @@ func (ctl *DefaultController) RemovePolicy(policyID int64) error { return fmt.Errorf("policy %d not found", policyID) } - if err = ctl.triggerManager.UnsetTrigger(policyID, *policy.Trigger); err != nil { + if err = ctl.triggerManager.UnsetTrigger(&policy); err != nil { return err } @@ -230,7 +230,6 @@ func (ctl *DefaultController) Replicate(policyID int64, metadata ...map[string]i // prepare candidates for replication candidates := getCandidates(&policy, ctl.sourcer, metadata...) - // TODO /* targets := []*common_models.RepTarget{} for _, targetID := range policy.TargetIDs { diff --git a/src/replication/core/controller_test.go b/src/replication/core/controller_test.go index 2404ebed7..58b1935a5 100644 --- a/src/replication/core/controller_test.go +++ b/src/replication/core/controller_test.go @@ -42,7 +42,11 @@ func TestInit(t *testing.T) { } func TestCreatePolicy(t *testing.T) { - _, err := GlobalController.CreatePolicy(models.ReplicationPolicy{}) + _, err := GlobalController.CreatePolicy(models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindManual, + }, + }) assert.Nil(t, err) } diff --git a/src/replication/models/trigger.go b/src/replication/models/trigger.go index 27c2afa69..4af3e5329 100644 --- a/src/replication/models/trigger.go +++ b/src/replication/models/trigger.go @@ -23,11 +23,8 @@ import ( //Trigger is replication launching approach definition type Trigger struct { - //The name of the trigger - Kind string `json:"kind"` - - //The parameters with json text format required by the trigger - Param string `json:"param"` + Kind string `json:"kind"` // the type of the trigger + ScheduleParam *ScheduleParam `json:"schedule_param"` // optional, only used when kind is 'schedule' } // Valid ... @@ -37,4 +34,46 @@ func (t *Trigger) Valid(v *validation.Validation) { t.Kind == replication.TriggerKindSchedule) { v.SetError("kind", fmt.Sprintf("invalid trigger kind: %s", t.Kind)) } + + if t.Kind == replication.TriggerKindSchedule { + if t.ScheduleParam == nil { + v.SetError("schedule_param", "empty schedule_param") + } else { + t.ScheduleParam.Valid(v) + } + } +} + +// ScheduleParam defines the parameters used by schedule trigger +type ScheduleParam struct { + Type string `json:"type"` //daily or weekly + Weekday int8 `json:"weekday"` //Optional, only used when type is 'weekly' + Offtime int64 `json:"offtime"` //The time offset with the UTC 00:00 in seconds +} + +// Valid ... +func (s *ScheduleParam) Valid(v *validation.Validation) { + if !(s.Type == replication.TriggerScheduleDaily || + s.Type == replication.TriggerScheduleWeekly) { + v.SetError("type", fmt.Sprintf("invalid schedule trigger parameter type: %s", s.Type)) + } + + if s.Type == replication.TriggerScheduleWeekly { + if s.Weekday < 1 || s.Weekday > 7 { + v.SetError("weekday", fmt.Sprintf("invalid schedule trigger parameter weekday: %d", s.Weekday)) + } + } + + if s.Offtime < 0 || s.Offtime > 3600*24 { + v.SetError("offtime", fmt.Sprintf("invalid schedule trigger parameter offtime: %d", s.Offtime)) + } +} + +// Equal ... +func (s *ScheduleParam) Equal(param *ScheduleParam) bool { + if param == nil { + return false + } + + return s.Type == param.Type && s.Weekday == param.Weekday && s.Offtime == param.Offtime } diff --git a/src/replication/models/trigger_test.go b/src/replication/models/trigger_test.go index b591995e9..2aba67a44 100644 --- a/src/replication/models/trigger_test.go +++ b/src/replication/models/trigger_test.go @@ -31,6 +31,9 @@ func TestValidOfTrigger(t *testing.T) { &Trigger{ Kind: replication.TriggerKindImmediate, }: false, + &Trigger{ + Kind: replication.TriggerKindSchedule, + }: true, } for filter, hasError := range cases { @@ -39,3 +42,36 @@ func TestValidOfTrigger(t *testing.T) { assert.Equal(t, hasError, v.HasErrors()) } } + +func TestValidOfScheduleParam(t *testing.T) { + cases := map[*ScheduleParam]bool{ + &ScheduleParam{}: true, + &ScheduleParam{ + Type: "invalid_type", + }: true, + &ScheduleParam{ + Type: replication.TriggerScheduleDaily, + Offtime: 3600*24 + 1, + }: true, + &ScheduleParam{ + Type: replication.TriggerScheduleDaily, + Offtime: 3600 * 2, + }: false, + &ScheduleParam{ + Type: replication.TriggerScheduleWeekly, + Weekday: 0, + Offtime: 3600 * 2, + }: true, + &ScheduleParam{ + Type: replication.TriggerScheduleWeekly, + Weekday: 7, + Offtime: 3600 * 2, + }: false, + } + + for param, hasError := range cases { + v := &validation.Validation{} + param.Valid(v) + assert.Equal(t, hasError, v.HasErrors()) + } +} diff --git a/src/replication/source/repository_filter.go b/src/replication/source/repository_filter.go index 48af422cc..78258dfe2 100644 --- a/src/replication/source/repository_filter.go +++ b/src/replication/source/repository_filter.go @@ -49,6 +49,12 @@ func (r *RepositoryFilter) GetConvertor() Convertor { // DoFilter filters repository and image(according to the repository part) and drops any other resource types func (r *RepositoryFilter) DoFilter(items []models.FilterItem) []models.FilterItem { + candidates := []string{} + for _, item := range items { + candidates = append(candidates, item.Value) + } + log.Debugf("repository filter candidates: %v", candidates) + result := []models.FilterItem{} for _, item := range items { if item.Kind != replication.FilterItemKindRepository && item.Kind != replication.FilterItemKindTag { diff --git a/src/replication/source/tag_filter.go b/src/replication/source/tag_filter.go index bdf9158e0..f6fc5db92 100644 --- a/src/replication/source/tag_filter.go +++ b/src/replication/source/tag_filter.go @@ -49,6 +49,12 @@ func (t *TagFilter) GetConvertor() Convertor { // DoFilter filters tag of the image func (t *TagFilter) DoFilter(items []models.FilterItem) []models.FilterItem { + candidates := []string{} + for _, item := range items { + candidates = append(candidates, item.Value) + } + log.Debugf("tag filter candidates: %v", candidates) + result := []models.FilterItem{} for _, item := range items { if item.Kind != replication.FilterItemKindTag { diff --git a/src/replication/trigger/manager.go b/src/replication/trigger/manager.go index 83969855c..10f6eaf83 100644 --- a/src/replication/trigger/manager.go +++ b/src/replication/trigger/manager.go @@ -1,7 +1,6 @@ package trigger import ( - "errors" "fmt" "github.com/vmware/harbor/src/common/utils/log" @@ -55,88 +54,71 @@ func (m *Manager) RemoveTrigger(policyID int64) error { //SetupTrigger will create the new trigger based on the provided policy. //If failed, an error will be returned. func (m *Manager) SetupTrigger(policy *models.ReplicationPolicy) error { - if policy == nil || policy.Trigger == nil { - log.Debug("empty policy or trigger, skip trigger setup") + trigger, err := createTrigger(policy) + if err != nil { + return err + } + + // manual trigger, do nothing + if trigger == nil { return nil } + tg := trigger.(Interface) + if err = tg.Setup(); err != nil { + return err + } + + log.Debugf("%s trigger for policy %d is set", tg.Kind(), policy.ID) + return nil +} + +//UnsetTrigger will disable the trigger which is not cached in the trigger cache. +func (m *Manager) UnsetTrigger(policy *models.ReplicationPolicy) error { + trigger, err := createTrigger(policy) + if err != nil { + return err + } + + // manual trigger, do nothing + if trigger == nil { + return nil + } + + tg := trigger.(Interface) + if err = tg.Unset(); err != nil { + return err + } + + log.Debugf("%s trigger for policy %d is unset", tg.Kind(), policy.ID) + return nil +} + +func createTrigger(policy *models.ReplicationPolicy) (interface{}, error) { + if policy == nil || policy.Trigger == nil { + return nil, fmt.Errorf("empty policy or trigger") + } + trigger := policy.Trigger switch trigger.Kind { case replication.TriggerKindSchedule: param := ScheduleParam{} - if err := param.Parse(trigger.Param); err != nil { - return err - } - //Append policy ID and whether replicate deletion param.PolicyID = policy.ID - param.OnDeletion = policy.ReplicateDeletion + param.Type = trigger.ScheduleParam.Type + param.Weekday = trigger.ScheduleParam.Weekday + param.Offtime = trigger.ScheduleParam.Offtime - newTrigger := NewScheduleTrigger(param) - if err := newTrigger.Setup(); err != nil { - return err - } + return NewScheduleTrigger(param), nil case replication.TriggerKindImmediate: param := ImmediateParam{} - if err := param.Parse(trigger.Param); err != nil { - return err - } - //Append policy ID and whether replicate deletion param.PolicyID = policy.ID param.OnDeletion = policy.ReplicateDeletion param.Namespaces = policy.Namespaces - newTrigger := NewImmediateTrigger(param) - if err := newTrigger.Setup(); err != nil { - return err - } + return NewImmediateTrigger(param), nil case replication.TriggerKindManual: - // do nothing + return nil, nil default: - return fmt.Errorf("invalid trigger type: %s", policy.Trigger.Kind) + return nil, fmt.Errorf("invalid trigger type: %s", trigger.Kind) } - - return nil -} - -//UnsetTrigger will disable the trigger which is not cached in the trigger cache. -func (m *Manager) UnsetTrigger(policyID int64, trigger models.Trigger) error { - if policyID <= 0 { - return errors.New("Invalid policy ID") - } - - if len(trigger.Kind) == 0 { - return errors.New("Invalid replication trigger definition") - } - - switch trigger.Kind { - case replication.TriggerKindSchedule: - param := ScheduleParam{} - if err := param.Parse(trigger.Param); err != nil { - return err - } - //Append policy ID info - param.PolicyID = policyID - - newTrigger := NewScheduleTrigger(param) - if err := newTrigger.Unset(); err != nil { - return err - } - case replication.TriggerKindImmediate: - param := ImmediateParam{} - if err := param.Parse(trigger.Param); err != nil { - return err - } - //Append policy ID info - param.PolicyID = policyID - - newTrigger := NewImmediateTrigger(param) - if err := newTrigger.Unset(); err != nil { - return err - } - default: - //Treat as manual trigger - break - } - - return nil } diff --git a/src/replication/trigger/schedule.go b/src/replication/trigger/schedule.go index 3a8480919..5d5b24aad 100644 --- a/src/replication/trigger/schedule.go +++ b/src/replication/trigger/schedule.go @@ -2,6 +2,7 @@ package trigger import ( "fmt" + "time" "github.com/vmware/harbor/src/common/scheduler" "github.com/vmware/harbor/src/common/scheduler/policy" @@ -31,10 +32,10 @@ func (st *ScheduleTrigger) Setup() error { config := &policy.AlternatePolicyConfiguration{} switch st.params.Type { case replication.TriggerScheduleDaily: - config.Duration = 24 * 3600 + config.Duration = 24 * 3600 * time.Second config.OffsetTime = st.params.Offtime case replication.TriggerScheduleWeekly: - config.Duration = 7 * 24 * 3600 + config.Duration = 7 * 24 * 3600 * time.Second config.OffsetTime = st.params.Offtime config.Weekday = st.params.Weekday default: diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index 0bf688105..9698d5df1 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -471,8 +471,7 @@ func TestConvertToRepPolicy(t *testing.T) { }, ReplicateDeletion: true, Trigger: &rep_models.Trigger{ - Kind: "trigger_kind_01", - Param: "{param}", + Kind: "trigger_kind_01", }, Projects: []*models.Project{ &models.Project{ @@ -498,8 +497,7 @@ func TestConvertToRepPolicy(t *testing.T) { }, ReplicateDeletion: true, Trigger: &rep_models.Trigger{ - Kind: "trigger_kind_01", - Param: "{param}", + Kind: "trigger_kind_01", }, ProjectIDs: []int64{1}, Namespaces: []string{"library"}, From b5e7de331e263a9c9484517ef96478168d3eec65 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 12 Dec 2017 20:44:41 +0800 Subject: [PATCH 25/37] Delete enabled and start_time properties of replication rule --- src/common/dao/dao_test.go | 51 ++---------------------- src/common/dao/replication_job.go | 50 ++++------------------- src/common/models/replication_job.go | 2 - src/jobservice/job/job_test.go | 2 - src/jobservice/job/jobs.go | 6 --- src/jobservice/job/statemachine.go | 10 ----- src/replication/event/on_push_handler.go | 8 ++-- src/ui/api/dataprepare_test.go | 4 -- src/ui/api/target.go | 17 -------- 9 files changed, 14 insertions(+), 136 deletions(-) diff --git a/src/common/dao/dao_test.go b/src/common/dao/dao_test.go index 03252787e..c169f11ba 100644 --- a/src/common/dao/dao_test.go +++ b/src/common/dao/dao_test.go @@ -941,7 +941,6 @@ func TestFilterRepTargets(t *testing.T) { func TestAddRepPolicy(t *testing.T) { policy := models.RepPolicy{ ProjectID: 1, - Enabled: 1, TargetID: targetID, Description: "whatever", Name: "mypolicy", @@ -961,15 +960,10 @@ func TestAddRepPolicy(t *testing.T) { t.Errorf("Unable to find a policy with id: %d", id) } - if p.Name != "mypolicy" || p.TargetID != targetID || p.Enabled != 1 || p.Description != "whatever" { - t.Errorf("The data does not match, expected: Name: mypolicy, TargetID: %d, Enabled: 1, Description: whatever;\n result: Name: %s, TargetID: %d, Enabled: %d, Description: %s", - targetID, p.Name, p.TargetID, p.Enabled, p.Description) + if p.Name != "mypolicy" || p.TargetID != targetID || p.Description != "whatever" { + t.Errorf("The data does not match, expected: Name: mypolicy, TargetID: %d, Description: whatever;\n result: Name: %s, TargetID: %d, Description: %s", + targetID, p.Name, p.TargetID, p.Description) } - var tm = time.Now().AddDate(0, 0, -1) - if !p.StartTime.After(tm) { - t.Errorf("Unexpected start_time: %v", p.StartTime) - } - } func TestGetRepPolicyByTarget(t *testing.T) { @@ -1019,44 +1013,9 @@ func TestGetRepPolicyByName(t *testing.T) { } -func TestDisableRepPolicy(t *testing.T) { - err := DisableRepPolicy(policyID) - if err != nil { - t.Errorf("Failed to disable policy, id: %d", policyID) - } - p, err := GetRepPolicy(policyID) - if err != nil { - t.Errorf("Error occurred in GetPolicy: %v, id: %d", err, policyID) - } - if p == nil { - t.Errorf("Unable to find a policy with id: %d", policyID) - } - if p.Enabled == 1 { - t.Errorf("The Enabled value of replication policy is still 1 after disabled, id: %d", policyID) - } -} - -func TestEnableRepPolicy(t *testing.T) { - err := EnableRepPolicy(policyID) - if err != nil { - t.Errorf("Failed to disable policy, id: %d", policyID) - } - p, err := GetRepPolicy(policyID) - if err != nil { - t.Errorf("Error occurred in GetPolicy: %v, id: %d", err, policyID) - } - if p == nil { - t.Errorf("Unable to find a policy with id: %d", policyID) - } - if p.Enabled == 0 { - t.Errorf("The Enabled value of replication policy is still 0 after disabled, id: %d", policyID) - } -} - func TestAddRepPolicy2(t *testing.T) { policy2 := models.RepPolicy{ ProjectID: 3, - Enabled: 0, TargetID: 3, Description: "whatever", Name: "mypolicy", @@ -1073,10 +1032,6 @@ func TestAddRepPolicy2(t *testing.T) { if p == nil { t.Errorf("Unable to find a policy with id: %d", policyID2) } - var tm time.Time - if p.StartTime.After(tm) { - t.Errorf("Unexpected start_time: %v", p.StartTime) - } } func TestAddRepJob(t *testing.T) { diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index 4087e3d13..cfdadc3eb 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -106,17 +106,13 @@ func FilterRepTargets(name string) ([]*models.RepTarget, error) { // AddRepPolicy ... func AddRepPolicy(policy models.RepPolicy) (int64, error) { o := GetOrmer() - sql := `insert into replication_policy (name, project_id, target_id, enabled, description, cron_str, start_time, creation_time, update_time, filters, replicate_deletion) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + sql := `insert into replication_policy (name, project_id, target_id, enabled, description, cron_str, creation_time, update_time, filters, replicate_deletion) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` params := []interface{}{} - params = append(params, policy.Name, policy.ProjectID, policy.TargetID, policy.Enabled, policy.Description, policy.Trigger) now := time.Now() - if policy.Enabled == 1 { - params = append(params, now) - } else { - params = append(params, nil) - } - params = append(params, now, now, policy.Filters, policy.ReplicateDeletion) + params = append(params, policy.Name, policy.ProjectID, policy.TargetID, 1, + policy.Description, policy.Trigger, now, now, policy.Filters, + policy.ReplicateDeletion) result, err := o.Raw(sql, params...).Exec() if err != nil { @@ -150,8 +146,8 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error var args []interface{} sql := `select rp.id, rp.project_id, rp.target_id, - rt.name as target_name, rp.name, rp.enabled, rp.description, - rp.cron_str, rp.filters, rp.replicate_deletion,rp.start_time, + rt.name as target_name, rp.name, rp.description, + rp.cron_str, rp.filters, rp.replicate_deletion, rp.creation_time, rp.update_time, count(rj.status) as error_job_count from replication_policy rp @@ -245,7 +241,7 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol func UpdateRepPolicy(policy *models.RepPolicy) error { o := GetOrmer() policy.UpdateTime = time.Now() - _, err := o.Update(policy, "TargetID", "Name", "Enabled", "Description", + _, err := o.Update(policy, "TargetID", "Name", "Description", "Trigger", "Filters", "ReplicateDeletion", "UpdateTime") return err } @@ -262,36 +258,6 @@ func DeleteRepPolicy(id int64) error { return err } -// UpdateRepPolicyEnablement ... -func UpdateRepPolicyEnablement(id int64, enabled int) error { - o := GetOrmer() - p := models.RepPolicy{ - ID: id, - Enabled: enabled, - UpdateTime: time.Now(), - } - - var err error - if enabled == 1 { - p.StartTime = time.Now() - _, err = o.Update(&p, "Enabled", "StartTime") - } else { - _, err = o.Update(&p, "Enabled") - } - - return err -} - -// EnableRepPolicy ... -func EnableRepPolicy(id int64) error { - return UpdateRepPolicyEnablement(id, 1) -} - -// DisableRepPolicy ... -func DisableRepPolicy(id int64) error { - return UpdateRepPolicyEnablement(id, 0) -} - // AddRepJob ... func AddRepJob(job models.RepJob) (int64, error) { o := GetOrmer() diff --git a/src/common/models/replication_job.go b/src/common/models/replication_job.go index abf011a34..8c5744800 100644 --- a/src/common/models/replication_job.go +++ b/src/common/models/replication_job.go @@ -42,12 +42,10 @@ type RepPolicy struct { ProjectID int64 `orm:"column(project_id)" ` TargetID int64 `orm:"column(target_id)"` Name string `orm:"column(name)"` - Enabled int `orm:"column(enabled)"` Description string `orm:"column(description)"` Trigger string `orm:"column(cron_str)"` Filters string `orm:"column(filters)"` ReplicateDeletion bool `orm:"column(replicate_deletion)"` - StartTime time.Time `orm:"column(start_time)"` CreationTime time.Time `orm:"column(creation_time);auto_now_add"` UpdateTime time.Time `orm:"column(update_time);auto_now"` Deleted int `orm:"column(deleted)"` diff --git a/src/jobservice/job/job_test.go b/src/jobservice/job/job_test.go index ab52c9487..eb29c93cc 100644 --- a/src/jobservice/job/job_test.go +++ b/src/jobservice/job/job_test.go @@ -105,7 +105,6 @@ func TestRepJob(t *testing.T) { assert.Nil(err) j, err := dao.GetRepJob(repJobID) assert.Equal(models.JobRetrying, j.Status) - assert.Equal(1, rj.parm.Enabled) assert.False(rj.parm.Insecure) rj2 := NewRepJob(99999) err = rj2.Init() @@ -163,7 +162,6 @@ func prepareRepJobData() error { } policy := models.RepPolicy{ ProjectID: 1, - Enabled: 1, TargetID: targetID, Description: "whatever", Name: "mypolicy", diff --git a/src/jobservice/job/jobs.go b/src/jobservice/job/jobs.go index 96a3bc821..1752f9164 100644 --- a/src/jobservice/job/jobs.go +++ b/src/jobservice/job/jobs.go @@ -62,7 +62,6 @@ type RepJobParm struct { TargetPassword string Repository string Tags []string - Enabled int Operation string Insecure bool } @@ -124,13 +123,8 @@ func (rj *RepJob) Init() error { LocalRegURL: regURL, Repository: job.Repository, Tags: job.TagList, - Enabled: policy.Enabled, Operation: job.Operation, } - if policy.Enabled == 0 { - //worker will cancel this job - return nil - } target, err := dao.GetRepTarget(policy.TargetID) if err != nil { return fmt.Errorf("Failed to get target, error: %v", err) diff --git a/src/jobservice/job/statemachine.go b/src/jobservice/job/statemachine.go index 3db88a78f..8b41ebdf7 100644 --- a/src/jobservice/job/statemachine.go +++ b/src/jobservice/job/statemachine.go @@ -208,16 +208,6 @@ func (sm *SM) Reset(j Job) error { } func (sm *SM) kickOff() error { - if repJob, ok := sm.CurrentJob.(*RepJob); ok { - if repJob.parm.Enabled == 0 { - log.Debugf("The policy of job:%v is disabled, will cancel the job", repJob) - _, err := sm.EnterState(models.JobCanceled) - if err != nil { - log.Warningf("For job: %v, failed to update state to 'canceled', error: %v", repJob, err) - } - return err - } - } log.Debugf("In kickOff: will start job: %v", sm.CurrentJob) sm.Start(models.JobRunning) return nil diff --git a/src/replication/event/on_push_handler.go b/src/replication/event/on_push_handler.go index 30ae3447a..f00468ca2 100644 --- a/src/replication/event/on_push_handler.go +++ b/src/replication/event/on_push_handler.go @@ -70,11 +70,9 @@ func checkAndTriggerReplication(image, operation string) error { for _, watchItem := range watchItems { item := models.FilterItem{ - Kind: replication.FilterItemKindTag, - Value: image, - Metadata: map[string]interface{}{ - "operation": operation, - }, + Kind: replication.FilterItemKindTag, + Value: image, + Operation: operation, } if err := notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ diff --git a/src/ui/api/dataprepare_test.go b/src/ui/api/dataprepare_test.go index 67e41c9c9..711a74bed 100644 --- a/src/ui/api/dataprepare_test.go +++ b/src/ui/api/dataprepare_test.go @@ -118,10 +118,6 @@ func CommonDelTarget() { _ = dao.DeleteRepTarget(target.ID) } -func CommonPolicyEabled(policyID int, enabled int) { - _ = dao.UpdateRepPolicyEnablement(int64(policyID), enabled) -} - func CommonAddRepository() { commonRepository := &models.RepoRecord{ RepositoryID: 1, diff --git a/src/ui/api/target.go b/src/ui/api/target.go index 68c3c2689..61f8939eb 100644 --- a/src/ui/api/target.go +++ b/src/ui/api/target.go @@ -231,23 +231,6 @@ func (t *TargetAPI) Put() { t.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } - policies, err := dao.GetRepPolicyByTarget(id) - if err != nil { - log.Errorf("failed to get policies according target %d: %v", id, err) - t.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError)) - } - - hasEnabledPolicy := false - for _, policy := range policies { - if policy.Enabled == 1 { - hasEnabledPolicy = true - break - } - } - - if hasEnabledPolicy { - t.CustomAbort(http.StatusBadRequest, "the target is associated with policy which is enabled") - } if len(target.Password) != 0 { target.Password, err = utils.ReversibleDecrypt(target.Password, t.secretKey) if err != nil { From c4dc95f4f9e1687e3037f87c7512688b51c85ac0 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 13 Dec 2017 14:56:45 +0800 Subject: [PATCH 26/37] Add implement for supporting replicatie the existing images now --- src/ui/api/replication.go | 13 +++++++++---- src/ui/api/replication_policy.go | 20 +++++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/ui/api/replication.go b/src/ui/api/replication.go index 37a8ec6ce..ffe9165d7 100644 --- a/src/ui/api/replication.go +++ b/src/ui/api/replication.go @@ -60,11 +60,16 @@ func (r *ReplicationAPI) Post() { return } - if err = notifier.Publish(topic.StartReplicationTopic, notification.StartReplicationNotification{ - PolicyID: replication.PolicyID, - }); err != nil { + if err = startReplication(replication.PolicyID); err != nil { r.HandleInternalServerError(fmt.Sprintf("failed to publish replication topic for policy %d: %v", replication.PolicyID, err)) return } - log.Infof("replication topic for policy %d triggered", replication.PolicyID) + log.Infof("replication signal for policy %d sent", replication.PolicyID) +} + +func startReplication(policyID int64) error { + return notifier.Publish(topic.StartReplicationTopic, + notification.StartReplicationNotification{ + PolicyID: policyID, + }) } diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index da452331b..b349f45c5 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -145,7 +145,15 @@ func (pa *RepPolicyAPI) Post() { return } - // TODO trigger a replication if ReplicateExistingImageNow is true + if policy.ReplicateExistingImageNow { + go func() { + if err = startReplication(id); err != nil { + log.Errorf("failed to send replication signal for policy %d: %v", id, err) + return + } + log.Infof("replication signal for policy %d sent", id) + }() + } pa.Redirect(http.StatusCreated, strconv.FormatInt(id, 10)) } @@ -201,6 +209,16 @@ func (pa *RepPolicyAPI) Put() { pa.HandleInternalServerError(fmt.Sprintf("failed to update policy %d: %v", id, err)) return } + + if policy.ReplicateExistingImageNow { + go func() { + if err = startReplication(id); err != nil { + log.Errorf("failed to send replication signal for policy %d: %v", id, err) + return + } + log.Infof("replication signal for policy %d sent", id) + }() + } } // Delete the replication policy From a736cb7b09d26cbe0e3b5e989dde788f033debd1 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 15 Dec 2017 06:22:37 +0800 Subject: [PATCH 27/37] Update the HTTP client according to the comments --- src/adminserver/client/client.go | 22 +++- src/adminserver/client/client_test.go | 3 +- src/common/http/client.go | 101 ++++++++++++++++++ src/common/http/client/client.go | 56 ---------- .../http/{client => modifier}/auth/auth.go | 53 +++------ .../{client => modifier}/auth/auth_test.go | 21 +--- .../registry => http/modifier}/modifier.go | 2 +- .../utils/registry/auth/tokenauthorizer.go | 6 +- src/common/utils/registry/transport.go | 5 +- src/jobservice/client/client.go | 26 ++--- src/jobservice/client/client_test.go | 2 +- src/jobservice/config/config.go | 8 +- src/replication/core/controller.go | 9 +- src/replication/replicator/replicator.go | 9 +- src/replication/replicator/replicator_test.go | 3 +- src/ui/config/config.go | 8 +- 16 files changed, 176 insertions(+), 158 deletions(-) create mode 100644 src/common/http/client.go delete mode 100644 src/common/http/client/client.go rename src/common/http/{client => modifier}/auth/auth.go (56%) rename src/common/http/{client => modifier}/auth/auth_test.go (65%) rename src/common/{utils/registry => http/modifier}/modifier.go (97%) diff --git a/src/adminserver/client/client.go b/src/adminserver/client/client.go index ba82d283c..d2a448eb9 100644 --- a/src/adminserver/client/client.go +++ b/src/adminserver/client/client.go @@ -24,7 +24,8 @@ import ( "strings" "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - httpclient "github.com/vmware/harbor/src/common/http/client" + common_http "github.com/vmware/harbor/src/common/http" + "github.com/vmware/harbor/src/common/http/modifier/auth" "github.com/vmware/harbor/src/common/utils" ) @@ -43,22 +44,33 @@ type Client interface { } // NewClient return an instance of Adminserver client -func NewClient(baseURL string, c httpclient.Client) Client { +func NewClient(baseURL string, cfg *Config) Client { baseURL = strings.TrimRight(baseURL, "/") if !strings.Contains(baseURL, "://") { baseURL = "http://" + baseURL } - return &client{ + client := &client{ baseURL: baseURL, - client: c, } + if cfg != nil { + authorizer := auth.NewSecretAuthorizer(cfg.Secret) + client.client = common_http.NewClient(nil, authorizer) + } + return client } type client struct { baseURL string - client httpclient.Client + client *common_http.Client } +// Config contains configurations needed for client +type Config struct { + Secret string +} + +// TODO refactor the codes with methods of common_http.Client + // do creates request and authorizes it if authorizer is not nil func (c *client) do(method, relativePath string, body io.Reader) (*http.Response, error) { url := c.baseURL + relativePath diff --git a/src/adminserver/client/client_test.go b/src/adminserver/client/client_test.go index b74c187b4..59d407a34 100644 --- a/src/adminserver/client/client_test.go +++ b/src/adminserver/client/client_test.go @@ -16,7 +16,6 @@ package client import ( "fmt" - "net/http" "os" "testing" @@ -35,7 +34,7 @@ func TestMain(m *testing.M) { os.Exit(1) } - c = NewClient(server.URL, &http.Client{}) + c = NewClient(server.URL, &Config{}) os.Exit(m.Run()) } diff --git a/src/common/http/client.go b/src/common/http/client.go new file mode 100644 index 000000000..70ec6e528 --- /dev/null +++ b/src/common/http/client.go @@ -0,0 +1,101 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package http + +import ( + "io" + "net/http" + + "github.com/vmware/harbor/src/common/http/modifier" +) + +// Client wraps net/http.Client with modifiers, modifiers the request before sending it +type Client struct { + modifiers []modifier.Modifier + client *http.Client +} + +// NewClient creates an instance of Client. Use net/http.Client as the default value +// if c is nil. +func NewClient(c *http.Client, modifiers ...modifier.Modifier) *Client { + client := &Client{ + client: c, + } + if client.client == nil { + client.client = &http.Client{} + } + if len(modifiers) > 0 { + client.modifiers = modifiers + } + return client +} + +// Do ... +func (c *Client) Do(req *http.Request) (*http.Response, error) { + for _, modifier := range c.modifiers { + if err := modifier.Modify(req); err != nil { + return nil, err + } + } + + return c.client.Do(req) +} + +// Get ... +func (c *Client) Get(url string) (*http.Response, error) { + req, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return nil, err + } + return c.Do(req) +} + +// Head ... +func (c *Client) Head(url string) (*http.Response, error) { + req, err := http.NewRequest(http.MethodHead, url, nil) + if err != nil { + return nil, err + } + return c.Do(req) +} + +// Post ... +func (c *Client) Post(url, bodyType string, body io.Reader) (*http.Response, error) { + req, err := http.NewRequest(http.MethodPost, url, body) + if err != nil { + return nil, err + } + req.Header.Set("Content-Type", bodyType) + return c.Do(req) +} + +// Put ... +func (c *Client) Put(url, bodyType string, body io.Reader) (*http.Response, error) { + req, err := http.NewRequest(http.MethodPut, url, body) + if err != nil { + return nil, err + } + req.Header.Set("Content-Type", bodyType) + return c.Do(req) +} + +// Delete ... +func (c *Client) Delete(url string) (*http.Response, error) { + req, err := http.NewRequest(http.MethodDelete, url, nil) + if err != nil { + return nil, err + } + return c.Do(req) +} diff --git a/src/common/http/client/client.go b/src/common/http/client/client.go deleted file mode 100644 index b8e86a596..000000000 --- a/src/common/http/client/client.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package client - -import ( - "net/http" - - "github.com/vmware/harbor/src/common/http/client/auth" -) - -// Client defines the method that a HTTP client should implement -type Client interface { - Do(*http.Request) (*http.Response, error) -} - -// AuthorizedClient authorizes the requests before sending them -type AuthorizedClient struct { - client *http.Client - authorizer auth.Authorizer -} - -// NewAuthorizedClient returns an instance of the AuthorizedClient -func NewAuthorizedClient(authorizer auth.Authorizer, client ...*http.Client) *AuthorizedClient { - c := &AuthorizedClient{ - authorizer: authorizer, - } - if len(client) > 0 { - c.client = client[0] - } - if c.client == nil { - c.client = &http.Client{} - } - return c -} - -// Do authorizes the request before sending it -func (a *AuthorizedClient) Do(req *http.Request) (*http.Response, error) { - if a.authorizer != nil { - if err := a.authorizer.Authorize(req); err != nil { - return nil, err - } - } - return a.client.Do(req) -} diff --git a/src/common/http/client/auth/auth.go b/src/common/http/modifier/auth/auth.go similarity index 56% rename from src/common/http/client/auth/auth.go rename to src/common/http/modifier/auth/auth.go index 7106a7df6..b28253fdf 100644 --- a/src/common/http/client/auth/auth.go +++ b/src/common/http/modifier/auth/auth.go @@ -17,57 +17,38 @@ package auth import ( "errors" "net/http" + + "github.com/vmware/harbor/src/common/http/modifier" ) const ( secretCookieName = "secret" ) -// Authorizer authorizes the requests -type Authorizer interface { - Authorize(*http.Request) error -} - -// CookieAuthorizer authorizes the requests by adding cookie specified by name and value -type CookieAuthorizer struct { - name string - value string -} - -// NewCookieAuthorizer returns an instance of CookieAuthorizer -func NewCookieAuthorizer(name, value string) *CookieAuthorizer { - return &CookieAuthorizer{ - name: name, - value: value, - } -} - -// Authorize the request with the cookie -func (c *CookieAuthorizer) Authorize(req *http.Request) error { - if req == nil { - return errors.New("the request is null") - } - - req.AddCookie(&http.Cookie{ - Name: c.name, - Value: c.value, - }) - return nil -} +// Authorizer is a kind of Modifier used to authorize the requests +type Authorizer modifier.Modifier // SecretAuthorizer authorizes the requests with the specified secret type SecretAuthorizer struct { - authorizer *CookieAuthorizer + secret string } // NewSecretAuthorizer returns an instance of SecretAuthorizer func NewSecretAuthorizer(secret string) *SecretAuthorizer { return &SecretAuthorizer{ - authorizer: NewCookieAuthorizer(secretCookieName, secret), + secret: secret, } } -// Authorize the request with the secret -func (s *SecretAuthorizer) Authorize(req *http.Request) error { - return s.authorizer.Authorize(req) +// Modify the request by adding secret authentication information +func (s *SecretAuthorizer) Modify(req *http.Request) error { + if req == nil { + return errors.New("the request is null") + } + + req.AddCookie(&http.Cookie{ + Name: secretCookieName, + Value: s.secret, + }) + return nil } diff --git a/src/common/http/client/auth/auth_test.go b/src/common/http/modifier/auth/auth_test.go similarity index 65% rename from src/common/http/client/auth/auth_test.go rename to src/common/http/modifier/auth/auth_test.go index 7754a663b..c0a68bc65 100644 --- a/src/common/http/client/auth/auth_test.go +++ b/src/common/http/modifier/auth/auth_test.go @@ -21,34 +21,17 @@ import ( "github.com/stretchr/testify/require" ) -func TestAuthorizeOfCookieAuthorizer(t *testing.T) { - name, value := "name", "value" - authorizer := NewCookieAuthorizer(name, value) - - // nil request - require.NotNil(t, authorizer.Authorize(nil)) - - // valid request - req, err := http.NewRequest("", "", nil) - require.Nil(t, err) - require.Nil(t, authorizer.Authorize(req)) - require.Equal(t, 1, len(req.Cookies())) - v, err := req.Cookie(name) - require.Nil(t, err) - assert.Equal(t, value, v.Value) -} - func TestAuthorizeOfSecretAuthorizer(t *testing.T) { secret := "secret" authorizer := NewSecretAuthorizer(secret) // nil request - require.NotNil(t, authorizer.Authorize(nil)) + require.NotNil(t, authorizer.Modify(nil)) // valid request req, err := http.NewRequest("", "", nil) require.Nil(t, err) - require.Nil(t, authorizer.Authorize(req)) + require.Nil(t, authorizer.Modify(req)) require.Equal(t, 1, len(req.Cookies())) v, err := req.Cookie(secretCookieName) require.Nil(t, err) diff --git a/src/common/utils/registry/modifier.go b/src/common/http/modifier/modifier.go similarity index 97% rename from src/common/utils/registry/modifier.go rename to src/common/http/modifier/modifier.go index a15a9a0fb..ccd34a87c 100644 --- a/src/common/utils/registry/modifier.go +++ b/src/common/http/modifier/modifier.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package registry +package modifier import ( "net/http" diff --git a/src/common/utils/registry/auth/tokenauthorizer.go b/src/common/utils/registry/auth/tokenauthorizer.go index bbdb69d9f..4e34a9f4d 100644 --- a/src/common/utils/registry/auth/tokenauthorizer.go +++ b/src/common/utils/registry/auth/tokenauthorizer.go @@ -23,9 +23,9 @@ import ( "time" "github.com/docker/distribution/registry/auth/token" + "github.com/vmware/harbor/src/common/http/modifier" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/common/utils/registry" token_util "github.com/vmware/harbor/src/ui/service/token" ) @@ -254,7 +254,7 @@ func ping(client *http.Client, endpoint string) (string, string, error) { // from token server and add it to the origin request // If customizedTokenService is set, the token request will be sent to it instead of the server get from authorizer func NewStandardTokenAuthorizer(client *http.Client, credential Credential, - customizedTokenService ...string) registry.Modifier { + customizedTokenService ...string) modifier.Modifier { generator := &standardTokenGenerator{ credential: credential, client: client, @@ -309,7 +309,7 @@ func (s *standardTokenGenerator) generate(scopes []*token.ResourceActions, endpo // NewRawTokenAuthorizer returns a token authorizer which calls method to create // token directly -func NewRawTokenAuthorizer(username, service string) registry.Modifier { +func NewRawTokenAuthorizer(username, service string) modifier.Modifier { generator := &rawTokenGenerator{ service: service, username: username, diff --git a/src/common/utils/registry/transport.go b/src/common/utils/registry/transport.go index 3ae8a8d50..d844f9308 100644 --- a/src/common/utils/registry/transport.go +++ b/src/common/utils/registry/transport.go @@ -17,17 +17,18 @@ package registry import ( "net/http" + "github.com/vmware/harbor/src/common/http/modifier" "github.com/vmware/harbor/src/common/utils/log" ) // Transport holds information about base transport and modifiers type Transport struct { transport http.RoundTripper - modifiers []Modifier + modifiers []modifier.Modifier } // NewTransport ... -func NewTransport(transport http.RoundTripper, modifiers ...Modifier) *Transport { +func NewTransport(transport http.RoundTripper, modifiers ...modifier.Modifier) *Transport { return &Transport{ transport: transport, modifiers: modifiers, diff --git a/src/jobservice/client/client.go b/src/jobservice/client/client.go index 5288a2f92..83dec41cd 100644 --- a/src/jobservice/client/client.go +++ b/src/jobservice/client/client.go @@ -21,7 +21,7 @@ import ( "net/http" commonhttp "github.com/vmware/harbor/src/common/http" - "github.com/vmware/harbor/src/common/http/client" + "github.com/vmware/harbor/src/common/http/modifier/auth" "github.com/vmware/harbor/src/jobservice/api" ) @@ -33,21 +33,22 @@ type Client interface { // DefaultClient provides a default implement for the interface Client type DefaultClient struct { endpoint string - client client.Client + client *commonhttp.Client +} + +// Config contains configuration items needed for DefaultClient +type Config struct { + Secret string } // NewDefaultClient returns an instance of DefaultClient -func NewDefaultClient(endpoint string, client ...client.Client) *DefaultClient { +func NewDefaultClient(endpoint string, cfg *Config) *DefaultClient { c := &DefaultClient{ endpoint: endpoint, } - if len(client) > 0 { - c.client = client[0] - } - - if c.client == nil { - c.client = &http.Client{} + if cfg != nil { + c.client = commonhttp.NewClient(nil, auth.NewSecretAuthorizer(cfg.Secret)) } return c @@ -62,12 +63,7 @@ func (d *DefaultClient) SubmitReplicationJob(replication *api.ReplicationReq) er return err } - req, err := http.NewRequest(http.MethodPost, url, buffer) - if err != nil { - return err - } - - resp, err := d.client.Do(req) + resp, err := d.client.Post(url, "application/json", buffer) if err != nil { return err } diff --git a/src/jobservice/client/client_test.go b/src/jobservice/client/client_test.go index 0cde379cf..4d8ab5fb0 100644 --- a/src/jobservice/client/client_test.go +++ b/src/jobservice/client/client_test.go @@ -49,7 +49,7 @@ func TestMain(m *testing.M) { } func TestSubmitReplicationJob(t *testing.T) { - client := NewDefaultClient(url) + client := NewDefaultClient(url, &Config{}) err := client.SubmitReplicationJob(&api.ReplicationReq{}) assert.Nil(t, err) } diff --git a/src/jobservice/config/config.go b/src/jobservice/config/config.go index 4ece1a814..4992c2363 100644 --- a/src/jobservice/config/config.go +++ b/src/jobservice/config/config.go @@ -22,8 +22,6 @@ import ( "github.com/vmware/harbor/src/adminserver/client" "github.com/vmware/harbor/src/common" comcfg "github.com/vmware/harbor/src/common/config" - httpclient "github.com/vmware/harbor/src/common/http/client" - "github.com/vmware/harbor/src/common/http/client/auth" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" ) @@ -51,8 +49,10 @@ func Init() error { adminServerURL = "http://adminserver" } log.Infof("initializing client for adminserver %s ...", adminServerURL) - authorizer := auth.NewSecretAuthorizer(UISecret()) - AdminserverClient = client.NewClient(adminServerURL, httpclient.NewAuthorizedClient(authorizer)) + cfg := &client.Config{ + Secret: UISecret(), + } + AdminserverClient = client.NewClient(adminServerURL, cfg) if err := AdminserverClient.Ping(); err != nil { return fmt.Errorf("failed to ping adminserver: %v", err) } diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 38a0a93f9..6945ae75b 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -18,11 +18,10 @@ import ( "fmt" "strings" - "github.com/vmware/harbor/src/common/http/client" - "github.com/vmware/harbor/src/common/http/client/auth" common_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/jobservice/api" + "github.com/vmware/harbor/src/jobservice/client" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" "github.com/vmware/harbor/src/replication/policy" @@ -85,8 +84,10 @@ func NewDefaultController(cfg ControllerConfig) *DefaultController { // TODO read from configuration endpoint := "http://jobservice:8080" - client := client.NewAuthorizedClient(auth.NewSecretAuthorizer(config.UISecret())) - ctl.replicator = replicator.NewDefaultReplicator(endpoint, client) + ctl.replicator = replicator.NewDefaultReplicator(endpoint, + &client.Config{ + Secret: config.UISecret(), + }) return ctl } diff --git a/src/replication/replicator/replicator.go b/src/replication/replicator/replicator.go index e27ba4da2..5edef542f 100644 --- a/src/replication/replicator/replicator.go +++ b/src/replication/replicator/replicator.go @@ -15,9 +15,8 @@ package replicator import ( - "github.com/vmware/harbor/src/common/http/client" "github.com/vmware/harbor/src/jobservice/api" - jobserviceclient "github.com/vmware/harbor/src/jobservice/client" + "github.com/vmware/harbor/src/jobservice/client" ) // Replicator submits the replication work to the jobservice @@ -27,13 +26,13 @@ type Replicator interface { // DefaultReplicator provides a default implement for Replicator type DefaultReplicator struct { - client jobserviceclient.Client + client client.Client } // NewDefaultReplicator returns an instance of DefaultReplicator -func NewDefaultReplicator(endpoint string, client ...client.Client) *DefaultReplicator { +func NewDefaultReplicator(endpoint string, cfg *client.Config) *DefaultReplicator { return &DefaultReplicator{ - client: jobserviceclient.NewDefaultClient(endpoint, client...), + client: client.NewDefaultClient(endpoint, cfg), } } diff --git a/src/replication/replicator/replicator_test.go b/src/replication/replicator/replicator_test.go index b2a229cce..726f12b7a 100644 --- a/src/replication/replicator/replicator_test.go +++ b/src/replication/replicator/replicator_test.go @@ -19,6 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/vmware/harbor/src/jobservice/api" + "github.com/vmware/harbor/src/jobservice/client" ) type fakeJobserviceClient struct{} @@ -28,7 +29,7 @@ func (f *fakeJobserviceClient) SubmitReplicationJob(replication *api.Replication } func TestReplicate(t *testing.T) { - replicator := NewDefaultReplicator("http://jobservice") + replicator := NewDefaultReplicator("http://jobservice", &client.Config{}) replicator.client = &fakeJobserviceClient{} assert.Nil(t, replicator.Replicate(&api.ReplicationReq{})) } diff --git a/src/ui/config/config.go b/src/ui/config/config.go index 1b798115a..207e8067d 100644 --- a/src/ui/config/config.go +++ b/src/ui/config/config.go @@ -25,8 +25,6 @@ import ( "github.com/vmware/harbor/src/adminserver/client" "github.com/vmware/harbor/src/common" comcfg "github.com/vmware/harbor/src/common/config" - httpclient "github.com/vmware/harbor/src/common/http/client" - "github.com/vmware/harbor/src/common/http/client/auth" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/secret" "github.com/vmware/harbor/src/common/utils/log" @@ -74,8 +72,10 @@ func Init() error { // InitByURL Init configurations with given url func InitByURL(adminServerURL string) error { log.Infof("initializing client for adminserver %s ...", adminServerURL) - authorizer := auth.NewSecretAuthorizer(UISecret()) - AdminserverClient = client.NewClient(adminServerURL, httpclient.NewAuthorizedClient(authorizer)) + cfg := &client.Config{ + Secret: UISecret(), + } + AdminserverClient = client.NewClient(adminServerURL, cfg) if err := AdminserverClient.Ping(); err != nil { return fmt.Errorf("failed to ping adminserver: %v", err) } From 260ef561c4298304434366980cc816467d949447 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Sat, 16 Dec 2017 06:45:59 +0800 Subject: [PATCH 28/37] Update the HTTP client for easy use by add more util functions --- src/adminserver/client/client.go | 105 ++++-------------------------- src/common/http/client.go | 107 ++++++++++++++++++++++++------- src/jobservice/client/client.go | 36 ++--------- 3 files changed, 99 insertions(+), 149 deletions(-) diff --git a/src/adminserver/client/client.go b/src/adminserver/client/client.go index d2a448eb9..115e903b6 100644 --- a/src/adminserver/client/client.go +++ b/src/adminserver/client/client.go @@ -15,16 +15,10 @@ package client import ( - "bytes" - "encoding/json" - "fmt" - "io" - "io/ioutil" - "net/http" "strings" "github.com/vmware/harbor/src/adminserver/systeminfo/imagestorage" - common_http "github.com/vmware/harbor/src/common/http" + "github.com/vmware/harbor/src/common/http" "github.com/vmware/harbor/src/common/http/modifier/auth" "github.com/vmware/harbor/src/common/utils" ) @@ -54,14 +48,14 @@ func NewClient(baseURL string, cfg *Config) Client { } if cfg != nil { authorizer := auth.NewSecretAuthorizer(cfg.Secret) - client.client = common_http.NewClient(nil, authorizer) + client.client = http.NewClient(nil, authorizer) } return client } type client struct { baseURL string - client *common_http.Client + client *http.Client } // Config contains configurations needed for client @@ -69,19 +63,6 @@ type Config struct { Secret string } -// TODO refactor the codes with methods of common_http.Client - -// do creates request and authorizes it if authorizer is not nil -func (c *client) do(method, relativePath string, body io.Reader) (*http.Response, error) { - url := c.baseURL + relativePath - req, err := http.NewRequest(method, url, body) - if err != nil { - return nil, err - } - - return c.client.Do(req) -} - func (c *client) Ping() error { addr := strings.Split(c.baseURL, "://")[1] if !strings.Contains(addr, ":") { @@ -93,96 +74,32 @@ func (c *client) Ping() error { // GetCfgs ... func (c *client) GetCfgs() (map[string]interface{}, error) { - resp, err := c.do(http.MethodGet, "/api/configurations", nil) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - - if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("failed to get configurations: %d %s", - resp.StatusCode, b) - } - + url := c.baseURL + "/api/configurations" cfgs := map[string]interface{}{} - if err = json.Unmarshal(b, &cfgs); err != nil { + if err := c.client.Get(url, &cfgs); err != nil { return nil, err } - return cfgs, nil } // UpdateCfgs ... func (c *client) UpdateCfgs(cfgs map[string]interface{}) error { - data, err := json.Marshal(cfgs) - if err != nil { - return err - } - - resp, err := c.do(http.MethodPut, "/api/configurations", bytes.NewReader(data)) - if err != nil { - return err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - return fmt.Errorf("failed to update configurations: %d %s", - resp.StatusCode, b) - } - - return nil + url := c.baseURL + "/api/configurations" + return c.client.Put(url, cfgs) } // ResetCfgs ... func (c *client) ResetCfgs() error { - resp, err := c.do(http.MethodPost, "/api/configurations/reset", nil) - if err != nil { - return err - } - - if resp.StatusCode != http.StatusOK { - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - return fmt.Errorf("failed to reset configurations: %d %s", - resp.StatusCode, b) - } - - return nil + url := c.baseURL + "/api/configurations/reset" + return c.client.Post(url) } // Capacity ... func (c *client) Capacity() (*imagestorage.Capacity, error) { - resp, err := c.do(http.MethodGet, "/api/systeminfo/capacity", nil) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - - if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("failed to get capacity: %d %s", - resp.StatusCode, b) - } - + url := c.baseURL + "/api/systeminfo/capacity" capacity := &imagestorage.Capacity{} - if err = json.Unmarshal(b, capacity); err != nil { + if err := c.client.Get(url, capacity); err != nil { return nil, err } - return capacity, nil } diff --git a/src/common/http/client.go b/src/common/http/client.go index 70ec6e528..a5971cbaf 100644 --- a/src/common/http/client.go +++ b/src/common/http/client.go @@ -15,20 +15,25 @@ package http import ( + "bytes" + "encoding/json" "io" + "io/ioutil" "net/http" "github.com/vmware/harbor/src/common/http/modifier" ) -// Client wraps net/http.Client with modifiers, modifiers the request before sending it +// Client is a util for common HTTP operations, such Get, Head, Post, Put and Delete. +// Use Do instead if those methods can not meet your requirement type Client struct { modifiers []modifier.Modifier client *http.Client } -// NewClient creates an instance of Client. Use net/http.Client as the default value -// if c is nil. +// NewClient creates an instance of Client. +// Use net/http.Client as the default value if c is nil. +// Modifiers modify the request before sending it. func NewClient(c *http.Client, modifiers ...modifier.Modifier) *Client { client := &Client{ client: c, @@ -54,48 +59,104 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) { } // Get ... -func (c *Client) Get(url string) (*http.Response, error) { +func (c *Client) Get(url string, v ...interface{}) error { req, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { - return nil, err + return err } - return c.Do(req) + + data, err := c.do(req) + if err != nil { + return err + } + + if len(v) == 0 { + return nil + } + + return json.Unmarshal(data, v[0]) } // Head ... -func (c *Client) Head(url string) (*http.Response, error) { +func (c *Client) Head(url string) error { req, err := http.NewRequest(http.MethodHead, url, nil) if err != nil { - return nil, err + return err } - return c.Do(req) + _, err = c.do(req) + return err } // Post ... -func (c *Client) Post(url, bodyType string, body io.Reader) (*http.Response, error) { - req, err := http.NewRequest(http.MethodPost, url, body) - if err != nil { - return nil, err +func (c *Client) Post(url string, v ...interface{}) error { + var reader io.Reader + if len(v) > 0 { + data, err := json.Marshal(v[0]) + if err != nil { + return err + } + + reader = bytes.NewReader(data) } - req.Header.Set("Content-Type", bodyType) - return c.Do(req) + + req, err := http.NewRequest(http.MethodPost, url, reader) + if err != nil { + return err + } + req.Header.Set("Content-Type", "application/json") + _, err = c.do(req) + return err } // Put ... -func (c *Client) Put(url, bodyType string, body io.Reader) (*http.Response, error) { - req, err := http.NewRequest(http.MethodPut, url, body) - if err != nil { - return nil, err +func (c *Client) Put(url string, v ...interface{}) error { + var reader io.Reader + if len(v) > 0 { + data := []byte{} + data, err := json.Marshal(v[0]) + if err != nil { + return err + } + reader = bytes.NewReader(data) } - req.Header.Set("Content-Type", bodyType) - return c.Do(req) + + req, err := http.NewRequest(http.MethodPut, url, reader) + if err != nil { + return err + } + req.Header.Set("Content-Type", "application/json") + _, err = c.do(req) + return err } // Delete ... -func (c *Client) Delete(url string) (*http.Response, error) { +func (c *Client) Delete(url string) error { req, err := http.NewRequest(http.MethodDelete, url, nil) + if err != nil { + return err + } + _, err = c.do(req) + return err +} + +func (c *Client) do(req *http.Request) ([]byte, error) { + resp, err := c.Do(req) if err != nil { return nil, err } - return c.Do(req) + defer resp.Body.Close() + + data, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil, err + } + + if resp.StatusCode < 200 || resp.StatusCode > 299 { + return nil, &Error{ + Code: resp.StatusCode, + Message: string(data), + } + } + + return data, nil } diff --git a/src/jobservice/client/client.go b/src/jobservice/client/client.go index 83dec41cd..7ace3d3a2 100644 --- a/src/jobservice/client/client.go +++ b/src/jobservice/client/client.go @@ -15,12 +15,7 @@ package client import ( - "bytes" - "encoding/json" - "io/ioutil" - "net/http" - - commonhttp "github.com/vmware/harbor/src/common/http" + "github.com/vmware/harbor/src/common/http" "github.com/vmware/harbor/src/common/http/modifier/auth" "github.com/vmware/harbor/src/jobservice/api" ) @@ -33,7 +28,7 @@ type Client interface { // DefaultClient provides a default implement for the interface Client type DefaultClient struct { endpoint string - client *commonhttp.Client + client *http.Client } // Config contains configuration items needed for DefaultClient @@ -48,7 +43,7 @@ func NewDefaultClient(endpoint string, cfg *Config) *DefaultClient { } if cfg != nil { - c.client = commonhttp.NewClient(nil, auth.NewSecretAuthorizer(cfg.Secret)) + c.client = http.NewClient(nil, auth.NewSecretAuthorizer(cfg.Secret)) } return c @@ -57,28 +52,5 @@ func NewDefaultClient(endpoint string, cfg *Config) *DefaultClient { // SubmitReplicationJob submits a replication job to the jobservice func (d *DefaultClient) SubmitReplicationJob(replication *api.ReplicationReq) error { url := d.endpoint + "/api/jobs/replication" - - buffer := &bytes.Buffer{} - if err := json.NewEncoder(buffer).Encode(replication); err != nil { - return err - } - - resp, err := d.client.Post(url, "application/json", buffer) - if err != nil { - return err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - message, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - return &commonhttp.Error{ - Code: resp.StatusCode, - Message: string(message), - } - } - - return nil + return d.client.Post(url, replication) } From 831f69595aa0d23a3af59259cda447b3b794fdb9 Mon Sep 17 00:00:00 2001 From: "Fuhui Peng (c)" Date: Thu, 30 Nov 2017 11:05:44 +0800 Subject: [PATCH 29/37] Add ui code about replication enhancement --- .../list-replication-rule.component.html.ts | 17 +- .../replication/replication.component.html.ts | 3 +- .../src/replication/replication.component.ts | 17 +- src/ui_ng/package.json | 2 +- .../harbor-shell/harbor-shell.component.html | 1 + src/ui_ng/src/app/harbor-routing.module.ts | 37 +- .../project-detail.component.html | 2 +- .../project-detail.component.ts | 7 +- .../destination-page.component.html | 1 + .../replication-page.component.html | 2 +- .../replication-rule.component.ts | 528 ++++++++++++++++++ .../replication-rule/replication-rule.css | 30 + .../replication-rule/replication-rule.html | 122 ++++ .../replication-rule.service.ts | 75 +++ .../replication-rule/replication-rule.ts | 48 ++ .../src/app/replication/replication.module.ts | 15 +- .../total-replication-page.component.html | 3 +- .../total-replication-page.component.ts | 14 +- .../total-replication.component.css | 5 +- .../route/system-admin-activate.service.ts | 5 +- src/ui_ng/src/app/shared/shared.utils.ts | 22 + src/ui_ng/src/i18n/lang/en-us-lang.json | 4 +- src/ui_ng/src/i18n/lang/es-es-lang.json | 4 +- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 4 +- .../resources/Harbor-Pages/Replication.robot | 26 +- .../Harbor-Pages/Replication_Elements.robot | 8 +- 26 files changed, 937 insertions(+), 65 deletions(-) create mode 100644 src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts create mode 100644 src/ui_ng/src/app/replication/replication-rule/replication-rule.css create mode 100644 src/ui_ng/src/app/replication/replication-rule/replication-rule.html create mode 100644 src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts create mode 100644 src/ui_ng/src/app/replication/replication-rule/replication-rule.ts diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index 410e2aeeb..8687a9a86 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -2,9 +2,9 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = `
{{'REPLICATION.NAME' | translate}} - {{'REPLICATION.PROJECT' | translate}} + {{'REPLICATION.PROJECT' | translate}} {{'REPLICATION.DESCRIPTION' | translate}} - {{'REPLICATION.DESTINATION_NAME' | translate}} + {{'REPLICATION.DESTINATION_NAME' | translate}} {{'REPLICATION.LAST_START_TIME' | translate}} {{'REPLICATION.ACTIVATION' | translate}} {{'REPLICATION.PLACEHOLDER' | translate }} @@ -14,17 +14,12 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = ` - - - {{p.name}} - - - {{p.name}} - + {{p.name}} + + {{p.projects[0].name}} - {{p.project_name}} {{p.description ? p.description : '-'}} - {{p.target_name}} + {{p.targets[0].name}} - {{p.start_time | date: 'short'}} diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts index cb374aa27..1d4877c13 100644 --- a/src/ui_ng/lib/src/replication/replication.component.html.ts +++ b/src/ui_ng/lib/src/replication/replication.component.html.ts @@ -3,8 +3,7 @@ export const REPLICATION_TEMPLATE: string = `
- - +
diff --git a/src/ui_ng/lib/src/replication/replication.component.ts b/src/ui_ng/lib/src/replication/replication.component.ts index 9e6ce673f..8427c5ecf 100644 --- a/src/ui_ng/lib/src/replication/replication.component.ts +++ b/src/ui_ng/lib/src/replication/replication.component.ts @@ -88,6 +88,8 @@ export class ReplicationComponent implements OnInit, OnDestroy { @Input() readonly: boolean; @Output() redirect = new EventEmitter(); + @Output() openCreateRule = new EventEmitter(); + @Output() openEdit = new EventEmitter(); search: SearchOption = new SearchOption(); @@ -111,8 +113,8 @@ export class ReplicationComponent implements OnInit, OnDestroy { @ViewChild(ListReplicationRuleComponent) listReplicationRule: ListReplicationRuleComponent; - @ViewChild(CreateEditRuleComponent) - createEditPolicyComponent: CreateEditRuleComponent; +/* @ViewChild(CreateEditRuleComponent) + createEditPolicyComponent: CreateEditRuleComponent;*/ @ViewChild("replicationLogViewer") replicationLogViewer: JobLogViewerComponent; @@ -134,9 +136,9 @@ export class ReplicationComponent implements OnInit, OnDestroy { private translateService: TranslateService) { } - public get creationAvailable(): boolean { + /*public get creationAvailable(): boolean { return !this.readonly && this.projectId ? true : false; - } + }*/ public get showPaginationIndex(): boolean { return this.totalCount > 0; @@ -146,6 +148,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { this.currentRuleStatus = this.ruleStatus[0]; this.currentJobStatus = this.jobStatus[0]; this.currentJobSearchOption = 0; + console.log('readonly', this.readonly); } ngOnDestroy() { @@ -155,7 +158,8 @@ export class ReplicationComponent implements OnInit, OnDestroy { } openModal(): void { - this.createEditPolicyComponent.openCreateEditRule(true); + this.openCreateRule.emit(); + // this.createEditPolicyComponent.openCreateEditRule(true); } openEditRule(rule: ReplicationRule) { @@ -164,7 +168,8 @@ export class ReplicationComponent implements OnInit, OnDestroy { if (rule.enabled === 1) { editable = false; } - this.createEditPolicyComponent.openCreateEditRule(editable, rule.id); + this.openEdit.emit(rule.id); + // this.createEditPolicyComponent.openCreateEditRule(editable, rule.id); } } diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index f8f2b596a..b91e5fd80 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.9.8", "clarity-ui": "^0.9.8", "core-js": "^2.4.1", - "harbor-ui": "0.4.91", + "harbor-ui": "^0.5.9-test-31", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", diff --git a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html index efe767bf4..7ce4a0cc0 100644 --- a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html +++ b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html @@ -18,6 +18,7 @@ diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index ed9f876ba..57711c35b 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -50,6 +50,7 @@ import { LeavingConfigRouteDeactivate } from './shared/route/leaving-config-deac import { MemberGuard } from './shared/route/member-guard-activate.service'; import { TagDetailPageComponent } from './repository/tag-detail/tag-detail-page.component'; +import { ReplicationRuleComponent} from "./replication/replication-rule/replication-rule.component"; const harborRoutes: Routes = [ { path: '', redirectTo: 'harbor', pathMatch: 'full' }, @@ -80,23 +81,23 @@ const harborRoutes: Routes = [ }, { path: 'replications', - component: ReplicationManagementComponent, + component: TotalReplicationPageComponent, canActivate: [SystemAdminGuard], canActivateChild: [SystemAdminGuard], - children: [ - { - path: 'rules', - component: TotalReplicationPageComponent - }, - { - path: 'endpoints', - component: DestinationPageComponent - }, - { - path: '**', - redirectTo: 'endpoints' - } - ] + }, + { + path: 'replications/:id/rule', + component: ReplicationRuleComponent, + canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], + + }, + { + path: 'replications/new-rule', + component: ReplicationRuleComponent, + canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], + }, { path: 'tags/:id/:repo', @@ -146,6 +147,12 @@ const harborRoutes: Routes = [ component: ConfigurationComponent, canActivate: [SystemAdminGuard], canDeactivate: [LeavingConfigRouteDeactivate] + }, + { + path: 'registry', + component: DestinationPageComponent, + canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], } ] }, diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.html b/src/ui_ng/src/app/project/project-detail/project-detail.component.html index 317f03b8a..e4d291458 100644 --- a/src/ui_ng/src/app/project/project-detail/project-detail.component.html +++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.html @@ -13,7 +13,7 @@
  • {{'PROJECT_DETAIL.LOGS' | translate}}
    • -
  • +
  • {{'PROJECT_DETAIL.REPLICATION' | translate}}
  • diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts index 942aedcb0..eb7703297 100644 --- a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts +++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts @@ -50,7 +50,12 @@ export class ProjectDetailComponent { public get isSystemAdmin(): boolean { let account = this.sessionService.getCurrentUser(); - return account != null && account.has_admin_role > 0; + return account && account.has_admin_role > 0; + } + + public get isSProjectAdmin(): boolean { + let account = this.sessionService.projectMembers; + return account && account[0].role_name === 'projectAdmin'; } public get isSessionValid(): boolean { diff --git a/src/ui_ng/src/app/replication/destination/destination-page.component.html b/src/ui_ng/src/app/replication/destination/destination-page.component.html index 3d0c138d2..b47208702 100644 --- a/src/ui_ng/src/app/replication/destination/destination-page.component.html +++ b/src/ui_ng/src/app/replication/destination/destination-page.component.html @@ -1,3 +1,4 @@ +

    {{'REPLICATION.ENDPOINTS' | translate}}

    \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication-page.component.html b/src/ui_ng/src/app/replication/replication-page.component.html index 667be81c6..b2ebb01ba 100644 --- a/src/ui_ng/src/app/replication/replication-page.component.html +++ b/src/ui_ng/src/app/replication/replication-page.component.html @@ -1,3 +1,3 @@
    - +
    \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts new file mode 100644 index 000000000..2d705b6c6 --- /dev/null +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts @@ -0,0 +1,528 @@ +import {Component, OnInit, OnDestroy, ViewChild, ChangeDetectorRef, AfterViewInit} from '@angular/core'; +import {ProjectService} from '../../project/project.service'; +import {Project} from '../../project/project'; +import {compareValue, toPromise} from 'harbor-ui/src/utils'; +import {ActivatedRoute, Router} from '@angular/router'; +import {FormArray, FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {ReplicationRuleServie} from "./replication-rule.service"; +import {MessageHandlerService} from "../../shared/message-handler/message-handler.service"; +import {Target, Filter, ReplicationRule} from "./replication-rule"; +import {ConfirmationDialogService} from "../../shared/confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationTargets, ConfirmationState } from '../../shared/shared.const'; +import {Subscription} from "rxjs/Subscription"; +import {ConfirmationMessage} from "../../shared/confirmation-dialog/confirmation-message"; +import {Subject} from "rxjs/Subject"; + + +const ONE_HOUR_SECONDS: number = 3600; +const ONE_DAY_SECONDS: number = 24 * ONE_HOUR_SECONDS; + +@Component ({ + selector: 'repliction-rule', + templateUrl: 'replication-rule.html', + styleUrls: ['replication-rule.css'] + +}) +export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestroy { + timerHandler: any; + _localTime: Date = new Date(); + policyId: number; + projectList: Project[] = []; + targetList: Target[] = []; + isFilterHide: boolean = false; + weeklySchedule: boolean; + isScheduleOpt: boolean; + filterCount: number = 0; + triggerNames: string[] = ['immediate', 'schedule', 'manual']; + scheduleNames: string[] = ['daily', 'weekly']; + weekly: string[] = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; + filterSelect: string[] = ['repository', 'tag']; + ruleNameTooltip: string = 'TOOLTIP.EMPTY'; + + filterListData: {[key: string]: any}[] = []; + inProgress: boolean = false; + inNameChecking: boolean = false; + isBackReplication: boolean = false; + isRuleNameExist: boolean = false; + nameChecker: Subject = new Subject(); + + confirmSub: Subscription; + ruleForm: FormGroup; + copyUpdateForm: ReplicationRule; + + baseFilterData(name: string, option: string[], state: boolean) { + return { + name: name, + options: option, + state: state, + isValid: true + }; + } + + constructor(public projectService: ProjectService, + private router: Router, + private fb: FormBuilder, + private repService: ReplicationRuleServie, + private route: ActivatedRoute, + private msgHandler: MessageHandlerService, + private confirmService: ConfirmationDialogService, + public ref: ChangeDetectorRef) { + this.createForm(); + + Promise.all([this.repService.getEndpoints(), this.repService.listProjects()]) + .then(res => { + if (!res[0].length || !res[1].length) { + this.msgHandler.error('should have project and target first'); + this.router.navigate(['/harbor/replications']); + }; + if (res[0].length && res[1].length) { + this.projectList = res[1]; + this.setProject([this.projectList[0]]); + this.targetList = res[0]; + this.setTarget([this.targetList[0]]); + } + }); + } + + ngOnInit(): void { + this.policyId = +this.route.snapshot.params['id']; + if (this.policyId) { + this.repService.getReplicationRule(this.policyId) + .then((response) => { + this.copyUpdateForm = Object.assign({}, response); + this.updateForm(response); + }).catch(error => { + this.msgHandler.handleError(error); + }); + } + + this.nameChecker.debounceTime(500).distinctUntilChanged().subscribe((ruleName: string) => { + this.isRuleNameExist = false; + this.inNameChecking = true; + toPromise(this.repService.getReplicationRules(0, ruleName)) + .then(response => { + if (response.some(rule => rule.name === ruleName)) { + this.ruleNameTooltip = 'TOOLTIP.RULE_USER_EXISTING'; + this.isRuleNameExist = true; + } + this.inNameChecking = false; + }).catch(() => { + this.inNameChecking = false; + }); + }); + this.confirmSub = this.confirmService.confirmationConfirm$.subscribe(confirmation => { + if (confirmation && + confirmation.state === ConfirmationState.CONFIRMED) { + if (confirmation.source === ConfirmationTargets.CONFIG) { + if (this.policyId) { + this.updateForm(this.copyUpdateForm); + } else { + this.initFom(); + } + if (this.isBackReplication) { + this.router.navigate(['/harbor/replications']); + } + } + } + }); + } + + get hasFormChange() { + if (this.copyUpdateForm) { + return !compareValue(this.copyUpdateForm, this.ruleForm.value); + } + return this.ruleForm.touched && this.ruleForm.dirty; + } + + ngAfterViewInit(): void { + } + + ngOnDestroy(): void { + if (this.confirmSub) { + this.confirmSub.unsubscribe(); + } + if (this.nameChecker) { + this.nameChecker.unsubscribe(); + } + } + + createForm() { + this.ruleForm = this.fb.group({ + name: ['', Validators.required], + description: '', + projects: this.fb.array([]), + targets: this.fb.array([]), + trigger: this.fb.group({ + kind: this.triggerNames[0], + schedule_param: this.fb.group({ + type: this.scheduleNames[0], + weekday: 1, + offtime: '08:00' + }), + }), + filters: this.fb.array([]), + replicate_existing_image_now: true, + replicate_deletion: true + }); + } + + updateForm(rule: ReplicationRule): void { + rule.trigger = this.updateTrigger(rule.trigger); + this.ruleForm.reset({ + name: rule.name, + description: rule.description, + trigger: rule.trigger, + replicate_existing_image_now: rule.replicate_existing_image_now, + replicate_deletion: rule.replicate_deletion + }); + this.setProject(rule.projects); + this.setTarget(rule.targets); + if (rule.filters) { + this.setFilter(rule.filters); + this.updateFilter(rule.filters); + } + } + + initFom(): void { + this.ruleForm.reset({ + name: '', + description: '', + trigger: {kind: this.triggerNames[0], schedule_param: { + type: this.scheduleNames[0], + weekday: 1, + offtime: '08:00' + }}, + replicate_existing_image_now: true, + replicate_deletion: true + }); + this.setProject([this.projectList[0]]); + this.setTarget([this.targetList[0]]); + this.setFilter([]); + + this.isFilterHide = false; + this.filterListData = []; + this.isScheduleOpt = false; + this.weeklySchedule = false; + this.isRuleNameExist = true; + this.ruleNameTooltip = 'TOOLTIP.EMPTY'; + } + + + get projects(): FormArray { + return this.ruleForm.get('projects') as FormArray; + } + setProject(projects: Project[]) { + const projectFGs = projects.map(project => this.fb.group(project)); + const projectFormArray = this.fb.array(projectFGs); + this.ruleForm.setControl('projects', projectFormArray); + } + + get filters(): FormArray { + return this.ruleForm.get('filters') as FormArray; + } + setFilter(filters: Filter[]) { + const filterFGs = filters.map(filter => this.fb.group(filter)); + const filterFormArray = this.fb.array(filterFGs); + this.ruleForm.setControl('filters', filterFormArray); + } + + get targets(): FormArray { + return this.ruleForm.get('targets') as FormArray; + } + setTarget(targets: Target[]) { + const targetFGs = targets.map(target => this.fb.group(target)); + const targetFormArray = this.fb.array(targetFGs); + this.ruleForm.setControl('targets', targetFormArray); + } + + initFilter(name: string) { + return this.fb.group({ + kind: name, + pattern: ['', Validators.required] + }); + } + + filterChange($event: any) { + if ($event && $event.target['value']) { + let id: number = $event.target.id; + let name: string = $event.target.name; + let value: string = $event.target['value']; + + this.filterListData.forEach((data, index) => { + if (index === +id) { + data.name = $event.target.name = value; + }else { + data.options.splice(data.options.indexOf(value), 1); + } + if (data.options.indexOf(name) === -1) { + data.options.push(name); + } + }); + } + } + + projectChange($event: any) { + if ($event && $event.target && event.target['value']) { + let selecedProject: Project = this.projectList.find(project => project.project_id === +$event.target['value']); + this.setProject([selecedProject]); + } + } + + targetChange($event: any) { + if ($event && $event.target && event.target['value']) { + let selecedTarget: Target = this.targetList.find(target => target.id === +$event.target['value']); + this.setTarget([selecedTarget]); + } + } + + addNewFilter(): void { + if (this.filterCount === 0) { + this.filterListData.push(this.baseFilterData(this.filterSelect[0], this.filterSelect.slice(), true)); + this.filters.push(this.initFilter(this.filterSelect[0])); + + }else { + let nameArr: string[] = this.filterSelect.slice(); + this.filterListData.forEach(data => { + nameArr.splice(nameArr.indexOf(data.name), 1); + }); + // when add a new filter,the filterListData should change the options + this.filterListData.filter((data) => { + data.options.splice(data.options.indexOf(nameArr[0]), 1); + }); + this.filterListData.push(this.baseFilterData(nameArr[0], nameArr, true)); + this.filters.push(this.initFilter(nameArr[0])); + } + this.filterCount += 1; + if (this.filterCount >= this.filterSelect.length) { + this.isFilterHide = true; + } + } + + // delete a filter + deleteFilter(i: number): void { + if (i || i === 0) { + let delfilter = this.filterListData.splice(i, 1)[0]; + if (this.filterCount === this.filterSelect.length) { + this.isFilterHide = false; + } + this.filterCount -= 1; + if (this.filterListData.length) { + let optionVal = delfilter.name; + this.filterListData.filter(data => { + if (data.options.indexOf(optionVal) === -1) { + data.options.push(optionVal); + } + }); + } + + const control = this.ruleForm.controls['filters']; + control.removeAt(i); + } + } + + selectTrigger($event: any): void { + if ($event && $event.target && $event.target['value']) { + if ($event.target['value'] === this.triggerNames[1]) { + this.isScheduleOpt = true; + } else { + this.isScheduleOpt = false; + } + } + } + + // Replication Schedule select exchange + selectSchedule($event: any): void { + if ($event && $event.target && $event.target['value']) { + switch ($event.target['value']) { + case this.scheduleNames[1]: + this.weeklySchedule = true; + break; + case this.scheduleNames[0]: +/* this.dailySchedule = true;*/ + this.weeklySchedule = false; + break; + } + } + } + + checkRuleName(): void { + let ruleName: string = this.ruleForm.controls['name'].value; + if (ruleName) { + this.nameChecker.next(ruleName); + } else { + this.ruleNameTooltip = 'TOOLTIP.EMPTY'; + } + } + + updateFilter(filters: any) { + let opt: string[] = this.filterSelect.slice(); + filters.forEach((filter: any) => { + opt.splice(opt.indexOf(filter.kind), 1); + }) + filters.forEach((filter: any) => { + let option: string [] = opt.slice(); + option.unshift(filter.kind); + this.filterListData.push(this.baseFilterData(filter.kind, option, true)); + }); + this.filterCount = filters.length; + if (filters.length === this.filterSelect.length) { + this.isFilterHide = true; + } + } + + updateTrigger(trigger: any) { + if (trigger['schedule_param']) { + this.isScheduleOpt = true; + trigger['schedule_param']['offtime'] = this.getOfftime(trigger['schedule_param']['offtime']); + if (trigger['schedule_param']['weekday']) { + this.weeklySchedule = true; + }else { + // set default + trigger['schedule_param']['weekday'] = 1; + } + }else { + trigger['schedule_param'] = { type: this.scheduleNames[0], + weekday: this.weekly[0], + offtime: '08:00'}; + } + return trigger; + } + + setTriggerVaule(trigger: any) { + if (!this.isScheduleOpt) { + delete trigger['schedule_param']; + return trigger; + }else { + if (!this.weeklySchedule) { + delete trigger['schedule_param']['weekday']; + }else { + trigger['schedule_param']['weekday'] = +trigger['schedule_param']['weekday']; + } + trigger['schedule_param']['offtime'] = this.setOfftime(trigger['schedule_param']['offtime']); + return trigger; + } + } + + + onSubmit() { + // add new Replication rule + let copyRuleForm: ReplicationRule = this.ruleForm.value; + copyRuleForm.trigger = this.setTriggerVaule(copyRuleForm.trigger); + if (!this.policyId) { + this.repService.createReplicationRule(copyRuleForm) + .then(() => { + this.msgHandler.showSuccess('REPLICATION.CREATED_SUCCESS'); + this.inProgress = false; + setTimeout(() => { + this.router.navigate(['/harbor/replications']); + }, 2000); + + }).catch((error: any) => { + this.inProgress = false; + this.msgHandler.handleError(error); + }); + } else { + this.repService.updateReplicationRule(this.policyId, this.ruleForm.value) + .then(() => { + this.msgHandler.showSuccess('REPLICATION.CREATED_SUCCESS'); + this.inProgress = false; + setTimeout(() => { + this.router.navigate(['/harbor/replications']); + }, 2000); + + }).catch((error: any) => { + this.inProgress = false; + this.msgHandler.handleError(error); + }); + } + this.inProgress = true; + } + + onCancel(): void { + + console.log(this.ruleForm.valid, this.isRuleNameExist , !this.hasFormChange) + if (this.ruleForm.dirty) { + let msg = new ConfirmationMessage( + 'CONFIG.CONFIRM_TITLE', + 'CONFIG.CONFIRM_SUMMARY', + '', + null, + ConfirmationTargets.CONFIG + ); + + this.confirmService.openComfirmDialog(msg); + } + } + // UTC time + public getOfftime(daily_time: any): string { + + let timeOffset: number = 0; // seconds + if (daily_time && typeof daily_time === 'number') { + timeOffset = +daily_time; + } + + // Convert to current time + let timezoneOffset: number = this._localTime.getTimezoneOffset(); + // Local time + timeOffset = timeOffset - timezoneOffset * 60; + if (timeOffset < 0) { + timeOffset = timeOffset + ONE_DAY_SECONDS; + } + + if (timeOffset >= ONE_DAY_SECONDS) { + timeOffset -= ONE_DAY_SECONDS; + } + + // To time string + let hours: number = Math.floor(timeOffset / ONE_HOUR_SECONDS); + let minutes: number = Math.floor((timeOffset - hours * ONE_HOUR_SECONDS) / 60); + + let timeStr: string = '' + hours; + if (hours < 10) { + timeStr = '0' + timeStr; + } + if (minutes < 10) { + timeStr += ':0'; + } else { + timeStr += ':'; + } + timeStr += minutes; + + return timeStr; + } + public setOfftime(v: string) { + if (!v || v === '') { + return; + } + + let values: string[] = v.split(':'); + if (!values || values.length !== 2) { + return; + } + + let hours: number = +values[0]; + let minutes: number = +values[1]; + // Convert to UTC time + let timezoneOffset: number = this._localTime.getTimezoneOffset(); + let utcTimes: number = hours * ONE_HOUR_SECONDS + minutes * 60; + utcTimes += timezoneOffset * 60; + if (utcTimes < 0) { + utcTimes += ONE_DAY_SECONDS; + } + + if (utcTimes >= ONE_DAY_SECONDS) { + utcTimes -= ONE_DAY_SECONDS; + } + + return utcTimes; + } + + backReplication(): void { + this.isBackReplication = true; + if (this.ruleForm.dirty) { + this.onCancel(); + } else { + this.router.navigate(['/harbor/replications']); + } + } +} diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.css b/src/ui_ng/src/app/replication/replication-rule/replication-rule.css new file mode 100644 index 000000000..a785e2ab0 --- /dev/null +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.css @@ -0,0 +1,30 @@ +/** + * Created by pengf on 9/28/2017. + */ + +.select{ + width: 186px; +} +.select .optionMore{ + background-color: #bfbaba; + height: 1.6em; + font-size: 1.2em; + cursor: pointer; + text-align: center; +} +.hideFilter{ display: none;} +h4{ + color: #666; +} +label:first-child { + font-size: 15px; + left: -10px !important; +} +.endpointSelect{ width: 290px;} +.filterSelect{width: 320px;} +.filterSelect label{width: 160px;} +.filterSelect label input{width: 100%;} +.cursor{cursor: pointer;} +.padLeft0{padding-left: 0;} +.floatSet {display: inline-block; float: left; width: 120px;margin-right: 10px;} +.form-group{ min-height: 36px;} \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.html b/src/ui_ng/src/app/replication/replication-rule/replication-rule.html new file mode 100644 index 000000000..41a7d72cb --- /dev/null +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.html @@ -0,0 +1,122 @@ +
    + < {{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}} +

    New Replication Rule

    +
    +
    +
    + + +
    + +
    + + +
    + +

    Source

    +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +

    Targets

    +
    + +
    +
    + +
    +
    +
    + + +

    Trigger

    +
    + +
    + +
    + +
    + +
    +
    + +
    + + on    +
    + +
    + + at    + +
    + +
    +
    + +

    Setting

    +
    + +
    + + Delete remote images when locally deleted + +
    +
    + + exiting images immediately + +
    +
    + +
    + +
    + + +
    +
    +
    +
    \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts new file mode 100644 index 000000000..fbe5a1c4c --- /dev/null +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts @@ -0,0 +1,75 @@ +/** + * Created by pengf on 12/5/2017. + */ + +import {Injectable} from "@angular/core"; +import {Http, RequestOptions, Headers, URLSearchParams} from "@angular/http"; +import {Observable} from "rxjs/Observable"; +import {ReplicationRule, Target} from "./replication-rule"; +import {HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS} from "../../shared/shared.utils"; +import {Project} from "../../project/project"; + +@Injectable() +export class ReplicationRuleServie { + headers = new Headers({'Content-type': 'application/json'}); + options = new RequestOptions({'headers': this.headers}); + baseurl = '/api/policies/replication'; + targetUrl= '/api/targets'; + + constructor(private http: Http) {} + + public createReplicationRule(replicationRule: ReplicationRule): Observable | Promise | any { + /*if (!this._isValidRule(replicationRule)) { + return Promise.reject('Bad argument'); + }*/ + + return this.http.post(this.baseurl, JSON.stringify(replicationRule), this.options).toPromise() + .then(response => response) + .catch(error => Promise.reject(error)); + } + + public getReplicationRules(projectId?: number | string, ruleName?: string): Promise | ReplicationRule[] { + let queryParams = new URLSearchParams(); + if (projectId) { + queryParams.set('project_id', '' + projectId); + } + + if (ruleName) { + queryParams.set('name', ruleName); + } + + return this.http.get(this.baseurl, {search: queryParams}).toPromise() + .then(response => response.json() as ReplicationRule[]) + .catch(error => Promise.reject(error)); + } + + public getReplicationRule(policyId: number): Promise { + let url: string = `${this.baseurl}/${policyId}`; + return this.http.get(url, HTTP_GET_OPTIONS).toPromise() + .then(response => response.json() as ReplicationRule) + .catch(error => Promise.reject(error)); + } + + + public getEndpoints(): Promise | Target[] { + return this.http + .get(this.targetUrl) + .toPromise() + .then(response => response.json()) + .catch(error => Promise.reject(error)); + } + + public listProjects(): Promise | Project[] { + return this.http.get(`/api/projects`, HTTP_GET_OPTIONS).toPromise() + .then(response => response.json()) + .catch(error => Promise.reject(error)); + } + + public updateReplicationRule(id: number, rep: {[key: string]: any | any[] }): Observable | Promise | any { + let url: string = `${this.baseurl}/${id}`; + return this.http.put(url, JSON.stringify(rep), HTTP_JSON_OPTIONS).toPromise() + .then(response => response) + .catch(error => Promise.reject(error)); + } + +} diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts new file mode 100644 index 000000000..0167be8d4 --- /dev/null +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts @@ -0,0 +1,48 @@ +import {Project} from "../../project/project"; +/** + * Created by pengf on 12/7/2017. + */ + +export class Target { + id: 0; + endpoint: 'string'; + name: 'string'; + username: 'string'; + password: 'string'; + type: 0; + insecure: true; + creation_time: 'string'; + update_time: 'string'; +} + +export class Filter { + kind: string; + pattern: string; + constructor(kind: string, pattern: string) { + this.kind = kind; + this.pattern = pattern; + } +} + +export class Trigger { + kind: string; + schedule_param: any | { + [key: string]: any | any[]; + }; + constructor(kind: string, param: any | { [key: string]: any | any[]; }) { + this.kind = kind; + this.schedule_param = param; + } +} + +export interface ReplicationRule { + name: string; + description: string; + projects: Project[]; + targets: Target[] ; + trigger: Trigger ; + filters: Filter[] ; + replicate_existing_image_now?: boolean; + replicate_deletion?: boolean; +} + diff --git a/src/ui_ng/src/app/replication/replication.module.ts b/src/ui_ng/src/app/replication/replication.module.ts index cd20fada9..b6da1c6f4 100644 --- a/src/ui_ng/src/app/replication/replication.module.ts +++ b/src/ui_ng/src/app/replication/replication.module.ts @@ -20,22 +20,29 @@ import { TotalReplicationPageComponent } from './total-replication/total-replica import { DestinationPageComponent } from './destination/destination-page.component'; import { SharedModule } from '../shared/shared.module'; +import {ReplicationRuleComponent} from "./replication-rule/replication-rule.component"; +import {ReactiveFormsModule} from "@angular/forms"; +import {ReplicationRuleServie} from "./replication-rule/replication-rule.service"; @NgModule({ imports: [ SharedModule, - RouterModule + RouterModule, + ReactiveFormsModule ], declarations: [ ReplicationPageComponent, ReplicationManagementComponent, TotalReplicationPageComponent, - DestinationPageComponent + DestinationPageComponent, + ReplicationRuleComponent, ], exports: [ ReplicationPageComponent, DestinationPageComponent, - TotalReplicationPageComponent - ] + TotalReplicationPageComponent, + ReplicationRuleComponent, + ], + providers: [ReplicationRuleServie] }) export class ReplicationModule { } \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html index b93ec2ca3..df2a97bfd 100644 --- a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html +++ b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html @@ -1,3 +1,4 @@ +

    {{'REPLICATION.REPLICATION_RULE' | translate}}

    - +
    \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts index 9716c07d7..5da340b1d 100644 --- a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts +++ b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts @@ -14,7 +14,7 @@ import { Component } from '@angular/core'; import {Router,ActivatedRoute} from "@angular/router"; -import {ReplicationRule} from "harbor-ui"; +import {ReplicationRule} from "../replication-rule/replication-rule"; @Component({ selector: 'total-replication', @@ -26,7 +26,15 @@ export class TotalReplicationPageComponent { private activeRoute: ActivatedRoute){} customRedirect(rule: ReplicationRule): void { if (rule) { - this.router.navigate(['../../projects', rule.project_id, "replications"], { relativeTo: this.activeRoute }); + this.router.navigate(['../projects', rule.projects[0].project_id, "replications"], { relativeTo: this.activeRoute }); } } -} \ No newline at end of file + + openEditPage(id: number): void { + this.router.navigate([id, 'rule'], { relativeTo: this.activeRoute }); + } + + openCreatePage(): void { + this.router.navigate(['new-rule'], { relativeTo: this.activeRoute }); + } +} diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication.component.css b/src/ui_ng/src/app/replication/total-replication/total-replication.component.css index 23904eade..8d38880dd 100644 --- a/src/ui_ng/src/app/replication/total-replication/total-replication.component.css +++ b/src/ui_ng/src/app/replication/total-replication/total-replication.component.css @@ -2,4 +2,7 @@ padding-right: 16px; margin-top: 36px; margin-bottom: 11px; -} \ No newline at end of file +} +.custom-h2 { + margin-top: 0px !important; +} diff --git a/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts b/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts index 5b1e9300b..c38c391ad 100644 --- a/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts @@ -33,12 +33,13 @@ export class SystemAdminGuard implements CanActivate, CanActivateChild { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { return new Promise((resolve, reject) => { let user = this.authService.getCurrentUser(); + let projectMem = this.authService.projectMembers; if (!user) { this.authService.retrieveUser() .then(() => { //updated user user = this.authService.getCurrentUser(); - if (user.has_admin_role > 0) { + if (user.has_admin_role > 0 || projectMem[0].role_name === 'projectAdmin') { return resolve(true); } else { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); @@ -60,7 +61,7 @@ export class SystemAdminGuard implements CanActivate, CanActivateChild { } }); } else { - if (user.has_admin_role > 0) { + if (user.has_admin_role > 0 || projectMem[0].role_name === 'projectAdmin') { return resolve(true); } else { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); diff --git a/src/ui_ng/src/app/shared/shared.utils.ts b/src/ui_ng/src/app/shared/shared.utils.ts index 6f04d8542..d38f3848a 100644 --- a/src/ui_ng/src/app/shared/shared.utils.ts +++ b/src/ui_ng/src/app/shared/shared.utils.ts @@ -15,6 +15,7 @@ import { NgForm } from '@angular/forms'; import { httpStatusCode, AlertType } from './shared.const'; import { MessageService } from '../global-message/message.service'; import { Comparator, State } from 'clarity-angular'; +import {RequestOptions, Headers} from "@angular/http"; /** * To handle the error message body @@ -155,6 +156,27 @@ export class CustomComparator implements Comparator { } } +export const HTTP_JSON_OPTIONS: RequestOptions = new RequestOptions({ + headers: new Headers({ + "Content-Type": 'application/json', + "Accept": 'application/json', + }) +}); +export const HTTP_GET_OPTIONS: RequestOptions = new RequestOptions({ + headers: new Headers({ + "Content-Type": 'application/json', + "Accept": 'application/json', + "Cache-Control": 'no-cache', + "Pragma": 'no-cache' + }) +}); + +export const HTTP_FORM_OPTIONS: RequestOptions = new RequestOptions({ + headers: new Headers({ + "Content-Type": 'application/x-www-form-urlencoded' + }) +}); + /** * Filter columns via RegExp * diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index 9089c6c01..0b32c0cb6 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -50,7 +50,9 @@ "NUMBER_REQUIRED": "Field is required and should be numbers.", "PORT_REQUIRED": "Field is required and should be valid port number.", "EMAIL_EXISTING": "Email address already exists.", - "USER_EXISTING": "Username is already in use." + "USER_EXISTING": "Username is already in use.", + "RULE_USER_EXISTING": "Name is already in use.", + "EMPTY": "Name is required" }, "PLACEHOLDER": { "CURRENT_PWD": "Enter current password", diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json index 8b1b40078..01fb4bf39 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -50,7 +50,9 @@ "NUMBER_REQUIRED": "El campo es obligatorio y debería ser un número.", "PORT_REQUIRED": "El campo es obligatorio y debería ser un número de puerto válido.", "EMAIL_EXISTING": "Esa dirección de email ya existe.", - "USER_EXISTING": "Ese nombre de usuario ya existe." + "USER_EXISTING": "Ese nombre de usuario ya existe.", + "RULE_USER_EXISTING": "Name is already in use.", + "EMPTY": "Name is required" }, "PLACEHOLDER": { "CURRENT_PWD": "Introduzca la contraseña actual", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index af643351b..dc1347f37 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -50,7 +50,9 @@ "NUMBER_REQUIRED": "此项为必填项且为数字。", "PORT_REQUIRED": "此项为必填项且为合法端口号。", "EMAIL_EXISTING": "邮件地址已经存在。", - "USER_EXISTING": "用户名已经存在。" + "USER_EXISTING": "用户名已经存在。", + "RULE_USER_EXISTING": "名称已经存在。", + "EMPTY": "名称为必填项" }, "PLACEHOLDER": { "CURRENT_PWD": "输入当前密码", diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot index 7c1eb174e..9e1d2355e 100644 --- a/tests/resources/Harbor-Pages/Replication.robot +++ b/tests/resources/Harbor-Pages/Replication.robot @@ -22,22 +22,32 @@ ${HARBOR_VERSION} v1.1.1 *** Keywords *** Create An New Rule With New Endpoint [Arguments] ${policy_name} ${policy_description} ${destination_name} ${destination_url} ${destination_username} ${destination_password} - Click element xpath=${new_name_xpath} + Click element xpath=${new_rule_xpath} Sleep 2 Input Text xpath=${policy_name_xpath} ${policy_name} Input Text xpath=${policy_description_xpath} ${policy_description} + Click Element xpath=//select[@id="ruleProject"] + Click Element xpath=//select[@id="ruleProject"]//option[1] + + Click Element xpath=//select[@id="ruleTarget"] + Click Element xpath=//select[@id="ruleTarget"]//option[1] + + Click Element xpath=//select[@id="ruleTrigger"] + Click Element xpath=//select[@id="ruleTrigger"]//option[@value='immediate'] + + Mouse down xpath=//*[@id="clr-checkbox-ruleDeletion"] + Mouse up xpath=//*[@id="clr-checkbox-ruleDeletion"] + + Mouse down xpath=//*[@id="clr-checkbox-ruleExit"] + Mouse up xpath=//*[@id="clr-checkbox-ruleExit"] + Click element xpath=${policy_enable_checkbox} Click element xpath=${policy_endpoint_checkbox} - Input text xpath=${destination_name_xpath} ${destination_name} - Input text xpath=${destination_url_xpath} ${destination_url} - Input text xpath=${destination_username_xpath} ${destination_username} - Input text xpath=${destination_password_xpath} ${destination_password} - Click element xpath=${replicaton_save_xpath} + Click element xpath=//*[@id="ruleBtnOk"] Sleep 5 Capture Page Screenshot rule_${policy_name}.png Wait Until Page Contains ${policy_name} - Wait Until Page Contains ${policy_description} - Wait Until Page Contains ${destination_name} \ No newline at end of file + Wait Until Page Contains ${policy_description} \ No newline at end of file diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot index a7a3fe98d..e3bd4292b 100644 --- a/tests/resources/Harbor-Pages/Replication_Elements.robot +++ b/tests/resources/Harbor-Pages/Replication_Elements.robot @@ -16,11 +16,9 @@ Documentation This resource provides any keywords related to the Harbor private registry appliance *** Variables *** -${new_name_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/replicaton/div/hbr-replication/div/div[1]/div/div[1]/button/clr-icon -${policy_name_xpath} //*[@id="policy_name"] -${policy_description_xpath} //*[@id="policy_description"] -${policy_enable_checkbox} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/replicaton/div/hbr-replication/div/div[1]/div/div[1]/create-edit-rule/clr-modal/div/div[1]/div/div[1]/div/div[2]/form/section/div[3]/div/label -${policy_endpoint_checkbox} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/replicaton/div/hbr-replication/div/div[1]/div/div[1]/create-edit-rule/clr-modal/div/div[1]/div/div[1]/div/div[2]/form/section/div[4]/div[2]/label +${new_rule_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/total-replication/div/hbr-replication/div/div[1]/div/div[1]/button +${policy_name_xpath} //*[@id="ruleName"] +${policy_description_xpath} //*[@id="ruleDescription"] ${destination_name_xpath} //*[@id='destination_name'] ${destination_url_xpath} //*[@id='destination_url'] ${destination_username_xpath} //*[@id='destination_username'] From 3be1d5a7fd23215b74c134fd82a56aaf25d8b26e Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Sat, 16 Dec 2017 21:52:29 +0800 Subject: [PATCH 30/37] Assign read-only privilege of replication policy to project admin and add stopping replication jobs API. --- docs/swagger.yaml | 54 ++++++++- src/jobservice/client/client.go | 26 +++- src/jobservice/client/client_test.go | 37 +++++- src/replication/core/controller.go | 26 ++-- src/replication/core/controller_test.go | 1 + src/replication/replicator/replicator.go | 9 +- src/replication/replicator/replicator_test.go | 12 +- src/ui/api/harborapi_test.go | 2 +- src/ui/api/models/replication_job.go | 35 ++++++ src/ui/api/replication_job.go | 60 +++++++++- src/ui/api/replication_policy.go | 10 +- src/ui/api/replication_policy_test.go | 111 ++++++++++++++++-- src/ui/config/config.go | 12 ++ src/ui/main.go | 2 +- src/ui/router.go | 2 +- 15 files changed, 349 insertions(+), 50 deletions(-) create mode 100644 src/ui/api/models/replication_job.go diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 84a8b0dab..94f4cc70a 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1391,6 +1391,32 @@ paths: description: User need to login first. '500': description: Unexpected internal errors. + put: + summary: Update status of jobs. Only stop is supported for now. + description: > + The endpoint is used to stop the replication jobs of a policy. + tags: + - Products + parameters: + - name: policyinfo + in: body + description: The policy ID and status. + required: true + schema: + $ref: '#/definitions/UpdateJobs' + responses: + '200': + description: Update the status successfully. + '400': + description: Bad request because of invalid parameters. + '401': + description: User need to login first. + '403': + description: User has no privilege for the operation. + '404': + description: Resource requested does not exist. + '500': + description: Unexpected internal errors. /jobs/replication/{id}: delete: summary: Delete specific ID job. @@ -2414,9 +2440,22 @@ definitions: kind: type: string description: The replication policy trigger kind. The valid values are manual, immediate and schedule. - param: + schedule_param: + $ref: '#/definitions/ScheduleParam' + ScheduleParam: + type: object + properties: + type: type: string - description: The replication policy trigger parameters. + description: The schedule type. The valid values are daily and weekly. + weekday: + type: integer + format: int8 + description: Optional, only used when the type is weedly. The valid values are 1-7. + offtime: + type: integer + format: int64 + description: The time offset with the UTC 00:00 in seconds. RepFilter: type: object properties: @@ -2927,5 +2966,12 @@ definitions: description: type: string description: The description of the repository. - - + UpdateJobs: + type: object + properties: + policy_id: + type: integer + description: The ID of replication policy + status: + type: string + description: The status of jobs. The only valid value is stop for now. \ No newline at end of file diff --git a/src/jobservice/client/client.go b/src/jobservice/client/client.go index 7ace3d3a2..215d018f5 100644 --- a/src/jobservice/client/client.go +++ b/src/jobservice/client/client.go @@ -17,12 +17,20 @@ package client import ( "github.com/vmware/harbor/src/common/http" "github.com/vmware/harbor/src/common/http/modifier/auth" - "github.com/vmware/harbor/src/jobservice/api" ) +// Replication holds information for submiting a replication job +type Replication struct { + PolicyID int64 `json:"policy_id"` + Repository string `json:"repository"` + Operation string `json:"operation"` + Tags []string `json:"tags"` +} + // Client defines the methods that a jobservice client should implement type Client interface { - SubmitReplicationJob(*api.ReplicationReq) error + SubmitReplicationJob(*Replication) error + StopReplicationJobs(policyID int64) error } // DefaultClient provides a default implement for the interface Client @@ -50,7 +58,19 @@ func NewDefaultClient(endpoint string, cfg *Config) *DefaultClient { } // SubmitReplicationJob submits a replication job to the jobservice -func (d *DefaultClient) SubmitReplicationJob(replication *api.ReplicationReq) error { +func (d *DefaultClient) SubmitReplicationJob(replication *Replication) error { url := d.endpoint + "/api/jobs/replication" return d.client.Post(url, replication) } + +// StopReplicationJobs stop replication jobs of the policy specified by the policy ID +func (d *DefaultClient) StopReplicationJobs(policyID int64) error { + url := d.endpoint + "/api/jobs/replication/actions" + return d.client.Post(url, &struct { + PolicyID int64 `json:"policy_id"` + Action string `json:"action"` + }{ + PolicyID: policyID, + Action: "stop", + }) +} diff --git a/src/jobservice/client/client_test.go b/src/jobservice/client/client_test.go index 4d8ab5fb0..a48adc8e0 100644 --- a/src/jobservice/client/client_test.go +++ b/src/jobservice/client/client_test.go @@ -22,18 +22,37 @@ import ( "github.com/stretchr/testify/assert" "github.com/vmware/harbor/src/common/utils/test" - "github.com/vmware/harbor/src/jobservice/api" ) var url string func TestMain(m *testing.M) { requestMapping := []*test.RequestHandlerMapping{ + &test.RequestHandlerMapping{ + Method: http.MethodPost, + Pattern: "/api/jobs/replication/actions", + Handler: func(w http.ResponseWriter, r *http.Request) { + action := &struct { + PolicyID int64 `json:"policy_id"` + Action string `json:"action"` + }{} + if err := json.NewDecoder(r.Body).Decode(action); err != nil { + w.WriteHeader(http.StatusInternalServerError) + return + } + + if action.PolicyID != 1 { + w.WriteHeader(http.StatusNotFound) + return + } + + }, + }, &test.RequestHandlerMapping{ Method: http.MethodPost, Pattern: "/api/jobs/replication", Handler: func(w http.ResponseWriter, r *http.Request) { - replication := &api.ReplicationReq{} + replication := &Replication{} if err := json.NewDecoder(r.Body).Decode(replication); err != nil { w.WriteHeader(http.StatusInternalServerError) } @@ -50,6 +69,18 @@ func TestMain(m *testing.M) { func TestSubmitReplicationJob(t *testing.T) { client := NewDefaultClient(url, &Config{}) - err := client.SubmitReplicationJob(&api.ReplicationReq{}) + err := client.SubmitReplicationJob(&Replication{}) + assert.Nil(t, err) +} + +func TestStopReplicationJobs(t *testing.T) { + client := NewDefaultClient(url, &Config{}) + + // 404 + err := client.StopReplicationJobs(2) + assert.NotNil(t, err) + + // 200 + err = client.StopReplicationJobs(1) assert.Nil(t, err) } diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 6945ae75b..7eda6a699 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -20,7 +20,6 @@ import ( common_models "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" - "github.com/vmware/harbor/src/jobservice/api" "github.com/vmware/harbor/src/jobservice/client" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" @@ -63,7 +62,7 @@ type DefaultController struct { //Keep controller as singleton instance var ( - GlobalController Controller = NewDefaultController(ControllerConfig{}) //Use default data + GlobalController Controller ) //ControllerConfig includes related configurations required by the controller @@ -82,16 +81,17 @@ func NewDefaultController(cfg ControllerConfig) *DefaultController { triggerManager: trigger.NewManager(cfg.CacheCapacity), } - // TODO read from configuration - endpoint := "http://jobservice:8080" - ctl.replicator = replicator.NewDefaultReplicator(endpoint, - &client.Config{ - Secret: config.UISecret(), - }) + ctl.replicator = replicator.NewDefaultReplicator(config.GlobalJobserviceClient) return ctl } +// Init creates the GlobalController and inits it +func Init() error { + GlobalController = NewDefaultController(ControllerConfig{}) //Use default data + return GlobalController.Init() +} + //Init will initialize the controller and the sub components func (ctl *DefaultController) Init() error { if ctl.initialized { @@ -308,11 +308,11 @@ func replicate(replicator replicator.Replicator, policyID int64, candidates []mo } for repository, tags := range repositories { - replication := &api.ReplicationReq{ - PolicyID: policyID, - Repo: repository, - Operation: operation, - TagList: tags, + replication := &client.Replication{ + PolicyID: policyID, + Repository: repository, + Operation: operation, + Tags: tags, } log.Debugf("submiting replication job to jobservice: %v", replication) if err := replicator.Replicate(replication); err != nil { diff --git a/src/replication/core/controller_test.go b/src/replication/core/controller_test.go index 58b1935a5..b88e2165b 100644 --- a/src/replication/core/controller_test.go +++ b/src/replication/core/controller_test.go @@ -26,6 +26,7 @@ import ( ) func TestMain(m *testing.M) { + GlobalController = NewDefaultController(ControllerConfig{}) // set the policy manager used by GlobalController with a fake policy manager controller := GlobalController.(*DefaultController) controller.policyManager = &test.FakePolicyManager{} diff --git a/src/replication/replicator/replicator.go b/src/replication/replicator/replicator.go index 5edef542f..37e387ce8 100644 --- a/src/replication/replicator/replicator.go +++ b/src/replication/replicator/replicator.go @@ -15,13 +15,12 @@ package replicator import ( - "github.com/vmware/harbor/src/jobservice/api" "github.com/vmware/harbor/src/jobservice/client" ) // Replicator submits the replication work to the jobservice type Replicator interface { - Replicate(*api.ReplicationReq) error + Replicate(*client.Replication) error } // DefaultReplicator provides a default implement for Replicator @@ -30,13 +29,13 @@ type DefaultReplicator struct { } // NewDefaultReplicator returns an instance of DefaultReplicator -func NewDefaultReplicator(endpoint string, cfg *client.Config) *DefaultReplicator { +func NewDefaultReplicator(client client.Client) *DefaultReplicator { return &DefaultReplicator{ - client: client.NewDefaultClient(endpoint, cfg), + client: client, } } // Replicate ... -func (d *DefaultReplicator) Replicate(replication *api.ReplicationReq) error { +func (d *DefaultReplicator) Replicate(replication *client.Replication) error { return d.client.SubmitReplicationJob(replication) } diff --git a/src/replication/replicator/replicator_test.go b/src/replication/replicator/replicator_test.go index 726f12b7a..934939cd0 100644 --- a/src/replication/replicator/replicator_test.go +++ b/src/replication/replicator/replicator_test.go @@ -18,18 +18,20 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/harbor/src/jobservice/api" "github.com/vmware/harbor/src/jobservice/client" ) type fakeJobserviceClient struct{} -func (f *fakeJobserviceClient) SubmitReplicationJob(replication *api.ReplicationReq) error { +func (f *fakeJobserviceClient) SubmitReplicationJob(replication *client.Replication) error { + return nil +} + +func (f *fakeJobserviceClient) StopReplicationJobs(policyID int64) error { return nil } func TestReplicate(t *testing.T) { - replicator := NewDefaultReplicator("http://jobservice", &client.Config{}) - replicator.client = &fakeJobserviceClient{} - assert.Nil(t, replicator.Replicate(&api.ReplicationReq{})) + replicator := NewDefaultReplicator(&fakeJobserviceClient{}) + assert.Nil(t, replicator.Replicate(&client.Replication{})) } diff --git a/src/ui/api/harborapi_test.go b/src/ui/api/harborapi_test.go index 7e62499c5..127824a81 100644 --- a/src/ui/api/harborapi_test.go +++ b/src/ui/api/harborapi_test.go @@ -134,7 +134,7 @@ func init() { _ = updateInitPassword(1, "Harbor12345") - if err := core.GlobalController.Init(); err != nil { + if err := core.Init(); err != nil { log.Fatalf("failed to initialize GlobalController: %v", err) } diff --git a/src/ui/api/models/replication_job.go b/src/ui/api/models/replication_job.go new file mode 100644 index 000000000..f3dfc2402 --- /dev/null +++ b/src/ui/api/models/replication_job.go @@ -0,0 +1,35 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package models + +import ( + "github.com/astaxie/beego/validation" +) + +// StopJobsReq holds information needed to stop the jobs for a replication rule +type StopJobsReq struct { + PolicyID int64 `json:"policy_id"` + Status string `json:"status"` +} + +// Valid ... +func (s *StopJobsReq) Valid(v *validation.Validation) { + if s.PolicyID <= 0 { + v.SetError("policy_id", "invalid value") + } + if s.Status != "stop" { + v.SetError("status", "invalid status, valid values: [stop]") + } +} diff --git a/src/ui/api/replication_job.go b/src/ui/api/replication_job.go index e032eb0d2..670ebacda 100644 --- a/src/ui/api/replication_job.go +++ b/src/ui/api/replication_job.go @@ -23,6 +23,9 @@ import ( "github.com/vmware/harbor/src/common/dao" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/utils/log" + "github.com/vmware/harbor/src/replication/core" + api_models "github.com/vmware/harbor/src/ui/api/models" + "github.com/vmware/harbor/src/ui/config" "github.com/vmware/harbor/src/ui/utils" ) @@ -40,7 +43,7 @@ func (ra *RepJobAPI) Prepare() { return } - if !ra.SecurityCtx.IsSysAdmin() { + if !(ra.Ctx.Request.Method == http.MethodGet || ra.SecurityCtx.IsSysAdmin()) { ra.HandleForbidden(ra.SecurityCtx.GetUsername()) return } @@ -63,16 +66,21 @@ func (ra *RepJobAPI) List() { ra.CustomAbort(http.StatusBadRequest, "invalid policy_id") } - policy, err := dao.GetRepPolicy(policyID) + policy, err := core.GlobalController.GetPolicy(policyID) if err != nil { log.Errorf("failed to get policy %d: %v", policyID, err) ra.CustomAbort(http.StatusInternalServerError, "") } - if policy == nil { + if policy.ID == 0 { ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("policy %d not found", policyID)) } + if !ra.SecurityCtx.HasAllPerm(policy.ProjectIDs[0]) { + ra.HandleForbidden(ra.SecurityCtx.GetUsername()) + return + } + repository := ra.GetString("repository") status := ra.GetString("status") @@ -145,12 +153,56 @@ func (ra *RepJobAPI) GetLog() { if ra.jobID == 0 { ra.CustomAbort(http.StatusBadRequest, "id is nil") } + + job, err := dao.GetRepJob(ra.jobID) + if err != nil { + ra.HandleInternalServerError(fmt.Sprintf("failed to get replication job %d: %v", ra.jobID, err)) + return + } + + if job == nil { + ra.HandleNotFound(fmt.Sprintf("replication job %d not found", ra.jobID)) + return + } + + policy, err := core.GlobalController.GetPolicy(job.PolicyID) + if err != nil { + ra.HandleInternalServerError(fmt.Sprintf("failed to get policy %d: %v", job.PolicyID, err)) + return + } + + if !ra.SecurityCtx.HasAllPerm(policy.ProjectIDs[0]) { + ra.HandleForbidden(ra.SecurityCtx.GetUsername()) + return + } + url := buildJobLogURL(strconv.FormatInt(ra.jobID, 10), ReplicationJobType) - err := utils.RequestAsUI(http.MethodGet, url, nil, utils.NewJobLogRespHandler(&ra.BaseAPI)) + err = utils.RequestAsUI(http.MethodGet, url, nil, utils.NewJobLogRespHandler(&ra.BaseAPI)) if err != nil { ra.RenderError(http.StatusInternalServerError, err.Error()) return } } +// StopJobs stop replication jobs for the policy +func (ra *RepJobAPI) StopJobs() { + req := &api_models.StopJobsReq{} + ra.DecodeJSONReqAndValidate(req) + + policy, err := core.GlobalController.GetPolicy(req.PolicyID) + if err != nil { + ra.HandleInternalServerError(fmt.Sprintf("failed to get policy %d: %v", req.PolicyID, err)) + return + } + + if policy.ID == 0 { + ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("policy %d not found", req.PolicyID)) + } + + if err = config.GlobalJobserviceClient.StopReplicationJobs(req.PolicyID); err != nil { + ra.HandleInternalServerError(fmt.Sprintf("failed to stop replication jobs of policy %d: %v", req.PolicyID, err)) + return + } +} + //TODO:add Post handler to call job service API to submit jobs by policy diff --git a/src/ui/api/replication_policy.go b/src/ui/api/replication_policy.go index b349f45c5..647fe6e58 100644 --- a/src/ui/api/replication_policy.go +++ b/src/ui/api/replication_policy.go @@ -42,7 +42,7 @@ func (pa *RepPolicyAPI) Prepare() { return } - if !pa.SecurityCtx.IsSysAdmin() { + if !(pa.Ctx.Request.Method == http.MethodGet || pa.SecurityCtx.IsSysAdmin()) { pa.HandleForbidden(pa.SecurityCtx.GetUsername()) return } @@ -61,6 +61,11 @@ func (pa *RepPolicyAPI) Get() { pa.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } + if !pa.SecurityCtx.HasAllPerm(policy.ProjectIDs[0]) { + pa.HandleForbidden(pa.SecurityCtx.GetUsername()) + return + } + ply, err := convertFromRepPolicy(pa.ProjectMgr, policy) if err != nil { pa.ParseAndHandleError(fmt.Sprintf("failed to convert from replication policy"), err) @@ -94,6 +99,9 @@ func (pa *RepPolicyAPI) List() { } for _, policy := range policies { + if !pa.SecurityCtx.HasAllPerm(policy.ProjectIDs[0]) { + continue + } ply, err := convertFromRepPolicy(pa.ProjectMgr, policy) if err != nil { pa.ParseAndHandleError(fmt.Sprintf("failed to convert from replication policy"), err) diff --git a/src/ui/api/replication_policy_test.go b/src/ui/api/replication_policy_test.go index 9698d5df1..25738298b 100644 --- a/src/ui/api/replication_policy_test.go +++ b/src/ui/api/replication_policy_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/dao" "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/replication" rep_models "github.com/vmware/harbor/src/replication/models" @@ -265,15 +266,28 @@ func TestRepPolicyAPIPost(t *testing.T) { } func TestRepPolicyAPIGet(t *testing.T) { - // 404 - runCodeCheckingCases(t, &codeCheckingCase{ - request: &testingRequest{ - method: http.MethodGet, - url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, 10000), - credential: sysAdmin, + + cases := []*codeCheckingCase{ + // 404 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodGet, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, 10000), + credential: sysAdmin, + }, + code: http.StatusNotFound, }, - code: http.StatusNotFound, - }) + // 401 + &codeCheckingCase{ + request: &testingRequest{ + method: http.MethodGet, + url: fmt.Sprintf("%s/%d", repPolicyAPIBasePath, policyID), + }, + code: http.StatusUnauthorized, + }, + } + + runCodeCheckingCases(t, cases...) // 200 policy := &api_models.ReplicationPolicy{} @@ -290,6 +304,39 @@ func TestRepPolicyAPIGet(t *testing.T) { } func TestRepPolicyAPIList(t *testing.T) { + projectAdmin := models.User{ + Username: "project_admin", + Password: "ProjectAdmin", + Email: "project_admin@test.com", + } + projectDev := models.User{ + Username: "project_dev", + Password: "ProjectDev", + Email: "project_dev@test.com", + } + + proAdminID, err := dao.Register(projectAdmin) + if err != nil { + panic(err) + } + defer dao.DeleteUser(int(proAdminID)) + + if err = dao.AddProjectMember(1, int(proAdminID), models.PROJECTADMIN); err != nil { + panic(err) + } + defer dao.DeleteProjectMember(1, int(proAdminID)) + + proDevID, err := dao.Register(projectDev) + if err != nil { + panic(err) + } + defer dao.DeleteUser(int(proDevID)) + + if err = dao.AddProjectMember(1, int(proDevID), models.DEVELOPER); err != nil { + panic(err) + } + defer dao.DeleteProjectMember(1, int(proDevID)) + // 400: invalid project ID runCodeCheckingCases(t, &codeCheckingCase{ request: &testingRequest{ @@ -305,7 +352,7 @@ func TestRepPolicyAPIList(t *testing.T) { code: http.StatusBadRequest, }) - // 200 + // 200 system admin policies := []*api_models.ReplicationPolicy{} resp, err := handleAndParse( &testingRequest{ @@ -326,6 +373,52 @@ func TestRepPolicyAPIList(t *testing.T) { assert.Equal(t, policyID, policies[0].ID) assert.Equal(t, policyName, policies[0].Name) + // 200 project admin + policies = []*api_models.ReplicationPolicy{} + resp, err = handleAndParse( + &testingRequest{ + method: http.MethodGet, + url: repPolicyAPIBasePath, + queryStruct: struct { + ProjectID int64 `url:"project_id"` + Name string `url:"name"` + }{ + ProjectID: projectID, + Name: policyName, + }, + credential: &usrInfo{ + Name: projectAdmin.Username, + Passwd: projectAdmin.Password, + }, + }, &policies) + require.Nil(t, err) + assert.Equal(t, http.StatusOK, resp.Code) + require.Equal(t, 1, len(policies)) + assert.Equal(t, policyID, policies[0].ID) + assert.Equal(t, policyName, policies[0].Name) + + // 200 project developer + policies = []*api_models.ReplicationPolicy{} + resp, err = handleAndParse( + &testingRequest{ + method: http.MethodGet, + url: repPolicyAPIBasePath, + queryStruct: struct { + ProjectID int64 `url:"project_id"` + Name string `url:"name"` + }{ + ProjectID: projectID, + Name: policyName, + }, + credential: &usrInfo{ + Name: projectDev.Username, + Passwd: projectDev.Password, + }, + }, &policies) + require.Nil(t, err) + assert.Equal(t, http.StatusOK, resp.Code) + require.Equal(t, 0, len(policies)) + // 200 policies = []*api_models.ReplicationPolicy{} resp, err = handleAndParse( diff --git a/src/ui/config/config.go b/src/ui/config/config.go index 207e8067d..8fef0a17e 100644 --- a/src/ui/config/config.go +++ b/src/ui/config/config.go @@ -28,6 +28,7 @@ import ( "github.com/vmware/harbor/src/common/models" "github.com/vmware/harbor/src/common/secret" "github.com/vmware/harbor/src/common/utils/log" + jobservice_client "github.com/vmware/harbor/src/jobservice/client" "github.com/vmware/harbor/src/ui/promgr" "github.com/vmware/harbor/src/ui/promgr/pmsdriver" "github.com/vmware/harbor/src/ui/promgr/pmsdriver/admiral" @@ -54,6 +55,8 @@ var ( AdmiralClient *http.Client // TokenReader is used in integration mode to read token TokenReader admiral.TokenReader + // GlobalJobserviceClient is a global client for jobservice + GlobalJobserviceClient jobservice_client.Client ) // Init configurations @@ -92,6 +95,11 @@ func InitByURL(adminServerURL string) error { // init project manager based on deploy mode initProjectManager() + GlobalJobserviceClient = jobservice_client.NewDefaultClient(InternalJobServiceURL(), + &jobservice_client.Config{ + Secret: UISecret(), + }) + return nil } @@ -260,6 +268,10 @@ func InternalJobServiceURL() string { return "http://jobservice" } + + if cfg[common.JobServiceURL] == nil { + return "http://jobservice" + } return strings.TrimSuffix(cfg[common.JobServiceURL].(string), "/") } diff --git a/src/ui/main.go b/src/ui/main.go index 12f500de3..44ffb8e00 100644 --- a/src/ui/main.go +++ b/src/ui/main.go @@ -132,7 +132,7 @@ func main() { notifier.Publish(notifier.ScanAllPolicyTopic, notifier.ScanPolicyNotification{Type: scanAllPolicy.Type, DailyTime: (int64)(dailyTime)}) } - if err := core.GlobalController.Init(); err != nil { + if err := core.Init(); err != nil { log.Errorf("failed to initialize the replication controller: %v", err) } diff --git a/src/ui/router.go b/src/ui/router.go index a0feadf41..6ad3be9fc 100644 --- a/src/ui/router.go +++ b/src/ui/router.go @@ -101,7 +101,7 @@ func initRouters() { beego.Router("/api/repositories/*/tags/:tag/manifest", &api.RepositoryAPI{}, "get:GetManifests") beego.Router("/api/repositories/*/signatures", &api.RepositoryAPI{}, "get:GetSignatures") beego.Router("/api/repositories/top", &api.RepositoryAPI{}, "get:GetTopRepos") - beego.Router("/api/jobs/replication/", &api.RepJobAPI{}, "get:List") + beego.Router("/api/jobs/replication/", &api.RepJobAPI{}, "get:List;put:StopJobs") beego.Router("/api/jobs/replication/:id([0-9]+)", &api.RepJobAPI{}) beego.Router("/api/jobs/replication/:id([0-9]+)/log", &api.RepJobAPI{}, "get:GetLog") beego.Router("/api/jobs/scan/:id([0-9]+)/log", &api.ScanJobAPI{}, "get:GetLog") From fb83f2433f6f4b47cff5db3bbc0f0ec4dbdd1297 Mon Sep 17 00:00:00 2001 From: "Fuhui Peng (c)" Date: Tue, 26 Dec 2017 14:54:59 +0800 Subject: [PATCH 31/37] Modify replication list datagrid --- .../list-replication-rule.component.html.ts | 4 ++-- src/ui_ng/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index 8687a9a86..e6d7f8f57 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -16,10 +16,10 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = ` {{p.name}} - {{p.projects[0].name}} + {{p.projects?.length>0 ? p.projects[0].name : ''}} {{p.description ? p.description : '-'}} - {{p.targets[0].name}} + {{p.targets?.length>0 ? p.targets[0].name : ''}} - {{p.start_time | date: 'short'}} diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 0d1039536..40de1aa69 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.9.8", "clarity-ui": "^0.9.8", "core-js": "^2.4.1", - "harbor-ui": "^0.5.9-test-32", + "harbor-ui": "^0.5.9-test-35", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", From d36811ce52ddad2048063f595316a45dc254cbf9 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 26 Dec 2017 19:09:14 +0800 Subject: [PATCH 32/37] Using the string trimmed the project name at the begining as the input of repository filter --- src/replication/core/controller.go | 6 +----- src/replication/source/repository_convertor.go | 2 -- src/replication/source/repository_filter.go | 3 +++ src/replication/source/repository_filter_test.go | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/replication/core/controller.go b/src/replication/core/controller.go index 7eda6a699..9065e6284 100644 --- a/src/replication/core/controller.go +++ b/src/replication/core/controller.go @@ -110,9 +110,7 @@ func (ctl *DefaultController) Init() error { if policies != nil && len(policies) > 0 { for _, policy := range policies { if err := ctl.triggerManager.SetupTrigger(&policy); err != nil { - //TODO: Log error - fmt.Printf("Error: %s", err) - //TODO:Update the status of policy + log.Errorf("failed to setup trigger for policy %v: %v", policy, err) } } } @@ -143,8 +141,6 @@ func (ctl *DefaultController) CreatePolicy(newPolicy models.ReplicationPolicy) ( //UpdatePolicy will update the policy with new content. //Parameter updatedPolicy must have the ID of the updated policy. func (ctl *DefaultController) UpdatePolicy(updatedPolicy models.ReplicationPolicy) error { - // TODO check pre-conditions - id := updatedPolicy.ID originPolicy, err := ctl.policyManager.GetPolicy(id) if err != nil { diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go index db39d775d..c3a8ea0b8 100644 --- a/src/replication/source/repository_convertor.go +++ b/src/replication/source/repository_convertor.go @@ -34,8 +34,6 @@ func NewRepositoryConvertor(registry registry.Adaptor) *RepositoryConvertor { // Convert projects to repositories func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem { - // TODO get repositories from database where the push/deletion operations are recorded - // if support replicate deletion result := []models.FilterItem{} for _, item := range items { // just put it to the result list if the item is not a project diff --git a/src/replication/source/repository_filter.go b/src/replication/source/repository_filter.go index 78258dfe2..7c4dc33fe 100644 --- a/src/replication/source/repository_filter.go +++ b/src/replication/source/repository_filter.go @@ -17,6 +17,7 @@ package source import ( "strings" + "github.com/vmware/harbor/src/common/utils" "github.com/vmware/harbor/src/common/utils/log" "github.com/vmware/harbor/src/replication" "github.com/vmware/harbor/src/replication/models" @@ -71,6 +72,8 @@ func (r *RepositoryFilter) DoFilter(items []models.FilterItem) []models.FilterIt log.Debugf("pattern is null, add %s to the repository filter result list", item.Value) result = append(result, item) } else { + // trim the project + _, repository = utils.ParseRepository(repository) matched, err := match(r.pattern, repository) if err != nil { log.Errorf("failed to match pattern %s to value %s: %v", r.pattern, repository, err) diff --git a/src/replication/source/repository_filter_test.go b/src/replication/source/repository_filter_test.go index 6ab515323..aab5d9462 100644 --- a/src/replication/source/repository_filter_test.go +++ b/src/replication/source/repository_filter_test.go @@ -54,7 +54,7 @@ func TestDoFilterOfRepositoryFilter(t *testing.T) { assert.Equal(t, 1, len(items)) // non-empty pattern - filter = NewRepositoryFilter("library/*", ®istry.HarborAdaptor{}) + filter = NewRepositoryFilter("*", ®istry.HarborAdaptor{}) items = filter.DoFilter([]models.FilterItem{ models.FilterItem{ Kind: replication.FilterItemKindTag, @@ -64,7 +64,7 @@ func TestDoFilterOfRepositoryFilter(t *testing.T) { assert.Equal(t, 1, len(items)) // non-empty pattern - filter = NewRepositoryFilter("library/*", ®istry.HarborAdaptor{}) + filter = NewRepositoryFilter("*", ®istry.HarborAdaptor{}) items = filter.DoFilter([]models.FilterItem{ models.FilterItem{ Kind: replication.FilterItemKindTag, From a9d7403bee58c7bf4cb999a8453fa1930f252e94 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 27 Dec 2017 15:04:26 +0800 Subject: [PATCH 33/37] Update project ID property if needed when updating replication policy --- src/common/dao/replication_job.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/dao/replication_job.go b/src/common/dao/replication_job.go index cfdadc3eb..5a2639bd0 100644 --- a/src/common/dao/replication_job.go +++ b/src/common/dao/replication_job.go @@ -241,7 +241,7 @@ func GetRepPolicyByProjectAndTarget(projectID, targetID int64) ([]*models.RepPol func UpdateRepPolicy(policy *models.RepPolicy) error { o := GetOrmer() policy.UpdateTime = time.Now() - _, err := o.Update(policy, "TargetID", "Name", "Description", + _, err := o.Update(policy, "ProjectID", "TargetID", "Name", "Description", "Trigger", "Filters", "ReplicateDeletion", "UpdateTime") return err } From bdd0664134bf757b673758aa6014f891b55ace0a Mon Sep 17 00:00:00 2001 From: "Fuhui Peng (c)" Date: Wed, 3 Jan 2018 16:57:01 +0800 Subject: [PATCH 34/37] Merge master and modify package version --- .../list-replication-rule.component.html.ts | 30 ++++-------- .../list-replication-rule.component.ts | 7 ++- .../replication/replication.component.css.ts | 7 +++ .../replication/replication.component.html.ts | 12 ++--- .../src/replication/replication.component.ts | 17 ++++--- .../lib/src/service/replication.service.ts | 4 +- src/ui_ng/package.json | 2 +- src/ui_ng/src/app/harbor-routing.module.ts | 14 +++--- .../replication-rule.component.ts | 48 ------------------- .../total-replication-page.component.ts | 2 +- .../confirmation-dialog.component.html | 2 +- .../confirmation-dialog.component.ts | 17 ++++++- .../leaving-new-rule-deactivate.service.ts | 2 - src/ui_ng/src/i18n/lang/en-us-lang.json | 14 +++++- src/ui_ng/src/i18n/lang/es-es-lang.json | 13 ++++- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 13 ++++- 16 files changed, 96 insertions(+), 108 deletions(-) diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index 420a519b6..a7d114c12 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -1,38 +1,28 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = ` -
    +
    - - - + + + +
    {{'REPLICATION.NAME' | translate}} {{'REPLICATION.PROJECT' | translate}} {{'REPLICATION.DESCRIPTION' | translate}} {{'REPLICATION.DESTINATION_NAME' | translate}} - {{'REPLICATION.LAST_START_TIME' | translate}} - {{'REPLICATION.ACTIVATION' | translate}} + {{'REPLICATION.SCHEDULE' | translate}} {{'REPLICATION.PLACEHOLDER' | translate }} - - - {{p.name}} - - - {{p.name}} - + {{p.name}} + + {{p.projects?.length>0 ? p.projects[0].name : ''}} {{p.description ? p.description : '-'}} {{p.targets?.length>0 ? p.targets[0].name : ''}} - - - - {{p.start_time | date: 'short'}} - - - {{ (p.enabled === 1 ? 'REPLICATION.ENABLED' : 'REPLICATION.DISABLED') | translate}} - + {{p.trigger ? p.trigger.kind : ''}} {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPLICATION.OF' | translate}} {{pagination.totalItems }} {{'REPLICATION.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts index b76bc3982..17960e01a 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts @@ -67,6 +67,7 @@ export class ListReplicationRuleComponent implements OnInit, OnChanges { @Output() toggleOne = new EventEmitter(); @Output() redirect = new EventEmitter(); @Output() openNewRule = new EventEmitter(); + @Output() replicateManual = new EventEmitter(); projectScope: boolean = false; @@ -96,7 +97,7 @@ export class ListReplicationRuleComponent implements OnInit, OnChanges { } public get creationAvailable(): boolean { - return !this.readonly && this.projectId ? true : false; + return !this.readonly && !this.projectId ? true : false; } @@ -221,6 +222,10 @@ export class ListReplicationRuleComponent implements OnInit, OnChanges { this.editOne.emit(rules); } + replicateRule(rule: ReplicationRule) { + this.replicateManual.emit(rule); + } + toggleRule(rule: ReplicationRule) { let toggleConfirmMessage: ConfirmationMessage = new ConfirmationMessage( rule.enabled === 1 ? 'REPLICATION.TOGGLE_DISABLE_TITLE' : 'REPLICATION.TOGGLE_ENABLE_TITLE', diff --git a/src/ui_ng/lib/src/replication/replication.component.css.ts b/src/ui_ng/lib/src/replication/replication.component.css.ts index 473cfc00e..51f755820 100644 --- a/src/ui_ng/lib/src/replication/replication.component.css.ts +++ b/src/ui_ng/lib/src/replication/replication.component.css.ts @@ -21,4 +21,11 @@ export const REPLICATION_STYLE: string = ` .option-right-down { padding-right: 16px; margin-top: 24px; +} + .rightPos{ + position: absolute; + right: 35px; + margin-top: 5px; + z-index: 100; + height: 32px; }`; \ No newline at end of file diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts index be054f729..59880e698 100644 --- a/src/ui_ng/lib/src/replication/replication.component.html.ts +++ b/src/ui_ng/lib/src/replication/replication.component.html.ts @@ -1,13 +1,8 @@ export const REPLICATION_TEMPLATE: string = `
    -
    -
    +
    +
    -
    - -
    @@ -16,7 +11,7 @@ export const REPLICATION_TEMPLATE: string = `
    - +
    @@ -72,5 +67,4 @@ export const REPLICATION_TEMPLATE: string = `
    -
    `; \ No newline at end of file diff --git a/src/ui_ng/lib/src/replication/replication.component.ts b/src/ui_ng/lib/src/replication/replication.component.ts index 89d9a18d8..7b7a81c5a 100644 --- a/src/ui_ng/lib/src/replication/replication.component.ts +++ b/src/ui_ng/lib/src/replication/replication.component.ts @@ -148,7 +148,6 @@ export class ReplicationComponent implements OnInit, OnDestroy { this.currentRuleStatus = this.ruleStatus[0]; this.currentJobStatus = this.jobStatus[0]; this.currentJobSearchOption = 0; - console.log('readonly', this.readonly); } ngOnDestroy() { @@ -265,6 +264,14 @@ export class ReplicationComponent implements OnInit, OnDestroy { } } + replicateManualRule(rule: ReplicationRule): void { + toPromise(this.replicationService.replicateRule(rule.id)) + .then(response => { + this.refreshJobs(); + }) + .catch(error => this.errorHandler.error(error)); + } + customRedirect(rule: ReplicationRule) { this.redirect.emit(rule); } @@ -274,14 +281,6 @@ export class ReplicationComponent implements OnInit, OnDestroy { this.listReplicationRule.retrieveRules(ruleName); } - /*doFilterRuleStatus($event: any) { - if ($event && $event.target && $event.target["value"]) { - let status = $event.target["value"]; - this.currentRuleStatus = this.ruleStatus.find((r: any) => r.key === status); - this.listReplicationRule.filterRuleStatus(this.currentRuleStatus.key); - } - }*/ - doFilterJobStatus($event: any) { if ($event && $event.target && $event.target["value"]) { let status = $event.target["value"]; diff --git a/src/ui_ng/lib/src/service/replication.service.ts b/src/ui_ng/lib/src/service/replication.service.ts index 3c27faff0..c0f3bce2a 100644 --- a/src/ui_ng/lib/src/service/replication.service.ts +++ b/src/ui_ng/lib/src/service/replication.service.ts @@ -226,8 +226,8 @@ export class ReplicationDefaultService extends ReplicationService { return Promise.reject("Bad argument"); } - let url: string = `${this._replicateUrl}/${ruleId}`; - return this.http.post(url, HTTP_JSON_OPTIONS).toPromise() + let url: string = `${this._replicateUrl}`; + return this.http.post(url, {policy_id: ruleId}, HTTP_JSON_OPTIONS).toPromise() .then(response => response) .catch(error => Promise.reject(error)); } diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 7b608e743..740814b00 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.10.17", "clarity-ui": "^0.10.17", "core-js": "^2.4.1", - "harbor-ui": "0.6.5", + "harbor-ui": "^0.6.0-test-5", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index 9314590ae..7e541d41f 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -86,13 +86,13 @@ const harborRoutes: Routes = [ canActivate: [SystemAdminGuard], canActivateChild: [SystemAdminGuard], }, - { - path: 'replications/:id/rule', - component: ReplicationRuleComponent, - canActivate: [SystemAdminGuard], - canActivateChild: [SystemAdminGuard], - canDeactivate: [LeavingNewRuleRouteDeactivate] - }, + { + path: 'replications/:id/rule', + component: ReplicationRuleComponent, + canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], + canDeactivate: [LeavingNewRuleRouteDeactivate] + }, { path: 'replications/new-rule', component: ReplicationRuleComponent, diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts index ca98fb10f..3a1f76a4d 100644 --- a/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts +++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts @@ -121,14 +121,6 @@ export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestro this.inNameChecking = false; }); }); - /*this.confirmSub = this.confirmService.confirmationConfirm$.subscribe(confirmation => { - if (confirmation && - confirmation.state === ConfirmationState.CONFIRMED) { - if (confirmation.source === ConfirmationTargets.CONFIG) { - this.router.navigate(['/harbor/replications']); - } - } - });*/ } ngAfterViewInit(): void { @@ -180,38 +172,11 @@ export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestro this.updateFilter(rule.filters); } - - // Force refresh view let hnd = setInterval(() => this.ref.markForCheck(), 100); setTimeout(() => clearInterval(hnd), 2000); } - /* initFom(): void { - this.ruleForm.reset({ - name: '', - description: '', - trigger: {kind: this.triggerNames[0], schedule_param: { - type: this.scheduleNames[0], - weekday: 1, - offtime: '08:00' - }}, - replicate_existing_image_now: true, - replicate_deletion: false - }); - this.setProject([]); - this.setTarget([this.targetList[0]]); - this.setFilter([]); - - this.isFilterHide = false; - this.filterListData = []; - this.isScheduleOpt = false; - this.weeklySchedule = false; - this.isRuleNameExist = true; - this.ruleNameTooltip = 'TOOLTIP.EMPTY'; - }*/ - - get projects(): FormArray { return this.ruleForm.get('projects') as FormArray; } @@ -277,7 +242,6 @@ export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestro } selectedProject(project: Project): void { - console.log('project', project) this.setProject([project]); } @@ -469,18 +433,6 @@ export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestro onCancel(): void { this.router.navigate(['/harbor/replications']); - - /*if (this.hasFormChange()) { - let msg = new ConfirmationMessage( - 'CONFIG.CONFIRM_TITLE', - 'CONFIG.CONFIRM_SUMMARY', - '', - null, - ConfirmationTargets.CONFIG - ); - - this.confirmService.openComfirmDialog(msg); - }*/ } // UTC time diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts index 5da340b1d..6f89caa2a 100644 --- a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts +++ b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts @@ -26,7 +26,7 @@ export class TotalReplicationPageComponent { private activeRoute: ActivatedRoute){} customRedirect(rule: ReplicationRule): void { if (rule) { - this.router.navigate(['../projects', rule.projects[0].project_id, "replications"], { relativeTo: this.activeRoute }); + this.router.navigate(['../projects', rule.projects[0].project_id, 'replications'], { relativeTo: this.activeRoute }); } } diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html index 4e74a1da7..5af5b73b8 100644 --- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html +++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html @@ -29,7 +29,7 @@ - + diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index 0d8d693b2..9182f66cb 100644 --- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -112,7 +112,7 @@ export class ConfirmationDialogComponent implements OnDestroy { this.close(); } - confirm(): void { + delete(): void { if(!this.message){//Inproper condition this.close(); return; @@ -130,6 +130,21 @@ export class ConfirmationDialogComponent implements OnDestroy { data, target )); + } + confirm(): void { + if(!this.message){//Inproper condition + this.close(); + return; + } + + let data: any = this.message.data ? this.message.data : {}; + let target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + this.confirmationService.confirm(new ConfirmationAcknowledgement( + ConfirmationState.CONFIRMED, + data, + target + )); + this.close(); } } \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts b/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts index 3a8088290..60ea8de74 100644 --- a/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts +++ b/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts @@ -36,9 +36,7 @@ export class LeavingNewRuleRouteDeactivate implements CanDeactivate | boolean { //Confirmation before leaving config route - console.log('ccc'); return new Promise((resolve, reject) => { - console.log("ddd", replicateRule.hasFormChange()); if (replicateRule && replicateRule.hasFormChange()) { let msg: ConfirmationMessage = new ConfirmationMessage( "CONFIG.LEAVING_CONFIRMATION_TITLE", diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index 512c6f948..5942d5c54 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -303,7 +303,17 @@ "INVALID_DATE": "Invalid date.", "PLACEHOLDER": "We couldn't find any replication rules!", "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", - "JOB_LOG_VIEWER": "View Replication Job Log" + "JOB_LOG_VIEWER": "View Replication Job Log", + "BACKINFO": "Please add project and endpoint first", + "FILTER": "Filter", + "SCHEDULE": "Schedule", + "SETTING":"Setting", + "TRIGGER":"Trigger", + "TARGETS":"Target", + "SOURCE": "Source", + "REPLICATE": "Replicate", + "DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted", + "REPLICATE_IMMEDIATE":"Replicate exiting images immediately" }, "DESTINATION": { "NEW_ENDPOINT": "New Endpoint", @@ -317,7 +327,7 @@ "TEST_CONNECTION": "Test Connection", "TITLE_EDIT": "Edit Endpoint", "TITLE_ADD": "Create Endpoint", - "DELETE": "Delete", + "DELETE": "Delete Endpoint", "TESTING_CONNECTION": "Testing Connection...", "TEST_CONNECTION_SUCCESS": "Connection tested successfully.", "TEST_CONNECTION_FAILURE": "Failed to ping endpoint.", diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json index f0f7a7e6f..6134cd1ab 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -299,7 +299,16 @@ "INVALID_DATE": "Fecha invalida.", "PLACEHOLDER": "We couldn't find any replication rules!", "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", - "JOB_LOG_VIEWER": "View Replication Job Log" + "JOB_LOG_VIEWER": "View Replication Job Log", + "BACKINFO": "Please add project and endpoint first", + "FILTER": "Filter", + "SCHEDULE": "Schedule", + "SETTING":"Setting", + "TRIGGER":"Trigger", + "TARGETS":"Target", + "SOURCE": "Source", + "DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted", + "REPLICATE_IMMEDIATE":"Replicate exiting images immediately" }, "DESTINATION": { "NEW_ENDPOINT": "Nuevo Endpoint", @@ -313,7 +322,7 @@ "TEST_CONNECTION": "Comprobar conexión", "TITLE_EDIT": "Editar Endpoint", "TITLE_ADD": "Crear Endpoint", - "DELETE": "Eliminar", + "DELETE": "Eliminar Endpoint", "TESTING_CONNECTION": "Comprobar conexión...", "TEST_CONNECTION_SUCCESS": "Conexión comprobada satisfactoriamente.", "TEST_CONNECTION_FAILURE": "Fallo al comprobar el endpoint.", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index 357723079..9418ec356 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -299,7 +299,16 @@ "INVALID_DATE": "无效日期。", "PLACEHOLDER": "未发现任何复制规则!", "JOB_PLACEHOLDER": "未发现任何复制任务!", - "JOB_LOG_VIEWER": "查看复制任务日志" + "JOB_LOG_VIEWER": "查看复制任务日志", + "BACKINFO": "请先添加项目名称和目标", + "FILTER": "过滤", + "SCHEDULE": "日程", + "SETTING":"设置", + "TRIGGER":"触发器", + "TARGETS":"目标", + "SOURCE": "资源", + "DELETE_REMOTE_IMAGES":"删除本地镜像时同时也删除远程的镜像。", + "REPLICATE_IMMEDIATE":"立即复制现有的镜像。" }, "DESTINATION": { "NEW_ENDPOINT": "新建目标", @@ -313,7 +322,7 @@ "TEST_CONNECTION": "测试连接", "TITLE_EDIT": "编辑目标", "TITLE_ADD": "新建目标", - "DELETE": "删除", + "DELETE": "删除目标", "TESTING_CONNECTION": "正在测试连接...", "TEST_CONNECTION_SUCCESS": "测试连接成功。", "TEST_CONNECTION_FAILURE": "测试连接失败。", From 8e4e5e8b541af91202c1ed253b46eb9fc857f03e Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 3 Jan 2018 18:39:30 +0800 Subject: [PATCH 35/37] Add unit test cases for replication codes --- src/replication/source/match_test.go | 43 ++++++++++ src/replication/target/target_test.go | 26 ++++++ src/replication/trigger/immediate_test.go | 57 ++++++++++++++ src/replication/trigger/manager_test.go | 96 +++++++++++++++++++++++ 4 files changed, 222 insertions(+) create mode 100644 src/replication/source/match_test.go create mode 100644 src/replication/target/target_test.go create mode 100644 src/replication/trigger/immediate_test.go create mode 100644 src/replication/trigger/manager_test.go diff --git a/src/replication/source/match_test.go b/src/replication/source/match_test.go new file mode 100644 index 000000000..b4d581b74 --- /dev/null +++ b/src/replication/source/match_test.go @@ -0,0 +1,43 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package source + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestMatch(t *testing.T) { + cases := []struct { + pattern string + str string + matched bool + }{ + {"", "", true}, + {"*", "library", true}, + {"library/*", "library/mysql", true}, + {"library/*", "library/mysql/5.6", false}, + {"library/mysq?", "library/mysql", true}, + {"library/mysq?", "library/mysqld", false}, + } + + for _, c := range cases { + matched, err := match(c.pattern, c.str) + require.Nil(t, err) + assert.Equal(t, c.matched, matched) + } +} diff --git a/src/replication/target/target_test.go b/src/replication/target/target_test.go new file mode 100644 index 000000000..42a8f59e7 --- /dev/null +++ b/src/replication/target/target_test.go @@ -0,0 +1,26 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package target + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestNewDefaultManager(t *testing.T) { + mgr := NewDefaultManager() + assert.NotNil(t, mgr) +} diff --git a/src/replication/trigger/immediate_test.go b/src/replication/trigger/immediate_test.go new file mode 100644 index 000000000..a14dfe252 --- /dev/null +++ b/src/replication/trigger/immediate_test.go @@ -0,0 +1,57 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package trigger + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/common/dao" + "github.com/vmware/harbor/src/common/utils/test" + "github.com/vmware/harbor/src/replication" +) + +func TestKindOfImmediateTrigger(t *testing.T) { + trigger := NewImmediateTrigger(ImmediateParam{}) + assert.Equal(t, replication.TriggerKindImmediate, trigger.Kind()) +} + +func TestSetupAndUnsetOfImmediateTrigger(t *testing.T) { + dao.DefaultDatabaseWatchItemDAO = &test.FakeWatchItemDAO{} + + param := ImmediateParam{} + param.PolicyID = 1 + param.OnDeletion = true + param.Namespaces = []string{"library"} + trigger := NewImmediateTrigger(param) + + err := trigger.Setup() + require.Nil(t, err) + + items, err := DefaultWatchList.Get("library", "push") + require.Nil(t, err) + assert.Equal(t, 1, len(items)) + + items, err = DefaultWatchList.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 1, len(items)) + + err = trigger.Unset() + require.Nil(t, err) + items, err = DefaultWatchList.Get("library", "delete") + require.Nil(t, err) + assert.Equal(t, 0, len(items)) +} diff --git a/src/replication/trigger/manager_test.go b/src/replication/trigger/manager_test.go new file mode 100644 index 000000000..d02d9ee28 --- /dev/null +++ b/src/replication/trigger/manager_test.go @@ -0,0 +1,96 @@ +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package trigger + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/vmware/harbor/src/replication" + "github.com/vmware/harbor/src/replication/models" +) + +func TestCreateTrigger(t *testing.T) { + // nil policy + _, err := createTrigger(nil) + require.NotNil(t, err) + + // nil trigger + _, err = createTrigger(&models.ReplicationPolicy{}) + require.NotNil(t, err) + + // schedule trigger + trigger, err := createTrigger(&models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindSchedule, + ScheduleParam: &models.ScheduleParam{ + Type: replication.TriggerScheduleWeekly, + Weekday: 1, + Offtime: 1, + }, + }, + }) + require.Nil(t, err) + assert.NotNil(t, trigger) + + // immediate trigger + trigger, err = createTrigger(&models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindImmediate, + }, + }) + require.Nil(t, err) + assert.NotNil(t, trigger) + + // manual trigger + trigger, err = createTrigger(&models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindManual, + }, + }) + require.Nil(t, err) + assert.Nil(t, trigger) +} + +func TestSetupTrigger(t *testing.T) { + mgr := NewManager(1) + + err := mgr.SetupTrigger(&models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindSchedule, + ScheduleParam: &models.ScheduleParam{ + Type: replication.TriggerScheduleDaily, + Offtime: 1, + }, + }, + }) + assert.Nil(t, err) +} + +func TestUnsetTrigger(t *testing.T) { + mgr := NewManager(1) + + err := mgr.UnsetTrigger(&models.ReplicationPolicy{ + Trigger: &models.Trigger{ + Kind: replication.TriggerKindSchedule, + ScheduleParam: &models.ScheduleParam{ + Type: replication.TriggerScheduleDaily, + Offtime: 1, + }, + }, + }) + assert.Nil(t, err) +} From 4932692b585fd166fa388d4c8360ca9c3e681be2 Mon Sep 17 00:00:00 2001 From: "Fuhui Peng (c)" Date: Thu, 4 Jan 2018 13:36:49 +0800 Subject: [PATCH 36/37] Modify test case about configuration for replication enhancment --- tests/resources/Harbor-Pages/Configuration.robot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/resources/Harbor-Pages/Configuration.robot b/tests/resources/Harbor-Pages/Configuration.robot index 14a6a928d..f8aee4bfd 100644 --- a/tests/resources/Harbor-Pages/Configuration.robot +++ b/tests/resources/Harbor-Pages/Configuration.robot @@ -45,7 +45,7 @@ Init LDAP Capture Page Screenshot Switch To Configure - Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/section/ul/li[3]/a + Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/section/ul/li[4]/a Sleep 2 Test Ldap Connection @@ -89,7 +89,7 @@ Ldap Verify Cert Checkbox Should Be Disabled Set Pro Create Admin Only #set limit to admin only Sleep 2 - Click Element xpath=//clr-main-container//nav//ul/li[3] + Click Element xpath=//clr-main-container//nav//ul/li[4] Sleep 1 Click Element xpath=//select[@id="proCreation"] Click Element xpath=//select[@id="proCreation"]//option[@value="adminonly"] @@ -99,7 +99,7 @@ Set Pro Create Admin Only Set Pro Create Every One #set limit to Every One - Click Element xpath=//clr-main-container//nav//ul/li[3] + Click Element xpath=//clr-main-container//nav//ul/li[4] Sleep 1 Click Element xpath=//select[@id="proCreation"] Click Element xpath=//select[@id="proCreation"]//option[@value="everyone"] @@ -109,7 +109,7 @@ Set Pro Create Every One Capture Page Screenshot EveryoneCreate.png Disable Self Reg - Click Element xpath=//clr-main-container//nav//ul/li[3] + Click Element xpath=//clr-main-container//nav//ul/li[4] Mouse Down xpath=${self_reg_xpath} Mouse Up xpath=${self_reg_xpath} Sleep 1 @@ -142,7 +142,7 @@ Project Creation Should Not Display ## System settings Switch To System Settings Sleep 1 - Click Element xpath=//clr-main-container//nav//ul/li[3] + Click Element xpath=//clr-main-container//nav//ul/li[4] Click Element xpath=//*[@id="config-system"] Modify Token Expiration From 162878a95cbd538a31bfd74920e14ae73b544824 Mon Sep 17 00:00:00 2001 From: pfh Date: Fri, 5 Jan 2018 14:32:16 +0800 Subject: [PATCH 37/37] Modify test case and merge master --- .../confirmation-dialog.component.html.ts | 3 +- .../confirmation-dialog.component.ts | 21 +- .../list-replication-rule.component.html.ts | 10 +- .../list-replication-rule.component.ts | 2 +- .../replication/replication.component.html.ts | 3 +- .../src/replication/replication.component.ts | 5 - src/ui_ng/package-lock.json | 11373 ---------------- src/ui_ng/package.json | 2 +- src/ui_ng/src/app/harbor-routing.module.ts | 2 +- .../route/system-admin-activate.service.ts | 5 +- tests/robot-cases/Group0-BAT/BAT.robot | 18 +- 11 files changed, 41 insertions(+), 11403 deletions(-) delete mode 100644 src/ui_ng/package-lock.json diff --git a/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.html.ts b/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.html.ts index e882ba5c6..086d008e0 100644 --- a/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.html.ts +++ b/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.html.ts @@ -23,7 +23,6 @@ export const CONFIRMATION_DIALOG_TEMPLATE: string = ` - @@ -31,7 +30,7 @@ export const CONFIRMATION_DIALOG_TEMPLATE: string = ` - + diff --git a/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.ts b/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.ts index 92d549a7c..9216d6356 100644 --- a/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/ui_ng/lib/src/confirmation-dialog/confirmation-dialog.component.ts @@ -98,8 +98,8 @@ export class ConfirmationDialogComponent { this.close(); } - confirm(): void { - if(!this.message){//Inproper condition + delete(): void { + if (!this.message){//Inproper condition this.close(); return; } @@ -118,4 +118,21 @@ export class ConfirmationDialogComponent { ); this.confirmAction.emit(message); } + + confirm(): void { + if (!this.message){//Inproper condition + this.close(); + return; + } + + let data: any = this.message.data ? this.message.data : {}; + let target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + let message = new ConfirmationAcknowledgement( + ConfirmationState.CONFIRMED, + data, + target + ); + this.confirmAction.emit(message); + this.close(); + } } diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index a7d114c12..f62870012 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -2,11 +2,11 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = `
    -
    - - - - +
    + + + +
    {{'REPLICATION.NAME' | translate}} diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts index 17960e01a..96bc4f98d 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts @@ -96,7 +96,7 @@ export class ListReplicationRuleComponent implements OnInit, OnChanges { setInterval(() => ref.markForCheck(), 500); } - public get creationAvailable(): boolean { + public get opereateAvailable(): boolean { return !this.readonly && !this.projectId ? true : false; } diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts index 59880e698..e5f7bb9e1 100644 --- a/src/ui_ng/lib/src/replication/replication.component.html.ts +++ b/src/ui_ng/lib/src/replication/replication.component.html.ts @@ -1,5 +1,5 @@ export const REPLICATION_TEMPLATE: string = ` -
    +
    @@ -13,6 +13,7 @@ export const REPLICATION_TEMPLATE: string = `
    +

    {{'REPLICATION.REPLICATION_JOBS' | translate}}
    diff --git a/src/ui_ng/lib/src/replication/replication.component.ts b/src/ui_ng/lib/src/replication/replication.component.ts index 7b7a81c5a..96a52d7e3 100644 --- a/src/ui_ng/lib/src/replication/replication.component.ts +++ b/src/ui_ng/lib/src/replication/replication.component.ts @@ -136,9 +136,6 @@ export class ReplicationComponent implements OnInit, OnDestroy { private translateService: TranslateService) { } - /*public get creationAvailable(): boolean { - return !this.readonly && this.projectId ? true : false; - }*/ public get showPaginationIndex(): boolean { return this.totalCount > 0; @@ -158,7 +155,6 @@ export class ReplicationComponent implements OnInit, OnDestroy { openModal(): void { this.openCreateRule.emit(); - // this.createEditPolicyComponent.openCreateEditRule(true); } openEditRule(rule: ReplicationRule) { @@ -168,7 +164,6 @@ export class ReplicationComponent implements OnInit, OnDestroy { editable = false; } this.openEdit.emit(rule.id); - // this.createEditPolicyComponent.openCreateEditRule(editable, rule.id); } } diff --git a/src/ui_ng/package-lock.json b/src/ui_ng/package-lock.json deleted file mode 100644 index 96cc35085..000000000 --- a/src/ui_ng/package-lock.json +++ /dev/null @@ -1,11373 +0,0 @@ -{ - "name": "harbor", - "version": "1.2.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@angular-devkit/build-optimizer": { - "version": "0.0.36", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.36.tgz", - "integrity": "sha512-EFFF7hBbVoTOzYfXuSlGhcDr8neafmwuBAIkzAekEjzik7OaTLq7LPG7As+ebed9ll+3DAGypnrpdIE1Tp/H/A==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.6.2", - "webpack-sources": "1.1.0" - }, - "dependencies": { - "typescript": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", - "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", - "dev": true - } - } - }, - "@angular-devkit/core": { - "version": "0.0.22", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.22.tgz", - "integrity": "sha512-zxrNtTiv60liye/GGeRMnnGgLgAWoqlMTfPLMW0D1qJ4bbrPHtme010mpxS3QL4edcDtQseyXSFCnEkuo2MrRw==", - "dev": true, - "requires": { - "source-map": "0.5.7" - } - }, - "@angular-devkit/schematics": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.42.tgz", - "integrity": "sha512-elTiNL0Nx9oin2pfZTvMBU/d9sgutXaZe8n3xm2p7jfqQZry5MYYFES4hq+WIJjtV/X9gAniafncEpxuF7ikYw==", - "dev": true, - "requires": { - "@angular-devkit/core": "0.0.22", - "@ngtools/json-schema": "1.1.0", - "@schematics/schematics": "0.0.11", - "minimist": "1.2.0", - "rxjs": "5.5.6" - } - }, - "@angular/animations": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.1.3.tgz", - "integrity": "sha1-bomh4Pv9bQ6Qvk8q4ZCqxn+DpBE=" - }, - "@angular/cli": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.3.tgz", - "integrity": "sha512-At0/Q8CsldsvekOmAnYF8g7BAf0aHJImPLstxzPeWdg7EZbQxwCH0I+ZSZFHL43f8md6n9JmSeUWrlwANs+bHw==", - "dev": true, - "requires": { - "@angular-devkit/build-optimizer": "0.0.36", - "@angular-devkit/schematics": "0.0.42", - "@ngtools/json-schema": "1.1.0", - "@ngtools/webpack": "1.9.3", - "@schematics/angular": "0.1.11", - "autoprefixer": "6.7.7", - "chalk": "2.2.2", - "circular-dependency-plugin": "4.3.0", - "common-tags": "1.6.0", - "copy-webpack-plugin": "4.3.1", - "core-object": "3.1.5", - "css-loader": "0.28.7", - "cssnano": "3.10.0", - "denodeify": "1.2.1", - "ember-cli-string-utils": "1.1.0", - "exports-loader": "0.6.4", - "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.6", - "fs-extra": "4.0.3", - "glob": "7.1.2", - "html-webpack-plugin": "2.30.1", - "istanbul-instrumenter-loader": "2.0.0", - "karma-source-map-support": "1.2.0", - "less": "2.7.3", - "less-loader": "4.0.5", - "license-webpack-plugin": "1.1.1", - "loader-utils": "1.1.0", - "lodash": "4.17.4", - "memory-fs": "0.4.1", - "minimatch": "3.0.4", - "node-modules-path": "1.0.1", - "node-sass": "4.7.2", - "nopt": "4.0.1", - "opn": "5.1.0", - "portfinder": "1.0.13", - "postcss-custom-properties": "6.2.0", - "postcss-loader": "2.0.9", - "postcss-url": "7.3.0", - "raw-loader": "0.5.1", - "resolve": "1.5.0", - "rxjs": "5.5.6", - "sass-loader": "6.0.6", - "semver": "5.4.1", - "silent-error": "1.1.0", - "source-map-loader": "0.2.3", - "source-map-support": "0.4.18", - "style-loader": "0.13.2", - "stylus": "0.54.5", - "stylus-loader": "3.0.1", - "uglifyjs-webpack-plugin": "1.1.5", - "url-loader": "0.6.2", - "webpack": "3.10.0", - "webpack-dev-middleware": "1.12.2", - "webpack-dev-server": "2.9.7", - "webpack-merge": "4.1.1", - "webpack-sources": "1.1.0", - "webpack-subresource-integrity": "1.0.3", - "zone.js": "0.8.19" - } - }, - "@angular/common": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.3.tgz", - "integrity": "sha1-58R5HjITHPdMI5QowqZ9qrLu8Bc=" - }, - "@angular/compiler": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.3.tgz", - "integrity": "sha1-0t0whTsM9KVHWLSjFGMsIx+clMM=" - }, - "@angular/compiler-cli": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.1.3.tgz", - "integrity": "sha1-wjYv/fZXVkcUgfg5+rZ1vKwhP5Y=", - "requires": { - "@angular/tsc-wrapped": "4.1.3", - "minimist": "1.2.0", - "reflect-metadata": "0.1.10" - } - }, - "@angular/core": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.3.tgz", - "integrity": "sha1-KFSY64arfQtvmC+Pn0h+9hABOzU=" - }, - "@angular/forms": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.3.tgz", - "integrity": "sha1-OAq0w6+ExdHXSMKn0EFRx9yOSYI=" - }, - "@angular/http": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.3.tgz", - "integrity": "sha1-650cMCoBcoFfmlczENm+C964Ra4=" - }, - "@angular/platform-browser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.3.tgz", - "integrity": "sha1-T6HbURndF4sxXdrlsym+4akypb0=" - }, - "@angular/platform-browser-dynamic": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.3.tgz", - "integrity": "sha1-PBP9z1kdSH9u/cHUaRPygMbYwuw=" - }, - "@angular/router": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.1.3.tgz", - "integrity": "sha1-3a/UaufMyLH3SQT/tF85TkRiUhY=" - }, - "@angular/tsc-wrapped": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.1.3.tgz", - "integrity": "sha1-LWNyyRh78WIerNlguUs5xPlSk80=", - "requires": { - "tsickle": "0.21.6" - } - }, - "@ngtools/json-schema": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", - "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", - "dev": true - }, - "@ngtools/webpack": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.3.tgz", - "integrity": "sha512-LOOc8eXkieY0Uh0lis8SqRvDhsDwb1CK31Fn55i0kfdzjeyGARidIYNGskO//bPMvLoWJYYpCl+jnDodtLpiLg==", - "dev": true, - "requires": { - "chalk": "2.2.2", - "enhanced-resolve": "3.4.1", - "loader-utils": "1.1.0", - "magic-string": "0.22.4", - "semver": "5.4.1", - "source-map": "0.5.7", - "tree-kill": "1.2.0", - "webpack-sources": "1.1.0" - } - }, - "@ngx-translate/core": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-6.0.1.tgz", - "integrity": "sha1-fHqAB3/rmU/IFbZ6cgZa8E05Tv4=" - }, - "@ngx-translate/http-loader": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-0.0.3.tgz", - "integrity": "sha1-g0bI0tb2MCVGAQKWaPF6vir+ips=" - }, - "@schematics/angular": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.11.tgz", - "integrity": "sha512-jYTantZjdYeDjxh9ZLYvGbDI0VeUxgSrcBjHvnHqMNe+YGJenY988ifWCwzjmOowj57maLrQQGrdoO7oUeNdyw==", - "dev": true, - "requires": { - "@angular-devkit/core": "0.0.22" - } - }, - "@schematics/schematics": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.0.11.tgz", - "integrity": "sha512-HAXgAIuuAGjiIKohGlRUkmUTWYtNmclR12KHlQQxT9pHFdEb2OrpHjUp2YoV32jiU6jIZm4pf3ODwlPA0VbwnA==", - "dev": true - }, - "@types/core-js": { - "version": "0.9.43", - "resolved": "https://registry.npmjs.org/@types/core-js/-/core-js-0.9.43.tgz", - "integrity": "sha512-Y11dktBJ5YwKXX8DfHSb9V6shXKSHN5P2URPZLHTRjX3OsO/u8u1kZnSJvsuSH74aTg8f5ZKcpEeCdIJOcBkHg==", - "dev": true - }, - "@types/jasmine": { - "version": "2.2.34", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.2.34.tgz", - "integrity": "sha1-QVbV+OpZ3Crbbl8h4JroDxkJBQU=", - "dev": true - }, - "@types/jquery": { - "version": "2.0.48", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.48.tgz", - "integrity": "sha512-nNLzUrVjaRV/Ds1eHZLYTd7IZxs38cwwLSaqMJj8OTXY8xNUbxSK69bi9cMLvQ7dm/IBeQ1wHwQ0S1uYa0rd2w==" - }, - "@types/node": { - "version": "6.0.95", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.95.tgz", - "integrity": "sha512-d1Twx1NM49dQ7jbNZfaHTQWuYL9cFVrGxYpbc3BvMf4626lOJOZnp2aJQNB9vP/WX3UOe1TrTUMABrGRu6FZhg==", - "dev": true - }, - "@types/q": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.30.tgz", - "integrity": "sha1-/X7hr0DyHN0fUZJoBzs0MuwX16M=", - "dev": true - }, - "@types/selenium-webdriver": { - "version": "2.53.43", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz", - "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==", - "dev": true - }, - "@webcomponents/custom-elements": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.0.0-alpha.3.tgz", - "integrity": "sha1-NA2MyDB3MFQKySJ2yaSRSfb8ARY=" - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", - "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", - "dev": true, - "requires": { - "mime-types": "2.1.17", - "negotiator": "0.6.1" - } - }, - "acorn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", - "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", - "dev": true, - "requires": { - "acorn": "4.0.13" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", - "dev": true - } - } - }, - "adm-zip": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", - "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", - "dev": true - }, - "after": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz", - "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic=", - "dev": true - }, - "agent-base": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", - "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", - "dev": true, - "requires": { - "extend": "3.0.1", - "semver": "5.0.3" - }, - "dependencies": { - "semver": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", - "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", - "dev": true - } - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, - "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "ansi-escapes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", - "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", - "dev": true - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.1" - } - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", - "dev": true - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", - "dev": true - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" - } - }, - "app-root-path": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz", - "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=", - "dev": true - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", - "dev": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" - } - }, - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-flatten": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", - "dev": true - }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.10.0" - } - }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "1.0.3" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arraybuffer.slice": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", - "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true, - "optional": true - }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true - }, - "asn1.js": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz", - "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, - "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, - "requires": { - "util": "0.10.3" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000784", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-generator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - } - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base64-arraybuffer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz", - "integrity": "sha1-R030qfLaJOBd8xWMOx2zw81GoVQ=", - "dev": true - }, - "base64-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", - "dev": true - }, - "base64id": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", - "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "benchmark": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz", - "integrity": "sha1-Lx4vpMNZ8REiqhgwgiGOlX45DHM=", - "dev": true - }, - "better-assert": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", - "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "blob": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", - "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", - "dev": true - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "optional": true, - "requires": { - "inherits": "2.0.3" - } - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", - "dev": true - }, - "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", - "debug": "2.6.9", - "depd": "1.1.1", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "on-finished": "2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "1.6.15" - }, - "dependencies": { - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - } - } - }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.1", - "multicast-dns-service-types": "1.1.0" - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "bootstrap": { - "version": "4.0.0-alpha.5", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.5.tgz", - "integrity": "sha1-oSa2SMO9L1K4+tS7xeLQrSq/cGQ=", - "dev": true, - "requires": { - "jquery": "3.2.1", - "tether": "1.4.3" - } - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.2.2", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browser-resolve": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", - "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", - "dev": true, - "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - } - } - }, - "browserify-aes": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", - "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", - "dev": true, - "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.3", - "safe-buffer": "5.1.1" - } - }, - "browserify-cipher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", - "dev": true, - "requires": { - "browserify-aes": "1.1.1", - "browserify-des": "1.0.0", - "evp_bytestokey": "1.0.3" - } - }, - "browserify-des": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "randombytes": "2.0.5" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "elliptic": "6.4.0", - "inherits": "2.0.3", - "parse-asn1": "5.1.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "1.0.6" - } - }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000784", - "electron-to-chromium": "1.3.30" - } - }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, - "requires": { - "base64-js": "1.2.1", - "ieee754": "1.1.8", - "isarray": "1.0.0" - } - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "cacache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.1.tgz", - "integrity": "sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA==", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "chownr": "1.0.1", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "lru-cache": "4.1.1", - "mississippi": "1.3.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "5.0.0", - "unique-filename": "1.1.0", - "y18n": "3.2.1" - } - }, - "callsite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", - "dev": true - }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" - } - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - } - }, - "caniuse-api": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000784", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" - } - }, - "caniuse-db": { - "version": "1.0.30000784", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000784.tgz", - "integrity": "sha1-G+lQEtlInHcZB0+BruV9vf/mNhs=", - "dev": true - }, - "capture-stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - }, - "dependencies": { - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - } - } - }, - "chalk": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz", - "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.1" - } - }, - "circular-dependency-plugin": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-4.3.0.tgz", - "integrity": "sha512-L3W9L1S0wC64rq+QSaZzmWnJW7cVBgimxI2lNEFEX5biwlRG8EHRM68JFi+CX5ZkCGUWJHIpnhdVs181Zlq3wA==", - "dev": true - }, - "clap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", - "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", - "dev": true, - "requires": { - "chalk": "1.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "clarity-angular": { - "version": "0.9.20", - "resolved": "https://registry.npmjs.org/clarity-angular/-/clarity-angular-0.9.20.tgz", - "integrity": "sha512-CzChkjujBjjxkc3SHcaag3ndkhmL7enwWZGICzDsKa6VKcWpkreBGGqLwjyI6S3gGD/t6KUmh0fgNJ77EeIIbA==" - }, - "clarity-icons": { - "version": "0.9.20", - "resolved": "https://registry.npmjs.org/clarity-icons/-/clarity-icons-0.9.20.tgz", - "integrity": "sha512-58iUo/1bLz6CjXOnGOhqKq1Nj1Ar82sXUkn+LsliZ/WUjvmAjkTNz3qa8Y3hILwD6siQWYxrs7AwabjzNWxlEg==" - }, - "clarity-ui": { - "version": "0.9.20", - "resolved": "https://registry.npmjs.org/clarity-ui/-/clarity-ui-0.9.20.tgz", - "integrity": "sha512-786VNQCYXXgiluqrgmv/1cMY1O/yKfrbtzE2P5CgFd3rN/SoMC2+Xux7e0jkJcc5rOfSeU1LsKm5bFv86U7qbw==" - }, - "clean-css": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", - "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=", - "dev": true, - "requires": { - "source-map": "0.5.7" - } - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "cli-truncate": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", - "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", - "dev": true, - "requires": { - "slice-ansi": "0.0.4", - "string-width": "1.0.2" - } - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", - "dev": true - }, - "clone-deep": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz", - "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=", - "dev": true, - "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "3.2.2", - "shallow-clone": "0.1.2" - } - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, - "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", - "dev": true, - "requires": { - "q": "1.5.1" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "codelyzer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-2.0.1.tgz", - "integrity": "sha1-0PcSH2eoQkyS0h07MfNkC4Pe+e0=", - "dev": true, - "requires": { - "app-root-path": "2.0.1", - "css-selector-tokenizer": "0.7.0", - "cssauron": "1.4.0", - "semver-dsl": "1.0.1", - "source-map": "0.5.7", - "sprintf-js": "1.0.3" - } - }, - "color": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", - "dev": true, - "requires": { - "clone": "1.0.3", - "color-convert": "1.9.1", - "color-string": "0.3.0" - } - }, - "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "color-string": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "colormin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", - "dev": true, - "requires": { - "color": "0.11.4", - "css-color-names": "0.0.4", - "has": "1.0.1" - } - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "columnify": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", - "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=", - "dev": true, - "requires": { - "strip-ansi": "3.0.1", - "wcwidth": "1.0.1" - } - }, - "combine-lists": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, - "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "commander": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz", - "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==", - "dev": true - }, - "common-tags": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.6.0.tgz", - "integrity": "sha512-sgmgEodNLbxnSSoR5a2xH23CoDJ9J5MKsJS/tqplfmJLpikG0oWMpAb+tM8ERQCMpp9I+ERf6SYl158G6GwX0w==", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, - "component-emitter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", - "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", - "dev": true - }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, - "compressible": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", - "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=", - "dev": true, - "requires": { - "mime-db": "1.30.0" - } - }, - "compression": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz", - "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=", - "dev": true, - "requires": { - "accepts": "1.3.4", - "bytes": "3.0.0", - "compressible": "2.0.12", - "debug": "2.6.9", - "on-headers": "1.0.1", - "safe-buffer": "5.1.1", - "vary": "1.1.2" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "typedarray": "0.0.6" - } - }, - "configstore": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz", - "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==", - "dev": true, - "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.1.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" - } - }, - "connect": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz", - "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=", - "dev": true, - "requires": { - "debug": "2.6.9", - "finalhandler": "1.0.6", - "parseurl": "1.3.2", - "utils-merge": "1.0.1" - }, - "dependencies": { - "finalhandler": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz", - "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" - } - } - } - }, - "connect-history-api-fallback": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", - "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", - "dev": true - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "0.1.4" - } - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" - } - }, - "copy-webpack-plugin": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.3.1.tgz", - "integrity": "sha512-xlcFiW/U7KrpS6dFuWq3r8Wb7koJx7QVc7LDFCosqkikaVSxkaYOnwDLwilbjrszZ0LYZXThDAJKcQCSrvdShQ==", - "dev": true, - "requires": { - "cacache": "10.0.1", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.0", - "loader-utils": "0.2.17", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "p-limit": "1.1.0", - "pify": "3.0.0", - "serialize-javascript": "1.4.0" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" - }, - "core-object": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/core-object/-/core-object-3.1.5.tgz", - "integrity": "sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==", - "dev": true, - "requires": { - "chalk": "2.2.2" - } - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cosmiconfig": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", - "dev": true, - "requires": { - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "os-homedir": "1.0.2", - "parse-json": "2.2.0", - "require-from-string": "1.2.1" - } - }, - "create-ecdh": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.0" - } - }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "dev": true, - "requires": { - "capture-stack-trace": "1.0.0" - } - }, - "create-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "sha.js": "2.4.9" - } - }, - "create-hmac": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.9" - } - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "optional": true, - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "1.0.0", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.0", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "diffie-hellman": "5.0.2", - "inherits": "2.0.3", - "pbkdf2": "3.0.14", - "public-encrypt": "4.0.0", - "randombytes": "2.0.5", - "randomfill": "1.0.3" - } - }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-loader": { - "version": "0.28.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", - "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "css-selector-tokenizer": "0.7.0", - "cssnano": "3.10.0", - "icss-utils": "2.1.0", - "loader-utils": "1.1.0", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-modules-extract-imports": "1.1.0", - "postcss-modules-local-by-default": "1.2.0", - "postcss-modules-scope": "1.1.0", - "postcss-modules-values": "1.3.0", - "postcss-value-parser": "3.3.0", - "source-list-map": "2.0.0" - } - }, - "css-parse": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", - "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", - "dev": true - }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "dev": true, - "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", - "domutils": "1.5.1", - "nth-check": "1.0.1" - } - }, - "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", - "dev": true, - "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.1", - "regexpu-core": "1.0.0" - } - }, - "css-what": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", - "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", - "dev": true - }, - "cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", - "dev": true, - "requires": { - "through": "2.3.8" - } - }, - "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", - "dev": true - }, - "cssnano": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", - "dev": true, - "requires": { - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.1", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.2", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "postcss-unique-selectors": "2.0.2", - "postcss-value-parser": "3.3.0", - "postcss-zindex": "2.2.0" - } - }, - "csso": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", - "dev": true, - "requires": { - "clap": "1.2.3", - "source-map": "0.5.7" - } - }, - "cuint": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", - "dev": true - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.37" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } - } - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "dev": true, - "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "1.0.3" - } - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, - "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" - } - }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", - "dev": true - }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, - "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.6.2" - }, - "dependencies": { - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - } - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "denodeify": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", - "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=", - "dev": true - }, - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", - "dev": true - }, - "di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, - "diff": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz", - "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.0.5" - } - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "dev": true, - "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz", - "integrity": "sha512-kN+DjfGF7dJGUL7nWRktL9Z18t1rWP3aQlyZdY8XlpvU3Nc6GeFTQApftcjtWKxAZfiggZSGrCEoszNgvnpwDg==", - "dev": true, - "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.1" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "1.1.1" - } - }, - "dom-converter": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz", - "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", - "dev": true, - "requires": { - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, - "dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.1", - "void-elements": "2.0.1" - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, - "domain-browser": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", - "dev": true - }, - "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz", - "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" - } - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "1.0.1" - } - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", - "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", - "dev": true, - "requires": { - "end-of-stream": "1.4.0", - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "stream-shift": "1.0.0" - } - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "ejs": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz", - "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=", - "dev": true - }, - "electron-releases": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/electron-releases/-/electron-releases-2.1.0.tgz", - "integrity": "sha512-cyKFD1bTE/UgULXfaueIN1k5EPFzs+FRc/rvCY5tIynefAPqopQEgjr0EzY+U3Dqrk/G4m9tXSPuZ77v6dL/Rw==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.30", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz", - "integrity": "sha512-zx1Prv7kYLfc4OA60FhxGbSo4qrEjgSzpo1/37i7l9ltXPYOoQBtjQxY9KmsgfHnBxHlBGXwLlsbt/gub1w5lw==", - "dev": true, - "requires": { - "electron-releases": "2.1.0" - } - }, - "elegant-spinner": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", - "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.3", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "ember-cli-string-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz", - "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "encodeurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", - "dev": true - }, - "end-of-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", - "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", - "dev": true, - "requires": { - "once": "1.4.0" - } - }, - "engine.io": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz", - "integrity": "sha1-+H2E4b0h0aLsf43u8MYgVKzfsno=", - "dev": true, - "requires": { - "accepts": "1.1.4", - "base64id": "0.1.0", - "debug": "2.2.0", - "engine.io-parser": "1.2.4", - "ws": "1.0.1" - }, - "dependencies": { - "accepts": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz", - "integrity": "sha1-1xyW99QdD+2iw4zRToonwEFY30o=", - "dev": true, - "requires": { - "mime-types": "2.0.14", - "negotiator": "0.4.9" - } - }, - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "mime-db": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz", - "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=", - "dev": true - }, - "mime-types": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz", - "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=", - "dev": true, - "requires": { - "mime-db": "1.12.0" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - }, - "negotiator": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz", - "integrity": "sha1-kuRrbbU8fkIe1koryU8IvnYw3z8=", - "dev": true - } - } - }, - "engine.io-client": { - "version": "1.6.9", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz", - "integrity": "sha1-HWrUgEilCDyVCWlDsp0279shJAE=", - "dev": true, - "requires": { - "component-emitter": "1.1.2", - "component-inherit": "0.0.3", - "debug": "2.2.0", - "engine.io-parser": "1.2.4", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parsejson": "0.0.1", - "parseqs": "0.0.2", - "parseuri": "0.0.4", - "ws": "1.0.1", - "xmlhttprequest-ssl": "1.5.1", - "yeast": "0.1.2" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - } - } - }, - "engine.io-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz", - "integrity": "sha1-4Il7C/FOeS1M0qWVBVORnFaUjEI=", - "dev": true, - "requires": { - "after": "0.8.1", - "arraybuffer.slice": "0.0.6", - "base64-arraybuffer": "0.1.2", - "blob": "0.0.4", - "has-binary": "0.1.6", - "utf8": "2.1.0" - }, - "dependencies": { - "has-binary": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz", - "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=", - "dev": true, - "requires": { - "isarray": "0.0.1" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "enhanced-resolve": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "object-assign": "4.1.1", - "tapable": "0.2.8" - } - }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true - }, - "errno": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz", - "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==", - "dev": true, - "requires": { - "prr": "1.0.1" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "es-abstract": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz", - "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==", - "dev": true, - "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.1", - "is-callable": "1.1.3", - "is-regex": "1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" - } - }, - "es5-ext": { - "version": "0.10.37", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", - "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", - "dev": true, - "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-symbol": "3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-promise": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz", - "integrity": "sha512-LSas5vsuA6Q4nEdf9wokY5/AJYXry98i0IzXsv49rYsgDGDNDPbqAYR1Pe23iFxygfbGZNR/5VrHXBCh2BhvUQ==", - "dev": true - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" - }, - "dependencies": { - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true - }, - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", - "estraverse": "4.2.0" - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", - "dev": true, - "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "estree-walker": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.1.tgz", - "integrity": "sha512-7HgCgz1axW7w5aOvgOQkoR1RMBkllygJrssU3BvymKQ95lxXYv6Pon17fBRDm9qhkvXZGijOULoSF9ShOk/ZLg==", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37" - } - }, - "eventemitter3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", - "dev": true - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "dev": true, - "requires": { - "original": "1.0.0" - } - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "1.3.4", - "safe-buffer": "5.1.1" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - } - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, - "exit-hook": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", - "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", - "dev": true - }, - "expand-braces": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", - "dev": true, - "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" - }, - "dependencies": { - "braces": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", - "dev": true, - "requires": { - "expand-range": "0.1.1" - } - }, - "expand-range": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", - "dev": true, - "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" - } - }, - "is-number": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", - "dev": true - } - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "exports-loader": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.6.4.tgz", - "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7" - } - }, - "express": { - "version": "4.16.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", - "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=", - "dev": true, - "requires": { - "accepts": "1.3.4", - "array-flatten": "1.1.1", - "body-parser": "1.18.2", - "content-disposition": "0.5.2", - "content-type": "1.0.4", - "cookie": "0.3.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "1.1.1", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.0", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.2", - "qs": "6.5.1", - "range-parser": "1.2.0", - "safe-buffer": "5.1.1", - "send": "0.16.1", - "serve-static": "1.13.1", - "setprototypeof": "1.1.0", - "statuses": "1.3.1", - "type-is": "1.6.15", - "utils-merge": "1.0.1", - "vary": "1.1.2" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - } - } - }, - "extract-text-webpack-plugin": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", - "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", - "dev": true, - "requires": { - "async": "2.6.0", - "loader-utils": "1.1.0", - "schema-utils": "0.3.0", - "webpack-sources": "1.1.0" - } - }, - "extract-zip": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz", - "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=", - "dev": true, - "requires": { - "concat-stream": "1.6.0", - "debug": "2.6.9", - "mkdirp": "0.5.0", - "yauzl": "2.4.1" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", - "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fancy-log": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", - "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", - "dev": true, - "requires": { - "ansi-gray": "0.1.1", - "color-support": "1.1.3", - "time-stamp": "1.1.0" - }, - "dependencies": { - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - } - } - }, - "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "fastparse": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", - "dev": true - }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - }, - "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", - "dev": true, - "requires": { - "pend": "1.2.0" - } - }, - "file-loader": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.6.tgz", - "integrity": "sha512-873ztuL+/hfvXbLDJ262PGO6XjERnybJu2gW1/5j8HUfxSiFJI9Hj/DhZ50ZGRUxBvuNiazb/cM2rh9pqrxP6Q==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.3.0" - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fileset": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz", - "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=", - "dev": true, - "requires": { - "glob": "5.0.15", - "minimatch": "2.0.10" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "2.0.10", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - } - } - }, - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "filled-array": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz", - "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=", - "dev": true - }, - "finalhandler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", - "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.1.0", - "pkg-dir": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "findup-sync": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=", - "dev": true, - "requires": { - "glob": "5.0.15" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } - } - }, - "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", - "dev": true - }, - "flush-write-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", - "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } - }, - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.3" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", - "dev": true, - "optional": true, - "requires": { - "globule": "1.2.0" - } - }, - "generate-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", - "dev": true, - "optional": true - }, - "generate-object-property": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", - "dev": true, - "optional": true, - "requires": { - "is-property": "1.0.2" - } - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "1.3.5" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - } - }, - "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "minimatch": "3.0.4" - } - }, - "glogg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", - "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", - "dev": true, - "requires": { - "create-error-class": "3.0.2", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.0", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "unzip-response": "2.0.1", - "url-parse-lax": "1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "gulp-util": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", - "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "1.0.12", - "fancy-log": "1.3.2", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.0" - } - }, - "handle-thing": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true - } - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "dev": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - } - } - }, - "harbor-ui": { - "version": "0.6.0-test-2", - "resolved": "https://registry.npmjs.org/harbor-ui/-/harbor-ui-0.6.0-test-2.tgz", - "integrity": "sha512-pcnDb1F8t4eZ9gn8BLzCEKG9Ak0odVezR6MCHTx+1ie8+vRtDR5Q53RBkTE2kj9t+RW7Jz/HrVOaSU8pnNyILg==" - }, - "has": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", - "dev": true, - "requires": { - "function-bind": "1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-binary": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", - "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, - "hash-base": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" - } - }, - "hasha": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz", - "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=", - "dev": true, - "requires": { - "is-stream": "1.1.0", - "pinkie-promise": "2.0.1" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "1.1.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "wbuf": "1.7.2" - } - }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", - "dev": true - }, - "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "html-minifier": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz", - "integrity": "sha512-WX7D6PB9PFq05fZ1/CyxPUuyqXed6vh2fGOM80+zJT5wAO93D/cUjLs0CcbBFjQmlwmCgRvl97RurtArIpOnkw==", - "dev": true, - "requires": { - "camel-case": "3.0.0", - "clean-css": "4.1.9", - "commander": "2.12.2", - "he": "1.1.1", - "ncname": "1.0.0", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.3.3" - } - }, - "html-webpack-plugin": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz", - "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "html-minifier": "3.5.8", - "loader-utils": "0.2.17", - "lodash": "4.17.4", - "pretty-error": "2.1.1", - "toposort": "1.0.6" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, - "htmlparser2": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", - "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", - "dev": true, - "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.1.0", - "domutils": "1.1.6", - "readable-stream": "1.0.34" - }, - "dependencies": { - "domutils": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz", - "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.3.1" - }, - "dependencies": { - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", - "dev": true - } - } - }, - "http-parser-js": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz", - "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=", - "dev": true - }, - "http-proxy": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", - "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", - "dev": true, - "requires": { - "eventemitter3": "1.2.0", - "requires-port": "1.0.0" - } - }, - "http-proxy-agent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz", - "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=", - "dev": true, - "requires": { - "agent-base": "2.1.1", - "debug": "2.6.9", - "extend": "3.0.1" - } - }, - "http-proxy-middleware": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", - "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", - "dev": true, - "requires": { - "http-proxy": "1.16.2", - "is-glob": "3.1.0", - "lodash": "4.17.4", - "micromatch": "2.3.11" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "https-proxy-agent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", - "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", - "dev": true, - "requires": { - "agent-base": "2.1.1", - "debug": "2.6.9", - "extend": "3.0.1" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "icss-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", - "dev": true, - "requires": { - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", - "dev": true - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true - }, - "ignore": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", - "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", - "dev": true - }, - "image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", - "dev": true, - "optional": true - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, - "import-local": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", - "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", - "dev": true, - "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true, - "optional": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "internal-ip": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", - "dev": true, - "requires": { - "meow": "3.7.0" - } - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", - "dev": true - }, - "intl": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz", - "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=" - }, - "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", - "dev": true, - "requires": { - "loose-envify": "1.3.1" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, - "ipaddr.js": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", - "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", - "dev": true - }, - "is-absolute": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", - "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", - "dev": true, - "requires": { - "is-relative": "0.2.1", - "is-windows": "0.2.0" - } - }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "1.11.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", - "dev": true - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, - "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" - } - }, - "is-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", - "dev": true - }, - "is-my-json-valid": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz", - "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==", - "dev": true, - "optional": true, - "requires": { - "generate-function": "2.0.0", - "generate-object-property": "1.2.0", - "jsonpointer": "4.0.1", - "xtend": "4.0.1" - } - }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", - "dev": true - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", - "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", - "dev": true, - "requires": { - "is-path-inside": "1.0.1" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "1.0.2" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "3.0.1" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-property": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true, - "optional": true - }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "1.0.1" - } - }, - "is-relative": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", - "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", - "dev": true, - "requires": { - "is-unc-path": "0.1.2" - } - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-svg": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", - "dev": true, - "requires": { - "html-comment-regex": "1.1.1" - } - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-unc-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", - "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", - "dev": true, - "requires": { - "unc-path-regex": "0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", - "dev": true - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isbinaryfile": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", - "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, - "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.0", - "wordwrap": "1.0.0" - }, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1.0.9" - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "istanbul-instrumenter-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-2.0.0.tgz", - "integrity": "sha1-5UkpAKsLuoNe+oAkywC+mz7qJwA=", - "dev": true, - "requires": { - "convert-source-map": "1.5.1", - "istanbul-lib-instrument": "1.9.1", - "loader-utils": "0.2.17", - "object-assign": "4.1.1" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, - "istanbul-lib-coverage": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", - "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", - "dev": true, - "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" - } - }, - "jasmine": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.5.2.tgz", - "integrity": "sha1-YoPO9whcCVzCXWUelU3wBPfj5CE=", - "dev": true, - "requires": { - "exit": "0.1.2", - "glob": "7.1.2", - "jasmine-core": "2.5.2" - }, - "dependencies": { - "jasmine-core": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.5.2.tgz", - "integrity": "sha1-b2G9eQYeJ/Q+b5NV5Es8bKtv8pc=", - "dev": true - } - } - }, - "jasmine-core": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.4.1.tgz", - "integrity": "sha1-b4OrOg8WlRcizgfSBsdz1XzIOL4=", - "dev": true - }, - "jasmine-spec-reporter": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-2.5.0.tgz", - "integrity": "sha1-EuR4LmRFwN+ruN70xS7dMPY2LUI=", - "dev": true, - "requires": { - "colors": "1.1.2" - } - }, - "jasminewd2": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.10.tgz", - "integrity": "sha1-lPSK4ryUbK1kMDVGe0u36pwQde8=", - "dev": true - }, - "jquery": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=", - "dev": true - }, - "js-base64": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.0.tgz", - "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", - "dev": true, - "requires": { - "argparse": "1.0.9", - "esprima": "2.7.3" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - }, - "json-loader": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11" - } - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, - "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } - } - }, - "karma": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz", - "integrity": "sha1-bcqJ7CX0dT8SD4NMiTmAmAQP1j4=", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.2", - "chokidar": "1.7.0", - "colors": "1.1.2", - "combine-lists": "1.0.1", - "connect": "3.6.5", - "core-js": "2.5.3", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "http-proxy": "1.16.2", - "isbinaryfile": "3.0.2", - "lodash": "3.10.1", - "log4js": "0.6.38", - "mime": "1.6.0", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.1.5", - "rimraf": "2.6.2", - "socket.io": "1.4.7", - "source-map": "0.5.7", - "tmp": "0.0.28", - "useragent": "2.2.1" - }, - "dependencies": { - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - } - } - }, - "karma-cli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz", - "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=", - "dev": true, - "requires": { - "resolve": "1.5.0" - } - }, - "karma-jasmine": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.1.tgz", - "integrity": "sha1-b+hA51oRYAydkehLM8RY4cRqNSk=", - "dev": true - }, - "karma-mocha-reporter": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz", - "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=", - "dev": true, - "requires": { - "chalk": "2.2.2", - "log-symbols": "2.1.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "karma-phantomjs-launcher": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz", - "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=", - "dev": true, - "requires": { - "lodash": "4.17.4", - "phantomjs-prebuilt": "2.1.16" - } - }, - "karma-remap-istanbul": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/karma-remap-istanbul/-/karma-remap-istanbul-0.2.2.tgz", - "integrity": "sha1-HN9shaVcayDpxxScCoxVUzA42dk=", - "dev": true, - "requires": { - "istanbul": "0.4.5", - "remap-istanbul": "0.6.4" - } - }, - "karma-source-map-support": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.2.0.tgz", - "integrity": "sha1-G/gee7SwiWJ6s1LsQXnhF8QGpUA=", - "dev": true, - "requires": { - "source-map-support": "0.4.18" - } - }, - "kew": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", - "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=", - "dev": true - }, - "killable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz", - "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - }, - "klaw": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11" - } - }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", - "dev": true, - "requires": { - "package-json": "4.0.1" - } - }, - "lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=", - "dev": true - }, - "lazy-req": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz", - "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "1.0.0" - } - }, - "less": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz", - "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==", - "dev": true, - "requires": { - "errno": "0.1.6", - "graceful-fs": "4.1.11", - "image-size": "0.5.5", - "mime": "1.6.0", - "mkdirp": "0.5.1", - "promise": "7.3.1", - "request": "2.81.0", - "source-map": "0.5.7" - } - }, - "less-loader": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.0.5.tgz", - "integrity": "sha1-rhVadAbKxqzSk9eFWH/P8PR4xN0=", - "dev": true, - "requires": { - "clone": "2.1.1", - "loader-utils": "1.1.0", - "pify": "2.3.0" - }, - "dependencies": { - "clone": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } - }, - "license-webpack-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.1.1.tgz", - "integrity": "sha512-TjKOyiC0exqd4Idy/4M8/DETR22dXBZks387DuS5LbslxHiMRXGx/Q2F/j9IUtvEoH5uFvt72vRgk/G6f8j3Dg==", - "dev": true, - "requires": { - "ejs": "2.5.7" - } - }, - "listify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz", - "integrity": "sha1-A8p7otFQ1CZ3c/dOV1WNEFPSvuM=", - "dev": true - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - } - }, - "lockfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz", - "integrity": "sha1-Jjj8OaAzHpysGgS3F5mTHJxQ33k=", - "dev": true - }, - "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true, - "optional": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", - "dev": true, - "optional": true - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" - } - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "log-symbols": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", - "dev": true, - "requires": { - "chalk": "2.2.2" - } - }, - "log-update": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz", - "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=", - "dev": true, - "requires": { - "ansi-escapes": "1.4.0", - "cli-cursor": "1.0.2" - } - }, - "log4js": { - "version": "0.6.38", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", - "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "semver": "4.3.6" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, - "loglevel": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.0.tgz", - "integrity": "sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=", - "dev": true - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, - "requires": { - "js-tokens": "3.0.2" - } - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" - } - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "dev": true, - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, - "macaddress": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", - "dev": true - }, - "magic-string": { - "version": "0.22.4", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz", - "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==", - "dev": true, - "requires": { - "vlq": "0.2.3" - } - }, - "make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", - "dev": true, - "requires": { - "pify": "3.0.0" - } - }, - "make-error": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz", - "integrity": "sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==", - "dev": true - }, - "make-error-cause": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz", - "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=", - "dev": true, - "requires": { - "make-error": "1.3.2" - } - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "math-expression-evaluator": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", - "dev": true - }, - "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", - "dev": true, - "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" - }, - "dependencies": { - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.1" - } - } - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "1.1.0" - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "0.1.6", - "readable-stream": "2.3.3" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", - "dev": true - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "dev": true, - "requires": { - "mime-db": "1.30.0" - } - }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "mississippi": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz", - "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=", - "dev": true, - "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.1", - "end-of-stream": "1.4.0", - "flush-write-stream": "1.0.2", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "1.0.3", - "pumpify": "1.3.5", - "stream-each": "1.2.2", - "through2": "2.0.3" - } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } - } - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "multicast-dns": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz", - "integrity": "sha512-uV3/ckdsffHx9IrGQrx613mturMdMqQ06WTq+C09NsStJ9iNG6RcUWgPKs1Rfjy+idZT6tfQoXEusGNnEZhT3w==", - "dev": true, - "requires": { - "dns-packet": "1.2.2", - "thunky": "0.1.0" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "mutationobserver-shim": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz", - "integrity": "sha1-9NXa56SXGiIHkU+1qQ69UUtlrMo=" - }, - "nan": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", - "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", - "dev": true, - "optional": true - }, - "ncname": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", - "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", - "dev": true, - "requires": { - "xml-char-classes": "1.0.0" - } - }, - "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", - "dev": true - }, - "ngx-cookie": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ngx-cookie/-/ngx-cookie-1.0.1.tgz", - "integrity": "sha512-zE0HTC0jU/C7+33/eO3qZJUtkbGY2mKuVLXR/jpH11rOD7u7BU+zy9i2D0vf8vaxZaW+TlfUD1jGOCuIYWvv+g==" - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "1.1.4" - } - }, - "node-forge": { - "version": "0.6.33", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", - "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=", - "dev": true - }, - "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.4", - "request": "2.81.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" - }, - "dependencies": { - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1" - } - }, - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true, - "optional": true - } - } - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.1.7", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.3", - "stream-browserify": "2.0.1", - "stream-http": "2.7.2", - "string_decoder": "1.0.3", - "timers-browserify": "2.0.4", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", - "vm-browserify": "0.0.4" - } - }, - "node-modules-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/node-modules-path/-/node-modules-path-1.0.1.tgz", - "integrity": "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=", - "dev": true - }, - "node-sass": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz", - "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==", - "dev": true, - "optional": true, - "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.0", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.8.0", - "node-gyp": "3.6.2", - "npmlog": "4.1.2", - "request": "2.79.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true, - "optional": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, - "optional": true, - "requires": { - "chalk": "1.1.3", - "commander": "2.12.2", - "is-my-json-valid": "2.17.1", - "pinkie-promise": "2.0.1" - } - }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", - "dev": true, - "optional": true - }, - "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.11.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "qs": "6.3.2", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.4.3", - "uuid": "3.1.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true, - "optional": true - } - } - }, - "node-status-codes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", - "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=", - "dev": true - }, - "nopt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "dev": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.4" - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "nth-check": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", - "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", - "dev": true, - "requires": { - "boolbase": "1.0.0" - } - }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-component": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", - "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", - "dev": true - }, - "object-keys": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - } - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "requires": { - "isobject": "3.0.1" - } - }, - "obuf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz", - "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", - "dev": true - }, - "opn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", - "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==", - "dev": true, - "requires": { - "is-wsl": "1.1.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", - "dev": true - }, - "original": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", - "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", - "dev": true, - "requires": { - "url-parse": "1.0.5" - }, - "dependencies": { - "url-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", - "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", - "dev": true, - "requires": { - "querystringify": "0.0.4", - "requires-port": "1.0.0" - } - } - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "1.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", - "dev": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "1.1.0" - } - }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true - }, - "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", - "dev": true, - "requires": { - "got": "6.7.1", - "registry-auth-token": "3.3.1", - "registry-url": "3.1.0", - "semver": "5.4.1" - } - }, - "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "dev": true, - "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, - "requires": { - "no-case": "2.3.2" - } - }, - "parse-asn1": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", - "dev": true, - "requires": { - "asn1.js": "4.9.2", - "browserify-aes": "1.1.1", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.14" - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "1.3.1" - } - }, - "parsejson": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz", - "integrity": "sha1-mxDGwNglq1ieaFFTgm3go7oni8w=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, - "parseqs": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz", - "integrity": "sha1-nf5wss3aw4i95PNbHyQPpYrb5sc=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, - "parseuri": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz", - "integrity": "sha1-gGWCo5iH4eoY3V4v4OAZAiaOk1A=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "3.0.0" - } - }, - "pbkdf2": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", - "dev": true, - "requires": { - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.9" - } - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "dev": true - }, - "phantomjs-prebuilt": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz", - "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=", - "dev": true, - "requires": { - "es6-promise": "4.2.2", - "extract-zip": "1.6.6", - "fs-extra": "1.0.0", - "hasha": "2.2.0", - "kew": "0.7.0", - "progress": "1.1.8", - "request": "2.81.0", - "request-progress": "2.0.1", - "which": "1.3.0" - }, - "dependencies": { - "fs-extra": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", - "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1" - } - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11" - } - } - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "2.1.0" - } - }, - "popsicle": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/popsicle/-/popsicle-8.2.0.tgz", - "integrity": "sha1-/0QBAFyrQ6lBipFBBhHAAZdxLSE=", - "dev": true, - "requires": { - "any-promise": "1.3.0", - "arrify": "1.0.1", - "concat-stream": "1.6.0", - "form-data": "2.1.4", - "make-error-cause": "1.2.2", - "throwback": "1.1.1", - "tough-cookie": "2.3.3", - "xtend": "4.0.1" - } - }, - "popsicle-proxy-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz", - "integrity": "sha1-uRM8VdlFdZq37mG3cRNkYg066tw=", - "dev": true, - "requires": { - "http-proxy-agent": "1.0.0", - "https-proxy-agent": "1.0.0" - } - }, - "popsicle-retry": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz", - "integrity": "sha1-4G6GZTO0KnoSPrMwy+Y6fOvLoQw=", - "dev": true, - "requires": { - "any-promise": "1.3.0", - "xtend": "4.0.1" - } - }, - "popsicle-rewrite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz", - "integrity": "sha1-HdTo6pwxgjUfuCD4eTTZkvf7kAc=", - "dev": true - }, - "popsicle-status": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz", - "integrity": "sha1-jdcMT+fGlBCa3XhP/oDqysHnso0=", - "dev": true - }, - "portfinder": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", - "dev": true, - "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - } - } - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.0", - "source-map": "0.5.7", - "supports-color": "3.2.3" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-calc": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-message-helpers": "2.0.0", - "reduce-css-calc": "1.3.0" - } - }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", - "dev": true, - "requires": { - "colormin": "1.1.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-custom-properties": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz", - "integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-discard-comments": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-discard-empty": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-discard-unused": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "uniqs": "2.0.0" - } - }, - "postcss-filter-plugins": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "uniqid": "4.1.1" - } - }, - "postcss-load-config": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", - "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1", - "postcss-load-options": "1.2.0", - "postcss-load-plugins": "2.3.0" - } - }, - "postcss-load-options": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", - "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } - }, - "postcss-load-plugins": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", - "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } - }, - "postcss-loader": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.9.tgz", - "integrity": "sha512-sgoXPtmgVT3aBAhU47Kig8oPF+mbXl8Unjvtz1Qj1q2D2EvSVJW2mKJNzxv5y/LvA9xWwuvdysvhc7Zn80UWWw==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "postcss": "6.0.14", - "postcss-load-config": "1.2.0", - "schema-utils": "0.3.0" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-merge-idents": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-merge-rules": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-api": "1.6.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3", - "vendors": "1.0.1" - } - }, - "postcss-message-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-minify-params": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "uniqs": "2.0.0" - } - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3" - } - }, - "postcss-modules-extract-imports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", - "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", - "dev": true, - "requires": { - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-modules-scope": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-modules-values": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", - "dev": true, - "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "6.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-normalize-url": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", - "dev": true, - "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "1.9.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-ordered-values": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", - "dev": true, - "requires": { - "postcss": "5.2.18" - } - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "postcss-selector-parser": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", - "dev": true, - "requires": { - "flatten": "1.0.2", - "indexes-of": "1.0.1", - "uniq": "1.0.1" - } - }, - "postcss-svgo": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", - "dev": true, - "requires": { - "is-svg": "2.1.0", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "svgo": "0.7.2" - } - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "uniqs": "2.0.0" - } - }, - "postcss-url": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.0.tgz", - "integrity": "sha512-VBP6uf6iL3AZra23nkPkOEkS/5azj1xf/toRrjfkolfFEgg9Gyzg9UhJZeIsz12EGKZTNVeGbPa2XtaZm/iZvg==", - "dev": true, - "requires": { - "mime": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.14", - "xxhashjs": "0.2.1" - }, - "dependencies": { - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", - "dev": true, - "requires": { - "chalk": "2.3.0", - "source-map": "0.6.1", - "supports-color": "4.5.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-value-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", - "dev": true - }, - "postcss-zindex": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", - "dev": true, - "requires": { - "has": "1.0.1", - "postcss": "5.2.18", - "uniqs": "2.0.0" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", - "dev": true, - "requires": { - "renderkid": "2.0.1", - "utila": "0.4.0" - } - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "progress": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", - "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", - "dev": true - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, - "optional": true, - "requires": { - "asap": "2.0.6" - } - }, - "promise-finally": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/promise-finally/-/promise-finally-2.2.1.tgz", - "integrity": "sha1-ImFsS6kCkW6Yi9RsVNfKoIkQzXc=", - "dev": true, - "requires": { - "any-promise": "1.3.0" - } - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true - }, - "protractor": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-4.0.9.tgz", - "integrity": "sha1-FS9y43KbJXYibjcNwwhpnMz6d7o=", - "dev": true, - "requires": { - "@types/jasmine": "2.2.34", - "@types/node": "6.0.95", - "@types/q": "0.0.30", - "@types/selenium-webdriver": "2.53.43", - "adm-zip": "0.4.7", - "chalk": "1.1.3", - "glob": "7.1.2", - "jasmine": "2.5.2", - "jasminewd2": "0.0.10", - "optimist": "0.6.1", - "q": "1.4.1", - "saucelabs": "1.3.0", - "selenium-webdriver": "2.53.3", - "source-map-support": "0.4.18", - "webdriver-manager": "10.2.5" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "proxy-addr": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", - "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", - "dev": true, - "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.5.2" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "parse-asn1": "5.1.0", - "randombytes": "2.0.5" - } - }, - "pump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", - "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", - "dev": true, - "requires": { - "end-of-stream": "1.4.0", - "once": "1.4.0" - } - }, - "pumpify": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz", - "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=", - "dev": true, - "requires": { - "duplexify": "3.5.1", - "inherits": "2.0.3", - "pump": "1.0.3" - } - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, - "qjobs": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", - "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=", - "dev": true - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" - } - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "querystringify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", - "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "randombytes": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "randomfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", - "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", - "dev": true, - "requires": { - "randombytes": "2.0.5", - "safe-buffer": "5.1.1" - } - }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", - "dev": true - }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - } - }, - "raw-loader": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", - "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", - "dev": true - }, - "rc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz", - "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=", - "dev": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - } - }, - "read-all-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", - "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1", - "readable-stream": "2.3.3" - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - }, - "dependencies": { - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - } - } - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.3", - "set-immediate-shim": "1.0.1" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" - } - }, - "reduce-css-calc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "math-expression-evaluator": "1.2.17", - "reduce-function-call": "1.0.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "reduce-function-call": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", - "dev": true, - "requires": { - "balanced-match": "0.4.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "reflect-metadata": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz", - "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=" - }, - "regenerate": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", - "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3" - } - }, - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true, - "requires": { - "regenerate": "1.3.3", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" - } - }, - "registry-auth-token": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz", - "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", - "dev": true, - "requires": { - "rc": "1.2.2", - "safe-buffer": "5.1.1" - } - }, - "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", - "dev": true, - "requires": { - "rc": "1.2.2" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "0.5.0" - } - }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, - "remap-istanbul": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.6.4.tgz", - "integrity": "sha1-rFUe/xqmQVBLTzGNAwPdph47tpU=", - "dev": true, - "requires": { - "amdefine": "1.0.0", - "gulp-util": "3.0.7", - "istanbul": "0.4.3", - "source-map": "0.5.7", - "through2": "2.0.1" - }, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "amdefine": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", - "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM=", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "istanbul": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz", - "integrity": "sha1-W3FO4K5JOsXvIEuZ84crzu9z1To=", - "dev": true, - "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "fileset": "0.2.1", - "handlebars": "4.0.11", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.0", - "wordwrap": "1.0.0" - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1.0.9" - } - }, - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - }, - "through2": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", - "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", - "dev": true, - "requires": { - "readable-stream": "2.0.6", - "xtend": "4.0.1" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "renderkid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", - "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", - "dev": true, - "requires": { - "css-select": "1.2.0", - "dom-converter": "0.1.4", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.1.0" - } - }, - "request-progress": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz", - "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=", - "dev": true, - "requires": { - "throttleit": "1.0.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-from-string": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "3.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "requires": { - "align-text": "0.1.4" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "ripemd160": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", - "dev": true, - "requires": { - "hash-base": "2.0.2", - "inherits": "2.0.3" - } - }, - "rollup": { - "version": "0.41.6", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz", - "integrity": "sha1-4NBUl4d6OYwQTYFtJzOnGKepTio=", - "dev": true, - "requires": { - "source-map-support": "0.4.18" - } - }, - "rollup-plugin-commonjs": { - "version": "8.2.6", - "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz", - "integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==", - "dev": true, - "requires": { - "acorn": "5.3.0", - "estree-walker": "0.5.1", - "magic-string": "0.22.4", - "resolve": "1.5.0", - "rollup-pluginutils": "2.0.1" - } - }, - "rollup-plugin-node-resolve": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz", - "integrity": "sha1-i4l8TDAw1QASd7BRSyXSygloPuA=", - "dev": true, - "requires": { - "browser-resolve": "1.11.2", - "builtin-modules": "1.1.1", - "is-module": "1.0.0", - "resolve": "1.5.0" - } - }, - "rollup-plugin-uglify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-1.0.2.tgz", - "integrity": "sha1-1KpvXfE1Iurhuhd4DHxMcJYDg1k=", - "dev": true, - "requires": { - "uglify-js": "2.8.29" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "rollup-pluginutils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", - "integrity": "sha1-fslbNXP2VDpGpkYb2afFRFJdD8A=", - "dev": true, - "requires": { - "estree-walker": "0.3.1", - "micromatch": "2.3.11" - }, - "dependencies": { - "estree-walker": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz", - "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=", - "dev": true - } - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "1.2.0" - } - }, - "rxjs": { - "version": "5.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz", - "integrity": "sha512-v4Q5HDC0FHAQ7zcBX7T2IL6O5ltl1a2GX4ENjPXg6SjDY69Cmx9v4113C99a4wGF16ClPv5Z8mghuYorVkg/kg==", - "requires": { - "symbol-observable": "1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" - } - }, - "sass-loader": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz", - "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==", - "dev": true, - "requires": { - "async": "2.6.0", - "clone-deep": "0.3.0", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "pify": "3.0.0" - } - }, - "saucelabs": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz", - "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=", - "dev": true, - "requires": { - "https-proxy-agent": "1.0.0" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, - "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, - "requires": { - "ajv": "5.5.2" - } - }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "optional": true, - "requires": { - "js-base64": "2.4.0", - "source-map": "0.4.4" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "optional": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selenium-webdriver": { - "version": "2.53.3", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", - "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", - "dev": true, - "requires": { - "adm-zip": "0.4.4", - "rimraf": "2.6.2", - "tmp": "0.0.24", - "ws": "1.0.1", - "xml2js": "0.4.4" - }, - "dependencies": { - "adm-zip": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", - "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", - "dev": true - }, - "tmp": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz", - "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=", - "dev": true - } - } - }, - "selfsigned": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.1.tgz", - "integrity": "sha1-v4y3uDJWxFUeMTR8YxF3jbme7FI=", - "dev": true, - "requires": { - "node-forge": "0.6.33" - } - }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true - }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", - "dev": true, - "requires": { - "semver": "5.4.1" - } - }, - "semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", - "dev": true, - "requires": { - "semver": "5.4.1" - } - }, - "send": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "1.1.1", - "destroy": "1.0.4", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "etag": "1.8.1", - "fresh": "0.5.2", - "http-errors": "1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.3.1" - }, - "dependencies": { - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz", - "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=", - "dev": true - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, - "requires": { - "accepts": "1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.2", - "mime-types": "2.1.17", - "parseurl": "1.3.2" - } - }, - "serve-static": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", - "dev": true, - "requires": { - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.16.1" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "sha.js": { - "version": "2.4.9", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz", - "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.1" - } - }, - "shallow-clone": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=", - "dev": true, - "requires": { - "is-extendable": "0.1.1", - "kind-of": "2.0.1", - "lazy-cache": "0.2.7", - "mixin-object": "2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "silent-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz", - "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", - "dev": true, - "requires": { - "debug": "2.6.9" - } - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", - "dev": true - }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", - "dev": true - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "socket.io": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz", - "integrity": "sha1-krf3y4jFeX1NruJ5/oB12+bT+hw=", - "dev": true, - "requires": { - "debug": "2.2.0", - "engine.io": "1.6.10", - "has-binary": "0.1.7", - "socket.io-adapter": "0.4.0", - "socket.io-client": "1.4.6", - "socket.io-parser": "2.2.6" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - } - } - }, - "socket.io-adapter": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz", - "integrity": "sha1-+5+CqxqmUpC/csNleVW5MKmRok8=", - "dev": true, - "requires": { - "debug": "2.2.0", - "socket.io-parser": "2.2.2" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "json3": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz", - "integrity": "sha1-9u/JPAagTemuxTBT3yVZuxniA4s=", - "dev": true - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - }, - "socket.io-parser": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz", - "integrity": "sha1-PXr2tkSX6Va32f53X5mXFgJ/lBc=", - "dev": true, - "requires": { - "benchmark": "1.0.0", - "component-emitter": "1.1.2", - "debug": "0.7.4", - "isarray": "0.0.1", - "json3": "3.2.6" - }, - "dependencies": { - "debug": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", - "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=", - "dev": true - } - } - } - } - }, - "socket.io-client": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz", - "integrity": "sha1-SbC6U379FbgpfIQBbmQuHHx1LD0=", - "dev": true, - "requires": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "1.2.0", - "debug": "2.2.0", - "engine.io-client": "1.6.9", - "has-binary": "0.1.7", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseuri": "0.0.4", - "socket.io-parser": "2.2.6", - "to-array": "0.1.4" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz", - "integrity": "sha1-zNETqGOI0GSC0D3j/H35hSa6jv4=", - "dev": true - }, - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - } - } - }, - "socket.io-parser": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz", - "integrity": "sha1-ON/WHfUNz4qx2eIJEyK/kCuii5k=", - "dev": true, - "requires": { - "benchmark": "1.0.0", - "component-emitter": "1.1.2", - "debug": "2.2.0", - "isarray": "0.0.1", - "json3": "3.3.2" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - } - } - }, - "sockjs": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz", - "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=", - "dev": true, - "requires": { - "faye-websocket": "0.10.0", - "uuid": "2.0.3" - }, - "dependencies": { - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", - "dev": true - } - } - }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.2.0" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - } - } - }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "1.1.0" - } - }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-loader": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz", - "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==", - "dev": true, - "requires": { - "async": "2.6.0", - "loader-utils": "0.2.17", - "source-map": "0.6.1" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "requires": { - "source-map": "0.5.7" - } - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, - "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.1", - "select-hose": "2.0.0", - "spdy-transport": "2.0.20" - } - }, - "spdy-transport": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz", - "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=", - "dev": true, - "requires": { - "debug": "2.6.9", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.1", - "readable-stream": "2.3.3", - "safe-buffer": "5.1.1", - "wbuf": "1.7.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", - "dev": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } - } - }, - "ssri": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz", - "integrity": "sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", - "dev": true - }, - "stdout-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", - "dev": true, - "optional": true, - "requires": { - "readable-stream": "2.3.3" - } - }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } - }, - "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", - "dev": true, - "requires": { - "end-of-stream": "1.4.0", - "stream-shift": "1.0.0" - } - }, - "stream-http": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", - "dev": true, - "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "string-template": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz", - "integrity": "sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y=", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "4.0.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "style-loader": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", - "integrity": "sha1-dFMzhM9pjHEEx5URULSXF63C87s=", - "dev": true, - "requires": { - "loader-utils": "1.1.0" - } - }, - "stylus": { - "version": "0.54.5", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", - "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", - "dev": true, - "requires": { - "css-parse": "1.7.0", - "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" - }, - "dependencies": { - "glob": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "sax": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", - "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", - "dev": true - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "stylus-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.1.tgz", - "integrity": "sha1-d/SzT9Aw0lsmF7z1UT21sHMMQIk=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" - } - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - }, - "svgo": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", - "dev": true, - "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" - } - }, - "symbol-observable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", - "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=" - }, - "tapable": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", - "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", - "dev": true - }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "optional": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, - "requires": { - "execa": "0.7.0" - } - }, - "tether": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.3.tgz", - "integrity": "sha512-YCfE/Ym9MpZpzUmzbek7MiLEyTofxx2YS0rJfSOUXX0aZtfQgxcgw7/Re2oGJUsREWZtEF0DzBKCjqH+DzgL6A==", - "dev": true - }, - "thenify": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "dev": true, - "requires": { - "any-promise": "1.3.0" - } - }, - "throat": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz", - "integrity": "sha512-/EY8VpvlqJ+sFtLPeOgc8Pl7kQVOWv0woD87KTXVHPIAE842FGT+rokxIhe8xIUP1cfgrkt0as0vDLjDiMtr8w==", - "dev": true - }, - "throttleit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", - "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - } - }, - "throwback": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/throwback/-/throwback-1.1.1.tgz", - "integrity": "sha1-8AfnwXYEptFtegfEGqDo/txhhKQ=", - "dev": true, - "requires": { - "any-promise": "1.3.0" - } - }, - "thunky": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", - "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=", - "dev": true - }, - "time-stamp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz", - "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=", - "dev": true - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", - "dev": true - }, - "timers-browserify": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz", - "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==", - "dev": true, - "requires": { - "setimmediate": "1.0.5" - } - }, - "tmp": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", - "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2" - } - }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "toposort": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz", - "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=", - "dev": true - }, - "touch": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz", - "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=", - "dev": true, - "requires": { - "nopt": "1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "dev": true, - "requires": { - "abbrev": "1.1.1" - } - } - } - }, - "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", - "dev": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tree-kill": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", - "dev": true - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, - "true-case-path": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", - "dev": true, - "optional": true, - "requires": { - "glob": "6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "optional": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } - } - }, - "ts-helpers": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ts-helpers/-/ts-helpers-1.1.2.tgz", - "integrity": "sha1-/Gm+nx87rtAfsaDvjUz+dIgU2DU=" - }, - "ts-node": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-1.2.1.tgz", - "integrity": "sha1-EI8eQzZuJfUiPoVJ+nxtz3gO2iM=", - "dev": true, - "requires": { - "arrify": "1.0.1", - "chalk": "1.1.3", - "diff": "2.2.3", - "make-error": "1.3.2", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "pinkie": "2.0.4", - "source-map-support": "0.4.18", - "tsconfig": "5.0.3", - "xtend": "4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "tsconfig": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz", - "integrity": "sha1-X0J45wGACWeo/Dg/0ZZIh48qbjo=", - "dev": true, - "requires": { - "any-promise": "1.3.0", - "parse-json": "2.2.0", - "strip-bom": "2.0.0", - "strip-json-comments": "2.0.1" - } - }, - "tsickle": { - "version": "0.21.6", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz", - "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=", - "requires": { - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map": "0.5.7", - "source-map-support": "0.4.18" - } - }, - "tslint": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz", - "integrity": "sha1-BTVocb7yOkNJBnNABvwYgza6gks=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "colors": "1.1.2", - "diff": "3.4.0", - "findup-sync": "0.3.0", - "glob": "7.1.2", - "optimist": "0.6.1", - "resolve": "1.5.0", - "tsutils": "1.9.1", - "update-notifier": "2.3.0" - }, - "dependencies": { - "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", - "dev": true - } - } - }, - "tsutils": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz", - "integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "1.1.2" - } - }, - "type-is": { - "version": "1.6.15", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.17" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typescript": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz", - "integrity": "sha1-YGAiUIR5tV/6NotY/uljoD39eww=", - "dev": true - }, - "typings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/typings/-/typings-1.5.0.tgz", - "integrity": "sha1-udI2zx03RghU+MZx6kldlAW4ED8=", - "dev": true, - "requires": { - "any-promise": "1.3.0", - "archy": "1.0.0", - "bluebird": "3.5.1", - "chalk": "1.1.3", - "cli-truncate": "0.2.1", - "columnify": "1.5.4", - "elegant-spinner": "1.0.1", - "has-unicode": "2.0.1", - "listify": "1.0.0", - "log-update": "1.0.2", - "minimist": "1.2.0", - "promise-finally": "2.2.1", - "typings-core": "1.6.1", - "update-notifier": "1.0.3", - "wordwrap": "1.0.0", - "xtend": "4.0.1" - }, - "dependencies": { - "ansi-align": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz", - "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=", - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "boxen": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz", - "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=", - "dev": true, - "requires": { - "ansi-align": "1.1.0", - "camelcase": "2.1.1", - "chalk": "1.1.3", - "cli-boxes": "1.0.0", - "filled-array": "1.1.0", - "object-assign": "4.1.1", - "repeating": "2.0.1", - "string-width": "1.0.2", - "widest-line": "1.0.0" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "configstore": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz", - "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=", - "dev": true, - "requires": { - "dot-prop": "3.0.0", - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "object-assign": "4.1.1", - "os-tmpdir": "1.0.2", - "osenv": "0.1.4", - "uuid": "2.0.3", - "write-file-atomic": "1.3.4", - "xdg-basedir": "2.0.0" - } - }, - "dot-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", - "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", - "dev": true, - "requires": { - "is-obj": "1.0.1" - } - }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "dev": true, - "requires": { - "readable-stream": "2.3.3" - } - }, - "got": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", - "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", - "dev": true, - "requires": { - "create-error-class": "3.0.2", - "duplexer2": "0.1.4", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.0", - "node-status-codes": "1.0.0", - "object-assign": "4.1.1", - "parse-json": "2.2.0", - "pinkie-promise": "2.0.1", - "read-all-stream": "3.1.0", - "readable-stream": "2.3.3", - "timed-out": "3.1.3", - "unzip-response": "1.0.2", - "url-parse-lax": "1.0.0" - } - }, - "latest-version": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz", - "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=", - "dev": true, - "requires": { - "package-json": "2.4.0" - } - }, - "package-json": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz", - "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=", - "dev": true, - "requires": { - "got": "5.7.1", - "registry-auth-token": "3.3.1", - "registry-url": "3.1.0", - "semver": "5.4.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "timed-out": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", - "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=", - "dev": true - }, - "unzip-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=", - "dev": true - }, - "update-notifier": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz", - "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=", - "dev": true, - "requires": { - "boxen": "0.6.0", - "chalk": "1.1.3", - "configstore": "2.1.0", - "is-npm": "1.0.0", - "latest-version": "2.0.0", - "lazy-req": "1.1.0", - "semver-diff": "2.1.0", - "xdg-basedir": "2.0.0" - } - }, - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", - "dev": true - }, - "widest-line": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", - "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=", - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" - } - }, - "xdg-basedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz", - "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=", - "dev": true, - "requires": { - "os-homedir": "1.0.2" - } - } - } - }, - "typings-core": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/typings-core/-/typings-core-1.6.1.tgz", - "integrity": "sha1-zkspMeovGbuPPay+xpmDrE6WSjc=", - "dev": true, - "requires": { - "any-promise": "1.3.0", - "array-uniq": "1.0.3", - "configstore": "2.1.0", - "debug": "2.6.9", - "detect-indent": "4.0.0", - "graceful-fs": "4.1.11", - "has": "1.0.1", - "invariant": "2.2.2", - "is-absolute": "0.2.6", - "listify": "1.0.0", - "lockfile": "1.0.3", - "make-error-cause": "1.2.2", - "mkdirp": "0.5.1", - "object.pick": "1.3.0", - "parse-json": "2.2.0", - "popsicle": "8.2.0", - "popsicle-proxy-agent": "3.0.0", - "popsicle-retry": "3.2.1", - "popsicle-rewrite": "1.0.0", - "popsicle-status": "2.0.1", - "promise-finally": "2.2.1", - "rc": "1.2.2", - "rimraf": "2.6.2", - "sort-keys": "1.1.2", - "string-template": "1.0.0", - "strip-bom": "2.0.0", - "thenify": "3.3.0", - "throat": "3.2.0", - "touch": "1.0.0", - "typescript": "2.2.2", - "xtend": "4.0.1", - "zip-object": "0.1.0" - }, - "dependencies": { - "configstore": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz", - "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=", - "dev": true, - "requires": { - "dot-prop": "3.0.0", - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "object-assign": "4.1.1", - "os-tmpdir": "1.0.2", - "osenv": "0.1.4", - "uuid": "2.0.3", - "write-file-atomic": "1.3.4", - "xdg-basedir": "2.0.0" - } - }, - "dot-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", - "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", - "dev": true, - "requires": { - "is-obj": "1.0.1" - } - }, - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" - } - }, - "xdg-basedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz", - "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=", - "dev": true, - "requires": { - "os-homedir": "1.0.2" - } - } - } - }, - "uglify-js": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.3.tgz", - "integrity": "sha512-blnyad6BpMsz0H4P2Ck863hy0aORNb75ty+o4h0JwMFKeRvrUkmaY7USQWRTsGE2uHcj9F2uAPCJBNVISknH/g==", - "dev": true, - "requires": { - "commander": "2.12.2", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.5.tgz", - "integrity": "sha512-YBGc9G7dv12Vjx8vUQs54DZgAXVf04LlG6dNNiEbTZjL3PbUqiY4uPB9Kv+fUJaqRskEGva/lS7sh08yJr7jnA==", - "dev": true, - "requires": { - "cacache": "10.0.1", - "find-cache-dir": "1.0.0", - "schema-utils": "0.3.0", - "serialize-javascript": "1.4.0", - "source-map": "0.6.1", - "uglify-es": "3.2.2", - "webpack-sources": "1.1.0", - "worker-farm": "1.5.2" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "uglify-es": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz", - "integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==", - "dev": true, - "requires": { - "commander": "2.12.2", - "source-map": "0.6.1" - } - } - } - }, - "ultron": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", - "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", - "dev": true - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", - "dev": true - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqid": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", - "dev": true, - "requires": { - "macaddress": "0.2.8" - } - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", - "dev": true, - "requires": { - "unique-slug": "2.0.0" - } - }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", - "dev": true, - "requires": { - "imurmurhash": "0.1.4" - } - }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, - "requires": { - "crypto-random-string": "1.0.0" - } - }, - "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", - "dev": true - }, - "update-notifier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz", - "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=", - "dev": true, - "requires": { - "boxen": "1.3.0", - "chalk": "2.2.2", - "configstore": "3.1.1", - "import-lazy": "2.1.0", - "is-installed-globally": "0.1.0", - "is-npm": "1.0.0", - "latest-version": "3.1.0", - "semver-diff": "2.1.0", - "xdg-basedir": "3.0.0" - } - }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "url-loader": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz", - "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mime": "1.6.0", - "schema-utils": "0.3.0" - } - }, - "url-parse": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", - "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", - "dev": true, - "requires": { - "querystringify": "1.0.0", - "requires-port": "1.0.0" - }, - "dependencies": { - "querystringify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", - "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", - "dev": true - } - } - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "dev": true, - "requires": { - "prepend-http": "1.0.4" - } - }, - "useragent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", - "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", - "dev": true, - "requires": { - "lru-cache": "2.2.4", - "tmp": "0.0.28" - }, - "dependencies": { - "lru-cache": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", - "dev": true - } - } - }, - "utf8": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz", - "integrity": "sha1-DP7FyAUtRKI+OqqQgQToB1+V39U=", - "dev": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, - "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "vendors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } - } - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "1.0.3", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" - } - }, - "vlq": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", - "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==", - "dev": true - }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } - }, - "void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", - "dev": true - }, - "watchpack": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", - "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", - "dev": true, - "requires": { - "async": "2.6.0", - "chokidar": "1.7.0", - "graceful-fs": "4.1.11" - } - }, - "wbuf": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz", - "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=", - "dev": true, - "requires": { - "minimalistic-assert": "1.0.0" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, - "requires": { - "defaults": "1.0.3" - } - }, - "web-animations-js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz", - "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=" - }, - "webdriver-manager": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-10.2.5.tgz", - "integrity": "sha1-ZDPBpksDg4jCle0NydqnHl31Ak4=", - "dev": true, - "requires": { - "adm-zip": "0.4.7", - "chalk": "1.1.3", - "del": "2.2.2", - "glob": "7.1.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "q": "1.5.1", - "request": "2.81.0", - "rimraf": "2.6.2", - "semver": "5.4.1" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" - } - }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "webpack": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz", - "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", - "dev": true, - "requires": { - "acorn": "5.3.0", - "acorn-dynamic-import": "2.0.2", - "ajv": "5.5.2", - "ajv-keywords": "2.1.1", - "async": "2.6.0", - "enhanced-resolve": "3.4.1", - "escope": "3.6.0", - "interpret": "1.1.0", - "json-loader": "0.5.7", - "json5": "0.5.1", - "loader-runner": "2.3.0", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "mkdirp": "0.5.1", - "node-libs-browser": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.5.0", - "tapable": "0.2.8", - "uglifyjs-webpack-plugin": "0.4.6", - "watchpack": "1.4.0", - "webpack-sources": "1.1.0", - "yargs": "8.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "uglifyjs-webpack-plugin": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", - "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", - "dev": true, - "requires": { - "source-map": "0.5.7", - "uglify-js": "2.8.29", - "webpack-sources": "1.1.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "dev": true, - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - } - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "dev": true, - "requires": { - "camelcase": "4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - } - } - }, - "webpack-core": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", - "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", - "dev": true, - "requires": { - "source-list-map": "0.1.8", - "source-map": "0.4.4" - }, - "dependencies": { - "source-list-map": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "webpack-dev-middleware": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz", - "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==", - "dev": true, - "requires": { - "memory-fs": "0.4.1", - "mime": "1.6.0", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "time-stamp": "2.0.0" - } - }, - "webpack-dev-server": { - "version": "2.9.7", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz", - "integrity": "sha512-Pu7uoQFgQj5RE5wmlfkpYSzihMKxulwEuO2xCsaMnAnyRSApwoVi3B8WCm9XbigyWTHaIMzYGkB90Vr6leAeTQ==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "1.7.0", - "compression": "1.7.1", - "connect-history-api-fallback": "1.5.0", - "debug": "3.1.0", - "del": "3.0.0", - "express": "4.16.2", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.17.4", - "import-local": "0.1.1", - "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.0", - "loglevel": "1.6.0", - "opn": "5.1.0", - "portfinder": "1.0.13", - "selfsigned": "1.10.1", - "serve-index": "1.9.1", - "sockjs": "0.3.18", - "sockjs-client": "1.1.4", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "4.5.0", - "webpack-dev-middleware": "1.12.2", - "yargs": "6.6.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - } - }, - "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - } - } - } - }, - "webpack-merge": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz", - "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, - "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", - "dev": true, - "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "webpack-subresource-integrity": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.3.tgz", - "integrity": "sha1-wGBtQAkLBwzeQovsjfNgMhbkcus=", - "dev": true, - "requires": { - "webpack-core": "0.6.9" - } - }, - "websocket-driver": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", - "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", - "dev": true, - "requires": { - "http-parser-js": "0.4.9", - "websocket-extensions": "0.1.3" - } - }, - "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", - "dev": true - }, - "when": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true - }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", - "dev": true - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "dev": true, - "requires": { - "isexe": "2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, - "widest-line": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", - "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", - "dev": true, - "requires": { - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true - }, - "worker-farm": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", - "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", - "dev": true, - "requires": { - "errno": "0.1.6", - "xtend": "4.0.1" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write-file-atomic": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" - } - }, - "ws": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz", - "integrity": "sha1-fQsqLljN3YGQOcKcneZQReGzEOk=", - "dev": true, - "requires": { - "options": "0.0.6", - "ultron": "1.0.2" - } - }, - "xdg-basedir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", - "dev": true - }, - "xml-char-classes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", - "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=", - "dev": true - }, - "xml2js": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz", - "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=", - "dev": true, - "requires": { - "sax": "0.6.1", - "xmlbuilder": "9.0.4" - }, - "dependencies": { - "sax": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", - "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", - "dev": true - } - } - }, - "xmlbuilder": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz", - "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=", - "dev": true - }, - "xmlhttprequest-ssl": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz", - "integrity": "sha1-O3dB/qSoZnWXbpCNKW1ERZYfqmc=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "xxhashjs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.1.tgz", - "integrity": "sha1-m76b6JYUKXbfo0wGGy0GjEPTDeA=", - "dev": true, - "requires": { - "cuint": "0.2.2" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "optional": true - } - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "3.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "optional": true - } - } - }, - "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", - "dev": true, - "requires": { - "fd-slicer": "1.0.1" - } - }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", - "dev": true - }, - "zip-object": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/zip-object/-/zip-object-0.1.0.tgz", - "integrity": "sha1-waDaBMiMg3dW4khoCgP/kC7D9To=", - "dev": true - }, - "zone.js": { - "version": "0.8.19", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.19.tgz", - "integrity": "sha512-l9rofaOs6a4y1W8zt4pDmnCUCnYG377dG+5SZlXNWrTWYUuXFqcJZiOarhYiRVR0NI9sH/8ooPJiz4uprB/Mkg==" - } - } -} diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index ce01b4a9d..7ee2c24de 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.10.17", "clarity-ui": "^0.10.17", "core-js": "^2.4.1", - "harbor-ui": "0.6.6", + "harbor-ui": "0.6.9", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index 8a5c3ce46..6ff812f29 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -89,6 +89,7 @@ const harborRoutes: Routes = [ path: 'replications', component: TotalReplicationPageComponent, canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], }, { path: 'replications/:id/rule', @@ -143,7 +144,6 @@ const harborRoutes: Routes = [ { path: 'replications', component: ReplicationPageComponent, - canActivate: [SystemAdminGuard] }, { path: 'members', diff --git a/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts b/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts index c38c391ad..5b1e9300b 100644 --- a/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/system-admin-activate.service.ts @@ -33,13 +33,12 @@ export class SystemAdminGuard implements CanActivate, CanActivateChild { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { return new Promise((resolve, reject) => { let user = this.authService.getCurrentUser(); - let projectMem = this.authService.projectMembers; if (!user) { this.authService.retrieveUser() .then(() => { //updated user user = this.authService.getCurrentUser(); - if (user.has_admin_role > 0 || projectMem[0].role_name === 'projectAdmin') { + if (user.has_admin_role > 0) { return resolve(true); } else { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); @@ -61,7 +60,7 @@ export class SystemAdminGuard implements CanActivate, CanActivateChild { } }); } else { - if (user.has_admin_role > 0 || projectMem[0].role_name === 'projectAdmin') { + if (user.has_admin_role > 0) { return resolve(true); } else { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); diff --git a/tests/robot-cases/Group0-BAT/BAT.robot b/tests/robot-cases/Group0-BAT/BAT.robot index 17b6d6328..9d51d091b 100644 --- a/tests/robot-cases/Group0-BAT/BAT.robot +++ b/tests/robot-cases/Group0-BAT/BAT.robot @@ -237,15 +237,15 @@ Test Case - Edit Token Expire Modify Token Expiration 30 Close Browser -Test Case - Create An Replication Rule New Endpoint - Init Chrome Driver - ${d}= Get current date result_format=%m%s - Sign In Harbor ${HARBOR_URL} %{HARBOR_ADMIN} %{HARBOR_PASSWORD} - Create An New Project project${d} - Go Into Project project${d} - Switch To Replication - Create An New Rule With New Endpoint policy_name=test_policy_${d} policy_description=test_description destination_name=test_destination_name_${d} destination_url=test_destination_url_${d} destination_username=test_destination_username destination_password=test_destination_password - Close Browser +# Test Case - Create An Replication Rule New Endpoint +# Init Chrome Driver +# ${d}= Get current date result_format=%m%s +# Sign In Harbor ${HARBOR_URL} %{HARBOR_ADMIN} %{HARBOR_PASSWORD} +# Create An New Project project${d} +# Go Into Project project${d} +# Switch To Replication +# Create An New Rule With New Endpoint policy_name=test_policy_${d} policy_description=test_description destination_name=test_destination_name_${d} destination_url=test_destination_url_${d} destination_username=test_destination_username destination_password=test_destination_password +# Close Browser Test Case - Scan A Tag In The Repo Init Chrome Driver