diff --git a/Makefile b/Makefile index f033fde90..e2c9ac1c0 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ test: .PHONY: tag tag: git tag -a ${VERSION} -s - git push origin --tags + git push awslabs --tags .PHONY: install-aws-codegen install-aws-codegen: diff --git a/code-generation/pkg/codegen/templates.go b/code-generation/pkg/codegen/templates.go index 69dd0fbb3..25c1083af 100644 --- a/code-generation/pkg/codegen/templates.go +++ b/code-generation/pkg/codegen/templates.go @@ -73,7 +73,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _awsServiceOperatorYamlTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x55\x4d\x8f\xdb\x36\x10\xbd\xeb\x57\x0c\x76\x03\x14\x28\x2a\x39\xee\xa9\x10\x76\x17\xd8\xda\x6e\x6a\x64\xeb\x5d\xd8\x4e\xaf\xc9\x98\x1a\xcb\xac\x29\x92\x20\x29\x3b\x8e\xe0\xff\x5e\x50\x5f\xfe\xf6\x2e\xda\x44\x27\x71\xf4\x38\xef\xcd\xe3\x70\x74\x0b\x0f\xd5\x03\xfd\x67\x18\x3d\x4f\x61\xd0\x1f\x4e\x61\xfa\xe7\x70\x02\x7f\x0c\x9f\x06\x70\xd7\x3e\xc1\x2d\x4c\x17\xdc\xc2\x9c\x0b\x02\x6e\x01\x73\xa7\x52\x92\x64\xd0\x51\x02\x2b\x8e\xf0\x05\xd7\x36\x54\xda\x47\x94\x81\xe6\xdb\x97\xe0\x16\x86\x73\xd8\xa8\xfc\xa7\x04\x04\x5f\x12\xb8\x05\x01\x5b\xa0\x4c\x09\x50\x6e\xdc\x82\xcb\x14\x70\xa6\x72\x07\xae\x25\xc8\x70\x49\x40\x09\x77\x16\x9c\x2a\x77\x44\x8e\x32\x2d\x82\xdb\x5a\x80\x2c\x83\x7a\x99\x76\x98\x4a\x28\x25\xd9\x41\x6b\xc9\x59\x48\xb8\x21\xe6\x94\xd9\x44\x41\x80\x9a\xff\x4d\xc6\x72\x25\x63\x58\x75\x83\x25\x97\x49\x0c\x4f\xdc\xba\x80\x3b\xca\x6c\x1c\x84\x50\xc5\x46\x98\x91\xd5\xc8\x28\x00\x38\xda\x04\x90\x91\xc3\x04\x1d\xc6\x01\x00\x80\xc4\x8c\x62\xf0\xa5\x5a\x32\x2b\xce\xa8\x2d\x39\x28\x0a\x53\x56\xf5\x8e\xcb\x84\xbe\xfe\x02\xef\x48\x50\x46\xd2\x41\x7c\x0f\xd1\xd0\x33\x6e\xb7\x41\x78\x40\x80\x9a\xd3\x57\x47\xd2\xaf\x6c\xb4\xfc\xcd\x46\x5c\x75\x56\xdd\x19\x39\xf4\xd4\x95\xba\x5e\x6e\x9d\xca\xc6\x64\x55\x6e\x18\xf5\x69\xce\x25\x77\x5c\xc9\x0b\xda\x8a\xa2\x21\x8e\x26\x9a\x58\xd4\x6c\x8c\x5e\x44\x6e\x50\x6c\xb7\xd1\xb1\xf2\x08\xd7\x36\x00\xb0\x9a\x58\x95\x28\x35\x2a\xd7\x31\x5c\xc0\x55\x44\xb6\x82\x36\x22\x8f\x59\x3f\x72\x99\x6c\xb7\x35\x44\x70\xeb\x3e\x5e\x81\x95\x67\x52\x41\x75\x29\xf2\x0d\x55\xd4\x78\xbb\x50\xc6\x8d\xf6\xf5\x14\x45\x08\x67\x0e\xc2\x9f\xc2\x85\x94\x13\x9f\xa3\xac\xa9\x4d\x1b\x36\x02\x22\x9f\xbb\x0d\xfb\xdc\xb4\x57\x98\xe5\x32\xcd\x05\x9a\xb7\xea\xb5\x4c\xe9\x6b\x47\x34\xf1\xdf\x6b\xec\x6a\xd7\x85\x28\xf4\x02\xbb\x41\x51\x54\xdc\x4d\xdb\xf6\x44\x6e\x1d\x99\xb1\x12\xc7\x8d\x6b\x66\xc8\x22\xcc\xdd\x42\x19\xfe\x0d\x7d\xb3\x9c\x36\xd7\x9b\xfb\x1a\xc0\xe4\xa2\xf2\xb7\xec\xde\x0f\xbe\x3b\x6a\xbb\x43\xb8\xb9\x29\x5f\x4c\x5d\x42\x1b\xb7\xc4\x0c\x39\x5b\xaf\xb4\x4a\x9a\x57\xa6\xe4\x9c\xa7\x19\x6a\xdb\x22\x4b\xc2\x66\x49\x2b\x92\xf5\xbe\x15\x99\x59\x9b\x30\x25\x57\xbf\x89\xa6\x5d\x42\x58\xa3\x63\x8b\x26\xb1\x21\x74\x54\x2f\x12\x12\xd4\x2e\x72\x9d\xec\xbe\xe8\x7a\xcb\x99\x5a\xce\x5d\xc7\xf3\xd5\xb1\xf2\x4e\x36\xe1\xa4\xbd\x93\xdf\x4f\xf7\x19\x79\x17\xef\xe3\x89\xbc\x9b\x9f\x6f\x4e\x85\xf8\x60\xdb\x3b\x93\x2a\xd7\x23\x63\x2a\x97\xee\x7f\xcd\xbd\x76\x22\xf8\x09\x7a\x01\x73\xae\x67\x7f\xe7\x32\xe1\x32\xfd\xc1\xad\xab\x04\x8d\x69\x5e\x21\x1b\x47\xaf\xb0\x04\xbb\x91\x76\x78\xbd\x5e\xe1\xb1\xf9\xec\x1f\x62\xae\xbe\x25\x17\x3c\xfe\x7e\x36\xf6\x49\x0b\xb5\xf1\x13\xe4\xc8\x3e\xd4\xda\xfe\x37\xa7\x5e\x67\xdf\xff\x45\x18\xd2\x82\x33\xb4\x31\x74\xcb\x75\xf9\x7b\x46\x47\xcd\x14\x3e\x24\x2e\xcd\x97\x52\xb9\xd2\x6a\xbb\x0b\x02\x70\xcc\x22\xcc\xf0\x9b\x92\xb8\xb6\x11\x53\x59\xc7\x1f\xd9\x15\x95\xe5\x0f\x05\x67\x24\x0e\xd2\xa0\xd6\x57\xf7\xec\x94\x97\xab\x83\x93\x19\x5d\xb7\xc5\x3f\x4c\x49\x87\x5c\x92\xd9\x23\x0d\x5f\xf3\xb3\x2e\x30\xc3\xb4\x42\xd5\xa0\x06\xd3\x39\xb7\x31\x5e\xbd\x8f\xde\x47\xdd\xb0\x1c\xf9\xbf\x1e\xa7\x79\xc9\x85\x78\x51\x82\xb3\x4d\x0c\x8f\x62\x8d\x1b\xbb\x6f\x81\x49\x0f\x2c\x69\x46\x06\x99\xa3\x60\x18\xb2\xaa\xb5\x43\x5f\xc0\xfd\x5d\xef\xe9\xd3\x64\x3a\x18\x7f\x1e\x3d\xfe\x35\x78\x38\xc1\x1a\x4a\xb9\x92\xf7\x77\xe3\xc1\x87\xe1\xf3\xe8\xf4\x3b\x56\x26\x86\x3c\xb9\xbf\x7b\xec\xf5\x9e\x3f\x8d\xa6\x9f\x87\xfd\x87\x7f\x03\x00\x00\xff\xff\x1b\x6a\x36\x65\x5b\x0a\x00\x00") +var _awsServiceOperatorYamlTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x55\x4d\x8f\xdb\x36\x10\xbd\xeb\x57\x0c\x76\x03\x14\x28\x2a\x39\x46\x2f\x85\xb0\xbb\xc0\xd6\x76\x53\x23\x5b\xef\xc2\x76\x7a\x4d\xc6\xd4\x58\x66\x4d\x91\x04\x49\xd9\x71\x04\xff\xf7\x82\xfa\xf2\xb7\x77\xd1\x26\x3a\x89\xa3\xc7\x79\x6f\x1e\x87\xa3\x5b\x78\xa8\x1e\xe8\x3f\xc3\xe8\x79\x0a\x83\xfe\x70\x0a\xd3\x3f\x87\x13\xf8\x63\xf8\x34\x80\xbb\xf6\x09\x6e\x61\xba\xe0\x16\xe6\x5c\x10\x70\x0b\x98\x3b\x95\x92\x24\x83\x8e\x12\x58\x71\x84\x2f\xb8\xb6\xa1\xd2\x3e\xa2\x0c\x34\xdf\xbe\x04\xb7\x30\x9c\xc3\x46\xe5\x3f\x25\x20\xf8\x92\xc0\x2d\x08\xd8\x02\x65\x4a\x80\x72\xe3\x16\x5c\xa6\x80\x33\x95\x3b\x70\x2d\x41\x86\x4b\x02\x4a\xb8\xb3\xe0\x54\xb9\x23\x72\x94\x69\x11\xdc\xd6\x02\x64\x19\xd4\xcb\xb4\xc3\x54\x42\x29\xc9\x0e\x5a\x4b\xce\x42\xc2\x0d\x31\xa7\xcc\x26\x0a\x02\xd4\xfc\x6f\x32\x96\x2b\x19\xc3\xaa\x1b\x2c\xb9\x4c\x62\x78\xe2\xd6\x05\xdc\x51\x66\xe3\x20\x84\x2a\x36\xc2\x8c\xac\x46\x46\x01\xc0\xd1\x26\x80\x8c\x1c\x26\xe8\x30\x0e\x00\x00\x24\x66\x14\x83\x2f\xd5\x92\x59\x71\x46\x6d\xc9\x41\x51\x98\xb2\xaa\x77\x5c\x26\xf4\xf5\x17\x78\x47\x82\x32\x92\x0e\xe2\x7b\x88\x86\x9e\x71\xbb\x0d\xc2\x03\x02\xd4\x9c\xbe\x3a\x92\x7e\x65\xa3\xe5\x6f\x36\xe2\xaa\xb3\xea\xce\xc8\xa1\xa7\xae\xd4\xf5\x72\xeb\x54\x36\x26\xab\x72\xc3\xa8\x4f\x73\x2e\xb9\xe3\x4a\x5e\xd0\x56\x14\x0d\x71\x34\xd1\xc4\xa2\x66\x63\xf4\x22\x72\x83\x62\xbb\x8d\x8e\x95\x47\xb8\xb6\x01\x80\xd5\xc4\xaa\x44\xa9\x51\xb9\x8e\xe1\x02\xae\x22\xb2\x15\xb4\x11\x79\xcc\xfa\x91\xcb\x64\xbb\xad\x21\x82\x5b\xf7\xf1\x0a\xac\x3c\x93\x0a\xaa\x4b\x91\x6f\xa8\xa2\xc6\xdb\x85\x32\x6e\xb4\xaf\xa7\x28\x42\x38\x73\x10\xfe\x14\x2e\xa4\x9c\xf8\x1c\x65\x4d\x6d\xda\xb0\x11\x10\xf9\xdc\x6d\xd8\xe7\xa6\xbd\xc2\x2c\x97\x69\x2e\xd0\xbc\x55\xaf\x65\x4a\x5f\x3b\xa2\x89\xff\x5e\x63\x57\xbb\x2e\x44\xa1\x17\xd8\x0d\x8a\xa2\xe2\x6e\xda\xb6\x27\x72\xeb\xc8\x8c\x95\x38\x6e\x5c\x33\x43\x16\x61\xee\x16\xca\xf0\x6f\xe8\x9b\xe5\xb4\xb9\xde\xdc\xd7\x00\x26\x17\x95\xbf\x65\xf7\x7e\xf0\xdd\x51\xdb\x1d\xc2\xcd\x4d\xf9\x62\xea\x12\xda\xb8\x25\x66\xc8\xd9\x7a\xa5\x55\xd2\xbc\x32\x25\xe7\x3c\xcd\x50\xdb\x16\x59\x12\x36\x4b\x5a\x91\xac\xf7\xad\xc8\xcc\xda\x84\x29\xb9\xfa\x4d\x34\xed\x12\xc2\x1a\x1d\x5b\x34\x89\x0d\xa1\xa3\x7a\x91\x90\xa0\x76\x91\xeb\x64\xf7\x45\xd7\x5b\xce\xd4\x72\xee\x3a\x9e\xaf\x8e\x95\x77\xb2\x09\x27\xed\x9d\xfc\x7e\xba\xcf\xc8\xbb\x78\x1f\x4f\xe4\xdd\xfc\x7c\x73\x2a\xc4\x07\xdb\xde\x99\x54\xb9\x1e\x19\x53\xb9\x74\xff\x6b\xee\xb5\x13\xc1\x4f\xd0\x0b\x98\x73\x3d\xfb\x3b\x97\x09\x97\xe9\x0f\x6e\x5d\x25\x68\x4c\xf3\x0a\xd9\x38\x7a\x85\x25\xd8\x8d\xb4\xc3\xeb\xf5\x0a\x8f\xcd\x67\xff\x10\x73\xf5\x2d\xb9\xe0\xf1\xf7\xb3\xb1\x4f\x5a\xa8\x8d\x9f\x20\x47\xf6\xa1\xd6\xf6\xbf\x39\xf5\x3a\xfb\xfe\x2f\xc2\x90\x16\x9c\xa1\x8d\xa1\x5b\xae\xcb\xdf\x33\x3a\x6a\xa6\xf0\x21\x71\x69\xbe\x94\xca\x95\x56\xdb\x5d\x10\x80\x63\x16\x61\x86\xdf\x94\xc4\xb5\x8d\x98\xca\x3a\xfe\xc8\xae\xa8\x2c\x7f\x28\x38\x23\x71\x90\x06\xb5\xbe\xba\x67\xa7\xbc\x5c\x1d\x9c\xcc\xe8\xba\x2d\xfe\x61\x4a\x3a\xe4\x92\xcc\x1e\x69\xf8\x9a\x9f\x75\x81\x19\xa6\x15\xaa\x06\x35\x98\xce\xb9\x8d\xf1\xea\x7d\xf4\x3e\xea\x86\xe5\xc8\xff\xf5\x38\xcd\x4b\x2e\xc4\x8b\x12\x9c\x6d\x62\x78\x14\x6b\xdc\xd8\x7d\x0b\x4c\x7a\x60\x49\x33\x32\xc8\x1c\x05\xc3\x90\x55\xad\x1d\xfa\x02\xee\xef\x7a\x4f\x9f\x26\xd3\xc1\xf8\xf3\xe8\xf1\xaf\xc1\xc3\x09\xd6\x50\xca\x95\xbc\xbf\x1b\x0f\x3e\x0c\x9f\x47\xa7\xdf\xb1\x32\x31\xe4\xc9\xfd\xdd\x63\xaf\xf7\xfc\x69\x34\xfd\x3c\xec\x3f\xfc\x1b\x00\x00\xff\xff\x8d\xfe\x5b\xa0\x5b\x0a\x00\x00") func awsServiceOperatorYamlTemplBytes() ([]byte, error) { return bindataRead( @@ -88,7 +88,7 @@ func awsServiceOperatorYamlTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "aws-service-operator.yaml.templ", size: 2651, mode: os.FileMode(420), modTime: time.Unix(1543602919, 0)} + info := bindataFileInfo{name: "aws-service-operator.yaml.templ", size: 2651, mode: os.FileMode(436), modTime: time.Unix(1548187260, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -108,7 +108,7 @@ func baseGoTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "base.go.templ", size: 1098, mode: os.FileMode(420), modTime: time.Unix(1545935804, 0)} + info := bindataFileInfo{name: "base.go.templ", size: 1098, mode: os.FileMode(436), modTime: time.Unix(1544578164, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -128,7 +128,7 @@ func cftGoTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "cft.go.templ", size: 9388, mode: os.FileMode(420), modTime: time.Unix(1545935804, 0)} + info := bindataFileInfo{name: "cft.go.templ", size: 9388, mode: os.FileMode(436), modTime: time.Unix(1544578164, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -148,7 +148,7 @@ func operatorGoTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operator.go.templ", size: 11590, mode: os.FileMode(420), modTime: time.Unix(1545939246, 0)} + info := bindataFileInfo{name: "operator.go.templ", size: 11590, mode: os.FileMode(436), modTime: time.Unix(1548177925, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -168,7 +168,7 @@ func template_functionsGoTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template_functions.go.templ", size: 1582, mode: os.FileMode(420), modTime: time.Unix(1545935804, 0)} + info := bindataFileInfo{name: "template_functions.go.templ", size: 1582, mode: os.FileMode(436), modTime: time.Unix(1544578164, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -188,7 +188,7 @@ func typesGoTempl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "types.go.templ", size: 3173, mode: os.FileMode(420), modTime: time.Unix(1543602919, 0)} + info := bindataFileInfo{name: "types.go.templ", size: 3173, mode: os.FileMode(436), modTime: time.Unix(1544578164, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/pkg/apis/service-operator.aws/v1alpha1/elasticache.go b/pkg/apis/service-operator.aws/v1alpha1/elasticache.go index becc24f8d..b9aaca50d 100644 --- a/pkg/apis/service-operator.aws/v1alpha1/elasticache.go +++ b/pkg/apis/service-operator.aws/v1alpha1/elasticache.go @@ -24,29 +24,29 @@ type ElastiCacheSpec struct { CloudFormationTemplateName string `json:"cloudFormationTemplateName"` CloudFormationTemplateNamespace string `json:"cloudFormationTemplateNamespace"` RollbackCount int `json:"rollbackCount"` - AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade"` - AZMode string `json:"AZMode"` - CacheNodeType string `json:"CacheNodeType"` - CacheParameterGroupName string `json:"CacheParameterGroupName"` - CacheSubnetGroupName string `json:"CacheSubnetGroupName"` - Engine string `json:"Engine"` - EngineVersion string `json:"EngineVersion"` - NotificationTopicArn string `json:"NotificationTopicArn"` - NumCacheNodes int `json:"NumCacheNodes"` - Port int `json:"Port"` - PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow"` - PreferredAvailabilityZone string `json:"PreferredAvailabilityZone"` - PreferredAvailabilityZones string `json:"PreferredAvailabilityZones"` - SnapshotWindow string `json:"SnapshotWindow"` - VpcSecurityGroupIds string `json:"VpcSecurityGroupIds"` + AutoMinorVersionUpgrade bool `json:"autoMinorVersionUpgrade"` + AZMode string `json:"azMode"` + CacheNodeType string `json:"cacheNodeType"` + CacheParameterGroupName string `json:"cacheParameterGroupName"` + CacheSubnetGroupName string `json:"cacheSubnetGroupName"` + Engine string `json:"engine"` + EngineVersion string `json:"engineVersion"` + NotificationTopicArn string `json:"notificationTopicArn"` + NumCacheNodes int `json:"numCacheNodes"` + Port int `json:"port"` + PreferredMaintenanceWindow string `json:"preferredMaintenanceWindow"` + PreferredAvailabilityZone string `json:"preferredAvailabilityZone"` + PreferredAvailabilityZones string `json:"preferredAvailabilityZones"` + SnapshotWindow string `json:"snapshotWindow"` + VpcSecurityGroupIds string `json:"vpcSecurityGroupIds"` } // ElastiCacheOutput defines the output resource for ElastiCache type ElastiCacheOutput struct { - RedisEndpointAddress string `json:"RedisEndpointAddress"` - RedisEndpointPort string `json:"RedisEndpointPort"` - ConfigurationEndpointAddress string `json:"ConfigurationEndpoint"` - ConfigurationEndpointPort string `json:"ConfigurationEndpointPort"` + RedisEndpointAddress string `json:"redisEndpointAddress"` + RedisEndpointPort string `json:"redisEndpointPort"` + ConfigurationEndpointAddress string `json:"configurationEndpoint"` + ConfigurationEndpointPort string `json:"configurationEndpointPort"` } // ElastiCacheStatus holds the status of the Cloudformation template diff --git a/pkg/operators/elasticache/cft.go b/pkg/operators/elasticache/cft.go index 664f63481..b36ce13d4 100644 --- a/pkg/operators/elasticache/cft.go +++ b/pkg/operators/elasticache/cft.go @@ -81,96 +81,96 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput namespace := helpers.CreateParam("Namespace", s.ElastiCache.Namespace) clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName) elastiCacheClusterName := helpers.CreateParam("ClusterName", helpers.Stringify(s.ElastiCache.Name)) - AutoMinorVersionUpgradeTemp := "{{.Obj.Spec.AutoMinorVersionUpgrade}}" - AutoMinorVersionUpgradeValue, err := helpers.Templatize(AutoMinorVersionUpgradeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + autoMinorVersionUpgradeTemp := "{{.Obj.Spec.AutoMinorVersionUpgrade}}" + autoMinorVersionUpgradeValue, err := helpers.Templatize(autoMinorVersionUpgradeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - AutoMinorVersionUpgrade := helpers.CreateParam("AutoMinorVersionUpgrade", helpers.Stringify(AutoMinorVersionUpgradeValue)) - AZModeTemp := "{{.Obj.Spec.AZMode}}" - AZModeValue, err := helpers.Templatize(AZModeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + autoMinorVersionUpgrade := helpers.CreateParam("AutoMinorVersionUpgrade", helpers.Stringify(autoMinorVersionUpgradeValue)) + azModeTemp := "{{.Obj.Spec.AZMode}}" + azModeValue, err := helpers.Templatize(azModeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - AZMode := helpers.CreateParam("AZMode", helpers.Stringify(AZModeValue)) - CacheNodeTypeTemp := "{{.Obj.Spec.CacheNodeType}}" - CacheNodeTypeValue, err := helpers.Templatize(CacheNodeTypeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + azMode := helpers.CreateParam("AZMode", helpers.Stringify(azModeValue)) + cacheNodeTypeTemp := "{{.Obj.Spec.CacheNodeType}}" + cacheNodeTypeValue, err := helpers.Templatize(cacheNodeTypeTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheNodeType := helpers.CreateParam("CacheNodeType", helpers.Stringify(CacheNodeTypeValue)) - CacheParameterGroupNameTemp := "{{.Obj.Spec.CacheParameterGroupName}}" - CacheParameterGroupNameValue, err := helpers.Templatize(CacheParameterGroupNameTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + cacheNodeType := helpers.CreateParam("CacheNodeType", helpers.Stringify(cacheNodeTypeValue)) + cacheParameterGroupNameTemp := "{{.Obj.Spec.CacheParameterGroupName}}" + cacheParameterGroupNameValue, err := helpers.Templatize(cacheParameterGroupNameTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheParameterGroupName := helpers.CreateParam("CacheParameterGroupName", helpers.Stringify(CacheParameterGroupNameValue)) - CacheSubnetGroupNameTemp := "{{.Obj.Spec.CacheSubnetGroupName}}" - CacheSubnetGroupNameValue, err := helpers.Templatize(CacheSubnetGroupNameTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + cacheParameterGroupName := helpers.CreateParam("CacheParameterGroupName", helpers.Stringify(cacheParameterGroupNameValue)) + cacheSubnetGroupNameTemp := "{{.Obj.Spec.CacheSubnetGroupName}}" + cacheSubnetGroupNameValue, err := helpers.Templatize(cacheSubnetGroupNameTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheSubnetGroupName := helpers.CreateParam("CacheSubnetGroupName", helpers.Stringify(CacheSubnetGroupNameValue)) - EngineTemp := "{{.Obj.Spec.Engine}}" - EngineValue, err := helpers.Templatize(EngineTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + cacheSubnetGroupName := helpers.CreateParam("CacheSubnetGroupName", helpers.Stringify(cacheSubnetGroupNameValue)) + engineTemp := "{{.Obj.Spec.Engine}}" + engineValue, err := helpers.Templatize(engineTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - Engine := helpers.CreateParam("Engine", helpers.Stringify(EngineValue)) - EngineVersionTemp := "{{.Obj.Spec.EngineVersion}}" - EngineVersionValue, err := helpers.Templatize(EngineVersionTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + engine := helpers.CreateParam("Engine", helpers.Stringify(engineValue)) + engineVersionTemp := "{{.Obj.Spec.EngineVersion}}" + engineVersionValue, err := helpers.Templatize(engineVersionTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - EngineVersion := helpers.CreateParam("EngineVersion", helpers.Stringify(EngineVersionValue)) - NotificationTopicArnTemp := "{{.Obj.Spec.NotificationTopicArn}}" - NotificationTopicArnValue, err := helpers.Templatize(NotificationTopicArnTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + engineVersion := helpers.CreateParam("EngineVersion", helpers.Stringify(engineVersionValue)) + notificationTopicArnTemp := "{{.Obj.Spec.NotificationTopicArn}}" + notificationTopicArnValue, err := helpers.Templatize(notificationTopicArnTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - NotificationTopicArn := helpers.CreateParam("NotificationTopicArn", helpers.Stringify(NotificationTopicArnValue)) - NumCacheNodesTemp := "{{.Obj.Spec.NumCacheNodes}}" - NumCacheNodesValue, err := helpers.Templatize(NumCacheNodesTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + notificationTopicArn := helpers.CreateParam("NotificationTopicArn", helpers.Stringify(notificationTopicArnValue)) + numCacheNodesTemp := "{{.Obj.Spec.NumCacheNodes}}" + numCacheNodesValue, err := helpers.Templatize(numCacheNodesTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - NumCacheNodes := helpers.CreateParam("NumCacheNodes", helpers.Stringify(NumCacheNodesValue)) - PortTemp := "{{.Obj.Spec.Port}}" - PortValue, err := helpers.Templatize(PortTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + numCacheNodes := helpers.CreateParam("NumCacheNodes", helpers.Stringify(numCacheNodesValue)) + portTemp := "{{.Obj.Spec.Port}}" + portValue, err := helpers.Templatize(portTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - Port := helpers.CreateParam("Port", helpers.Stringify(PortValue)) - PreferredMaintenanceWindowTemp := "{{.Obj.Spec.PreferredMaintenanceWindow}}" - PreferredMaintenanceWindowValue, err := helpers.Templatize(PreferredMaintenanceWindowTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + port := helpers.CreateParam("Port", helpers.Stringify(portValue)) + preferredMaintenanceWindowTemp := "{{.Obj.Spec.PreferredMaintenanceWindow}}" + preferredMaintenanceWindowValue, err := helpers.Templatize(preferredMaintenanceWindowTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredMaintenanceWindow := helpers.CreateParam("PreferredMaintenanceWindow", helpers.Stringify(PreferredMaintenanceWindowValue)) - PreferredAvailabilityZoneTemp := "{{.Obj.Spec.PreferredAvailabilityZone}}" - PreferredAvailabilityZoneValue, err := helpers.Templatize(PreferredAvailabilityZoneTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + preferredMaintenanceWindow := helpers.CreateParam("PreferredMaintenanceWindow", helpers.Stringify(preferredMaintenanceWindowValue)) + preferredAvailabilityZoneTemp := "{{.Obj.Spec.PreferredAvailabilityZone}}" + preferredAvailabilityZoneValue, err := helpers.Templatize(preferredAvailabilityZoneTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredAvailabilityZone := helpers.CreateParam("PreferredAvailabilityZone", helpers.Stringify(PreferredAvailabilityZoneValue)) - PreferredAvailabilityZonesTemp := "{{.Obj.Spec.PreferredAvailabilityZones}}" - PreferredAvailabilityZonesValue, err := helpers.Templatize(PreferredAvailabilityZonesTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + preferredAvailabilityZone := helpers.CreateParam("PreferredAvailabilityZone", helpers.Stringify(preferredAvailabilityZoneValue)) + preferredAvailabilityZonesTemp := "{{.Obj.Spec.PreferredAvailabilityZones}}" + preferredAvailabilityZonesValue, err := helpers.Templatize(preferredAvailabilityZonesTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredAvailabilityZones := helpers.CreateParam("PreferredAvailabilityZones", helpers.Stringify(PreferredAvailabilityZonesValue)) - SnapshotWindowTemp := "{{.Obj.Spec.SnapshotWindow}}" - SnapshotWindowValue, err := helpers.Templatize(SnapshotWindowTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + preferredAvailabilityZones := helpers.CreateParam("PreferredAvailabilityZones", helpers.Stringify(preferredAvailabilityZonesValue)) + snapshotWindowTemp := "{{.Obj.Spec.SnapshotWindow}}" + snapshotWindowValue, err := helpers.Templatize(snapshotWindowTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - SnapshotWindow := helpers.CreateParam("SnapshotWindow", helpers.Stringify(SnapshotWindowValue)) - VpcSecurityGroupIdsTemp := "{{.Obj.Spec.VpcSecurityGroupIds}}" - VpcSecurityGroupIdsValue, err := helpers.Templatize(VpcSecurityGroupIdsTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) + snapshotWindow := helpers.CreateParam("SnapshotWindow", helpers.Stringify(snapshotWindowValue)) + vpcSecurityGroupIdsTemp := "{{.Obj.Spec.VpcSecurityGroupIds}}" + vpcSecurityGroupIdsValue, err := helpers.Templatize(vpcSecurityGroupIdsTemp, helpers.Data{Obj: s.ElastiCache, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - VpcSecurityGroupIds := helpers.CreateParam("VpcSecurityGroupIds", helpers.Stringify(VpcSecurityGroupIdsValue)) + vpcSecurityGroupIds := helpers.CreateParam("VpcSecurityGroupIds", helpers.Stringify(vpcSecurityGroupIdsValue)) parameters := []*cloudformation.Parameter{} parameters = append(parameters, resourceName) @@ -178,21 +178,21 @@ func (s *Cloudformation) CreateStack() (output *cloudformation.CreateStackOutput parameters = append(parameters, namespace) parameters = append(parameters, clusterName) parameters = append(parameters, elastiCacheClusterName) - parameters = append(parameters, AutoMinorVersionUpgrade) - parameters = append(parameters, AZMode) - parameters = append(parameters, CacheNodeType) - parameters = append(parameters, CacheParameterGroupName) - parameters = append(parameters, CacheSubnetGroupName) - parameters = append(parameters, Engine) - parameters = append(parameters, EngineVersion) - parameters = append(parameters, NotificationTopicArn) - parameters = append(parameters, NumCacheNodes) - parameters = append(parameters, Port) - parameters = append(parameters, PreferredMaintenanceWindow) - parameters = append(parameters, PreferredAvailabilityZone) - parameters = append(parameters, PreferredAvailabilityZones) - parameters = append(parameters, SnapshotWindow) - parameters = append(parameters, VpcSecurityGroupIds) + parameters = append(parameters, autoMinorVersionUpgrade) + parameters = append(parameters, azMode) + parameters = append(parameters, cacheNodeType) + parameters = append(parameters, cacheParameterGroupName) + parameters = append(parameters, cacheSubnetGroupName) + parameters = append(parameters, engine) + parameters = append(parameters, engineVersion) + parameters = append(parameters, notificationTopicArn) + parameters = append(parameters, numCacheNodes) + parameters = append(parameters, port) + parameters = append(parameters, preferredMaintenanceWindow) + parameters = append(parameters, preferredAvailabilityZone) + parameters = append(parameters, preferredAvailabilityZones) + parameters = append(parameters, snapshotWindow) + parameters = append(parameters, vpcSecurityGroupIds) stackInputs.SetParameters(parameters) @@ -233,96 +233,96 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.ElastiCache) (output * namespace := helpers.CreateParam("Namespace", s.ElastiCache.Namespace) clusterName := helpers.CreateParam("ClusterName", s.config.ClusterName) elastiCacheClusterName := helpers.CreateParam("ClusterName", helpers.Stringify(s.ElastiCache.Name)) - AutoMinorVersionUpgradeTemp := "{{.Obj.Spec.AutoMinorVersionUpgrade}}" - AutoMinorVersionUpgradeValue, err := helpers.Templatize(AutoMinorVersionUpgradeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + autoMinorVersionUpgradeTemp := "{{.Obj.Spec.AutoMinorVersionUpgrade}}" + autoMinorVersionUpgradeValue, err := helpers.Templatize(autoMinorVersionUpgradeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - AutoMinorVersionUpgrade := helpers.CreateParam("AutoMinorVersionUpgrade", helpers.Stringify(AutoMinorVersionUpgradeValue)) - AZModeTemp := "{{.Obj.Spec.AZMode}}" - AZModeValue, err := helpers.Templatize(AZModeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + autoMinorVersionUpgrade := helpers.CreateParam("AutoMinorVersionUpgrade", helpers.Stringify(autoMinorVersionUpgradeValue)) + azModeTemp := "{{.Obj.Spec.AZMode}}" + azModeValue, err := helpers.Templatize(azModeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - AZMode := helpers.CreateParam("AZMode", helpers.Stringify(AZModeValue)) - CacheNodeTypeTemp := "{{.Obj.Spec.CacheNodeType}}" - CacheNodeTypeValue, err := helpers.Templatize(CacheNodeTypeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + azMode := helpers.CreateParam("AZMode", helpers.Stringify(azModeValue)) + cacheNodeTypeTemp := "{{.Obj.Spec.CacheNodeType}}" + cacheNodeTypeValue, err := helpers.Templatize(cacheNodeTypeTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheNodeType := helpers.CreateParam("CacheNodeType", helpers.Stringify(CacheNodeTypeValue)) - CacheParameterGroupNameTemp := "{{.Obj.Spec.CacheParameterGroupName}}" - CacheParameterGroupNameValue, err := helpers.Templatize(CacheParameterGroupNameTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + cacheNodeType := helpers.CreateParam("CacheNodeType", helpers.Stringify(cacheNodeTypeValue)) + cacheParameterGroupNameTemp := "{{.Obj.Spec.CacheParameterGroupName}}" + cacheParameterGroupNameValue, err := helpers.Templatize(cacheParameterGroupNameTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheParameterGroupName := helpers.CreateParam("CacheParameterGroupName", helpers.Stringify(CacheParameterGroupNameValue)) - CacheSubnetGroupNameTemp := "{{.Obj.Spec.CacheSubnetGroupName}}" - CacheSubnetGroupNameValue, err := helpers.Templatize(CacheSubnetGroupNameTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + cacheParameterGroupName := helpers.CreateParam("CacheParameterGroupName", helpers.Stringify(cacheParameterGroupNameValue)) + cacheSubnetGroupNameTemp := "{{.Obj.Spec.CacheSubnetGroupName}}" + cacheSubnetGroupNameValue, err := helpers.Templatize(cacheSubnetGroupNameTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - CacheSubnetGroupName := helpers.CreateParam("CacheSubnetGroupName", helpers.Stringify(CacheSubnetGroupNameValue)) - EngineTemp := "{{.Obj.Spec.Engine}}" - EngineValue, err := helpers.Templatize(EngineTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + cacheSubnetGroupName := helpers.CreateParam("CacheSubnetGroupName", helpers.Stringify(cacheSubnetGroupNameValue)) + engineTemp := "{{.Obj.Spec.Engine}}" + engineValue, err := helpers.Templatize(engineTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - Engine := helpers.CreateParam("Engine", helpers.Stringify(EngineValue)) - EngineVersionTemp := "{{.Obj.Spec.EngineVersion}}" - EngineVersionValue, err := helpers.Templatize(EngineVersionTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + engine := helpers.CreateParam("Engine", helpers.Stringify(engineValue)) + engineVersionTemp := "{{.Obj.Spec.EngineVersion}}" + engineVersionValue, err := helpers.Templatize(engineVersionTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - EngineVersion := helpers.CreateParam("EngineVersion", helpers.Stringify(EngineVersionValue)) - NotificationTopicArnTemp := "{{.Obj.Spec.NotificationTopicArn}}" - NotificationTopicArnValue, err := helpers.Templatize(NotificationTopicArnTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + engineVersion := helpers.CreateParam("EngineVersion", helpers.Stringify(engineVersionValue)) + notificationTopicArnTemp := "{{.Obj.Spec.NotificationTopicArn}}" + notificationTopicArnValue, err := helpers.Templatize(notificationTopicArnTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - NotificationTopicArn := helpers.CreateParam("NotificationTopicArn", helpers.Stringify(NotificationTopicArnValue)) - NumCacheNodesTemp := "{{.Obj.Spec.NumCacheNodes}}" - NumCacheNodesValue, err := helpers.Templatize(NumCacheNodesTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + notificationTopicArn := helpers.CreateParam("NotificationTopicArn", helpers.Stringify(notificationTopicArnValue)) + numCacheNodesTemp := "{{.Obj.Spec.NumCacheNodes}}" + numCacheNodesValue, err := helpers.Templatize(numCacheNodesTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - NumCacheNodes := helpers.CreateParam("NumCacheNodes", helpers.Stringify(NumCacheNodesValue)) - PortTemp := "{{.Obj.Spec.Port}}" - PortValue, err := helpers.Templatize(PortTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + numCacheNodes := helpers.CreateParam("NumCacheNodes", helpers.Stringify(numCacheNodesValue)) + portTemp := "{{.Obj.Spec.Port}}" + portValue, err := helpers.Templatize(portTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - Port := helpers.CreateParam("Port", helpers.Stringify(PortValue)) - PreferredMaintenanceWindowTemp := "{{.Obj.Spec.PreferredMaintenanceWindow}}" - PreferredMaintenanceWindowValue, err := helpers.Templatize(PreferredMaintenanceWindowTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + port := helpers.CreateParam("Port", helpers.Stringify(portValue)) + preferredMaintenanceWindowTemp := "{{.Obj.Spec.PreferredMaintenanceWindow}}" + preferredMaintenanceWindowValue, err := helpers.Templatize(preferredMaintenanceWindowTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredMaintenanceWindow := helpers.CreateParam("PreferredMaintenanceWindow", helpers.Stringify(PreferredMaintenanceWindowValue)) - PreferredAvailabilityZoneTemp := "{{.Obj.Spec.PreferredAvailabilityZone}}" - PreferredAvailabilityZoneValue, err := helpers.Templatize(PreferredAvailabilityZoneTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + preferredMaintenanceWindow := helpers.CreateParam("PreferredMaintenanceWindow", helpers.Stringify(preferredMaintenanceWindowValue)) + preferredAvailabilityZoneTemp := "{{.Obj.Spec.PreferredAvailabilityZone}}" + preferredAvailabilityZoneValue, err := helpers.Templatize(preferredAvailabilityZoneTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredAvailabilityZone := helpers.CreateParam("PreferredAvailabilityZone", helpers.Stringify(PreferredAvailabilityZoneValue)) - PreferredAvailabilityZonesTemp := "{{.Obj.Spec.PreferredAvailabilityZones}}" - PreferredAvailabilityZonesValue, err := helpers.Templatize(PreferredAvailabilityZonesTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + preferredAvailabilityZone := helpers.CreateParam("PreferredAvailabilityZone", helpers.Stringify(preferredAvailabilityZoneValue)) + preferredAvailabilityZonesTemp := "{{.Obj.Spec.PreferredAvailabilityZones}}" + preferredAvailabilityZonesValue, err := helpers.Templatize(preferredAvailabilityZonesTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - PreferredAvailabilityZones := helpers.CreateParam("PreferredAvailabilityZones", helpers.Stringify(PreferredAvailabilityZonesValue)) - SnapshotWindowTemp := "{{.Obj.Spec.SnapshotWindow}}" - SnapshotWindowValue, err := helpers.Templatize(SnapshotWindowTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + preferredAvailabilityZones := helpers.CreateParam("PreferredAvailabilityZones", helpers.Stringify(preferredAvailabilityZonesValue)) + snapshotWindowTemp := "{{.Obj.Spec.SnapshotWindow}}" + snapshotWindowValue, err := helpers.Templatize(snapshotWindowTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - SnapshotWindow := helpers.CreateParam("SnapshotWindow", helpers.Stringify(SnapshotWindowValue)) - VpcSecurityGroupIdsTemp := "{{.Obj.Spec.VpcSecurityGroupIds}}" - VpcSecurityGroupIdsValue, err := helpers.Templatize(VpcSecurityGroupIdsTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) + snapshotWindow := helpers.CreateParam("SnapshotWindow", helpers.Stringify(snapshotWindowValue)) + vpcSecurityGroupIdsTemp := "{{.Obj.Spec.VpcSecurityGroupIds}}" + vpcSecurityGroupIdsValue, err := helpers.Templatize(vpcSecurityGroupIdsTemp, helpers.Data{Obj: updated, Config: s.config, Helpers: helpers.New()}) if err != nil { return output, err } - VpcSecurityGroupIds := helpers.CreateParam("VpcSecurityGroupIds", helpers.Stringify(VpcSecurityGroupIdsValue)) + vpcSecurityGroupIds := helpers.CreateParam("VpcSecurityGroupIds", helpers.Stringify(vpcSecurityGroupIdsValue)) parameters := []*cloudformation.Parameter{} parameters = append(parameters, resourceName) @@ -330,21 +330,21 @@ func (s *Cloudformation) UpdateStack(updated *awsV1alpha1.ElastiCache) (output * parameters = append(parameters, namespace) parameters = append(parameters, clusterName) parameters = append(parameters, elastiCacheClusterName) - parameters = append(parameters, AutoMinorVersionUpgrade) - parameters = append(parameters, AZMode) - parameters = append(parameters, CacheNodeType) - parameters = append(parameters, CacheParameterGroupName) - parameters = append(parameters, CacheSubnetGroupName) - parameters = append(parameters, Engine) - parameters = append(parameters, EngineVersion) - parameters = append(parameters, NotificationTopicArn) - parameters = append(parameters, NumCacheNodes) - parameters = append(parameters, Port) - parameters = append(parameters, PreferredMaintenanceWindow) - parameters = append(parameters, PreferredAvailabilityZone) - parameters = append(parameters, PreferredAvailabilityZones) - parameters = append(parameters, SnapshotWindow) - parameters = append(parameters, VpcSecurityGroupIds) + parameters = append(parameters, autoMinorVersionUpgrade) + parameters = append(parameters, azMode) + parameters = append(parameters, cacheNodeType) + parameters = append(parameters, cacheParameterGroupName) + parameters = append(parameters, cacheSubnetGroupName) + parameters = append(parameters, engine) + parameters = append(parameters, engineVersion) + parameters = append(parameters, notificationTopicArn) + parameters = append(parameters, numCacheNodes) + parameters = append(parameters, port) + parameters = append(parameters, preferredMaintenanceWindow) + parameters = append(parameters, preferredAvailabilityZone) + parameters = append(parameters, preferredAvailabilityZones) + parameters = append(parameters, snapshotWindow) + parameters = append(parameters, vpcSecurityGroupIds) stackInputs.SetParameters(parameters) diff --git a/pkg/operators/elasticache/operator.go b/pkg/operators/elasticache/operator.go index fd1675d02..fe7210605 100644 --- a/pkg/operators/elasticache/operator.go +++ b/pkg/operators/elasticache/operator.go @@ -256,8 +256,8 @@ func syncAdditionalResources(config config.Config, s *awsV1alpha1.ElastiCache) ( resource = resource.DeepCopy() services := []string{} - ElastiCacheAddressSvc := helpers.CreateExternalNameService(config, s, s.Name, s.Namespace, "{{ if .Obj.Output.RedisEndpointAddress }}{{ .Obj.Output.RedisEndpointAddress }}{{ else }}{{ .Obj.Output.ConfigurationEndpointAddress }}{{end}}", "{{ if .Obj.Output.RedisEndpointPort }}{{ .Obj.Output.RedisEndpointPort }}{{ else }}{{ .Obj.Output.ConfigurationEndpointPort }}{{end}}") - services = append(services, ElastiCacheAddressSvc) + elastiCacheAddressSvc := helpers.CreateExternalNameService(config, s, s.Name, s.Namespace, "{{ if .Obj.Output.RedisEndpointAddress }}{{ .Obj.Output.RedisEndpointAddress }}{{ else }}{{ .Obj.Output.ConfigurationEndpointAddress }}{{end}}", "{{ if .Obj.Output.RedisEndpointPort }}{{ .Obj.Output.RedisEndpointPort }}{{ else }}{{ .Obj.Output.ConfigurationEndpointPort }}{{end}}") + services = append(services, elastiCacheAddressSvc) resource.AdditionalResources.Services = services _, err = clientSet.ElastiCaches(s.Namespace).Update(resource)