From 1c1d93813c028fd964cdf1c96fa0d5291ee397a3 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 5 Jul 2018 20:20:49 +0000 Subject: [PATCH 1/5] Generated from b00470113261a9f037a9526a594f1db7167feb28 Refactor DependsOn for regular Tumbling Window Trigger ans self-dependent version --- .../datafactory/mgmt/datafactory/models.go | 16 + .../2017-09-01-preview/datafactory/models.go | 294 ++++++++++++++++++ 2 files changed, 310 insertions(+) diff --git a/profiles/preview/preview/datafactory/mgmt/datafactory/models.go b/profiles/preview/preview/datafactory/mgmt/datafactory/models.go index e142e7082d37..d0751ee488bf 100644 --- a/profiles/preview/preview/datafactory/mgmt/datafactory/models.go +++ b/profiles/preview/preview/datafactory/mgmt/datafactory/models.go @@ -721,6 +721,14 @@ const ( TypeTextFormat TypeBasicDatasetStorageFormat = original.TypeTextFormat ) +type TypeBasicDependencyReference = original.TypeBasicDependencyReference + +const ( + TypeDependencyReference TypeBasicDependencyReference = original.TypeDependencyReference + TypeSelfDependencyTumblingWindowTriggerReference TypeBasicDependencyReference = original.TypeSelfDependencyTumblingWindowTriggerReference + TypeTumblingWindowTriggerDependencyReference TypeBasicDependencyReference = original.TypeTumblingWindowTriggerDependencyReference +) + type TypeBasicIntegrationRuntime = original.TypeBasicIntegrationRuntime const ( @@ -964,6 +972,8 @@ type DatasetStorageFormat = original.DatasetStorageFormat type DatasetZipDeflateCompression = original.DatasetZipDeflateCompression type Db2LinkedService = original.Db2LinkedService type Db2LinkedServiceTypeProperties = original.Db2LinkedServiceTypeProperties +type BasicDependencyReference = original.BasicDependencyReference +type DependencyReference = original.DependencyReference type DistcpSettings = original.DistcpSettings type DocumentDbCollectionDataset = original.DocumentDbCollectionDataset type DocumentDbCollectionDatasetTypeProperties = original.DocumentDbCollectionDatasetTypeProperties @@ -1238,6 +1248,7 @@ type ScheduleTriggerTypeProperties = original.ScheduleTriggerTypeProperties type BasicSecretBase = original.BasicSecretBase type SecretBase = original.SecretBase type SecureString = original.SecureString +type SelfDependencyTumblingWindowTriggerReference = original.SelfDependencyTumblingWindowTriggerReference type SelfHostedIntegrationRuntime = original.SelfHostedIntegrationRuntime type SelfHostedIntegrationRuntimeNode = original.SelfHostedIntegrationRuntimeNode type SelfHostedIntegrationRuntimeStatus = original.SelfHostedIntegrationRuntimeStatus @@ -1288,6 +1299,7 @@ type TriggerListResponse = original.TriggerListResponse type TriggerListResponseIterator = original.TriggerListResponseIterator type TriggerListResponsePage = original.TriggerListResponsePage type TriggerPipelineReference = original.TriggerPipelineReference +type TriggerReference = original.TriggerReference type TriggerResource = original.TriggerResource type TriggerRun = original.TriggerRun type TriggerRunListResponse = original.TriggerRunListResponse @@ -1296,6 +1308,7 @@ type TriggerRunListResponsePage = original.TriggerRunListResponsePage type TriggersStartFuture = original.TriggersStartFuture type TriggersStopFuture = original.TriggersStopFuture type TumblingWindowTrigger = original.TumblingWindowTrigger +type TumblingWindowTriggerDependencyReference = original.TumblingWindowTriggerDependencyReference type TumblingWindowTriggerTypeProperties = original.TumblingWindowTriggerTypeProperties type UntilActivity = original.UntilActivity type UntilActivityTypeProperties = original.UntilActivityTypeProperties @@ -1575,6 +1588,9 @@ func PossibleTypeBasicDatasetCompressionValues() []TypeBasicDatasetCompression { func PossibleTypeBasicDatasetStorageFormatValues() []TypeBasicDatasetStorageFormat { return original.PossibleTypeBasicDatasetStorageFormatValues() } +func PossibleTypeBasicDependencyReferenceValues() []TypeBasicDependencyReference { + return original.PossibleTypeBasicDependencyReferenceValues() +} func PossibleTypeBasicIntegrationRuntimeValues() []TypeBasicIntegrationRuntime { return original.PossibleTypeBasicIntegrationRuntimeValues() } diff --git a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go index 5f0249e30950..b2b9acf16440 100644 --- a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go +++ b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go @@ -1473,6 +1473,23 @@ func PossibleTypeBasicDatasetStorageFormatValues() []TypeBasicDatasetStorageForm return []TypeBasicDatasetStorageFormat{TypeAvroFormat, TypeDatasetStorageFormat, TypeJSONFormat, TypeOrcFormat, TypeParquetFormat, TypeTextFormat} } +// TypeBasicDependencyReference enumerates the values for type basic dependency reference. +type TypeBasicDependencyReference string + +const ( + // TypeDependencyReference ... + TypeDependencyReference TypeBasicDependencyReference = "DependencyReference" + // TypeSelfDependencyTumblingWindowTriggerReference ... + TypeSelfDependencyTumblingWindowTriggerReference TypeBasicDependencyReference = "SelfDependencyTumblingWindowTriggerReference" + // TypeTumblingWindowTriggerDependencyReference ... + TypeTumblingWindowTriggerDependencyReference TypeBasicDependencyReference = "TumblingWindowTriggerDependencyReference" +) + +// PossibleTypeBasicDependencyReferenceValues returns an array of possible values for the TypeBasicDependencyReference const type. +func PossibleTypeBasicDependencyReferenceValues() []TypeBasicDependencyReference { + return []TypeBasicDependencyReference{TypeDependencyReference, TypeSelfDependencyTumblingWindowTriggerReference, TypeTumblingWindowTriggerDependencyReference} +} + // TypeBasicIntegrationRuntime enumerates the values for type basic integration runtime. type TypeBasicIntegrationRuntime string @@ -27640,6 +27657,90 @@ func (d2lstp *Db2LinkedServiceTypeProperties) UnmarshalJSON(body []byte) error { return nil } +// BasicDependencyReference referenced dependency +type BasicDependencyReference interface { + AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) + AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) + AsDependencyReference() (*DependencyReference, bool) +} + +// DependencyReference referenced dependency +type DependencyReference struct { + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + Type TypeBasicDependencyReference `json:"type,omitempty"` +} + +func unmarshalBasicDependencyReference(body []byte) (BasicDependencyReference, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["type"] { + case string(TypeSelfDependencyTumblingWindowTriggerReference): + var sdtwtr SelfDependencyTumblingWindowTriggerReference + err := json.Unmarshal(body, &sdtwtr) + return sdtwtr, err + case string(TypeTumblingWindowTriggerDependencyReference): + var twtdr TumblingWindowTriggerDependencyReference + err := json.Unmarshal(body, &twtdr) + return twtdr, err + default: + var dr DependencyReference + err := json.Unmarshal(body, &dr) + return dr, err + } +} +func unmarshalBasicDependencyReferenceArray(body []byte) ([]BasicDependencyReference, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + drArray := make([]BasicDependencyReference, len(rawMessages)) + + for index, rawMessage := range rawMessages { + dr, err := unmarshalBasicDependencyReference(*rawMessage) + if err != nil { + return nil, err + } + drArray[index] = dr + } + return drArray, nil +} + +// MarshalJSON is the custom marshaler for DependencyReference. +func (dr DependencyReference) MarshalJSON() ([]byte, error) { + dr.Type = TypeDependencyReference + objectMap := make(map[string]interface{}) + if dr.Type != "" { + objectMap["type"] = dr.Type + } + return json.Marshal(objectMap) +} + +// AsSelfDependencyTumblingWindowTriggerReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) { + return nil, false +} + +// AsTumblingWindowTriggerDependencyReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) { + return nil, false +} + +// AsDependencyReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsDependencyReference() (*DependencyReference, bool) { + return &dr, true +} + +// AsBasicDependencyReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsBasicDependencyReference() (BasicDependencyReference, bool) { + return &dr, true +} + // DistcpSettings distcp settings. type DistcpSettings struct { // ResourceManagerEndpoint - Specifies the Yarn ResourceManager endpoint. Type: string (or Expression with resultType string). @@ -77613,6 +77714,52 @@ func (ss SecureString) AsBasicSecretBase() (BasicSecretBase, bool) { return &ss, true } +// SelfDependencyTumblingWindowTriggerReference self referenced tumbling window trigger dependency +type SelfDependencyTumblingWindowTriggerReference struct { + // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + Offset *string `json:"offset,omitempty"` + // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + Size *string `json:"size,omitempty"` + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + Type TypeBasicDependencyReference `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) MarshalJSON() ([]byte, error) { + sdtwtr.Type = TypeSelfDependencyTumblingWindowTriggerReference + objectMap := make(map[string]interface{}) + if sdtwtr.Offset != nil { + objectMap["offset"] = sdtwtr.Offset + } + if sdtwtr.Size != nil { + objectMap["size"] = sdtwtr.Size + } + if sdtwtr.Type != "" { + objectMap["type"] = sdtwtr.Type + } + return json.Marshal(objectMap) +} + +// AsSelfDependencyTumblingWindowTriggerReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) { + return &sdtwtr, true +} + +// AsTumblingWindowTriggerDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) { + return nil, false +} + +// AsDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsDependencyReference() (*DependencyReference, bool) { + return nil, false +} + +// AsBasicDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsBasicDependencyReference() (BasicDependencyReference, bool) { + return &sdtwtr, true +} + // SelfHostedIntegrationRuntime self-hosted integration runtime. type SelfHostedIntegrationRuntime struct { // LinkedIntegrationRuntimeTypeProperties - When this property is not null, means this is a linked integration runtime. The property is used to access original integration runtime. @@ -87219,6 +87366,14 @@ func (tpr TriggerPipelineReference) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +// TriggerReference tumbling window trigger reference type. +type TriggerReference struct { + // Type - Tumbling window trigger reference type. + Type *string `json:"type,omitempty"` + // ReferenceName - Reference trigger name. + ReferenceName *string `json:"referenceName,omitempty"` +} + // TriggerResource trigger resource type. type TriggerResource struct { autorest.Response `json:"-"` @@ -87648,6 +87803,57 @@ func (twt *TumblingWindowTrigger) UnmarshalJSON(body []byte) error { return nil } +// TumblingWindowTriggerDependencyReference referenced tumbling window trigger dependency +type TumblingWindowTriggerDependencyReference struct { + // ReferenceTrigger - Referenced trigger + ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` + // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + Offset *string `json:"offset,omitempty"` + // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + Size *string `json:"size,omitempty"` + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + Type TypeBasicDependencyReference `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) MarshalJSON() ([]byte, error) { + twtdr.Type = TypeTumblingWindowTriggerDependencyReference + objectMap := make(map[string]interface{}) + if twtdr.ReferenceTrigger != nil { + objectMap["referenceTrigger"] = twtdr.ReferenceTrigger + } + if twtdr.Offset != nil { + objectMap["offset"] = twtdr.Offset + } + if twtdr.Size != nil { + objectMap["size"] = twtdr.Size + } + if twtdr.Type != "" { + objectMap["type"] = twtdr.Type + } + return json.Marshal(objectMap) +} + +// AsSelfDependencyTumblingWindowTriggerReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) { + return nil, false +} + +// AsTumblingWindowTriggerDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) { + return &twtdr, true +} + +// AsDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsDependencyReference() (*DependencyReference, bool) { + return nil, false +} + +// AsBasicDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsBasicDependencyReference() (BasicDependencyReference, bool) { + return &twtdr, true +} + // TumblingWindowTriggerTypeProperties tumbling Window Trigger properties. type TumblingWindowTriggerTypeProperties struct { // Frequency - The frequency of the time windows. Possible values include: 'TumblingWindowFrequencyMinute', 'TumblingWindowFrequencyHour' @@ -87664,6 +87870,94 @@ type TumblingWindowTriggerTypeProperties struct { MaxConcurrency *int32 `json:"maxConcurrency,omitempty"` // RetryPolicy - Retry policy that will be applied for failed pipeline runs. RetryPolicy *RetryPolicy `json:"retryPolicy,omitempty"` + // DependsOn - Tumbling window triggers that this trigger depends on. Only tumbling window triggers are supported. + DependsOn *[]BasicDependencyReference `json:"dependsOn,omitempty"` +} + +// UnmarshalJSON is the custom unmarshaler for TumblingWindowTriggerTypeProperties struct. +func (twtP *TumblingWindowTriggerTypeProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "frequency": + if v != nil { + var frequency TumblingWindowFrequency + err = json.Unmarshal(*v, &frequency) + if err != nil { + return err + } + twtP.Frequency = frequency + } + case "interval": + if v != nil { + var interval int32 + err = json.Unmarshal(*v, &interval) + if err != nil { + return err + } + twtP.Interval = &interval + } + case "startTime": + if v != nil { + var startTime date.Time + err = json.Unmarshal(*v, &startTime) + if err != nil { + return err + } + twtP.StartTime = &startTime + } + case "endTime": + if v != nil { + var endTime date.Time + err = json.Unmarshal(*v, &endTime) + if err != nil { + return err + } + twtP.EndTime = &endTime + } + case "delay": + if v != nil { + var delay interface{} + err = json.Unmarshal(*v, &delay) + if err != nil { + return err + } + twtP.Delay = delay + } + case "maxConcurrency": + if v != nil { + var maxConcurrency int32 + err = json.Unmarshal(*v, &maxConcurrency) + if err != nil { + return err + } + twtP.MaxConcurrency = &maxConcurrency + } + case "retryPolicy": + if v != nil { + var retryPolicy RetryPolicy + err = json.Unmarshal(*v, &retryPolicy) + if err != nil { + return err + } + twtP.RetryPolicy = &retryPolicy + } + case "dependsOn": + if v != nil { + dependsOn, err := unmarshalBasicDependencyReferenceArray(*v) + if err != nil { + return err + } + twtP.DependsOn = &dependsOn + } + } + } + + return nil } // UntilActivity this activity executes inner activities until the specified boolean expression results to true or From 133b38e9fab998b2123b860fa5497dddd518a387 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 5 Jul 2018 21:49:55 +0000 Subject: [PATCH 2/5] Generated from a2ed13053427facfb2a7ef10ef9182e5ff1da8c4 Update description for TriggerReference --- .../datafactory/mgmt/2017-09-01-preview/datafactory/models.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go index b2b9acf16440..a6411d467d1f 100644 --- a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go +++ b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go @@ -87366,9 +87366,9 @@ func (tpr TriggerPipelineReference) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// TriggerReference tumbling window trigger reference type. +// TriggerReference trigger reference type. type TriggerReference struct { - // Type - Tumbling window trigger reference type. + // Type - Trigger reference type. Type *string `json:"type,omitempty"` // ReferenceName - Reference trigger name. ReferenceName *string `json:"referenceName,omitempty"` From 680ca1694eaf834d087447d8313e7365bb17fc2c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 6 Jul 2018 14:51:27 +0000 Subject: [PATCH 3/5] Generated from 1e8254bc8159b6cf8e51cea54d24f220de463fba Fix syntax --- .../datafactory/mgmt/datafactory/models.go | 3 + .../2017-09-01-preview/datafactory/models.go | 150 ++++++++++++++++-- 2 files changed, 144 insertions(+), 9 deletions(-) diff --git a/profiles/preview/preview/datafactory/mgmt/datafactory/models.go b/profiles/preview/preview/datafactory/mgmt/datafactory/models.go index d0751ee488bf..f843790d3131 100644 --- a/profiles/preview/preview/datafactory/mgmt/datafactory/models.go +++ b/profiles/preview/preview/datafactory/mgmt/datafactory/models.go @@ -726,6 +726,7 @@ type TypeBasicDependencyReference = original.TypeBasicDependencyReference const ( TypeDependencyReference TypeBasicDependencyReference = original.TypeDependencyReference TypeSelfDependencyTumblingWindowTriggerReference TypeBasicDependencyReference = original.TypeSelfDependencyTumblingWindowTriggerReference + TypeTriggerDependencyReference TypeBasicDependencyReference = original.TypeTriggerDependencyReference TypeTumblingWindowTriggerDependencyReference TypeBasicDependencyReference = original.TypeTumblingWindowTriggerDependencyReference ) @@ -1295,6 +1296,8 @@ type TeradataLinkedServiceTypeProperties = original.TeradataLinkedServiceTypePro type TextFormat = original.TextFormat type BasicTrigger = original.BasicTrigger type Trigger = original.Trigger +type BasicTriggerDependencyReference = original.BasicTriggerDependencyReference +type TriggerDependencyReference = original.TriggerDependencyReference type TriggerListResponse = original.TriggerListResponse type TriggerListResponseIterator = original.TriggerListResponseIterator type TriggerListResponsePage = original.TriggerListResponsePage diff --git a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go index a6411d467d1f..d4da9f00069d 100644 --- a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go +++ b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go @@ -1481,13 +1481,15 @@ const ( TypeDependencyReference TypeBasicDependencyReference = "DependencyReference" // TypeSelfDependencyTumblingWindowTriggerReference ... TypeSelfDependencyTumblingWindowTriggerReference TypeBasicDependencyReference = "SelfDependencyTumblingWindowTriggerReference" + // TypeTriggerDependencyReference ... + TypeTriggerDependencyReference TypeBasicDependencyReference = "TriggerDependencyReference" // TypeTumblingWindowTriggerDependencyReference ... TypeTumblingWindowTriggerDependencyReference TypeBasicDependencyReference = "TumblingWindowTriggerDependencyReference" ) // PossibleTypeBasicDependencyReferenceValues returns an array of possible values for the TypeBasicDependencyReference const type. func PossibleTypeBasicDependencyReferenceValues() []TypeBasicDependencyReference { - return []TypeBasicDependencyReference{TypeDependencyReference, TypeSelfDependencyTumblingWindowTriggerReference, TypeTumblingWindowTriggerDependencyReference} + return []TypeBasicDependencyReference{TypeDependencyReference, TypeSelfDependencyTumblingWindowTriggerReference, TypeTriggerDependencyReference, TypeTumblingWindowTriggerDependencyReference} } // TypeBasicIntegrationRuntime enumerates the values for type basic integration runtime. @@ -27661,12 +27663,14 @@ func (d2lstp *Db2LinkedServiceTypeProperties) UnmarshalJSON(body []byte) error { type BasicDependencyReference interface { AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) + AsTriggerDependencyReference() (*TriggerDependencyReference, bool) + AsBasicTriggerDependencyReference() (BasicTriggerDependencyReference, bool) AsDependencyReference() (*DependencyReference, bool) } // DependencyReference referenced dependency type DependencyReference struct { - // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` } @@ -27686,6 +27690,10 @@ func unmarshalBasicDependencyReference(body []byte) (BasicDependencyReference, e var twtdr TumblingWindowTriggerDependencyReference err := json.Unmarshal(body, &twtdr) return twtdr, err + case string(TypeTriggerDependencyReference): + var tdr TriggerDependencyReference + err := json.Unmarshal(body, &tdr) + return tdr, err default: var dr DependencyReference err := json.Unmarshal(body, &dr) @@ -27731,6 +27739,16 @@ func (dr DependencyReference) AsTumblingWindowTriggerDependencyReference() (*Tum return nil, false } +// AsTriggerDependencyReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsTriggerDependencyReference() (*TriggerDependencyReference, bool) { + return nil, false +} + +// AsBasicTriggerDependencyReference is the BasicDependencyReference implementation for DependencyReference. +func (dr DependencyReference) AsBasicTriggerDependencyReference() (BasicTriggerDependencyReference, bool) { + return nil, false +} + // AsDependencyReference is the BasicDependencyReference implementation for DependencyReference. func (dr DependencyReference) AsDependencyReference() (*DependencyReference, bool) { return &dr, true @@ -77720,7 +77738,7 @@ type SelfDependencyTumblingWindowTriggerReference struct { Offset *string `json:"offset,omitempty"` // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Size *string `json:"size,omitempty"` - // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` } @@ -77750,6 +77768,16 @@ func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsTumblingWindowTrigg return nil, false } +// AsTriggerDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsTriggerDependencyReference() (*TriggerDependencyReference, bool) { + return nil, false +} + +// AsBasicTriggerDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. +func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsBasicTriggerDependencyReference() (BasicTriggerDependencyReference, bool) { + return nil, false +} + // AsDependencyReference is the BasicDependencyReference implementation for SelfDependencyTumblingWindowTriggerReference. func (sdtwtr SelfDependencyTumblingWindowTriggerReference) AsDependencyReference() (*DependencyReference, bool) { return nil, false @@ -87244,6 +87272,100 @@ func (t Trigger) AsBasicTrigger() (BasicTrigger, bool) { return &t, true } +// BasicTriggerDependencyReference trigger referenced dependency +type BasicTriggerDependencyReference interface { + AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) + AsTriggerDependencyReference() (*TriggerDependencyReference, bool) +} + +// TriggerDependencyReference trigger referenced dependency +type TriggerDependencyReference struct { + // ReferenceTrigger - Referenced trigger + ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' + Type TypeBasicDependencyReference `json:"type,omitempty"` +} + +func unmarshalBasicTriggerDependencyReference(body []byte) (BasicTriggerDependencyReference, error) { + var m map[string]interface{} + err := json.Unmarshal(body, &m) + if err != nil { + return nil, err + } + + switch m["type"] { + case string(TypeTumblingWindowTriggerDependencyReference): + var twtdr TumblingWindowTriggerDependencyReference + err := json.Unmarshal(body, &twtdr) + return twtdr, err + default: + var tdr TriggerDependencyReference + err := json.Unmarshal(body, &tdr) + return tdr, err + } +} +func unmarshalBasicTriggerDependencyReferenceArray(body []byte) ([]BasicTriggerDependencyReference, error) { + var rawMessages []*json.RawMessage + err := json.Unmarshal(body, &rawMessages) + if err != nil { + return nil, err + } + + tdrArray := make([]BasicTriggerDependencyReference, len(rawMessages)) + + for index, rawMessage := range rawMessages { + tdr, err := unmarshalBasicTriggerDependencyReference(*rawMessage) + if err != nil { + return nil, err + } + tdrArray[index] = tdr + } + return tdrArray, nil +} + +// MarshalJSON is the custom marshaler for TriggerDependencyReference. +func (tdr TriggerDependencyReference) MarshalJSON() ([]byte, error) { + tdr.Type = TypeTriggerDependencyReference + objectMap := make(map[string]interface{}) + if tdr.ReferenceTrigger != nil { + objectMap["referenceTrigger"] = tdr.ReferenceTrigger + } + if tdr.Type != "" { + objectMap["type"] = tdr.Type + } + return json.Marshal(objectMap) +} + +// AsSelfDependencyTumblingWindowTriggerReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) { + return nil, false +} + +// AsTumblingWindowTriggerDependencyReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) { + return nil, false +} + +// AsTriggerDependencyReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsTriggerDependencyReference() (*TriggerDependencyReference, bool) { + return &tdr, true +} + +// AsBasicTriggerDependencyReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsBasicTriggerDependencyReference() (BasicTriggerDependencyReference, bool) { + return &tdr, true +} + +// AsDependencyReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsDependencyReference() (*DependencyReference, bool) { + return nil, false +} + +// AsBasicDependencyReference is the BasicDependencyReference implementation for TriggerDependencyReference. +func (tdr TriggerDependencyReference) AsBasicDependencyReference() (BasicDependencyReference, bool) { + return &tdr, true +} + // TriggerListResponse a list of trigger resources. type TriggerListResponse struct { autorest.Response `json:"-"` @@ -87805,13 +87927,13 @@ func (twt *TumblingWindowTrigger) UnmarshalJSON(body []byte) error { // TumblingWindowTriggerDependencyReference referenced tumbling window trigger dependency type TumblingWindowTriggerDependencyReference struct { - // ReferenceTrigger - Referenced trigger - ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Offset *string `json:"offset,omitempty"` // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Size *string `json:"size,omitempty"` - // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference' + // ReferenceTrigger - Referenced trigger + ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` + // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` } @@ -87819,15 +87941,15 @@ type TumblingWindowTriggerDependencyReference struct { func (twtdr TumblingWindowTriggerDependencyReference) MarshalJSON() ([]byte, error) { twtdr.Type = TypeTumblingWindowTriggerDependencyReference objectMap := make(map[string]interface{}) - if twtdr.ReferenceTrigger != nil { - objectMap["referenceTrigger"] = twtdr.ReferenceTrigger - } if twtdr.Offset != nil { objectMap["offset"] = twtdr.Offset } if twtdr.Size != nil { objectMap["size"] = twtdr.Size } + if twtdr.ReferenceTrigger != nil { + objectMap["referenceTrigger"] = twtdr.ReferenceTrigger + } if twtdr.Type != "" { objectMap["type"] = twtdr.Type } @@ -87844,6 +87966,16 @@ func (twtdr TumblingWindowTriggerDependencyReference) AsTumblingWindowTriggerDep return &twtdr, true } +// AsTriggerDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsTriggerDependencyReference() (*TriggerDependencyReference, bool) { + return nil, false +} + +// AsBasicTriggerDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. +func (twtdr TumblingWindowTriggerDependencyReference) AsBasicTriggerDependencyReference() (BasicTriggerDependencyReference, bool) { + return &twtdr, true +} + // AsDependencyReference is the BasicDependencyReference implementation for TumblingWindowTriggerDependencyReference. func (twtdr TumblingWindowTriggerDependencyReference) AsDependencyReference() (*DependencyReference, bool) { return nil, false From 88ef53bc1e42bf8dcb0763e1250925c533524b52 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 9 Jul 2018 17:31:03 +0000 Subject: [PATCH 4/5] Generated from b8ba26d1c429ab5fbe938576995d7d3d589e06d3 Add dots to descriptions --- .../2017-09-01-preview/datafactory/models.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go index d4da9f00069d..bdfe640d9b29 100644 --- a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go +++ b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go @@ -27659,7 +27659,7 @@ func (d2lstp *Db2LinkedServiceTypeProperties) UnmarshalJSON(body []byte) error { return nil } -// BasicDependencyReference referenced dependency +// BasicDependencyReference referenced dependency. type BasicDependencyReference interface { AsSelfDependencyTumblingWindowTriggerReference() (*SelfDependencyTumblingWindowTriggerReference, bool) AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) @@ -27668,7 +27668,7 @@ type BasicDependencyReference interface { AsDependencyReference() (*DependencyReference, bool) } -// DependencyReference referenced dependency +// DependencyReference referenced dependency. type DependencyReference struct { // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` @@ -77732,7 +77732,7 @@ func (ss SecureString) AsBasicSecretBase() (BasicSecretBase, bool) { return &ss, true } -// SelfDependencyTumblingWindowTriggerReference self referenced tumbling window trigger dependency +// SelfDependencyTumblingWindowTriggerReference self referenced tumbling window trigger dependency. type SelfDependencyTumblingWindowTriggerReference struct { // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Offset *string `json:"offset,omitempty"` @@ -87272,15 +87272,15 @@ func (t Trigger) AsBasicTrigger() (BasicTrigger, bool) { return &t, true } -// BasicTriggerDependencyReference trigger referenced dependency +// BasicTriggerDependencyReference trigger referenced dependency. type BasicTriggerDependencyReference interface { AsTumblingWindowTriggerDependencyReference() (*TumblingWindowTriggerDependencyReference, bool) AsTriggerDependencyReference() (*TriggerDependencyReference, bool) } -// TriggerDependencyReference trigger referenced dependency +// TriggerDependencyReference trigger referenced dependency. type TriggerDependencyReference struct { - // ReferenceTrigger - Referenced trigger + // ReferenceTrigger - Referenced trigger. ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` @@ -87925,13 +87925,13 @@ func (twt *TumblingWindowTrigger) UnmarshalJSON(body []byte) error { return nil } -// TumblingWindowTriggerDependencyReference referenced tumbling window trigger dependency +// TumblingWindowTriggerDependencyReference referenced tumbling window trigger dependency. type TumblingWindowTriggerDependencyReference struct { // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Offset *string `json:"offset,omitempty"` // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Size *string `json:"size,omitempty"` - // ReferenceTrigger - Referenced trigger + // ReferenceTrigger - Referenced trigger. ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"` // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` @@ -88002,7 +88002,7 @@ type TumblingWindowTriggerTypeProperties struct { MaxConcurrency *int32 `json:"maxConcurrency,omitempty"` // RetryPolicy - Retry policy that will be applied for failed pipeline runs. RetryPolicy *RetryPolicy `json:"retryPolicy,omitempty"` - // DependsOn - Tumbling window triggers that this trigger depends on. Only tumbling window triggers are supported. + // DependsOn - Triggers that this trigger depends on. Only tumbling window triggers are supported. DependsOn *[]BasicDependencyReference `json:"dependsOn,omitempty"` } From 457d2170ebd52c2c871a6828b06f26d23c9412e9 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 9 Jul 2018 22:17:11 +0000 Subject: [PATCH 5/5] Generated from 5859a04864006e3579c0efb5c28c0c34adfb66a8 Add validation for size and offset --- .../mgmt/2017-09-01-preview/datafactory/models.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go index bdfe640d9b29..b84a6a8b4c0c 100644 --- a/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go +++ b/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory/models.go @@ -77734,9 +77734,9 @@ func (ss SecureString) AsBasicSecretBase() (BasicSecretBase, bool) { // SelfDependencyTumblingWindowTriggerReference self referenced tumbling window trigger dependency. type SelfDependencyTumblingWindowTriggerReference struct { - // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, .Net timespan format. Offset *string `json:"offset,omitempty"` - // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, .Net timespan format. Size *string `json:"size,omitempty"` // Type - Possible values include: 'TypeDependencyReference', 'TypeSelfDependencyTumblingWindowTriggerReference', 'TypeTumblingWindowTriggerDependencyReference', 'TypeTriggerDependencyReference' Type TypeBasicDependencyReference `json:"type,omitempty"` @@ -87927,9 +87927,9 @@ func (twt *TumblingWindowTrigger) UnmarshalJSON(body []byte) error { // TumblingWindowTriggerDependencyReference referenced tumbling window trigger dependency. type TumblingWindowTriggerDependencyReference struct { - // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + // Offset - Timespan applied to the start time of a tumbling window when evaluating dependency, .Net timespan format. Offset *string `json:"offset,omitempty"` - // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + // Size - The size of the window when evaluating the dependency. If undefined the frequency of the tumbling window will be used, .Net timespan format. Size *string `json:"size,omitempty"` // ReferenceTrigger - Referenced trigger. ReferenceTrigger *TriggerReference `json:"referenceTrigger,omitempty"`