From 96d264193fd82d7b685470d10a1e87f387da19ea Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Fri, 14 Jan 2022 01:34:44 +0300 Subject: [PATCH] Update Terraform provider to 3.x Signed-off-by: Alper Rifat Ulucinar --- .github/workflows/ci.yml | 12 +- Makefile | 13 + .../v1alpha2/zz_autoscalinggroup_types.go | 6 + .../v1alpha2/zz_generated.deepcopy.go | 16 + apis/ec2/v1alpha2/zz_generated.deepcopy.go | 122 +++++- apis/ec2/v1alpha2/zz_instance_types.go | 3 + apis/ec2/v1alpha2/zz_launchtemplate_types.go | 6 + .../ec2/v1alpha2/zz_networkinterface_types.go | 16 + apis/ec2/v1alpha2/zz_subnet_types.go | 19 +- apis/ec2/v1alpha2/zz_vpc_types.go | 21 +- .../zz_vpcipv4cidrblockassociation_types.go | 10 +- apis/ecs/v1alpha2/zz_generated.deepcopy.go | 47 +++ apis/ecs/v1alpha2/zz_taskdefinition_types.go | 15 + apis/eks/v1alpha2/zz_generated.deepcopy.go | 47 +++ apis/eks/v1alpha2/zz_nodegroup_types.go | 15 + .../v1alpha2/zz_generated.deepcopy.go | 398 +----------------- .../v1alpha2/zz_generated.managed.go | 112 ----- .../v1alpha2/zz_generated.managedlist.go | 18 - .../v1alpha2/zz_generated.resolvers.go | 26 -- .../v1alpha2/zz_replicationgroup_types.go | 3 + .../v1alpha2/zz_user_terraformed.go | 100 ----- apis/elasticache/v1alpha2/zz_user_types.go | 110 ----- .../v1alpha2/zz_usergroup_terraformed.go | 100 ----- .../v1alpha2/zz_usergroup_types.go | 110 ----- apis/elbv2/v1alpha2/zz_generated.deepcopy.go | 17 +- apis/elbv2/v1alpha2/zz_lb_types.go | 6 + apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go | 5 +- apis/kms/v1alpha2/zz_generated.deepcopy.go | 5 + apis/kms/v1alpha2/zz_key_types.go | 3 + apis/rds/v1alpha2/zz_cluster_types.go | 6 + apis/rds/v1alpha2/zz_generated.deepcopy.go | 20 + apis/rds/v1alpha2/zz_instance_types.go | 5 + .../v1alpha2/zz_delegationset_types.go | 2 + .../route53/v1alpha2/zz_generated.deepcopy.go | 25 ++ apis/route53/v1alpha2/zz_healthcheck_types.go | 5 + apis/route53/v1alpha2/zz_querylog_types.go | 2 + apis/route53/v1alpha2/zz_zone_types.go | 2 + apis/s3/v1alpha2/zz_bucket_types.go | 30 ++ apis/s3/v1alpha2/zz_generated.deepcopy.go | 94 +++++ .../provider-jet-aws-controller/Dockerfile | 2 +- cmd/generator/main.go | 2 +- cmd/provider/main.go | 4 +- config/provider.go | 1 + go.mod | 6 +- go.sum | 40 +- hack/provider.go.txt | 11 + .../elasticache/user/zz_controller.go | 57 --- .../elasticache/usergroup/zz_controller.go | 57 --- internal/controller/zz_setup.go | 8 +- ...s.jet.crossplane.io_autoscalinggroups.yaml | 7 + .../ec2.aws.jet.crossplane.io_instances.yaml | 3 + ...aws.jet.crossplane.io_launchtemplates.yaml | 5 + ...s.jet.crossplane.io_networkinterfaces.yaml | 18 + .../ec2.aws.jet.crossplane.io_subnets.yaml | 11 +- ...plane.io_vpcipv4cidrblockassociations.yaml | 6 +- .../crds/ec2.aws.jet.crossplane.io_vpcs.yaml | 15 +- ...aws.jet.crossplane.io_taskdefinitions.yaml | 9 + .../eks.aws.jet.crossplane.io_nodegroups.yaml | 11 + ...s.jet.crossplane.io_replicationgroups.yaml | 2 + ...ache.aws.jet.crossplane.io_usergroups.yaml | 212 ---------- ...asticache.aws.jet.crossplane.io_users.yaml | 195 --------- .../crds/elbv2.aws.jet.crossplane.io_lbs.yaml | 4 + ....aws.jet.crossplane.io_lbtargetgroups.yaml | 5 +- .../crds/kms.aws.jet.crossplane.io_keys.yaml | 2 + .../rds.aws.jet.crossplane.io_clusters.yaml | 4 + .../rds.aws.jet.crossplane.io_instances.yaml | 4 + ....aws.jet.crossplane.io_delegationsets.yaml | 2 + ...53.aws.jet.crossplane.io_healthchecks.yaml | 4 + ...ute53.aws.jet.crossplane.io_querylogs.yaml | 2 + .../route53.aws.jet.crossplane.io_zones.yaml | 2 + .../s3.aws.jet.crossplane.io_buckets.yaml | 20 + scripts/prepare_tfaws.sh | 31 ++ 72 files changed, 790 insertions(+), 1544 deletions(-) delete mode 100755 apis/elasticache/v1alpha2/zz_user_terraformed.go delete mode 100755 apis/elasticache/v1alpha2/zz_user_types.go delete mode 100755 apis/elasticache/v1alpha2/zz_usergroup_terraformed.go delete mode 100755 apis/elasticache/v1alpha2/zz_usergroup_types.go create mode 100644 hack/provider.go.txt delete mode 100755 internal/controller/elasticache/user/zz_controller.go delete mode 100755 internal/controller/elasticache/usergroup/zz_controller.go delete mode 100644 package/crds/elasticache.aws.jet.crossplane.io_usergroups.yaml delete mode 100644 package/crds/elasticache.aws.jet.crossplane.io_users.yaml create mode 100755 scripts/prepare_tfaws.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6885b42bd..6e914220c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make provider-jet-aws.vendor vendor.check # Go version coming with golangci-lint-action may not be our desired # go version. We deploy our desired go version and then skip go @@ -101,7 +101,7 @@ jobs: go-version: ${{ env.GO_VERSION }} - name: Install goimports - run: go install golang.org/x/tools/cmd/goimports + run: cd /tmp/ && go get golang.org/x/tools/cmd/goimports - name: Find the Go Build Cache id: go @@ -122,7 +122,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make provider-jet-aws.vendor vendor.check - name: Check Diff run: make check-diff @@ -165,7 +165,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make provider-jet-aws.vendor vendor.check - name: Run Unit Tests run: make -j2 test @@ -226,7 +226,7 @@ jobs: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make provider-jet-aws.vendor vendor.check - name: Build Helm Chart run: make -j2 build @@ -287,7 +287,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make provider-jet-aws.vendor vendor.check - name: Build Artifacts run: make -j2 build.all diff --git a/Makefile b/Makefile index 31590704a..2e680392b 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,19 @@ run: go.build @# To see other arguments that can be provided, run the command with --help instead $(GO_OUT_DIR)/provider --debug +go.build: prepare.tfaws +reviewable: prepare.tfaws +test: prepare.tfaws +generate: prepare.tfaws +build: prepare.tfaws +provider-jet-aws.vendor: prepare.tfaws vendor + +# must match Docker build file env. variable TERRAFORM_PROVIDER_VERSION in +# cluster/images/provider-jet-aws-controller/Dockerfile +TFAWS_REFSPEC ?= v3.71.0 +prepare.tfaws: + @WORK_DIR=.work TFAWS_REFSPEC=$(TFAWS_REFSPEC) ./scripts/prepare_tfaws.sh + .PHONY: cobertura submodules fallthrough run crds.clean # ==================================================================================== diff --git a/apis/autoscaling/v1alpha2/zz_autoscalinggroup_types.go b/apis/autoscaling/v1alpha2/zz_autoscalinggroup_types.go index a0fa0a221..96dcb9da5 100755 --- a/apis/autoscaling/v1alpha2/zz_autoscalinggroup_types.go +++ b/apis/autoscaling/v1alpha2/zz_autoscalinggroup_types.go @@ -303,6 +303,12 @@ type PreferencesObservation struct { type PreferencesParameters struct { + // +kubebuilder:validation:Optional + CheckpointDelay *string `json:"checkpointDelay,omitempty" tf:"checkpoint_delay,omitempty"` + + // +kubebuilder:validation:Optional + CheckpointPercentages []*int64 `json:"checkpointPercentages,omitempty" tf:"checkpoint_percentages,omitempty"` + // +kubebuilder:validation:Optional InstanceWarmup *string `json:"instanceWarmup,omitempty" tf:"instance_warmup,omitempty"` diff --git a/apis/autoscaling/v1alpha2/zz_generated.deepcopy.go b/apis/autoscaling/v1alpha2/zz_generated.deepcopy.go index aae758c8e..42a13d355 100644 --- a/apis/autoscaling/v1alpha2/zz_generated.deepcopy.go +++ b/apis/autoscaling/v1alpha2/zz_generated.deepcopy.go @@ -1047,6 +1047,22 @@ func (in *PreferencesObservation) DeepCopy() *PreferencesObservation { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PreferencesParameters) DeepCopyInto(out *PreferencesParameters) { *out = *in + if in.CheckpointDelay != nil { + in, out := &in.CheckpointDelay, &out.CheckpointDelay + *out = new(string) + **out = **in + } + if in.CheckpointPercentages != nil { + in, out := &in.CheckpointPercentages, &out.CheckpointPercentages + *out = make([]*int64, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(int64) + **out = **in + } + } + } if in.InstanceWarmup != nil { in, out := &in.InstanceWarmup, &out.InstanceWarmup *out = new(string) diff --git a/apis/ec2/v1alpha2/zz_generated.deepcopy.go b/apis/ec2/v1alpha2/zz_generated.deepcopy.go index d2be3a7b6..40863a64b 100644 --- a/apis/ec2/v1alpha2/zz_generated.deepcopy.go +++ b/apis/ec2/v1alpha2/zz_generated.deepcopy.go @@ -1879,6 +1879,11 @@ func (in *InstanceParameters) DeepCopyInto(out *InstanceParameters) { *out = new(string) **out = **in } + if in.PlacementPartitionNumber != nil { + in, out := &in.PlacementPartitionNumber, &out.PlacementPartitionNumber + *out = new(int64) + **out = **in + } if in.PrivateIP != nil { in, out := &in.PrivateIP, &out.PrivateIP *out = new(string) @@ -2254,6 +2259,11 @@ func (in *LaunchTemplateMetadataOptionsParameters) DeepCopyInto(out *LaunchTempl *out = new(string) **out = **in } + if in.HTTPProtocolIPv6 != nil { + in, out := &in.HTTPProtocolIPv6, &out.HTTPProtocolIPv6 + *out = new(string) + **out = **in + } if in.HTTPPutResponseHopLimit != nil { in, out := &in.HTTPPutResponseHopLimit, &out.HTTPPutResponseHopLimit *out = new(int64) @@ -2851,6 +2861,11 @@ func (in *NetworkInterfaceObservation) DeepCopy() *NetworkInterfaceObservation { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NetworkInterfaceObservation_2) DeepCopyInto(out *NetworkInterfaceObservation_2) { *out = *in + if in.Arn != nil { + in, out := &in.Arn, &out.Arn + *out = new(string) + **out = **in + } if in.ID != nil { in, out := &in.ID, &out.ID *out = new(string) @@ -2866,6 +2881,11 @@ func (in *NetworkInterfaceObservation_2) DeepCopyInto(out *NetworkInterfaceObser *out = new(string) **out = **in } + if in.OwnerID != nil { + in, out := &in.OwnerID, &out.OwnerID + *out = new(string) + **out = **in + } if in.PrivateDNSName != nil { in, out := &in.PrivateDNSName, &out.PrivateDNSName *out = new(string) @@ -2953,6 +2973,22 @@ func (in *NetworkInterfaceParameters_2) DeepCopyInto(out *NetworkInterfaceParame *out = new(string) **out = **in } + if in.IPv4PrefixCount != nil { + in, out := &in.IPv4PrefixCount, &out.IPv4PrefixCount + *out = new(int64) + **out = **in + } + if in.IPv4Prefixes != nil { + in, out := &in.IPv4Prefixes, &out.IPv4Prefixes + *out = make([]*string, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(string) + **out = **in + } + } + } if in.IPv6AddressCount != nil { in, out := &in.IPv6AddressCount, &out.IPv6AddressCount *out = new(int64) @@ -2969,6 +3005,22 @@ func (in *NetworkInterfaceParameters_2) DeepCopyInto(out *NetworkInterfaceParame } } } + if in.IPv6PrefixCount != nil { + in, out := &in.IPv6PrefixCount, &out.IPv6PrefixCount + *out = new(int64) + **out = **in + } + if in.IPv6Prefixes != nil { + in, out := &in.IPv6Prefixes, &out.IPv6Prefixes + *out = make([]*string, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(string) + **out = **in + } + } + } if in.InterfaceType != nil { in, out := &in.InterfaceType, &out.InterfaceType *out = new(string) @@ -3182,6 +3234,11 @@ func (in *NetworkInterfacesParameters) DeepCopyInto(out *NetworkInterfacesParame *out = new(string) **out = **in } + if in.NetworkCardIndex != nil { + in, out := &in.NetworkCardIndex, &out.NetworkCardIndex + *out = new(int64) + **out = **in + } if in.NetworkInterfaceID != nil { in, out := &in.NetworkInterfaceID, &out.NetworkInterfaceID *out = new(string) @@ -4882,11 +4939,31 @@ func (in *SubnetParameters) DeepCopyInto(out *SubnetParameters) { *out = new(string) **out = **in } + if in.EnableDns64 != nil { + in, out := &in.EnableDns64, &out.EnableDns64 + *out = new(bool) + **out = **in + } + if in.EnableResourceNameDNSARecordOnLaunch != nil { + in, out := &in.EnableResourceNameDNSARecordOnLaunch, &out.EnableResourceNameDNSARecordOnLaunch + *out = new(bool) + **out = **in + } + if in.EnableResourceNameDNSAaaaRecordOnLaunch != nil { + in, out := &in.EnableResourceNameDNSAaaaRecordOnLaunch, &out.EnableResourceNameDNSAaaaRecordOnLaunch + *out = new(bool) + **out = **in + } if in.IPv6CidrBlock != nil { in, out := &in.IPv6CidrBlock, &out.IPv6CidrBlock *out = new(string) **out = **in } + if in.IPv6Native != nil { + in, out := &in.IPv6Native, &out.IPv6Native + *out = new(bool) + **out = **in + } if in.MapCustomerOwnedIPOnLaunch != nil { in, out := &in.MapCustomerOwnedIPOnLaunch, &out.MapCustomerOwnedIPOnLaunch *out = new(bool) @@ -4902,6 +4979,11 @@ func (in *SubnetParameters) DeepCopyInto(out *SubnetParameters) { *out = new(string) **out = **in } + if in.PrivateDNSHostnameTypeOnLaunch != nil { + in, out := &in.PrivateDNSHostnameTypeOnLaunch, &out.PrivateDNSHostnameTypeOnLaunch + *out = new(string) + **out = **in + } if in.Region != nil { in, out := &in.Region, &out.Region *out = new(string) @@ -6870,6 +6952,16 @@ func (in *VPCIPv4CidrBlockAssociationParameters) DeepCopyInto(out *VPCIPv4CidrBl *out = new(string) **out = **in } + if in.IPv4IpamPoolID != nil { + in, out := &in.IPv4IpamPoolID, &out.IPv4IpamPoolID + *out = new(string) + **out = **in + } + if in.IPv4NetmaskLength != nil { + in, out := &in.IPv4NetmaskLength, &out.IPv4NetmaskLength + *out = new(int64) + **out = **in + } if in.Region != nil { in, out := &in.Region, &out.Region *out = new(string) @@ -7006,11 +7098,6 @@ func (in *VPCObservation) DeepCopyInto(out *VPCObservation) { *out = new(string) **out = **in } - if in.IPv6CidrBlock != nil { - in, out := &in.IPv6CidrBlock, &out.IPv6CidrBlock - *out = new(string) - **out = **in - } if in.MainRouteTableID != nil { in, out := &in.MainRouteTableID, &out.MainRouteTableID *out = new(string) @@ -7081,6 +7168,31 @@ func (in *VPCParameters) DeepCopyInto(out *VPCParameters) { *out = new(bool) **out = **in } + if in.IPv4IpamPoolID != nil { + in, out := &in.IPv4IpamPoolID, &out.IPv4IpamPoolID + *out = new(string) + **out = **in + } + if in.IPv4NetmaskLength != nil { + in, out := &in.IPv4NetmaskLength, &out.IPv4NetmaskLength + *out = new(int64) + **out = **in + } + if in.IPv6CidrBlock != nil { + in, out := &in.IPv6CidrBlock, &out.IPv6CidrBlock + *out = new(string) + **out = **in + } + if in.IPv6IpamPoolID != nil { + in, out := &in.IPv6IpamPoolID, &out.IPv6IpamPoolID + *out = new(string) + **out = **in + } + if in.IPv6NetmaskLength != nil { + in, out := &in.IPv6NetmaskLength, &out.IPv6NetmaskLength + *out = new(int64) + **out = **in + } if in.InstanceTenancy != nil { in, out := &in.InstanceTenancy, &out.InstanceTenancy *out = new(string) diff --git a/apis/ec2/v1alpha2/zz_instance_types.go b/apis/ec2/v1alpha2/zz_instance_types.go index e8cdd3a42..a9485ff59 100755 --- a/apis/ec2/v1alpha2/zz_instance_types.go +++ b/apis/ec2/v1alpha2/zz_instance_types.go @@ -225,6 +225,9 @@ type InstanceParameters struct { // +kubebuilder:validation:Optional PlacementGroup *string `json:"placementGroup,omitempty" tf:"placement_group,omitempty"` + // +kubebuilder:validation:Optional + PlacementPartitionNumber *int64 `json:"placementPartitionNumber,omitempty" tf:"placement_partition_number,omitempty"` + // +kubebuilder:validation:Optional PrivateIP *string `json:"privateIp,omitempty" tf:"private_ip,omitempty"` diff --git a/apis/ec2/v1alpha2/zz_launchtemplate_types.go b/apis/ec2/v1alpha2/zz_launchtemplate_types.go index 590a6f3de..908b53be6 100755 --- a/apis/ec2/v1alpha2/zz_launchtemplate_types.go +++ b/apis/ec2/v1alpha2/zz_launchtemplate_types.go @@ -205,6 +205,9 @@ type LaunchTemplateMetadataOptionsParameters struct { // +kubebuilder:validation:Optional HTTPEndpoint *string `json:"httpEndpoint,omitempty" tf:"http_endpoint,omitempty"` + // +kubebuilder:validation:Optional + HTTPProtocolIPv6 *string `json:"httpProtocolIpv6,omitempty" tf:"http_protocol_ipv6,omitempty"` + // +kubebuilder:validation:Optional HTTPPutResponseHopLimit *int64 `json:"httpPutResponseHopLimit,omitempty" tf:"http_put_response_hop_limit,omitempty"` @@ -400,6 +403,9 @@ type NetworkInterfacesParameters struct { // +kubebuilder:validation:Optional InterfaceType *string `json:"interfaceType,omitempty" tf:"interface_type,omitempty"` + // +kubebuilder:validation:Optional + NetworkCardIndex *int64 `json:"networkCardIndex,omitempty" tf:"network_card_index,omitempty"` + // +crossplane:generate:reference:type=NetworkInterface // +kubebuilder:validation:Optional NetworkInterfaceID *string `json:"networkInterfaceId,omitempty" tf:"network_interface_id,omitempty"` diff --git a/apis/ec2/v1alpha2/zz_networkinterface_types.go b/apis/ec2/v1alpha2/zz_networkinterface_types.go index 9e5720eec..6c73ff718 100755 --- a/apis/ec2/v1alpha2/zz_networkinterface_types.go +++ b/apis/ec2/v1alpha2/zz_networkinterface_types.go @@ -46,12 +46,16 @@ type AttachmentParameters struct { } type NetworkInterfaceObservation_2 struct { + Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` + ID *string `json:"id,omitempty" tf:"id,omitempty"` MacAddress *string `json:"macAddress,omitempty" tf:"mac_address,omitempty"` OutpostArn *string `json:"outpostArn,omitempty" tf:"outpost_arn,omitempty"` + OwnerID *string `json:"ownerId,omitempty" tf:"owner_id,omitempty"` + PrivateDNSName *string `json:"privateDnsName,omitempty" tf:"private_dns_name,omitempty"` TagsAll map[string]*string `json:"tagsAll,omitempty" tf:"tags_all,omitempty"` @@ -65,12 +69,24 @@ type NetworkInterfaceParameters_2 struct { // +kubebuilder:validation:Optional Description *string `json:"description,omitempty" tf:"description,omitempty"` + // +kubebuilder:validation:Optional + IPv4PrefixCount *int64 `json:"ipv4PrefixCount,omitempty" tf:"ipv4_prefix_count,omitempty"` + + // +kubebuilder:validation:Optional + IPv4Prefixes []*string `json:"ipv4Prefixes,omitempty" tf:"ipv4_prefixes,omitempty"` + // +kubebuilder:validation:Optional IPv6AddressCount *int64 `json:"ipv6AddressCount,omitempty" tf:"ipv6_address_count,omitempty"` // +kubebuilder:validation:Optional IPv6Addresses []*string `json:"ipv6Addresses,omitempty" tf:"ipv6_addresses,omitempty"` + // +kubebuilder:validation:Optional + IPv6PrefixCount *int64 `json:"ipv6PrefixCount,omitempty" tf:"ipv6_prefix_count,omitempty"` + + // +kubebuilder:validation:Optional + IPv6Prefixes []*string `json:"ipv6Prefixes,omitempty" tf:"ipv6_prefixes,omitempty"` + // +kubebuilder:validation:Optional InterfaceType *string `json:"interfaceType,omitempty" tf:"interface_type,omitempty"` diff --git a/apis/ec2/v1alpha2/zz_subnet_types.go b/apis/ec2/v1alpha2/zz_subnet_types.go index c833be0b1..049588bba 100755 --- a/apis/ec2/v1alpha2/zz_subnet_types.go +++ b/apis/ec2/v1alpha2/zz_subnet_types.go @@ -48,15 +48,27 @@ type SubnetParameters struct { // +kubebuilder:validation:Optional AvailabilityZoneID *string `json:"availabilityZoneId,omitempty" tf:"availability_zone_id,omitempty"` - // +kubebuilder:validation:Required - CidrBlock *string `json:"cidrBlock" tf:"cidr_block,omitempty"` + // +kubebuilder:validation:Optional + CidrBlock *string `json:"cidrBlock,omitempty" tf:"cidr_block,omitempty"` // +kubebuilder:validation:Optional CustomerOwnedIPv4Pool *string `json:"customerOwnedIpv4Pool,omitempty" tf:"customer_owned_ipv4_pool,omitempty"` + // +kubebuilder:validation:Optional + EnableDns64 *bool `json:"enableDns64,omitempty" tf:"enable_dns64,omitempty"` + + // +kubebuilder:validation:Optional + EnableResourceNameDNSARecordOnLaunch *bool `json:"enableResourceNameDnsARecordOnLaunch,omitempty" tf:"enable_resource_name_dns_a_record_on_launch,omitempty"` + + // +kubebuilder:validation:Optional + EnableResourceNameDNSAaaaRecordOnLaunch *bool `json:"enableResourceNameDnsAaaaRecordOnLaunch,omitempty" tf:"enable_resource_name_dns_aaaa_record_on_launch,omitempty"` + // +kubebuilder:validation:Optional IPv6CidrBlock *string `json:"ipv6CidrBlock,omitempty" tf:"ipv6_cidr_block,omitempty"` + // +kubebuilder:validation:Optional + IPv6Native *bool `json:"ipv6Native,omitempty" tf:"ipv6_native,omitempty"` + // +kubebuilder:validation:Optional MapCustomerOwnedIPOnLaunch *bool `json:"mapCustomerOwnedIpOnLaunch,omitempty" tf:"map_customer_owned_ip_on_launch,omitempty"` @@ -66,6 +78,9 @@ type SubnetParameters struct { // +kubebuilder:validation:Optional OutpostArn *string `json:"outpostArn,omitempty" tf:"outpost_arn,omitempty"` + // +kubebuilder:validation:Optional + PrivateDNSHostnameTypeOnLaunch *string `json:"privateDnsHostnameTypeOnLaunch,omitempty" tf:"private_dns_hostname_type_on_launch,omitempty"` + // Region is the region you'd like your resource to be created in. // +terrajet:crd:field:TFTag=- // +kubebuilder:validation:Required diff --git a/apis/ec2/v1alpha2/zz_vpc_types.go b/apis/ec2/v1alpha2/zz_vpc_types.go index 000b9f397..a1404ce98 100755 --- a/apis/ec2/v1alpha2/zz_vpc_types.go +++ b/apis/ec2/v1alpha2/zz_vpc_types.go @@ -40,8 +40,6 @@ type VPCObservation struct { IPv6AssociationID *string `json:"ipv6AssociationId,omitempty" tf:"ipv6_association_id,omitempty"` - IPv6CidrBlock *string `json:"ipv6CidrBlock,omitempty" tf:"ipv6_cidr_block,omitempty"` - MainRouteTableID *string `json:"mainRouteTableId,omitempty" tf:"main_route_table_id,omitempty"` OwnerID *string `json:"ownerId,omitempty" tf:"owner_id,omitempty"` @@ -54,8 +52,8 @@ type VPCParameters struct { // +kubebuilder:validation:Optional AssignGeneratedIPv6CidrBlock *bool `json:"assignGeneratedIpv6CidrBlock,omitempty" tf:"assign_generated_ipv6_cidr_block,omitempty"` - // +kubebuilder:validation:Required - CidrBlock *string `json:"cidrBlock" tf:"cidr_block,omitempty"` + // +kubebuilder:validation:Optional + CidrBlock *string `json:"cidrBlock,omitempty" tf:"cidr_block,omitempty"` // +kubebuilder:validation:Optional EnableClassiclink *bool `json:"enableClassiclink,omitempty" tf:"enable_classiclink,omitempty"` @@ -69,6 +67,21 @@ type VPCParameters struct { // +kubebuilder:validation:Optional EnableDNSSupport *bool `json:"enableDnsSupport,omitempty" tf:"enable_dns_support,omitempty"` + // +kubebuilder:validation:Optional + IPv4IpamPoolID *string `json:"ipv4IpamPoolId,omitempty" tf:"ipv4_ipam_pool_id,omitempty"` + + // +kubebuilder:validation:Optional + IPv4NetmaskLength *int64 `json:"ipv4NetmaskLength,omitempty" tf:"ipv4_netmask_length,omitempty"` + + // +kubebuilder:validation:Optional + IPv6CidrBlock *string `json:"ipv6CidrBlock,omitempty" tf:"ipv6_cidr_block,omitempty"` + + // +kubebuilder:validation:Optional + IPv6IpamPoolID *string `json:"ipv6IpamPoolId,omitempty" tf:"ipv6_ipam_pool_id,omitempty"` + + // +kubebuilder:validation:Optional + IPv6NetmaskLength *int64 `json:"ipv6NetmaskLength,omitempty" tf:"ipv6_netmask_length,omitempty"` + // +kubebuilder:validation:Optional InstanceTenancy *string `json:"instanceTenancy,omitempty" tf:"instance_tenancy,omitempty"` diff --git a/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go b/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go index f0f775ab9..de099ace6 100755 --- a/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go +++ b/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go @@ -31,8 +31,14 @@ type VPCIPv4CidrBlockAssociationObservation struct { type VPCIPv4CidrBlockAssociationParameters struct { - // +kubebuilder:validation:Required - CidrBlock *string `json:"cidrBlock" tf:"cidr_block,omitempty"` + // +kubebuilder:validation:Optional + CidrBlock *string `json:"cidrBlock,omitempty" tf:"cidr_block,omitempty"` + + // +kubebuilder:validation:Optional + IPv4IpamPoolID *string `json:"ipv4IpamPoolId,omitempty" tf:"ipv4_ipam_pool_id,omitempty"` + + // +kubebuilder:validation:Optional + IPv4NetmaskLength *int64 `json:"ipv4NetmaskLength,omitempty" tf:"ipv4_netmask_length,omitempty"` // Region is the region you'd like your resource to be created in. // +terrajet:crd:field:TFTag=- diff --git a/apis/ecs/v1alpha2/zz_generated.deepcopy.go b/apis/ecs/v1alpha2/zz_generated.deepcopy.go index 4e18c1760..7d23e190e 100644 --- a/apis/ecs/v1alpha2/zz_generated.deepcopy.go +++ b/apis/ecs/v1alpha2/zz_generated.deepcopy.go @@ -1422,6 +1422,46 @@ func (in *ProxyConfigurationParameters) DeepCopy() *ProxyConfigurationParameters return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RuntimePlatformObservation) DeepCopyInto(out *RuntimePlatformObservation) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuntimePlatformObservation. +func (in *RuntimePlatformObservation) DeepCopy() *RuntimePlatformObservation { + if in == nil { + return nil + } + out := new(RuntimePlatformObservation) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RuntimePlatformParameters) DeepCopyInto(out *RuntimePlatformParameters) { + *out = *in + if in.CPUArchitecture != nil { + in, out := &in.CPUArchitecture, &out.CPUArchitecture + *out = new(string) + **out = **in + } + if in.OperatingSystemFamily != nil { + in, out := &in.OperatingSystemFamily, &out.OperatingSystemFamily + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuntimePlatformParameters. +func (in *RuntimePlatformParameters) DeepCopy() *RuntimePlatformParameters { + if in == nil { + return nil + } + out := new(RuntimePlatformParameters) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Service) DeepCopyInto(out *Service) { *out = *in @@ -2027,6 +2067,13 @@ func (in *TaskDefinitionParameters) DeepCopyInto(out *TaskDefinitionParameters) } } } + if in.RuntimePlatform != nil { + in, out := &in.RuntimePlatform, &out.RuntimePlatform + *out = make([]RuntimePlatformParameters, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.Tags != nil { in, out := &in.Tags, &out.Tags *out = make(map[string]*string, len(*in)) diff --git a/apis/ecs/v1alpha2/zz_taskdefinition_types.go b/apis/ecs/v1alpha2/zz_taskdefinition_types.go index 8e63d93e2..41c207001 100755 --- a/apis/ecs/v1alpha2/zz_taskdefinition_types.go +++ b/apis/ecs/v1alpha2/zz_taskdefinition_types.go @@ -142,6 +142,18 @@ type ProxyConfigurationParameters struct { Type *string `json:"type,omitempty" tf:"type,omitempty"` } +type RuntimePlatformObservation struct { +} + +type RuntimePlatformParameters struct { + + // +kubebuilder:validation:Optional + CPUArchitecture *string `json:"cpuArchitecture,omitempty" tf:"cpu_architecture,omitempty"` + + // +kubebuilder:validation:Optional + OperatingSystemFamily *string `json:"operatingSystemFamily,omitempty" tf:"operating_system_family,omitempty"` +} + type TaskDefinitionObservation struct { Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` @@ -206,6 +218,9 @@ type TaskDefinitionParameters struct { // +kubebuilder:validation:Optional RequiresCompatibilities []*string `json:"requiresCompatibilities,omitempty" tf:"requires_compatibilities,omitempty"` + // +kubebuilder:validation:Optional + RuntimePlatform []RuntimePlatformParameters `json:"runtimePlatform,omitempty" tf:"runtime_platform,omitempty"` + // +kubebuilder:validation:Optional Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` diff --git a/apis/eks/v1alpha2/zz_generated.deepcopy.go b/apis/eks/v1alpha2/zz_generated.deepcopy.go index e32ff6ae2..c7effc556 100644 --- a/apis/eks/v1alpha2/zz_generated.deepcopy.go +++ b/apis/eks/v1alpha2/zz_generated.deepcopy.go @@ -1502,6 +1502,13 @@ func (in *NodeGroupParameters) DeepCopyInto(out *NodeGroupParameters) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.UpdateConfig != nil { + in, out := &in.UpdateConfig, &out.UpdateConfig + *out = make([]UpdateConfigParameters, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.Version != nil { in, out := &in.Version, &out.Version *out = new(string) @@ -1861,6 +1868,46 @@ func (in *TaintParameters) DeepCopy() *TaintParameters { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *UpdateConfigObservation) DeepCopyInto(out *UpdateConfigObservation) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UpdateConfigObservation. +func (in *UpdateConfigObservation) DeepCopy() *UpdateConfigObservation { + if in == nil { + return nil + } + out := new(UpdateConfigObservation) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *UpdateConfigParameters) DeepCopyInto(out *UpdateConfigParameters) { + *out = *in + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(int64) + **out = **in + } + if in.MaxUnavailablePercentage != nil { + in, out := &in.MaxUnavailablePercentage, &out.MaxUnavailablePercentage + *out = new(int64) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UpdateConfigParameters. +func (in *UpdateConfigParameters) DeepCopy() *UpdateConfigParameters { + if in == nil { + return nil + } + out := new(UpdateConfigParameters) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VPCConfigObservation) DeepCopyInto(out *VPCConfigObservation) { *out = *in diff --git a/apis/eks/v1alpha2/zz_nodegroup_types.go b/apis/eks/v1alpha2/zz_nodegroup_types.go index 053618e2f..ac580a84a 100755 --- a/apis/eks/v1alpha2/zz_nodegroup_types.go +++ b/apis/eks/v1alpha2/zz_nodegroup_types.go @@ -135,6 +135,9 @@ type NodeGroupParameters struct { // +kubebuilder:validation:Optional Taint []TaintParameters `json:"taint,omitempty" tf:"taint,omitempty"` + // +kubebuilder:validation:Optional + UpdateConfig []UpdateConfigParameters `json:"updateConfig,omitempty" tf:"update_config,omitempty"` + // +kubebuilder:validation:Optional Version *string `json:"version,omitempty" tf:"version,omitempty"` } @@ -199,6 +202,18 @@ type TaintParameters struct { Value *string `json:"value,omitempty" tf:"value,omitempty"` } +type UpdateConfigObservation struct { +} + +type UpdateConfigParameters struct { + + // +kubebuilder:validation:Optional + MaxUnavailable *int64 `json:"maxUnavailable,omitempty" tf:"max_unavailable,omitempty"` + + // +kubebuilder:validation:Optional + MaxUnavailablePercentage *int64 `json:"maxUnavailablePercentage,omitempty" tf:"max_unavailable_percentage,omitempty"` +} + // NodeGroupSpec defines the desired state of NodeGroup type NodeGroupSpec struct { v1.ResourceSpec `json:",inline"` diff --git a/apis/elasticache/v1alpha2/zz_generated.deepcopy.go b/apis/elasticache/v1alpha2/zz_generated.deepcopy.go index 456868a83..850f86e97 100644 --- a/apis/elasticache/v1alpha2/zz_generated.deepcopy.go +++ b/apis/elasticache/v1alpha2/zz_generated.deepcopy.go @@ -850,6 +850,11 @@ func (in *ReplicationGroupParameters) DeepCopyInto(out *ReplicationGroupParamete (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.DataTieringEnabled != nil { + in, out := &in.DataTieringEnabled, &out.DataTieringEnabled + *out = new(bool) + **out = **in + } if in.Engine != nil { in, out := &in.Engine, &out.Engine *out = new(string) @@ -1058,396 +1063,3 @@ func (in *ReplicationGroupStatus) DeepCopy() *ReplicationGroupStatus { in.DeepCopyInto(out) return out } - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *User) DeepCopyInto(out *User) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new User. -func (in *User) DeepCopy() *User { - if in == nil { - return nil - } - out := new(User) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *User) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroup) DeepCopyInto(out *UserGroup) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroup. -func (in *UserGroup) DeepCopy() *UserGroup { - if in == nil { - return nil - } - out := new(UserGroup) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *UserGroup) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroupList) DeepCopyInto(out *UserGroupList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]UserGroup, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroupList. -func (in *UserGroupList) DeepCopy() *UserGroupList { - if in == nil { - return nil - } - out := new(UserGroupList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *UserGroupList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroupObservation) DeepCopyInto(out *UserGroupObservation) { - *out = *in - if in.ID != nil { - in, out := &in.ID, &out.ID - *out = new(string) - **out = **in - } - if in.TagsAll != nil { - in, out := &in.TagsAll, &out.TagsAll - *out = make(map[string]*string, len(*in)) - for key, val := range *in { - var outVal *string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = new(string) - **out = **in - } - (*out)[key] = outVal - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroupObservation. -func (in *UserGroupObservation) DeepCopy() *UserGroupObservation { - if in == nil { - return nil - } - out := new(UserGroupObservation) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroupParameters) DeepCopyInto(out *UserGroupParameters) { - *out = *in - if in.Arn != nil { - in, out := &in.Arn, &out.Arn - *out = new(string) - **out = **in - } - if in.Engine != nil { - in, out := &in.Engine, &out.Engine - *out = new(string) - **out = **in - } - if in.Region != nil { - in, out := &in.Region, &out.Region - *out = new(string) - **out = **in - } - if in.Tags != nil { - in, out := &in.Tags, &out.Tags - *out = make(map[string]*string, len(*in)) - for key, val := range *in { - var outVal *string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = new(string) - **out = **in - } - (*out)[key] = outVal - } - } - if in.UserIdRefs != nil { - in, out := &in.UserIdRefs, &out.UserIdRefs - *out = make([]v1.Reference, len(*in)) - copy(*out, *in) - } - if in.UserIdSelector != nil { - in, out := &in.UserIdSelector, &out.UserIdSelector - *out = new(v1.Selector) - (*in).DeepCopyInto(*out) - } - if in.UserIds != nil { - in, out := &in.UserIds, &out.UserIds - *out = make([]*string, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(string) - **out = **in - } - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroupParameters. -func (in *UserGroupParameters) DeepCopy() *UserGroupParameters { - if in == nil { - return nil - } - out := new(UserGroupParameters) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroupSpec) DeepCopyInto(out *UserGroupSpec) { - *out = *in - in.ResourceSpec.DeepCopyInto(&out.ResourceSpec) - in.ForProvider.DeepCopyInto(&out.ForProvider) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroupSpec. -func (in *UserGroupSpec) DeepCopy() *UserGroupSpec { - if in == nil { - return nil - } - out := new(UserGroupSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserGroupStatus) DeepCopyInto(out *UserGroupStatus) { - *out = *in - in.ResourceStatus.DeepCopyInto(&out.ResourceStatus) - in.AtProvider.DeepCopyInto(&out.AtProvider) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserGroupStatus. -func (in *UserGroupStatus) DeepCopy() *UserGroupStatus { - if in == nil { - return nil - } - out := new(UserGroupStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserList) DeepCopyInto(out *UserList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]User, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserList. -func (in *UserList) DeepCopy() *UserList { - if in == nil { - return nil - } - out := new(UserList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *UserList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserObservation) DeepCopyInto(out *UserObservation) { - *out = *in - if in.ID != nil { - in, out := &in.ID, &out.ID - *out = new(string) - **out = **in - } - if in.TagsAll != nil { - in, out := &in.TagsAll, &out.TagsAll - *out = make(map[string]*string, len(*in)) - for key, val := range *in { - var outVal *string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = new(string) - **out = **in - } - (*out)[key] = outVal - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserObservation. -func (in *UserObservation) DeepCopy() *UserObservation { - if in == nil { - return nil - } - out := new(UserObservation) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserParameters) DeepCopyInto(out *UserParameters) { - *out = *in - if in.AccessString != nil { - in, out := &in.AccessString, &out.AccessString - *out = new(string) - **out = **in - } - if in.Arn != nil { - in, out := &in.Arn, &out.Arn - *out = new(string) - **out = **in - } - if in.Engine != nil { - in, out := &in.Engine, &out.Engine - *out = new(string) - **out = **in - } - if in.NoPasswordRequired != nil { - in, out := &in.NoPasswordRequired, &out.NoPasswordRequired - *out = new(bool) - **out = **in - } - if in.Passwords != nil { - in, out := &in.Passwords, &out.Passwords - *out = make([]*string, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(string) - **out = **in - } - } - } - if in.Region != nil { - in, out := &in.Region, &out.Region - *out = new(string) - **out = **in - } - if in.Tags != nil { - in, out := &in.Tags, &out.Tags - *out = make(map[string]*string, len(*in)) - for key, val := range *in { - var outVal *string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = new(string) - **out = **in - } - (*out)[key] = outVal - } - } - if in.UserName != nil { - in, out := &in.UserName, &out.UserName - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserParameters. -func (in *UserParameters) DeepCopy() *UserParameters { - if in == nil { - return nil - } - out := new(UserParameters) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserSpec) DeepCopyInto(out *UserSpec) { - *out = *in - in.ResourceSpec.DeepCopyInto(&out.ResourceSpec) - in.ForProvider.DeepCopyInto(&out.ForProvider) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserSpec. -func (in *UserSpec) DeepCopy() *UserSpec { - if in == nil { - return nil - } - out := new(UserSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserStatus) DeepCopyInto(out *UserStatus) { - *out = *in - in.ResourceStatus.DeepCopyInto(&out.ResourceStatus) - in.AtProvider.DeepCopyInto(&out.AtProvider) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserStatus. -func (in *UserStatus) DeepCopy() *UserStatus { - if in == nil { - return nil - } - out := new(UserStatus) - in.DeepCopyInto(out) - return out -} diff --git a/apis/elasticache/v1alpha2/zz_generated.managed.go b/apis/elasticache/v1alpha2/zz_generated.managed.go index 622b48d8f..be5c3c71e 100644 --- a/apis/elasticache/v1alpha2/zz_generated.managed.go +++ b/apis/elasticache/v1alpha2/zz_generated.managed.go @@ -186,115 +186,3 @@ func (mg *ReplicationGroup) SetProviderReference(r *xpv1.Reference) { func (mg *ReplicationGroup) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { mg.Spec.WriteConnectionSecretToReference = r } - -// GetCondition of this User. -func (mg *User) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this User. -func (mg *User) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetProviderConfigReference of this User. -func (mg *User) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -/* -GetProviderReference of this User. -Deprecated: Use GetProviderConfigReference. -*/ -func (mg *User) GetProviderReference() *xpv1.Reference { - return mg.Spec.ProviderReference -} - -// GetWriteConnectionSecretToReference of this User. -func (mg *User) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this User. -func (mg *User) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this User. -func (mg *User) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetProviderConfigReference of this User. -func (mg *User) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -/* -SetProviderReference of this User. -Deprecated: Use SetProviderConfigReference. -*/ -func (mg *User) SetProviderReference(r *xpv1.Reference) { - mg.Spec.ProviderReference = r -} - -// SetWriteConnectionSecretToReference of this User. -func (mg *User) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} - -// GetCondition of this UserGroup. -func (mg *UserGroup) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return mg.Status.GetCondition(ct) -} - -// GetDeletionPolicy of this UserGroup. -func (mg *UserGroup) GetDeletionPolicy() xpv1.DeletionPolicy { - return mg.Spec.DeletionPolicy -} - -// GetProviderConfigReference of this UserGroup. -func (mg *UserGroup) GetProviderConfigReference() *xpv1.Reference { - return mg.Spec.ProviderConfigReference -} - -/* -GetProviderReference of this UserGroup. -Deprecated: Use GetProviderConfigReference. -*/ -func (mg *UserGroup) GetProviderReference() *xpv1.Reference { - return mg.Spec.ProviderReference -} - -// GetWriteConnectionSecretToReference of this UserGroup. -func (mg *UserGroup) GetWriteConnectionSecretToReference() *xpv1.SecretReference { - return mg.Spec.WriteConnectionSecretToReference -} - -// SetConditions of this UserGroup. -func (mg *UserGroup) SetConditions(c ...xpv1.Condition) { - mg.Status.SetConditions(c...) -} - -// SetDeletionPolicy of this UserGroup. -func (mg *UserGroup) SetDeletionPolicy(r xpv1.DeletionPolicy) { - mg.Spec.DeletionPolicy = r -} - -// SetProviderConfigReference of this UserGroup. -func (mg *UserGroup) SetProviderConfigReference(r *xpv1.Reference) { - mg.Spec.ProviderConfigReference = r -} - -/* -SetProviderReference of this UserGroup. -Deprecated: Use SetProviderConfigReference. -*/ -func (mg *UserGroup) SetProviderReference(r *xpv1.Reference) { - mg.Spec.ProviderReference = r -} - -// SetWriteConnectionSecretToReference of this UserGroup. -func (mg *UserGroup) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { - mg.Spec.WriteConnectionSecretToReference = r -} diff --git a/apis/elasticache/v1alpha2/zz_generated.managedlist.go b/apis/elasticache/v1alpha2/zz_generated.managedlist.go index 3d36587fe..2c4546d42 100644 --- a/apis/elasticache/v1alpha2/zz_generated.managedlist.go +++ b/apis/elasticache/v1alpha2/zz_generated.managedlist.go @@ -45,21 +45,3 @@ func (l *ReplicationGroupList) GetItems() []resource.Managed { } return items } - -// GetItems of this UserGroupList. -func (l *UserGroupList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} - -// GetItems of this UserList. -func (l *UserList) GetItems() []resource.Managed { - items := make([]resource.Managed, len(l.Items)) - for i := range l.Items { - items[i] = &l.Items[i] - } - return items -} diff --git a/apis/elasticache/v1alpha2/zz_generated.resolvers.go b/apis/elasticache/v1alpha2/zz_generated.resolvers.go index 0db8ab6ad..b0003ef28 100644 --- a/apis/elasticache/v1alpha2/zz_generated.resolvers.go +++ b/apis/elasticache/v1alpha2/zz_generated.resolvers.go @@ -94,29 +94,3 @@ func (mg *ReplicationGroup) ResolveReferences(ctx context.Context, c client.Read return nil } - -// ResolveReferences of this UserGroup. -func (mg *UserGroup) ResolveReferences(ctx context.Context, c client.Reader) error { - r := reference.NewAPIResolver(c, mg) - - var mrsp reference.MultiResolutionResponse - var err error - - mrsp, err = r.ResolveMultiple(ctx, reference.MultiResolutionRequest{ - CurrentValues: reference.FromPtrValues(mg.Spec.ForProvider.UserIds), - Extract: reference.ExternalName(), - References: mg.Spec.ForProvider.UserIdRefs, - Selector: mg.Spec.ForProvider.UserIdSelector, - To: reference.To{ - List: &UserList{}, - Managed: &User{}, - }, - }) - if err != nil { - return errors.Wrap(err, "mg.Spec.ForProvider.UserIds") - } - mg.Spec.ForProvider.UserIds = reference.ToPtrValues(mrsp.ResolvedValues) - mg.Spec.ForProvider.UserIdRefs = mrsp.ResolvedReferences - - return nil -} diff --git a/apis/elasticache/v1alpha2/zz_replicationgroup_types.go b/apis/elasticache/v1alpha2/zz_replicationgroup_types.go index d8d1f4016..6b4f846ed 100755 --- a/apis/elasticache/v1alpha2/zz_replicationgroup_types.go +++ b/apis/elasticache/v1alpha2/zz_replicationgroup_types.go @@ -80,6 +80,9 @@ type ReplicationGroupParameters struct { // +kubebuilder:validation:Optional ClusterMode []ClusterModeParameters `json:"clusterMode,omitempty" tf:"cluster_mode,omitempty"` + // +kubebuilder:validation:Optional + DataTieringEnabled *bool `json:"dataTieringEnabled,omitempty" tf:"data_tiering_enabled,omitempty"` + // +kubebuilder:validation:Optional Engine *string `json:"engine,omitempty" tf:"engine,omitempty"` diff --git a/apis/elasticache/v1alpha2/zz_user_terraformed.go b/apis/elasticache/v1alpha2/zz_user_terraformed.go deleted file mode 100755 index b2d9fefd1..000000000 --- a/apis/elasticache/v1alpha2/zz_user_terraformed.go +++ /dev/null @@ -1,100 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package v1alpha2 - -import ( - "github.com/pkg/errors" - - "github.com/crossplane/terrajet/pkg/resource" - "github.com/crossplane/terrajet/pkg/resource/json" -) - -// GetTerraformResourceType returns Terraform resource type for this User -func (mg *User) GetTerraformResourceType() string { - return "aws_elasticache_user" -} - -// GetConnectionDetailsMapping for this User -func (tr *User) GetConnectionDetailsMapping() map[string]string { - return nil -} - -// GetObservation of this User -func (tr *User) GetObservation() (map[string]interface{}, error) { - o, err := json.TFParser.Marshal(tr.Status.AtProvider) - if err != nil { - return nil, err - } - base := map[string]interface{}{} - return base, json.TFParser.Unmarshal(o, &base) -} - -// SetObservation for this User -func (tr *User) SetObservation(obs map[string]interface{}) error { - p, err := json.TFParser.Marshal(obs) - if err != nil { - return err - } - return json.TFParser.Unmarshal(p, &tr.Status.AtProvider) -} - -// GetID returns ID of underlying Terraform resource of this User -func (tr *User) GetID() string { - if tr.Status.AtProvider.ID == nil { - return "" - } - return *tr.Status.AtProvider.ID -} - -// GetParameters of this User -func (tr *User) GetParameters() (map[string]interface{}, error) { - p, err := json.TFParser.Marshal(tr.Spec.ForProvider) - if err != nil { - return nil, err - } - base := map[string]interface{}{} - return base, json.TFParser.Unmarshal(p, &base) -} - -// SetParameters for this User -func (tr *User) SetParameters(params map[string]interface{}) error { - p, err := json.TFParser.Marshal(params) - if err != nil { - return err - } - return json.TFParser.Unmarshal(p, &tr.Spec.ForProvider) -} - -// LateInitialize this User using its observed tfState. -// returns True if there are any spec changes for the resource. -func (tr *User) LateInitialize(attrs []byte) (bool, error) { - params := &UserParameters{} - if err := json.TFParser.Unmarshal(attrs, params); err != nil { - return false, errors.Wrap(err, "failed to unmarshal Terraform state parameters for late-initialization") - } - opts := []resource.GenericLateInitializerOption{resource.WithZeroValueJSONOmitEmptyFilter(resource.CNameWildcard)} - - li := resource.NewGenericLateInitializer(opts...) - return li.LateInitialize(&tr.Spec.ForProvider, params) -} - -// GetTerraformSchemaVersion returns the associated Terraform schema version -func (tr *User) GetTerraformSchemaVersion() int { - return 0 -} diff --git a/apis/elasticache/v1alpha2/zz_user_types.go b/apis/elasticache/v1alpha2/zz_user_types.go deleted file mode 100755 index f30961fe9..000000000 --- a/apis/elasticache/v1alpha2/zz_user_types.go +++ /dev/null @@ -1,110 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package v1alpha2 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" - - v1 "github.com/crossplane/crossplane-runtime/apis/common/v1" -) - -type UserObservation struct { - ID *string `json:"id,omitempty" tf:"id,omitempty"` - - TagsAll map[string]*string `json:"tagsAll,omitempty" tf:"tags_all,omitempty"` -} - -type UserParameters struct { - - // +kubebuilder:validation:Required - AccessString *string `json:"accessString" tf:"access_string,omitempty"` - - // +kubebuilder:validation:Optional - Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` - - // +kubebuilder:validation:Required - Engine *string `json:"engine" tf:"engine,omitempty"` - - // +kubebuilder:validation:Optional - NoPasswordRequired *bool `json:"noPasswordRequired,omitempty" tf:"no_password_required,omitempty"` - - // +kubebuilder:validation:Optional - Passwords []*string `json:"passwords,omitempty" tf:"passwords,omitempty"` - - // Region is the region you'd like your resource to be created in. - // +terrajet:crd:field:TFTag=- - // +kubebuilder:validation:Required - Region *string `json:"region" tf:"-"` - - // +kubebuilder:validation:Optional - Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` - - // +kubebuilder:validation:Required - UserName *string `json:"userName" tf:"user_name,omitempty"` -} - -// UserSpec defines the desired state of User -type UserSpec struct { - v1.ResourceSpec `json:",inline"` - ForProvider UserParameters `json:"forProvider"` -} - -// UserStatus defines the observed state of User. -type UserStatus struct { - v1.ResourceStatus `json:",inline"` - AtProvider UserObservation `json:"atProvider,omitempty"` -} - -// +kubebuilder:object:root=true - -// User is the Schema for the Users API -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" -// +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" -// +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" -// +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" -// +kubebuilder:subresource:status -// +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,awsjet} -type User struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Spec UserSpec `json:"spec"` - Status UserStatus `json:"status,omitempty"` -} - -// +kubebuilder:object:root=true - -// UserList contains a list of Users -type UserList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []User `json:"items"` -} - -// Repository type metadata. -var ( - User_Kind = "User" - User_GroupKind = schema.GroupKind{Group: CRDGroup, Kind: User_Kind}.String() - User_KindAPIVersion = User_Kind + "." + CRDGroupVersion.String() - User_GroupVersionKind = CRDGroupVersion.WithKind(User_Kind) -) - -func init() { - SchemeBuilder.Register(&User{}, &UserList{}) -} diff --git a/apis/elasticache/v1alpha2/zz_usergroup_terraformed.go b/apis/elasticache/v1alpha2/zz_usergroup_terraformed.go deleted file mode 100755 index 495a866a6..000000000 --- a/apis/elasticache/v1alpha2/zz_usergroup_terraformed.go +++ /dev/null @@ -1,100 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package v1alpha2 - -import ( - "github.com/pkg/errors" - - "github.com/crossplane/terrajet/pkg/resource" - "github.com/crossplane/terrajet/pkg/resource/json" -) - -// GetTerraformResourceType returns Terraform resource type for this UserGroup -func (mg *UserGroup) GetTerraformResourceType() string { - return "aws_elasticache_user_group" -} - -// GetConnectionDetailsMapping for this UserGroup -func (tr *UserGroup) GetConnectionDetailsMapping() map[string]string { - return nil -} - -// GetObservation of this UserGroup -func (tr *UserGroup) GetObservation() (map[string]interface{}, error) { - o, err := json.TFParser.Marshal(tr.Status.AtProvider) - if err != nil { - return nil, err - } - base := map[string]interface{}{} - return base, json.TFParser.Unmarshal(o, &base) -} - -// SetObservation for this UserGroup -func (tr *UserGroup) SetObservation(obs map[string]interface{}) error { - p, err := json.TFParser.Marshal(obs) - if err != nil { - return err - } - return json.TFParser.Unmarshal(p, &tr.Status.AtProvider) -} - -// GetID returns ID of underlying Terraform resource of this UserGroup -func (tr *UserGroup) GetID() string { - if tr.Status.AtProvider.ID == nil { - return "" - } - return *tr.Status.AtProvider.ID -} - -// GetParameters of this UserGroup -func (tr *UserGroup) GetParameters() (map[string]interface{}, error) { - p, err := json.TFParser.Marshal(tr.Spec.ForProvider) - if err != nil { - return nil, err - } - base := map[string]interface{}{} - return base, json.TFParser.Unmarshal(p, &base) -} - -// SetParameters for this UserGroup -func (tr *UserGroup) SetParameters(params map[string]interface{}) error { - p, err := json.TFParser.Marshal(params) - if err != nil { - return err - } - return json.TFParser.Unmarshal(p, &tr.Spec.ForProvider) -} - -// LateInitialize this UserGroup using its observed tfState. -// returns True if there are any spec changes for the resource. -func (tr *UserGroup) LateInitialize(attrs []byte) (bool, error) { - params := &UserGroupParameters{} - if err := json.TFParser.Unmarshal(attrs, params); err != nil { - return false, errors.Wrap(err, "failed to unmarshal Terraform state parameters for late-initialization") - } - opts := []resource.GenericLateInitializerOption{resource.WithZeroValueJSONOmitEmptyFilter(resource.CNameWildcard)} - - li := resource.NewGenericLateInitializer(opts...) - return li.LateInitialize(&tr.Spec.ForProvider, params) -} - -// GetTerraformSchemaVersion returns the associated Terraform schema version -func (tr *UserGroup) GetTerraformSchemaVersion() int { - return 0 -} diff --git a/apis/elasticache/v1alpha2/zz_usergroup_types.go b/apis/elasticache/v1alpha2/zz_usergroup_types.go deleted file mode 100755 index b1805bcbe..000000000 --- a/apis/elasticache/v1alpha2/zz_usergroup_types.go +++ /dev/null @@ -1,110 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package v1alpha2 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" - - v1 "github.com/crossplane/crossplane-runtime/apis/common/v1" -) - -type UserGroupObservation struct { - ID *string `json:"id,omitempty" tf:"id,omitempty"` - - TagsAll map[string]*string `json:"tagsAll,omitempty" tf:"tags_all,omitempty"` -} - -type UserGroupParameters struct { - - // +kubebuilder:validation:Optional - Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` - - // +kubebuilder:validation:Required - Engine *string `json:"engine" tf:"engine,omitempty"` - - // Region is the region you'd like your resource to be created in. - // +terrajet:crd:field:TFTag=- - // +kubebuilder:validation:Required - Region *string `json:"region" tf:"-"` - - // +kubebuilder:validation:Optional - Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` - - // +kubebuilder:validation:Optional - UserIdRefs []v1.Reference `json:"userIdRefs,omitempty" tf:"-"` - - // +kubebuilder:validation:Optional - UserIdSelector *v1.Selector `json:"userIdSelector,omitempty" tf:"-"` - - // +crossplane:generate:reference:type=User - // +crossplane:generate:reference:refFieldName=UserIdRefs - // +crossplane:generate:reference:selectorFieldName=UserIdSelector - // +kubebuilder:validation:Optional - UserIds []*string `json:"userIds,omitempty" tf:"user_ids,omitempty"` -} - -// UserGroupSpec defines the desired state of UserGroup -type UserGroupSpec struct { - v1.ResourceSpec `json:",inline"` - ForProvider UserGroupParameters `json:"forProvider"` -} - -// UserGroupStatus defines the observed state of UserGroup. -type UserGroupStatus struct { - v1.ResourceStatus `json:",inline"` - AtProvider UserGroupObservation `json:"atProvider,omitempty"` -} - -// +kubebuilder:object:root=true - -// UserGroup is the Schema for the UserGroups API -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" -// +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" -// +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" -// +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" -// +kubebuilder:subresource:status -// +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,awsjet} -type UserGroup struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Spec UserGroupSpec `json:"spec"` - Status UserGroupStatus `json:"status,omitempty"` -} - -// +kubebuilder:object:root=true - -// UserGroupList contains a list of UserGroups -type UserGroupList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []UserGroup `json:"items"` -} - -// Repository type metadata. -var ( - UserGroup_Kind = "UserGroup" - UserGroup_GroupKind = schema.GroupKind{Group: CRDGroup, Kind: UserGroup_Kind}.String() - UserGroup_KindAPIVersion = UserGroup_Kind + "." + CRDGroupVersion.String() - UserGroup_GroupVersionKind = CRDGroupVersion.WithKind(UserGroup_Kind) -) - -func init() { - SchemeBuilder.Register(&UserGroup{}, &UserGroupList{}) -} diff --git a/apis/elbv2/v1alpha2/zz_generated.deepcopy.go b/apis/elbv2/v1alpha2/zz_generated.deepcopy.go index fbc9f5598..34872d492 100644 --- a/apis/elbv2/v1alpha2/zz_generated.deepcopy.go +++ b/apis/elbv2/v1alpha2/zz_generated.deepcopy.go @@ -854,6 +854,11 @@ func (in *LBParameters) DeepCopyInto(out *LBParameters) { *out = new(string) **out = **in } + if in.DesyncMitigationMode != nil { + in, out := &in.DesyncMitigationMode, &out.DesyncMitigationMode + *out = new(string) + **out = **in + } if in.DropInvalidHeaderFields != nil { in, out := &in.DropInvalidHeaderFields, &out.DropInvalidHeaderFields *out = new(bool) @@ -874,6 +879,11 @@ func (in *LBParameters) DeepCopyInto(out *LBParameters) { *out = new(bool) **out = **in } + if in.EnableWafFailOpen != nil { + in, out := &in.EnableWafFailOpen, &out.EnableWafFailOpen + *out = new(bool) + **out = **in + } if in.IPAddressType != nil { in, out := &in.IPAddressType, &out.IPAddressType *out = new(string) @@ -1284,9 +1294,14 @@ func (in *LBTargetGroupObservation) DeepCopy() *LBTargetGroupObservation { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LBTargetGroupParameters) DeepCopyInto(out *LBTargetGroupParameters) { *out = *in + if in.ConnectionTermination != nil { + in, out := &in.ConnectionTermination, &out.ConnectionTermination + *out = new(bool) + **out = **in + } if in.DeregistrationDelay != nil { in, out := &in.DeregistrationDelay, &out.DeregistrationDelay - *out = new(int64) + *out = new(string) **out = **in } if in.HealthCheck != nil { diff --git a/apis/elbv2/v1alpha2/zz_lb_types.go b/apis/elbv2/v1alpha2/zz_lb_types.go index 9855668f9..e29e55df3 100755 --- a/apis/elbv2/v1alpha2/zz_lb_types.go +++ b/apis/elbv2/v1alpha2/zz_lb_types.go @@ -71,6 +71,9 @@ type LBParameters struct { // +kubebuilder:validation:Optional CustomerOwnedIPv4Pool *string `json:"customerOwnedIpv4Pool,omitempty" tf:"customer_owned_ipv4_pool,omitempty"` + // +kubebuilder:validation:Optional + DesyncMitigationMode *string `json:"desyncMitigationMode,omitempty" tf:"desync_mitigation_mode,omitempty"` + // +kubebuilder:validation:Optional DropInvalidHeaderFields *bool `json:"dropInvalidHeaderFields,omitempty" tf:"drop_invalid_header_fields,omitempty"` @@ -83,6 +86,9 @@ type LBParameters struct { // +kubebuilder:validation:Optional EnableHttp2 *bool `json:"enableHttp2,omitempty" tf:"enable_http2,omitempty"` + // +kubebuilder:validation:Optional + EnableWafFailOpen *bool `json:"enableWafFailOpen,omitempty" tf:"enable_waf_fail_open,omitempty"` + // +kubebuilder:validation:Optional IPAddressType *string `json:"ipAddressType,omitempty" tf:"ip_address_type,omitempty"` diff --git a/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go b/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go index e43513cd4..54f714cf3 100755 --- a/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go +++ b/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go @@ -71,7 +71,10 @@ type LBTargetGroupObservation struct { type LBTargetGroupParameters struct { // +kubebuilder:validation:Optional - DeregistrationDelay *int64 `json:"deregistrationDelay,omitempty" tf:"deregistration_delay,omitempty"` + ConnectionTermination *bool `json:"connectionTermination,omitempty" tf:"connection_termination,omitempty"` + + // +kubebuilder:validation:Optional + DeregistrationDelay *string `json:"deregistrationDelay,omitempty" tf:"deregistration_delay,omitempty"` // +kubebuilder:validation:Optional HealthCheck []HealthCheckParameters `json:"healthCheck,omitempty" tf:"health_check,omitempty"` diff --git a/apis/kms/v1alpha2/zz_generated.deepcopy.go b/apis/kms/v1alpha2/zz_generated.deepcopy.go index ca0914184..425ef1966 100644 --- a/apis/kms/v1alpha2/zz_generated.deepcopy.go +++ b/apis/kms/v1alpha2/zz_generated.deepcopy.go @@ -166,6 +166,11 @@ func (in *KeyParameters) DeepCopyInto(out *KeyParameters) { *out = new(string) **out = **in } + if in.MultiRegion != nil { + in, out := &in.MultiRegion, &out.MultiRegion + *out = new(bool) + **out = **in + } if in.Policy != nil { in, out := &in.Policy, &out.Policy *out = new(string) diff --git a/apis/kms/v1alpha2/zz_key_types.go b/apis/kms/v1alpha2/zz_key_types.go index 290187ad9..a8bbaef61 100755 --- a/apis/kms/v1alpha2/zz_key_types.go +++ b/apis/kms/v1alpha2/zz_key_types.go @@ -58,6 +58,9 @@ type KeyParameters struct { // +kubebuilder:validation:Optional KeyUsage *string `json:"keyUsage,omitempty" tf:"key_usage,omitempty"` + // +kubebuilder:validation:Optional + MultiRegion *bool `json:"multiRegion,omitempty" tf:"multi_region,omitempty"` + // +kubebuilder:validation:Optional Policy *string `json:"policy,omitempty" tf:"policy,omitempty"` diff --git a/apis/rds/v1alpha2/zz_cluster_types.go b/apis/rds/v1alpha2/zz_cluster_types.go index f59962e15..fb7a25956 100755 --- a/apis/rds/v1alpha2/zz_cluster_types.go +++ b/apis/rds/v1alpha2/zz_cluster_types.go @@ -69,6 +69,9 @@ type ClusterParameters struct { // +kubebuilder:validation:Optional DBClusterParameterGroupName *string `json:"dbClusterParameterGroupName,omitempty" tf:"db_cluster_parameter_group_name,omitempty"` + // +kubebuilder:validation:Optional + DBInstanceParameterGroupName *string `json:"dbInstanceParameterGroupName,omitempty" tf:"db_instance_parameter_group_name,omitempty"` + // +kubebuilder:validation:Optional DBSubnetGroupName *string `json:"dbSubnetGroupName,omitempty" tf:"db_subnet_group_name,omitempty"` @@ -78,6 +81,9 @@ type ClusterParameters struct { // +kubebuilder:validation:Optional DeletionProtection *bool `json:"deletionProtection,omitempty" tf:"deletion_protection,omitempty"` + // +kubebuilder:validation:Optional + EnableGlobalWriteForwarding *bool `json:"enableGlobalWriteForwarding,omitempty" tf:"enable_global_write_forwarding,omitempty"` + // +kubebuilder:validation:Optional EnableHTTPEndpoint *bool `json:"enableHttpEndpoint,omitempty" tf:"enable_http_endpoint,omitempty"` diff --git a/apis/rds/v1alpha2/zz_generated.deepcopy.go b/apis/rds/v1alpha2/zz_generated.deepcopy.go index dd22b6105..32bddfb43 100644 --- a/apis/rds/v1alpha2/zz_generated.deepcopy.go +++ b/apis/rds/v1alpha2/zz_generated.deepcopy.go @@ -204,6 +204,11 @@ func (in *ClusterParameters) DeepCopyInto(out *ClusterParameters) { *out = new(string) **out = **in } + if in.DBInstanceParameterGroupName != nil { + in, out := &in.DBInstanceParameterGroupName, &out.DBInstanceParameterGroupName + *out = new(string) + **out = **in + } if in.DBSubnetGroupName != nil { in, out := &in.DBSubnetGroupName, &out.DBSubnetGroupName *out = new(string) @@ -219,6 +224,11 @@ func (in *ClusterParameters) DeepCopyInto(out *ClusterParameters) { *out = new(bool) **out = **in } + if in.EnableGlobalWriteForwarding != nil { + in, out := &in.EnableGlobalWriteForwarding, &out.EnableGlobalWriteForwarding + *out = new(bool) + **out = **in + } if in.EnableHTTPEndpoint != nil { in, out := &in.EnableHTTPEndpoint, &out.EnableHTTPEndpoint *out = new(bool) @@ -641,6 +651,11 @@ func (in *InstanceObservation) DeepCopyInto(out *InstanceObservation) { *out = new(string) **out = **in } + if in.EngineVersionActual != nil { + in, out := &in.EngineVersionActual, &out.EngineVersionActual + *out = new(string) + **out = **in + } if in.HostedZoneID != nil { in, out := &in.HostedZoneID, &out.HostedZoneID *out = new(string) @@ -948,6 +963,11 @@ func (in *InstanceParameters) DeepCopyInto(out *InstanceParameters) { *out = new(string) **out = **in } + if in.ReplicaMode != nil { + in, out := &in.ReplicaMode, &out.ReplicaMode + *out = new(string) + **out = **in + } if in.ReplicateSourceDB != nil { in, out := &in.ReplicateSourceDB, &out.ReplicateSourceDB *out = new(string) diff --git a/apis/rds/v1alpha2/zz_instance_types.go b/apis/rds/v1alpha2/zz_instance_types.go index 57cd532e4..f3685ef49 100755 --- a/apis/rds/v1alpha2/zz_instance_types.go +++ b/apis/rds/v1alpha2/zz_instance_types.go @@ -32,6 +32,8 @@ type InstanceObservation struct { Endpoint *string `json:"endpoint,omitempty" tf:"endpoint,omitempty"` + EngineVersionActual *string `json:"engineVersionActual,omitempty" tf:"engine_version_actual,omitempty"` + HostedZoneID *string `json:"hostedZoneId,omitempty" tf:"hosted_zone_id,omitempty"` ID *string `json:"id,omitempty" tf:"id,omitempty"` @@ -195,6 +197,9 @@ type InstanceParameters struct { // +kubebuilder:validation:Required Region *string `json:"region" tf:"-"` + // +kubebuilder:validation:Optional + ReplicaMode *string `json:"replicaMode,omitempty" tf:"replica_mode,omitempty"` + // +kubebuilder:validation:Optional ReplicateSourceDB *string `json:"replicateSourceDb,omitempty" tf:"replicate_source_db,omitempty"` diff --git a/apis/route53/v1alpha2/zz_delegationset_types.go b/apis/route53/v1alpha2/zz_delegationset_types.go index 8997f4853..4f7c3889e 100755 --- a/apis/route53/v1alpha2/zz_delegationset_types.go +++ b/apis/route53/v1alpha2/zz_delegationset_types.go @@ -26,6 +26,8 @@ import ( ) type DelegationSetObservation struct { + Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` + ID *string `json:"id,omitempty" tf:"id,omitempty"` NameServers []*string `json:"nameServers,omitempty" tf:"name_servers,omitempty"` diff --git a/apis/route53/v1alpha2/zz_generated.deepcopy.go b/apis/route53/v1alpha2/zz_generated.deepcopy.go index ff70f1641..171130907 100644 --- a/apis/route53/v1alpha2/zz_generated.deepcopy.go +++ b/apis/route53/v1alpha2/zz_generated.deepcopy.go @@ -132,6 +132,11 @@ func (in *DelegationSetList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DelegationSetObservation) DeepCopyInto(out *DelegationSetObservation) { *out = *in + if in.Arn != nil { + in, out := &in.Arn, &out.Arn + *out = new(string) + **out = **in + } if in.ID != nil { in, out := &in.ID, &out.ID *out = new(string) @@ -361,6 +366,11 @@ func (in *HealthCheckList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HealthCheckObservation) DeepCopyInto(out *HealthCheckObservation) { *out = *in + if in.Arn != nil { + in, out := &in.Arn, &out.Arn + *out = new(string) + **out = **in + } if in.ID != nil { in, out := &in.ID, &out.ID *out = new(string) @@ -498,6 +508,11 @@ func (in *HealthCheckParameters) DeepCopyInto(out *HealthCheckParameters) { *out = new(string) **out = **in } + if in.RoutingControlArn != nil { + in, out := &in.RoutingControlArn, &out.RoutingControlArn + *out = new(string) + **out = **in + } if in.SearchString != nil { in, out := &in.SearchString, &out.SearchString *out = new(string) @@ -1042,6 +1057,11 @@ func (in *QueryLogList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *QueryLogObservation) DeepCopyInto(out *QueryLogObservation) { *out = *in + if in.Arn != nil { + in, out := &in.Arn, &out.Arn + *out = new(string) + **out = **in + } if in.ID != nil { in, out := &in.ID, &out.ID *out = new(string) @@ -1855,6 +1875,11 @@ func (in *ZoneList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ZoneObservation) DeepCopyInto(out *ZoneObservation) { *out = *in + if in.Arn != nil { + in, out := &in.Arn, &out.Arn + *out = new(string) + **out = **in + } if in.ID != nil { in, out := &in.ID, &out.ID *out = new(string) diff --git a/apis/route53/v1alpha2/zz_healthcheck_types.go b/apis/route53/v1alpha2/zz_healthcheck_types.go index b090d5d15..4b431f4ee 100755 --- a/apis/route53/v1alpha2/zz_healthcheck_types.go +++ b/apis/route53/v1alpha2/zz_healthcheck_types.go @@ -26,6 +26,8 @@ import ( ) type HealthCheckObservation struct { + Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` + ID *string `json:"id,omitempty" tf:"id,omitempty"` TagsAll map[string]*string `json:"tagsAll,omitempty" tf:"tags_all,omitempty"` @@ -89,6 +91,9 @@ type HealthCheckParameters struct { // +kubebuilder:validation:Optional ResourcePath *string `json:"resourcePath,omitempty" tf:"resource_path,omitempty"` + // +kubebuilder:validation:Optional + RoutingControlArn *string `json:"routingControlArn,omitempty" tf:"routing_control_arn,omitempty"` + // +kubebuilder:validation:Optional SearchString *string `json:"searchString,omitempty" tf:"search_string,omitempty"` diff --git a/apis/route53/v1alpha2/zz_querylog_types.go b/apis/route53/v1alpha2/zz_querylog_types.go index 75a97a701..645eae6b3 100755 --- a/apis/route53/v1alpha2/zz_querylog_types.go +++ b/apis/route53/v1alpha2/zz_querylog_types.go @@ -26,6 +26,8 @@ import ( ) type QueryLogObservation struct { + Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` + ID *string `json:"id,omitempty" tf:"id,omitempty"` } diff --git a/apis/route53/v1alpha2/zz_zone_types.go b/apis/route53/v1alpha2/zz_zone_types.go index 2de4e632b..5b12dd205 100755 --- a/apis/route53/v1alpha2/zz_zone_types.go +++ b/apis/route53/v1alpha2/zz_zone_types.go @@ -45,6 +45,8 @@ type VPCParameters struct { } type ZoneObservation struct { + Arn *string `json:"arn,omitempty" tf:"arn,omitempty"` + ID *string `json:"id,omitempty" tf:"id,omitempty"` NameServers []*string `json:"nameServers,omitempty" tf:"name_servers,omitempty"` diff --git a/apis/s3/v1alpha2/zz_bucket_types.go b/apis/s3/v1alpha2/zz_bucket_types.go index a5145fc64..0bbc83dc8 100755 --- a/apis/s3/v1alpha2/zz_bucket_types.go +++ b/apis/s3/v1alpha2/zz_bucket_types.go @@ -179,9 +179,15 @@ type DestinationParameters struct { // +kubebuilder:validation:Required Bucket *string `json:"bucket" tf:"bucket,omitempty"` + // +kubebuilder:validation:Optional + Metrics []MetricsParameters `json:"metrics,omitempty" tf:"metrics,omitempty"` + // +kubebuilder:validation:Optional ReplicaKMSKeyID *string `json:"replicaKmsKeyId,omitempty" tf:"replica_kms_key_id,omitempty"` + // +kubebuilder:validation:Optional + ReplicationTime []ReplicationTimeParameters `json:"replicationTime,omitempty" tf:"replication_time,omitempty"` + // +kubebuilder:validation:Optional StorageClass *string `json:"storageClass,omitempty" tf:"storage_class,omitempty"` } @@ -276,6 +282,18 @@ type LoggingParameters struct { TargetPrefix *string `json:"targetPrefix,omitempty" tf:"target_prefix,omitempty"` } +type MetricsObservation struct { +} + +type MetricsParameters struct { + + // +kubebuilder:validation:Optional + Minutes *int64 `json:"minutes,omitempty" tf:"minutes,omitempty"` + + // +kubebuilder:validation:Optional + Status *string `json:"status,omitempty" tf:"status,omitempty"` +} + type NoncurrentVersionExpirationObservation struct { } @@ -321,6 +339,18 @@ type ReplicationConfigurationParameters struct { Rules []RulesParameters `json:"rules" tf:"rules,omitempty"` } +type ReplicationTimeObservation struct { +} + +type ReplicationTimeParameters struct { + + // +kubebuilder:validation:Optional + Minutes *int64 `json:"minutes,omitempty" tf:"minutes,omitempty"` + + // +kubebuilder:validation:Optional + Status *string `json:"status,omitempty" tf:"status,omitempty"` +} + type RuleObservation struct { } diff --git a/apis/s3/v1alpha2/zz_generated.deepcopy.go b/apis/s3/v1alpha2/zz_generated.deepcopy.go index e8e5c8a89..54252ef30 100644 --- a/apis/s3/v1alpha2/zz_generated.deepcopy.go +++ b/apis/s3/v1alpha2/zz_generated.deepcopy.go @@ -550,11 +550,25 @@ func (in *DestinationParameters) DeepCopyInto(out *DestinationParameters) { *out = new(string) **out = **in } + if in.Metrics != nil { + in, out := &in.Metrics, &out.Metrics + *out = make([]MetricsParameters, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.ReplicaKMSKeyID != nil { in, out := &in.ReplicaKMSKeyID, &out.ReplicaKMSKeyID *out = new(string) **out = **in } + if in.ReplicationTime != nil { + in, out := &in.ReplicationTime, &out.ReplicationTime + *out = make([]ReplicationTimeParameters, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.StorageClass != nil { in, out := &in.StorageClass, &out.StorageClass *out = new(string) @@ -856,6 +870,46 @@ func (in *LoggingParameters) DeepCopy() *LoggingParameters { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MetricsObservation) DeepCopyInto(out *MetricsObservation) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsObservation. +func (in *MetricsObservation) DeepCopy() *MetricsObservation { + if in == nil { + return nil + } + out := new(MetricsObservation) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MetricsParameters) DeepCopyInto(out *MetricsParameters) { + *out = *in + if in.Minutes != nil { + in, out := &in.Minutes, &out.Minutes + *out = new(int64) + **out = **in + } + if in.Status != nil { + in, out := &in.Status, &out.Status + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsParameters. +func (in *MetricsParameters) DeepCopy() *MetricsParameters { + if in == nil { + return nil + } + out := new(MetricsParameters) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NoncurrentVersionExpirationObservation) DeepCopyInto(out *NoncurrentVersionExpirationObservation) { *out = *in @@ -1015,6 +1069,46 @@ func (in *ReplicationConfigurationParameters) DeepCopy() *ReplicationConfigurati return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ReplicationTimeObservation) DeepCopyInto(out *ReplicationTimeObservation) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReplicationTimeObservation. +func (in *ReplicationTimeObservation) DeepCopy() *ReplicationTimeObservation { + if in == nil { + return nil + } + out := new(ReplicationTimeObservation) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ReplicationTimeParameters) DeepCopyInto(out *ReplicationTimeParameters) { + *out = *in + if in.Minutes != nil { + in, out := &in.Minutes, &out.Minutes + *out = new(int64) + **out = **in + } + if in.Status != nil { + in, out := &in.Status, &out.Status + *out = new(string) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReplicationTimeParameters. +func (in *ReplicationTimeParameters) DeepCopy() *ReplicationTimeParameters { + if in == nil { + return nil + } + out := new(ReplicationTimeParameters) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RuleObservation) DeepCopyInto(out *RuleObservation) { *out = *in diff --git a/cluster/images/provider-jet-aws-controller/Dockerfile b/cluster/images/provider-jet-aws-controller/Dockerfile index 1584077a0..7b675069a 100644 --- a/cluster/images/provider-jet-aws-controller/Dockerfile +++ b/cluster/images/provider-jet-aws-controller/Dockerfile @@ -10,7 +10,7 @@ ENV USER_ID=1001 ## Provider-dependent configuration ENV TERRAFORM_VERSION 1.0.5 ENV TERRAFORM_PROVIDER_SOURCE "hashicorp/aws" -ENV TERRAFORM_PROVIDER_VERSION 3.56.0 +ENV TERRAFORM_PROVIDER_VERSION 3.71.0 ENV TERRAFORM_PROVIDER_DOWNLOAD_NAME terraform-provider-aws ## End of - Provider-dependent configuration diff --git a/cmd/generator/main.go b/cmd/generator/main.go index 4b04a2003..fd1138aba 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - tf "github.com/terraform-providers/terraform-provider-aws/aws" + tf "github.com/hashicorp/terraform-provider-aws/xppprovider" "github.com/crossplane/terrajet/pkg/pipeline" diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 8e3431e8c..4bf368007 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -22,12 +22,12 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/logging" "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" - tf "github.com/terraform-providers/terraform-provider-aws/aws" + "github.com/crossplane/terrajet/pkg/terraform" "gopkg.in/alecthomas/kingpin.v2" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/crossplane/terrajet/pkg/terraform" + tf "github.com/hashicorp/terraform-provider-aws/xppprovider" "github.com/crossplane-contrib/provider-jet-aws/apis" "github.com/crossplane-contrib/provider-jet-aws/config" diff --git a/config/provider.go b/config/provider.go index ca83bd8b9..24b034aaa 100644 --- a/config/provider.go +++ b/config/provider.go @@ -136,6 +136,7 @@ var skipList = []string{ "aws_wafregional_rule_group$", // Too big CRD schema "aws_glue_connection$", // See https://github.com/crossplane-contrib/terrajet/issues/100 "aws_mwaa_environment$", // See https://github.com/crossplane-contrib/terrajet/issues/100 + "aws_elasticache_user", // See https://github.com/crossplane-contrib/terrajet/issues/100 "aws_ecs_tag$", // tags are already managed by ecs resources. "aws_alb$", // identical with aws_lb "aws_alb_target_group_attachment$", // identical with aws_lb_target_group_attachment diff --git a/go.mod b/go.mod index 71e0e54b4..b5ef8fb1e 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/crossplane/crossplane-tools v0.0.0-20210916125540-071de511ae8e github.com/crossplane/provider-aws v0.19.0 github.com/crossplane/terrajet v0.3.1 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1 + github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220106231712-d14b20ba8b08 github.com/pkg/errors v0.9.1 - github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210811232925-d6f99829ec3f gopkg.in/alecthomas/kingpin.v2 v2.2.6 k8s.io/apimachinery v0.22.0 k8s.io/client-go v0.22.0 @@ -20,3 +20,5 @@ require ( ) replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/gdavison/terraform-plugin-sdk/v2 v2.0.2-0.20210714181518-b5a3dc95a675 + +replace github.com/hashicorp/terraform-provider-aws => ./.work/.tfaws diff --git a/go.sum b/go.sum index 56a6cf9bd..7d30d5668 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,9 @@ github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.40.19 h1:eqjo8yqijqgO2LctbSTRWrpZ1FFMuVtAC1H4T4qwsVE= -github.com/aws/aws-sdk-go v1.40.19/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.42.18/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.42.25 h1:BbdvHAi+t9LRiaYUyd53noq9jcaAcfzOhSVbKfr6Avs= +github.com/aws/aws-sdk-go v1.42.25/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= github.com/aws/aws-sdk-go-v2 v0.23.0 h1:+E1q1LLSfHSDn/DzOtdJOX+pLZE2HiNV2yO5AjZINwM= github.com/aws/aws-sdk-go-v2 v0.23.0/go.mod h1:2LhT7UgHOXK3UXONKI5OMgIyoQL6zTAw/jwIeX6yqzw= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -442,8 +443,12 @@ github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/aws-sdk-go-base v0.7.1 h1:7s/aR3hFn74tYPVihzDyZe7y/+BorN70rr9ZvpV3j3o= -github.com/hashicorp/aws-sdk-go-base v0.7.1/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= +github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.14.0 h1:2Usl5CuFvGhAXocHfEbEtirux3Bd60nt1ewBY70+NRI= +github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.14.0/go.mod h1:C6GVuO9RWOrt6QCGTmLCOYuSHpkfQSBDuRqTteOlo0g= +github.com/hashicorp/aws-sdk-go-base v1.0.0 h1:J7MMLOfSoDWkusy+cSzKYG1/aFyCzYJmdE0mod3/WLw= +github.com/hashicorp/aws-sdk-go-base v1.0.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= +github.com/hashicorp/awspolicyequivalence v1.4.0 h1:mpQ7/MnyOsaMcXQcJiYbE3LAONzMH1MnwEK/HMvE6Ss= +github.com/hashicorp/awspolicyequivalence v1.4.0/go.mod h1:9IOaIHx+a7C0NfUNk1A93M7kHd5rJ19aoUx37LZGC14= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= @@ -531,8 +536,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jen20/awspolicyequivalence v1.1.0 h1:cn37D6o0lXLwqx2neCokGfaB3LLNSo5CrLMLGjY609g= -github.com/jen20/awspolicyequivalence v1.1.0/go.mod h1:PV1fS2xyHhCLp83vbgSMFr2drM4GzG61wkz+k4pOG3E= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= @@ -596,6 +599,8 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= +github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 h1:uYuGXJBAi1umT+ZS4oQJUgKtfXCAYTR+n9zw1ViT0vA= +github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -637,10 +642,10 @@ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUb github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= @@ -750,8 +755,8 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -802,8 +807,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210811232925-d6f99829ec3f h1:+KG809ej4LPed4O5Eq0mL3eq3UOR3dik8l1QvEDA1Vo= -github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210811232925-d6f99829ec3f/go.mod h1:VhCSH/yeR/nHIgleNX27V73ZnR2Gx7Ai2f0BgOXKof0= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -821,6 +824,12 @@ github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+ github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -898,8 +907,9 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -996,8 +1006,9 @@ golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5o golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1096,6 +1107,7 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/hack/provider.go.txt b/hack/provider.go.txt new file mode 100644 index 000000000..30df7424c --- /dev/null +++ b/hack/provider.go.txt @@ -0,0 +1,11 @@ +package xpprovider + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + + "github.com/hashicorp/terraform-provider-aws/internal/provider" +) + +func Provider() *schema.Provider { + return provider.AzureProvider() +} diff --git a/internal/controller/elasticache/user/zz_controller.go b/internal/controller/elasticache/user/zz_controller.go deleted file mode 100755 index a13fa8ef5..000000000 --- a/internal/controller/elasticache/user/zz_controller.go +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package user - -import ( - "time" - - "k8s.io/client-go/util/workqueue" - ctrl "sigs.k8s.io/controller-runtime" - - "github.com/crossplane/crossplane-runtime/pkg/event" - "github.com/crossplane/crossplane-runtime/pkg/logging" - "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" - xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - "sigs.k8s.io/controller-runtime/pkg/controller" - - tjconfig "github.com/crossplane/terrajet/pkg/config" - tjcontroller "github.com/crossplane/terrajet/pkg/controller" - "github.com/crossplane/terrajet/pkg/terraform" - - v1alpha2 "github.com/crossplane-contrib/provider-jet-aws/apis/elasticache/v1alpha2" -) - -// Setup adds a controller that reconciles User managed resources. -func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, s terraform.SetupFn, ws *terraform.WorkspaceStore, cfg *tjconfig.Provider, concurrency int) error { - name := managed.ControllerName(v1alpha2.User_GroupVersionKind.String()) - r := managed.NewReconciler(mgr, - xpresource.ManagedKind(v1alpha2.User_GroupVersionKind), - managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), ws, s, cfg.Resources["aws_elasticache_user"])), - managed.WithLogger(l.WithValues("controller", name)), - managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithFinalizer(terraform.NewWorkspaceFinalizer(ws, xpresource.NewAPIFinalizer(mgr.GetClient(), managed.FinalizerName))), - managed.WithTimeout(3*time.Minute), - ) - - return ctrl.NewControllerManagedBy(mgr). - Named(name). - WithOptions(controller.Options{RateLimiter: rl, MaxConcurrentReconciles: concurrency}). - For(&v1alpha2.User{}). - Complete(r) -} diff --git a/internal/controller/elasticache/usergroup/zz_controller.go b/internal/controller/elasticache/usergroup/zz_controller.go deleted file mode 100755 index 110470b05..000000000 --- a/internal/controller/elasticache/usergroup/zz_controller.go +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2021 The Crossplane 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 terrajet. DO NOT EDIT. - -package usergroup - -import ( - "time" - - "k8s.io/client-go/util/workqueue" - ctrl "sigs.k8s.io/controller-runtime" - - "github.com/crossplane/crossplane-runtime/pkg/event" - "github.com/crossplane/crossplane-runtime/pkg/logging" - "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" - xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - "sigs.k8s.io/controller-runtime/pkg/controller" - - tjconfig "github.com/crossplane/terrajet/pkg/config" - tjcontroller "github.com/crossplane/terrajet/pkg/controller" - "github.com/crossplane/terrajet/pkg/terraform" - - v1alpha2 "github.com/crossplane-contrib/provider-jet-aws/apis/elasticache/v1alpha2" -) - -// Setup adds a controller that reconciles UserGroup managed resources. -func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, s terraform.SetupFn, ws *terraform.WorkspaceStore, cfg *tjconfig.Provider, concurrency int) error { - name := managed.ControllerName(v1alpha2.UserGroup_GroupVersionKind.String()) - r := managed.NewReconciler(mgr, - xpresource.ManagedKind(v1alpha2.UserGroup_GroupVersionKind), - managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), ws, s, cfg.Resources["aws_elasticache_user_group"])), - managed.WithLogger(l.WithValues("controller", name)), - managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithFinalizer(terraform.NewWorkspaceFinalizer(ws, xpresource.NewAPIFinalizer(mgr.GetClient(), managed.FinalizerName))), - managed.WithTimeout(3*time.Minute), - ) - - return ctrl.NewControllerManagedBy(mgr). - Named(name). - WithOptions(controller.Options{RateLimiter: rl, MaxConcurrentReconciles: concurrency}). - For(&v1alpha2.UserGroup{}). - Complete(r) -} diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go index c5fea1cb0..52e01bacb 100755 --- a/internal/controller/zz_setup.go +++ b/internal/controller/zz_setup.go @@ -63,8 +63,6 @@ import ( clusterelasticache "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elasticache/cluster" parametergroup "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elasticache/parametergroup" replicationgroup "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elasticache/replicationgroup" - user "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elasticache/user" - usergroup "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elasticache/usergroup" lb "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elbv2/lb" lblistener "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elbv2/lblistener" lbtargetgroup "github.com/crossplane-contrib/provider-jet-aws/internal/controller/elbv2/lbtargetgroup" @@ -76,7 +74,7 @@ import ( policy "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/policy" role "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/role" rolepolicyattachment "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/rolepolicyattachment" - useriam "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/user" + user "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/user" usergroupmembership "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/usergroupmembership" userpolicyattachment "github.com/crossplane-contrib/provider-jet-aws/internal/controller/iam/userpolicyattachment" key "github.com/crossplane-contrib/provider-jet-aws/internal/controller/kms/key" @@ -149,8 +147,6 @@ func Setup(mgr ctrl.Manager, l logging.Logger, wl workqueue.RateLimiter, ps terr clusterelasticache.Setup, parametergroup.Setup, replicationgroup.Setup, - user.Setup, - usergroup.Setup, lb.Setup, lblistener.Setup, lbtargetgroup.Setup, @@ -162,7 +158,7 @@ func Setup(mgr ctrl.Manager, l logging.Logger, wl workqueue.RateLimiter, ps terr policy.Setup, role.Setup, rolepolicyattachment.Setup, - useriam.Setup, + user.Setup, usergroupmembership.Setup, userpolicyattachment.Setup, key.Setup, diff --git a/package/crds/autoscaling.aws.jet.crossplane.io_autoscalinggroups.yaml b/package/crds/autoscaling.aws.jet.crossplane.io_autoscalinggroups.yaml index b573ff8de..28702ee55 100644 --- a/package/crds/autoscaling.aws.jet.crossplane.io_autoscalinggroups.yaml +++ b/package/crds/autoscaling.aws.jet.crossplane.io_autoscalinggroups.yaml @@ -116,6 +116,13 @@ spec: preferences: items: properties: + checkpointDelay: + type: string + checkpointPercentages: + items: + format: int64 + type: integer + type: array instanceWarmup: type: string minHealthyPercentage: diff --git a/package/crds/ec2.aws.jet.crossplane.io_instances.yaml b/package/crds/ec2.aws.jet.crossplane.io_instances.yaml index 87f065024..6f9abdbf3 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_instances.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_instances.yaml @@ -261,6 +261,9 @@ spec: type: array placementGroup: type: string + placementPartitionNumber: + format: int64 + type: integer privateIp: type: string region: diff --git a/package/crds/ec2.aws.jet.crossplane.io_launchtemplates.yaml b/package/crds/ec2.aws.jet.crossplane.io_launchtemplates.yaml index ef57946b8..6e15d0eb2 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_launchtemplates.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_launchtemplates.yaml @@ -300,6 +300,8 @@ spec: properties: httpEndpoint: type: string + httpProtocolIpv6: + type: string httpPutResponseHopLimit: format: int64 type: integer @@ -348,6 +350,9 @@ spec: items: type: string type: array + networkCardIndex: + format: int64 + type: integer networkInterfaceId: type: string networkInterfaceIdRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_networkinterfaces.yaml b/package/crds/ec2.aws.jet.crossplane.io_networkinterfaces.yaml index 414b3764d..1d92b0878 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_networkinterfaces.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_networkinterfaces.yaml @@ -102,6 +102,13 @@ spec: type: string interfaceType: type: string + ipv4PrefixCount: + format: int64 + type: integer + ipv4Prefixes: + items: + type: string + type: array ipv6AddressCount: format: int64 type: integer @@ -109,6 +116,13 @@ spec: items: type: string type: array + ipv6PrefixCount: + format: int64 + type: integer + ipv6Prefixes: + items: + type: string + type: array privateIp: type: string privateIps: @@ -234,12 +248,16 @@ spec: properties: atProvider: properties: + arn: + type: string id: type: string macAddress: type: string outpostArn: type: string + ownerId: + type: string privateDnsName: type: string tagsAll: diff --git a/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml b/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml index b5d670d28..26a7b7e0e 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml @@ -72,14 +72,24 @@ spec: type: string customerOwnedIpv4Pool: type: string + enableDns64: + type: boolean + enableResourceNameDnsARecordOnLaunch: + type: boolean + enableResourceNameDnsAaaaRecordOnLaunch: + type: boolean ipv6CidrBlock: type: string + ipv6Native: + type: boolean mapCustomerOwnedIpOnLaunch: type: boolean mapPublicIpOnLaunch: type: boolean outpostArn: type: string + privateDnsHostnameTypeOnLaunch: + type: string region: description: Region is the region you'd like your resource to be created in. @@ -114,7 +124,6 @@ spec: type: object type: object required: - - cidrBlock - region type: object providerConfigRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml b/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml index 52c9c70d6..ae301dd16 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml @@ -66,6 +66,11 @@ spec: properties: cidrBlock: type: string + ipv4IpamPoolId: + type: string + ipv4NetmaskLength: + format: int64 + type: integer region: description: Region is the region you'd like your resource to be created in. @@ -96,7 +101,6 @@ spec: type: object type: object required: - - cidrBlock - region type: object providerConfigRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_vpcs.yaml b/package/crds/ec2.aws.jet.crossplane.io_vpcs.yaml index a3eeebcd3..ccbd410d0 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_vpcs.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_vpcs.yaml @@ -76,6 +76,18 @@ spec: type: boolean instanceTenancy: type: string + ipv4IpamPoolId: + type: string + ipv4NetmaskLength: + format: int64 + type: integer + ipv6CidrBlock: + type: string + ipv6IpamPoolId: + type: string + ipv6NetmaskLength: + format: int64 + type: integer region: description: Region is the region you'd like your resource to be created in. @@ -85,7 +97,6 @@ spec: type: string type: object required: - - cidrBlock - region type: object providerConfigRef: @@ -151,8 +162,6 @@ spec: type: string ipv6AssociationId: type: string - ipv6CidrBlock: - type: string mainRouteTableId: type: string ownerId: diff --git a/package/crds/ecs.aws.jet.crossplane.io_taskdefinitions.yaml b/package/crds/ecs.aws.jet.crossplane.io_taskdefinitions.yaml index 255501ce5..39262b22b 100644 --- a/package/crds/ecs.aws.jet.crossplane.io_taskdefinitions.yaml +++ b/package/crds/ecs.aws.jet.crossplane.io_taskdefinitions.yaml @@ -157,6 +157,15 @@ spec: items: type: string type: array + runtimePlatform: + items: + properties: + cpuArchitecture: + type: string + operatingSystemFamily: + type: string + type: object + type: array tags: additionalProperties: type: string diff --git a/package/crds/eks.aws.jet.crossplane.io_nodegroups.yaml b/package/crds/eks.aws.jet.crossplane.io_nodegroups.yaml index 55dc53f79..5f0fe8550 100644 --- a/package/crds/eks.aws.jet.crossplane.io_nodegroups.yaml +++ b/package/crds/eks.aws.jet.crossplane.io_nodegroups.yaml @@ -250,6 +250,17 @@ spec: - key type: object type: array + updateConfig: + items: + properties: + maxUnavailable: + format: int64 + type: integer + maxUnavailablePercentage: + format: int64 + type: integer + type: object + type: array version: type: string required: diff --git a/package/crds/elasticache.aws.jet.crossplane.io_replicationgroups.yaml b/package/crds/elasticache.aws.jet.crossplane.io_replicationgroups.yaml index 5498d0eb0..2d07d595d 100644 --- a/package/crds/elasticache.aws.jet.crossplane.io_replicationgroups.yaml +++ b/package/crds/elasticache.aws.jet.crossplane.io_replicationgroups.yaml @@ -105,6 +105,8 @@ spec: - replicasPerNodeGroup type: object type: array + dataTieringEnabled: + type: boolean engine: type: string engineVersion: diff --git a/package/crds/elasticache.aws.jet.crossplane.io_usergroups.yaml b/package/crds/elasticache.aws.jet.crossplane.io_usergroups.yaml deleted file mode 100644 index cd064dfca..000000000 --- a/package/crds/elasticache.aws.jet.crossplane.io_usergroups.yaml +++ /dev/null @@ -1,212 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.6.2 - creationTimestamp: null - name: usergroups.elasticache.aws.jet.crossplane.io -spec: - group: elasticache.aws.jet.crossplane.io - names: - categories: - - crossplane - - managed - - awsjet - kind: UserGroup - listKind: UserGroupList - plural: usergroups - singular: usergroup - scope: Cluster - versions: - - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - - jsonPath: .status.conditions[?(@.type=='Synced')].status - name: SYNCED - type: string - - jsonPath: .metadata.annotations.crossplane\.io/external-name - name: EXTERNAL-NAME - type: string - - jsonPath: .metadata.creationTimestamp - name: AGE - type: date - name: v1alpha2 - schema: - openAPIV3Schema: - description: UserGroup is the Schema for the UserGroups API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: UserGroupSpec defines the desired state of UserGroup - properties: - deletionPolicy: - default: Delete - description: DeletionPolicy specifies what will happen to the underlying - external when this managed resource is deleted - either "Delete" - or "Orphan" the external resource. - enum: - - Orphan - - Delete - type: string - forProvider: - properties: - arn: - type: string - engine: - type: string - region: - description: Region is the region you'd like your resource to - be created in. - type: string - tags: - additionalProperties: - type: string - type: object - userIdRefs: - items: - description: A Reference to a named object. - properties: - name: - description: Name of the referenced object. - type: string - required: - - name - type: object - type: array - userIdSelector: - description: A Selector selects an object. - properties: - matchControllerRef: - description: MatchControllerRef ensures an object with the - same controller reference as the selecting object is selected. - type: boolean - matchLabels: - additionalProperties: - type: string - description: MatchLabels ensures an object with matching labels - is selected. - type: object - type: object - userIds: - items: - type: string - type: array - required: - - engine - - region - type: object - providerConfigRef: - default: - name: default - description: ProviderConfigReference specifies how the provider that - will be used to create, observe, update, and delete this managed - resource should be configured. - properties: - name: - description: Name of the referenced object. - type: string - required: - - name - type: object - providerRef: - description: 'ProviderReference specifies the provider that will be - used to create, observe, update, and delete this managed resource. - Deprecated: Please use ProviderConfigReference, i.e. `providerConfigRef`' - properties: - name: - description: Name of the referenced object. - type: string - required: - - name - type: object - writeConnectionSecretToRef: - description: WriteConnectionSecretToReference specifies the namespace - and name of a Secret to which any connection details for this managed - resource should be written. Connection details frequently include - the endpoint, username, and password required to connect to the - managed resource. - properties: - name: - description: Name of the secret. - type: string - namespace: - description: Namespace of the secret. - type: string - required: - - name - - namespace - type: object - required: - - forProvider - type: object - status: - description: UserGroupStatus defines the observed state of UserGroup. - properties: - atProvider: - properties: - id: - type: string - tagsAll: - additionalProperties: - type: string - type: object - type: object - conditions: - description: Conditions of the resource. - items: - description: A Condition that may apply to a resource. - properties: - lastTransitionTime: - description: LastTransitionTime is the last time this condition - transitioned from one status to another. - format: date-time - type: string - message: - description: A Message containing details about this condition's - last transition from one status to another, if any. - type: string - reason: - description: A Reason for this condition's last transition from - one status to another. - type: string - status: - description: Status of this condition; is it currently True, - False, or Unknown? - type: string - type: - description: Type of this condition. At most one of each condition - type may apply to a resource at any point in time. - type: string - required: - - lastTransitionTime - - reason - - status - - type - type: object - type: array - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/package/crds/elasticache.aws.jet.crossplane.io_users.yaml b/package/crds/elasticache.aws.jet.crossplane.io_users.yaml deleted file mode 100644 index 581d3c0d6..000000000 --- a/package/crds/elasticache.aws.jet.crossplane.io_users.yaml +++ /dev/null @@ -1,195 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.6.2 - creationTimestamp: null - name: users.elasticache.aws.jet.crossplane.io -spec: - group: elasticache.aws.jet.crossplane.io - names: - categories: - - crossplane - - managed - - awsjet - kind: User - listKind: UserList - plural: users - singular: user - scope: Cluster - versions: - - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - - jsonPath: .status.conditions[?(@.type=='Synced')].status - name: SYNCED - type: string - - jsonPath: .metadata.annotations.crossplane\.io/external-name - name: EXTERNAL-NAME - type: string - - jsonPath: .metadata.creationTimestamp - name: AGE - type: date - name: v1alpha2 - schema: - openAPIV3Schema: - description: User is the Schema for the Users API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: UserSpec defines the desired state of User - properties: - deletionPolicy: - default: Delete - description: DeletionPolicy specifies what will happen to the underlying - external when this managed resource is deleted - either "Delete" - or "Orphan" the external resource. - enum: - - Orphan - - Delete - type: string - forProvider: - properties: - accessString: - type: string - arn: - type: string - engine: - type: string - noPasswordRequired: - type: boolean - passwords: - items: - type: string - type: array - region: - description: Region is the region you'd like your resource to - be created in. - type: string - tags: - additionalProperties: - type: string - type: object - userName: - type: string - required: - - accessString - - engine - - region - - userName - type: object - providerConfigRef: - default: - name: default - description: ProviderConfigReference specifies how the provider that - will be used to create, observe, update, and delete this managed - resource should be configured. - properties: - name: - description: Name of the referenced object. - type: string - required: - - name - type: object - providerRef: - description: 'ProviderReference specifies the provider that will be - used to create, observe, update, and delete this managed resource. - Deprecated: Please use ProviderConfigReference, i.e. `providerConfigRef`' - properties: - name: - description: Name of the referenced object. - type: string - required: - - name - type: object - writeConnectionSecretToRef: - description: WriteConnectionSecretToReference specifies the namespace - and name of a Secret to which any connection details for this managed - resource should be written. Connection details frequently include - the endpoint, username, and password required to connect to the - managed resource. - properties: - name: - description: Name of the secret. - type: string - namespace: - description: Namespace of the secret. - type: string - required: - - name - - namespace - type: object - required: - - forProvider - type: object - status: - description: UserStatus defines the observed state of User. - properties: - atProvider: - properties: - id: - type: string - tagsAll: - additionalProperties: - type: string - type: object - type: object - conditions: - description: Conditions of the resource. - items: - description: A Condition that may apply to a resource. - properties: - lastTransitionTime: - description: LastTransitionTime is the last time this condition - transitioned from one status to another. - format: date-time - type: string - message: - description: A Message containing details about this condition's - last transition from one status to another, if any. - type: string - reason: - description: A Reason for this condition's last transition from - one status to another. - type: string - status: - description: Status of this condition; is it currently True, - False, or Unknown? - type: string - type: - description: Type of this condition. At most one of each condition - type may apply to a resource at any point in time. - type: string - required: - - lastTransitionTime - - reason - - status - - type - type: object - type: array - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/package/crds/elbv2.aws.jet.crossplane.io_lbs.yaml b/package/crds/elbv2.aws.jet.crossplane.io_lbs.yaml index e7fbe0588..0c1c09285 100644 --- a/package/crds/elbv2.aws.jet.crossplane.io_lbs.yaml +++ b/package/crds/elbv2.aws.jet.crossplane.io_lbs.yaml @@ -99,6 +99,8 @@ spec: type: array customerOwnedIpv4Pool: type: string + desyncMitigationMode: + type: string dropInvalidHeaderFields: type: boolean enableCrossZoneLoadBalancing: @@ -107,6 +109,8 @@ spec: type: boolean enableHttp2: type: boolean + enableWafFailOpen: + type: boolean idleTimeout: format: int64 type: integer diff --git a/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml b/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml index 705a9253e..90569d271 100644 --- a/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml +++ b/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml @@ -62,9 +62,10 @@ spec: type: string forProvider: properties: + connectionTermination: + type: boolean deregistrationDelay: - format: int64 - type: integer + type: string healthCheck: items: properties: diff --git a/package/crds/kms.aws.jet.crossplane.io_keys.yaml b/package/crds/kms.aws.jet.crossplane.io_keys.yaml index b428be2b2..9c0e89829 100644 --- a/package/crds/kms.aws.jet.crossplane.io_keys.yaml +++ b/package/crds/kms.aws.jet.crossplane.io_keys.yaml @@ -77,6 +77,8 @@ spec: type: boolean keyUsage: type: string + multiRegion: + type: boolean policy: type: string region: diff --git a/package/crds/rds.aws.jet.crossplane.io_clusters.yaml b/package/crds/rds.aws.jet.crossplane.io_clusters.yaml index f993cd575..fa2d0bb4e 100644 --- a/package/crds/rds.aws.jet.crossplane.io_clusters.yaml +++ b/package/crds/rds.aws.jet.crossplane.io_clusters.yaml @@ -86,10 +86,14 @@ spec: type: string dbClusterParameterGroupName: type: string + dbInstanceParameterGroupName: + type: string dbSubnetGroupName: type: string deletionProtection: type: boolean + enableGlobalWriteForwarding: + type: boolean enableHttpEndpoint: type: boolean enabledCloudwatchLogsExports: diff --git a/package/crds/rds.aws.jet.crossplane.io_instances.yaml b/package/crds/rds.aws.jet.crossplane.io_instances.yaml index 18759cfea..373a4f515 100644 --- a/package/crds/rds.aws.jet.crossplane.io_instances.yaml +++ b/package/crds/rds.aws.jet.crossplane.io_instances.yaml @@ -240,6 +240,8 @@ spec: description: Region is the region you'd like your resource to be created in. type: string + replicaMode: + type: string replicateSourceDb: type: string restoreToPointInTime: @@ -455,6 +457,8 @@ spec: type: string endpoint: type: string + engineVersionActual: + type: string hostedZoneId: type: string id: diff --git a/package/crds/route53.aws.jet.crossplane.io_delegationsets.yaml b/package/crds/route53.aws.jet.crossplane.io_delegationsets.yaml index 51b50d421..a472f3480 100644 --- a/package/crds/route53.aws.jet.crossplane.io_delegationsets.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_delegationsets.yaml @@ -120,6 +120,8 @@ spec: properties: atProvider: properties: + arn: + type: string id: type: string nameServers: diff --git a/package/crds/route53.aws.jet.crossplane.io_healthchecks.yaml b/package/crds/route53.aws.jet.crossplane.io_healthchecks.yaml index 076eb36c8..c0ad9e274 100644 --- a/package/crds/route53.aws.jet.crossplane.io_healthchecks.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_healthchecks.yaml @@ -108,6 +108,8 @@ spec: type: integer resourcePath: type: string + routingControlArn: + type: string searchString: type: string tags: @@ -169,6 +171,8 @@ spec: properties: atProvider: properties: + arn: + type: string id: type: string tagsAll: diff --git a/package/crds/route53.aws.jet.crossplane.io_querylogs.yaml b/package/crds/route53.aws.jet.crossplane.io_querylogs.yaml index eb673bebb..c4593906a 100644 --- a/package/crds/route53.aws.jet.crossplane.io_querylogs.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_querylogs.yaml @@ -124,6 +124,8 @@ spec: properties: atProvider: properties: + arn: + type: string id: type: string type: object diff --git a/package/crds/route53.aws.jet.crossplane.io_zones.yaml b/package/crds/route53.aws.jet.crossplane.io_zones.yaml index d46c0f480..9eccea317 100644 --- a/package/crds/route53.aws.jet.crossplane.io_zones.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_zones.yaml @@ -187,6 +187,8 @@ spec: properties: atProvider: properties: + arn: + type: string id: type: string nameServers: diff --git a/package/crds/s3.aws.jet.crossplane.io_buckets.yaml b/package/crds/s3.aws.jet.crossplane.io_buckets.yaml index 6dc3c41ba..c65fcc012 100644 --- a/package/crds/s3.aws.jet.crossplane.io_buckets.yaml +++ b/package/crds/s3.aws.jet.crossplane.io_buckets.yaml @@ -257,8 +257,28 @@ spec: type: string bucket: type: string + metrics: + items: + properties: + minutes: + format: int64 + type: integer + status: + type: string + type: object + type: array replicaKmsKeyId: type: string + replicationTime: + items: + properties: + minutes: + format: int64 + type: integer + status: + type: string + type: object + type: array storageClass: type: string required: diff --git a/scripts/prepare_tfaws.sh b/scripts/prepare_tfaws.sh new file mode 100755 index 000000000..7b9813acc --- /dev/null +++ b/scripts/prepare_tfaws.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env sh + +# Copyright 2022 The Crossplane 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. + +set -eu + +REPO_DIR="${WORK_DIR}/.tfaws" +mkdir -p "${REPO_DIR}" + +if [ ! -d "${REPO_DIR}/.git" ]; then + git -C "${REPO_DIR}" init --initial-branch=trunk + git -C "${REPO_DIR}" remote add origin https://github.com/hashicorp/terraform-provider-aws +fi + +git -C "${REPO_DIR}" fetch origin "${TFAWS_REFSPEC}" +git -C "${REPO_DIR}" reset --hard FETCH_HEAD + +mkdir -p "${REPO_DIR}/xpprovider" +cp hack/provider.go.txt "${REPO_DIR}/xpprovider/provider.go" \ No newline at end of file