-
Notifications
You must be signed in to change notification settings - Fork 378
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2108 from crossplane-contrib/backport-2105-to-rel…
…ease-0.50
- Loading branch information
Showing
4 changed files
with
828 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| svcsdk "github.com/aws/aws-sdk-go/service/ecs" | ||
|
|
||
| svcapitypes "github.com/crossplane-contrib/provider-aws/apis/ecs/v1alpha1" | ||
| ) | ||
|
|
||
| // GenerateServiceCustom returns the current state in the form of *svcapitypes.Service with custom prarameters set | ||
| func GenerateServiceCustom(resp *svcsdk.DescribeServicesOutput) *svcapitypes.Service { | ||
| if len(resp.Services) != 1 { | ||
| return nil | ||
| } | ||
|
|
||
| out := resp.Services[0] | ||
| service := GenerateService(resp) | ||
| params := &service.Spec.ForProvider | ||
|
|
||
| if out.NetworkConfiguration != nil && out.NetworkConfiguration.AwsvpcConfiguration != nil { | ||
| params.CustomServiceParameters.NetworkConfiguration = &svcapitypes.CustomNetworkConfiguration{ | ||
| AWSvpcConfiguration: &svcapitypes.CustomAWSVPCConfiguration{ | ||
| AssignPublicIP: out.NetworkConfiguration.AwsvpcConfiguration.AssignPublicIp, | ||
| SecurityGroups: out.NetworkConfiguration.AwsvpcConfiguration.SecurityGroups, | ||
| Subnets: out.NetworkConfiguration.AwsvpcConfiguration.Subnets, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| if out.LoadBalancers != nil { | ||
| params.CustomServiceParameters.LoadBalancers = []*svcapitypes.CustomLoadBalancer{} | ||
| for _, lb := range out.LoadBalancers { | ||
| params.CustomServiceParameters.LoadBalancers = append(params.CustomServiceParameters.LoadBalancers, &svcapitypes.CustomLoadBalancer{ | ||
| ContainerName: lb.ContainerName, | ||
| ContainerPort: lb.ContainerPort, | ||
| LoadBalancerName: lb.LoadBalancerName, | ||
| TargetGroupARN: lb.TargetGroupArn, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| if out.TaskDefinition != nil { | ||
| params.CustomServiceParameters.TaskDefinition = out.TaskDefinition | ||
| } | ||
|
|
||
| return service | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,249 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| svcsdk "github.com/aws/aws-sdk-go/service/ecs" | ||
| xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" | ||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/google/go-cmp/cmp/cmpopts" | ||
| "k8s.io/utils/ptr" | ||
|
|
||
| "github.com/crossplane-contrib/provider-aws/apis/ecs/v1alpha1" | ||
| svcapitypes "github.com/crossplane-contrib/provider-aws/apis/ecs/v1alpha1" | ||
| ) | ||
|
|
||
| func TestGenerateServiceCustom(t *testing.T) { | ||
| cases := map[string]struct { | ||
| reason string | ||
| out *svcsdk.DescribeServicesOutput | ||
| want *svcapitypes.Service | ||
| }{ | ||
| "TestAllParameters": { | ||
| "When passed a DescribeServicesOutput, generate a Service", | ||
| &svcsdk.DescribeServicesOutput{ | ||
| Services: []*svcsdk.Service{ | ||
| { | ||
| SchedulingStrategy: ptr.To("Test 12"), | ||
| CapacityProviderStrategy: []*svcsdk.CapacityProviderStrategyItem{ | ||
| { | ||
| Base: ptr.To(int64(1)), | ||
| Weight: ptr.To(int64(2)), | ||
| CapacityProvider: ptr.To("Test"), | ||
| }, | ||
| }, | ||
| DeploymentConfiguration: &svcsdk.DeploymentConfiguration{ | ||
| Alarms: &svcsdk.DeploymentAlarms{ | ||
| AlarmNames: []*string{ptr.To("Test 1"), ptr.To("Test 2")}, | ||
| Enable: ptr.To(true), | ||
| Rollback: ptr.To(false), | ||
| }, | ||
| DeploymentCircuitBreaker: &svcsdk.DeploymentCircuitBreaker{ | ||
| Enable: ptr.To(true), | ||
| Rollback: ptr.To(false), | ||
| }, | ||
| MaximumPercent: ptr.To(int64(3)), | ||
| MinimumHealthyPercent: ptr.To(int64(4)), | ||
| }, | ||
| DesiredCount: ptr.To(int64(5)), | ||
| EnableECSManagedTags: ptr.To(true), | ||
| EnableExecuteCommand: ptr.To(false), | ||
| HealthCheckGracePeriodSeconds: ptr.To(int64(6)), | ||
| PlacementConstraints: []*svcsdk.PlacementConstraint{ | ||
| { | ||
| Expression: ptr.To("Test 5"), | ||
| Type: ptr.To("Test 6"), | ||
| }, | ||
| }, | ||
| PlacementStrategy: []*svcsdk.PlacementStrategy{ | ||
| { | ||
| Field: ptr.To("Test 7"), | ||
| Type: ptr.To("Test 8"), | ||
| }, | ||
| }, | ||
| PlatformVersion: ptr.To("Test 9"), | ||
| PropagateTags: ptr.To("Test 10"), | ||
| ServiceRegistries: []*svcsdk.ServiceRegistry{ | ||
| { | ||
| ContainerName: ptr.To("Test 20"), | ||
| ContainerPort: ptr.To(int64(8082)), | ||
| Port: ptr.To(int64(8083)), | ||
| RegistryArn: ptr.To("Test 21"), | ||
| }, | ||
| }, | ||
| LoadBalancers: []*svcsdk.LoadBalancer{ | ||
| { | ||
| ContainerName: aws.String("test-container"), | ||
| ContainerPort: aws.Int64(443), | ||
| LoadBalancerName: aws.String("test-loadbalancer"), | ||
| TargetGroupArn: aws.String("arn:::test-listener"), | ||
| }, | ||
| }, | ||
| NetworkConfiguration: &svcsdk.NetworkConfiguration{ | ||
| AwsvpcConfiguration: &svcsdk.AwsVpcConfiguration{ | ||
| Subnets: []*string{ | ||
| aws.String("subnet-12345"), | ||
| aws.String("subnet-45678"), | ||
| }, | ||
| }, | ||
| }, | ||
| TaskDefinition: ptr.To("arn:aws:ecs:xx:xx:task-definition/xx:1"), | ||
| Tags: []*svcsdk.Tag{ | ||
| { | ||
| Key: ptr.To("Test 22"), | ||
| Value: ptr.To("Test 23"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| &svcapitypes.Service{ | ||
| Spec: svcapitypes.ServiceSpec{ | ||
| ForProvider: svcapitypes.ServiceParameters{ | ||
| Region: "us-east-1", | ||
| CapacityProviderStrategy: []*svcapitypes.CapacityProviderStrategyItem{ | ||
| { | ||
| Base: ptr.To(int64(1)), | ||
| Weight: ptr.To(int64(2)), | ||
| CapacityProvider: ptr.To("Test"), | ||
| }, | ||
| }, | ||
| DeploymentConfiguration: &svcapitypes.DeploymentConfiguration{ | ||
| Alarms: &svcapitypes.DeploymentAlarms{ | ||
| AlarmNames: []*string{ptr.To("Test 1"), ptr.To("Test 2")}, | ||
| Enable: ptr.To(true), | ||
| Rollback: ptr.To(false), | ||
| }, | ||
| DeploymentCircuitBreaker: &svcapitypes.DeploymentCircuitBreaker{ | ||
| Enable: ptr.To(true), | ||
| Rollback: ptr.To(false), | ||
| }, | ||
| MaximumPercent: ptr.To(int64(3)), | ||
| MinimumHealthyPercent: ptr.To(int64(4)), | ||
| }, | ||
| DesiredCount: ptr.To(int64(5)), | ||
| EnableECSManagedTags: ptr.To(true), | ||
| EnableExecuteCommand: ptr.To(false), | ||
| HealthCheckGracePeriodSeconds: ptr.To(int64(6)), | ||
| PlacementConstraints: []*svcapitypes.PlacementConstraint{ | ||
| { | ||
| Expression: ptr.To("Test 5"), | ||
| Type: ptr.To("Test 6"), | ||
| }, | ||
| }, | ||
| PlacementStrategy: []*svcapitypes.PlacementStrategy{ | ||
| { | ||
| Field: ptr.To("Test 7"), | ||
| Type: ptr.To("Test 8"), | ||
| }, | ||
| }, | ||
| PlatformVersion: ptr.To("Test 9"), | ||
| PropagateTags: ptr.To("Test 10"), | ||
| SchedulingStrategy: ptr.To("Test 12"), | ||
| ServiceConnectConfiguration: &svcapitypes.ServiceConnectConfiguration{ | ||
| Enabled: ptr.To(true), | ||
| LogConfiguration: &svcapitypes.LogConfiguration{ | ||
| LogDriver: ptr.To("Test 13"), | ||
| Options: map[string]*string{"test": ptr.To("Test 14")}, | ||
| SecretOptions: []*svcapitypes.Secret{ | ||
| { | ||
| Name: ptr.To("Test 15"), | ||
| ValueFrom: ptr.To("Test 16"), | ||
| }, | ||
| }, | ||
| }, | ||
| Namespace: ptr.To("Test 17"), | ||
| Services: []*svcapitypes.ServiceConnectService{ | ||
| { | ||
| ClientAliases: []*svcapitypes.ServiceConnectClientAlias{ | ||
| { | ||
| DNSName: ptr.To("Test 17"), | ||
| Port: ptr.To(int64(8080)), | ||
| }, | ||
| }, | ||
| DiscoveryName: ptr.To("Test 18"), | ||
| IngressPortOverride: ptr.To(int64(8081)), | ||
| PortName: ptr.To("Test 19"), | ||
| }, | ||
| }, | ||
| }, | ||
| ServiceRegistries: []*svcapitypes.ServiceRegistry{ | ||
| { | ||
| ContainerName: ptr.To("Test 20"), | ||
| ContainerPort: ptr.To(int64(8082)), | ||
| Port: ptr.To(int64(8083)), | ||
| RegistryARN: ptr.To("Test 21"), | ||
| }, | ||
| }, | ||
| Tags: []*svcapitypes.Tag{ | ||
| { | ||
| Key: ptr.To("Test 22"), | ||
| Value: ptr.To("Test 23"), | ||
| }, | ||
| }, | ||
| CustomServiceParameters: svcapitypes.CustomServiceParameters{ | ||
| ForceDeletion: true, | ||
| LoadBalancers: []*svcapitypes.CustomLoadBalancer{ | ||
| { | ||
| ContainerName: aws.String("test-container"), | ||
| ContainerPort: aws.Int64(443), | ||
| LoadBalancerName: aws.String("test-loadbalancer"), | ||
| TargetGroupARN: aws.String("arn:::test-listener"), | ||
| TargetGroupARNRef: &xpv1.Reference{ | ||
| Name: "test-listener", | ||
| }, | ||
| TargetGroupARNSelector: &xpv1.Selector{ | ||
| MatchLabels: map[string]string{ | ||
| "crossplane.io/name": "test-loadbalancer", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| NetworkConfiguration: &svcapitypes.CustomNetworkConfiguration{ | ||
| AWSvpcConfiguration: &svcapitypes.CustomAWSVPCConfiguration{ | ||
| Subnets: []*string{ | ||
| aws.String("subnet-12345"), | ||
| aws.String("subnet-45678"), | ||
| }, | ||
| SubnetRefs: []xpv1.Reference{ | ||
| { | ||
| Name: "subnet1234", | ||
| }, | ||
| { | ||
| Name: "subnet5678", | ||
| }, | ||
| }, | ||
| SubnetSelector: &xpv1.Selector{ | ||
| MatchLabels: map[string]string{ | ||
| "createdBy": "test", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| TaskDefinition: ptr.To("arn:aws:ecs:xx:xx:task-definition/xx:1"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for name, tc := range cases { | ||
| t.Run(name, func(t *testing.T) { | ||
| got := GenerateServiceCustom(tc.out) | ||
|
|
||
| if diff := cmp.Diff(tc.want, got, | ||
| cmpopts.EquateEmpty(), | ||
| cmpopts.IgnoreFields(v1alpha1.Service{}, "Status"), | ||
| // Not in DescribeServicesOutput | ||
| cmpopts.IgnoreFields(v1alpha1.ServiceParameters{}, "ForceDeletion"), | ||
| cmpopts.IgnoreFields(v1alpha1.ServiceParameters{}, "Region"), | ||
| cmpopts.IgnoreFields(v1alpha1.ServiceParameters{}, "ServiceConnectConfiguration"), | ||
| cmpopts.IgnoreTypes(&xpv1.Reference{}, &xpv1.Selector{}, []xpv1.Reference{}), | ||
| ); diff != "" { | ||
| t.Errorf("%s\nExample(...): -want, +got:\n%s", tc.reason, diff) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.