From fa18857b43b9626d2f0848b66d2d8a07e6968f28 Mon Sep 17 00:00:00 2001 From: alok87 Date: Wed, 30 Nov 2016 09:10:34 +0530 Subject: [PATCH] Auto generated fi tasks for loadbalancer attributes --- .../topologies/_topology_private/bastion.yaml | 1 - .../awstasks/loadbalancer_attributes.go | 12 ++++-- .../loadbalancer_attributes_fitask.go | 41 ------------------ .../awstasks/loadbalancerattributes_fitask.go | 43 +++++++++++++++++++ .../loadbalancerconnectionsettings_fitask.go | 43 +++++++++++++++++++ 5 files changed, 94 insertions(+), 46 deletions(-) delete mode 100644 upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes_fitask.go create mode 100644 upup/pkg/fi/cloudup/awstasks/loadbalancerattributes_fitask.go create mode 100644 upup/pkg/fi/cloudup/awstasks/loadbalancerconnectionsettings_fitask.go diff --git a/upup/models/cloudup/_aws/topologies/_topology_private/bastion.yaml b/upup/models/cloudup/_aws/topologies/_topology_private/bastion.yaml index 8c11b3ee04..a8c64e0910 100644 --- a/upup/models/cloudup/_aws/topologies/_topology_private/bastion.yaml +++ b/upup/models/cloudup/_aws/topologies/_topology_private/bastion.yaml @@ -133,7 +133,6 @@ autoscalingGroup/bastion.{{ ClusterName }}: # the bastion DNS entry for it to be reachable from outside. # BastionPublicName --> Bastion LoadBalancer # ------------------------------------------------------------------------ -dnsZone/{{ .DNSZone }}: {} dnsName/{{ GetBastionDNS }}: Zone: dnsZone/{{ .DNSZone }} ResourceType: "A" diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go index 3c1a95e532..e14c01b2d0 100644 --- a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go +++ b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go @@ -47,11 +47,15 @@ type LoadBalancerCrossZoneLoadBalancing struct { Enabled *bool } +//go:generate fitask -type=LoadBalancerConnectionSettings type LoadBalancerConnectionSettings struct { + Name *string IdleTimeout *int64 } +//go:generate fitask -type=LoadBalancerAttributes type LoadBalancerAttributes struct { + Name *string LoadBalancer *LoadBalancer AccessLog *LoadBalancerAccessLog AdditionalAttributes []*LoadBalancerAdditionalAttribute @@ -60,10 +64,6 @@ type LoadBalancerAttributes struct { CrossZoneLoadBalancing *LoadBalancerCrossZoneLoadBalancing } -func (e *LoadBalancerAttributes) String() string { - return fi.TaskAsString(e) -} - func findELBAttributes(cloud awsup.AWSCloud, name string) (*elb.LoadBalancerAttributes, error) { request := &elb.DescribeLoadBalancerAttributesInput{ LoadBalancerName: aws.String(name), @@ -138,6 +138,10 @@ func (e *LoadBalancerAttributes) Run(c *fi.Context) error { return fi.DefaultDeltaRunMethod(e, c) } +func (e *LoadBalancerConnectionSettings) Run(c *fi.Context) error { + return fi.DefaultDeltaRunMethod(e, c) +} + func (s *LoadBalancerAttributes) CheckChanges(a, e, changes *LoadBalancerAttributes) error { if a == nil { if e.LoadBalancer == nil { diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes_fitask.go b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes_fitask.go deleted file mode 100644 index 3e65c5cbef..0000000000 --- a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes_fitask.go +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -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. -*/ - -// Code generated by ""fitask" -type=LoadBalancer"; DO NOT EDIT - -package awstasks - -import "encoding/json" - -// LoadBalancer - -// JSON marshalling boilerplate -type realLoadBalancerAttributes LoadBalancerAttributes -type realLoadBalancerConnectionSettings LoadBalancerConnectionSettings - -func (o *LoadBalancerAttributes) UnmarshalJSON(data []byte) error { - var r realLoadBalancerAttributes - var c realLoadBalancerConnectionSettings - if err := json.Unmarshal(data, &r); err != nil { - return err - } - if err := json.Unmarshal(data, &c); err != nil { - return err - } - *o = LoadBalancerAttributes(r) - *o.ConnectionSettings = LoadBalancerConnectionSettings(c) - return nil -} diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancerattributes_fitask.go b/upup/pkg/fi/cloudup/awstasks/loadbalancerattributes_fitask.go new file mode 100644 index 0000000000..81eb7a292e --- /dev/null +++ b/upup/pkg/fi/cloudup/awstasks/loadbalancerattributes_fitask.go @@ -0,0 +1,43 @@ +// Code generated by ""fitask" -type=LoadBalancerAttributes"; DO NOT EDIT + +package awstasks + +import ( + "encoding/json" + + "k8s.io/kops/upup/pkg/fi" +) + +// LoadBalancerAttributes + +// JSON marshalling boilerplate +type realLoadBalancerAttributes LoadBalancerAttributes + +func (o *LoadBalancerAttributes) UnmarshalJSON(data []byte) error { + var jsonName string + if err := json.Unmarshal(data, &jsonName); err == nil { + o.Name = &jsonName + return nil + } + + var r realLoadBalancerAttributes + if err := json.Unmarshal(data, &r); err != nil { + return err + } + *o = LoadBalancerAttributes(r) + return nil +} + +var _ fi.HasName = &LoadBalancerAttributes{} + +func (e *LoadBalancerAttributes) GetName() *string { + return e.Name +} + +func (e *LoadBalancerAttributes) SetName(name string) { + e.Name = &name +} + +func (e *LoadBalancerAttributes) String() string { + return fi.TaskAsString(e) +} diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancerconnectionsettings_fitask.go b/upup/pkg/fi/cloudup/awstasks/loadbalancerconnectionsettings_fitask.go new file mode 100644 index 0000000000..29a26c628e --- /dev/null +++ b/upup/pkg/fi/cloudup/awstasks/loadbalancerconnectionsettings_fitask.go @@ -0,0 +1,43 @@ +// Code generated by ""fitask" -type=LoadBalancerConnectionSettings"; DO NOT EDIT + +package awstasks + +import ( + "encoding/json" + + "k8s.io/kops/upup/pkg/fi" +) + +// LoadBalancerConnectionSettings + +// JSON marshalling boilerplate +type realLoadBalancerConnectionSettings LoadBalancerConnectionSettings + +func (o *LoadBalancerConnectionSettings) UnmarshalJSON(data []byte) error { + var jsonName string + if err := json.Unmarshal(data, &jsonName); err == nil { + o.Name = &jsonName + return nil + } + + var r realLoadBalancerConnectionSettings + if err := json.Unmarshal(data, &r); err != nil { + return err + } + *o = LoadBalancerConnectionSettings(r) + return nil +} + +var _ fi.HasName = &LoadBalancerConnectionSettings{} + +func (e *LoadBalancerConnectionSettings) GetName() *string { + return e.Name +} + +func (e *LoadBalancerConnectionSettings) SetName(name string) { + e.Name = &name +} + +func (e *LoadBalancerConnectionSettings) String() string { + return fi.TaskAsString(e) +}