From 49a39ce3aa3d5a6699591dad11ad277a7b0d36d4 Mon Sep 17 00:00:00 2001
From: Artem Charykov <1912947+artych@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:07:24 +0100
Subject: [PATCH] Bump Upbound Provider AWS to 1.7 (#467)

---
 libs/crossplane/Makefile                   |  3 +-
 libs/crossplane/config.jsonnet             |  6 ++-
 libs/crossplane/upbound_aws_crds.libsonnet | 60 +++++++++++-----------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/libs/crossplane/Makefile b/libs/crossplane/Makefile
index 854d094..abc3c44 100644
--- a/libs/crossplane/Makefile
+++ b/libs/crossplane/Makefile
@@ -1,7 +1,8 @@
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 TMP:=$(shell mktemp -d)
-AWS_VERSION?=v1.6.1
+AWS_VERSION?=v1.7.0
 
+.PHONY: upbound_aws_crds.libsonnet
 upbound_aws_crds.libsonnet:
 	cd $(TMP) && \
 	jb init && \
diff --git a/libs/crossplane/config.jsonnet b/libs/crossplane/config.jsonnet
index 231902a..eb9eafb 100644
--- a/libs/crossplane/config.jsonnet
+++ b/libs/crossplane/config.jsonnet
@@ -96,10 +96,12 @@ config.new(
 
     // Upbound official providers
     // https://marketplace.upbound.io/
+    // WARNING: When bumping the version, ensure that you also update the 
+    // version in the Makefile and run `make upbound_aws_crds.libsonnet` to update the CRDs list.
     {
-      output: 'upbound-provider-aws/1.6',
+      output: 'upbound-provider-aws/1.7',
       prefix: '^io\\.upbound\\.aws\\..*',
-      crds: ['https://raw.githubusercontent.com/crossplane-contrib/provider-upjet-aws/v1.6.1/package/crds/%s' % crd for crd in upbound_aws_crds],
+      crds: ['https://raw.githubusercontent.com/crossplane-contrib/provider-upjet-aws/v1.7.0/package/crds/%s' % crd for crd in upbound_aws_crds],
       localName: 'upbound_aws',
     },
     {
diff --git a/libs/crossplane/upbound_aws_crds.libsonnet b/libs/crossplane/upbound_aws_crds.libsonnet
index 78f3605..d96e373 100644
--- a/libs/crossplane/upbound_aws_crds.libsonnet
+++ b/libs/crossplane/upbound_aws_crds.libsonnet
@@ -29,8 +29,8 @@
   'apigateway.aws.upbound.io_integrationresponses.yaml',
   'apigateway.aws.upbound.io_integrations.yaml',
   'apigateway.aws.upbound.io_methodresponses.yaml',
-  'apigateway.aws.upbound.io_methodsettings.yaml',
   'apigateway.aws.upbound.io_methods.yaml',
+  'apigateway.aws.upbound.io_methodsettings.yaml',
   'apigateway.aws.upbound.io_models.yaml',
   'apigateway.aws.upbound.io_requestvalidators.yaml',
   'apigateway.aws.upbound.io_resources.yaml',
@@ -57,8 +57,8 @@
   'appautoscaling.aws.upbound.io_targets.yaml',
   'appconfig.aws.upbound.io_applications.yaml',
   'appconfig.aws.upbound.io_configurationprofiles.yaml',
-  'appconfig.aws.upbound.io_deploymentstrategies.yaml',
   'appconfig.aws.upbound.io_deployments.yaml',
+  'appconfig.aws.upbound.io_deploymentstrategies.yaml',
   'appconfig.aws.upbound.io_environments.yaml',
   'appconfig.aws.upbound.io_extensionassociations.yaml',
   'appconfig.aws.upbound.io_extensions.yaml',
@@ -79,12 +79,12 @@
   'apprunner.aws.upbound.io_services.yaml',
   'apprunner.aws.upbound.io_vpcconnectors.yaml',
   'appstream.aws.upbound.io_directoryconfigs.yaml',
-  'appstream.aws.upbound.io_fleetstackassociations.yaml',
   'appstream.aws.upbound.io_fleet.yaml',
+  'appstream.aws.upbound.io_fleetstackassociations.yaml',
   'appstream.aws.upbound.io_imagebuilders.yaml',
   'appstream.aws.upbound.io_stacks.yaml',
-  'appstream.aws.upbound.io_userstackassociations.yaml',
   'appstream.aws.upbound.io_users.yaml',
+  'appstream.aws.upbound.io_userstackassociations.yaml',
   'appsync.aws.upbound.io_apicaches.yaml',
   'appsync.aws.upbound.io_apikeys.yaml',
   'appsync.aws.upbound.io_datasources.yaml',
@@ -125,16 +125,16 @@
   'chime.aws.upbound.io_voiceconnectorgroups.yaml',
   'chime.aws.upbound.io_voiceconnectorloggings.yaml',
   'chime.aws.upbound.io_voiceconnectororiginations.yaml',
-  'chime.aws.upbound.io_voiceconnectorstreamings.yaml',
   'chime.aws.upbound.io_voiceconnectors.yaml',
+  'chime.aws.upbound.io_voiceconnectorstreamings.yaml',
   'chime.aws.upbound.io_voiceconnectorterminationcredentials.yaml',
   'chime.aws.upbound.io_voiceconnectorterminations.yaml',
   'cloud9.aws.upbound.io_environmentec2s.yaml',
   'cloud9.aws.upbound.io_environmentmemberships.yaml',
   'cloudcontrol.aws.upbound.io_resources.yaml',
+  'cloudformation.aws.upbound.io_stacks.yaml',
   'cloudformation.aws.upbound.io_stacksetinstances.yaml',
   'cloudformation.aws.upbound.io_stacksets.yaml',
-  'cloudformation.aws.upbound.io_stacks.yaml',
   'cloudfront.aws.upbound.io_cachepolicies.yaml',
   'cloudfront.aws.upbound.io_distributions.yaml',
   'cloudfront.aws.upbound.io_fieldlevelencryptionconfigs.yaml',
@@ -148,8 +148,8 @@
   'cloudfront.aws.upbound.io_publickeys.yaml',
   'cloudfront.aws.upbound.io_realtimelogconfigs.yaml',
   'cloudfront.aws.upbound.io_responseheaderspolicies.yaml',
-  'cloudsearch.aws.upbound.io_domainserviceaccesspolicies.yaml',
   'cloudsearch.aws.upbound.io_domains.yaml',
+  'cloudsearch.aws.upbound.io_domainserviceaccesspolicies.yaml',
   'cloudtrail.aws.upbound.io_eventdatastores.yaml',
   'cloudtrail.aws.upbound.io_trails.yaml',
   'cloudwatch.aws.upbound.io_compositealarms.yaml',
@@ -207,8 +207,8 @@
   'connect.aws.upbound.io_contactflowmodules.yaml',
   'connect.aws.upbound.io_contactflows.yaml',
   'connect.aws.upbound.io_hoursofoperations.yaml',
-  'connect.aws.upbound.io_instancestorageconfigs.yaml',
   'connect.aws.upbound.io_instances.yaml',
+  'connect.aws.upbound.io_instancestorageconfigs.yaml',
   'connect.aws.upbound.io_lambdafunctionassociations.yaml',
   'connect.aws.upbound.io_phonenumbers.yaml',
   'connect.aws.upbound.io_queues.yaml',
@@ -265,8 +265,8 @@
   'dms.aws.upbound.io_s3endpoints.yaml',
   'docdb.aws.upbound.io_clusterinstances.yaml',
   'docdb.aws.upbound.io_clusterparametergroups.yaml',
-  'docdb.aws.upbound.io_clustersnapshots.yaml',
   'docdb.aws.upbound.io_clusters.yaml',
+  'docdb.aws.upbound.io_clustersnapshots.yaml',
   'docdb.aws.upbound.io_eventsubscriptions.yaml',
   'docdb.aws.upbound.io_globalclusters.yaml',
   'docdb.aws.upbound.io_subnetgroups.yaml',
@@ -304,8 +304,8 @@
   'ec2.aws.upbound.io_eips.yaml',
   'ec2.aws.upbound.io_flowlogs.yaml',
   'ec2.aws.upbound.io_hosts.yaml',
-  'ec2.aws.upbound.io_instancestates.yaml',
   'ec2.aws.upbound.io_instances.yaml',
+  'ec2.aws.upbound.io_instancestates.yaml',
   'ec2.aws.upbound.io_internetgateways.yaml',
   'ec2.aws.upbound.io_keypairs.yaml',
   'ec2.aws.upbound.io_launchtemplates.yaml',
@@ -318,8 +318,8 @@
   'ec2.aws.upbound.io_networkinsightsanalyses.yaml',
   'ec2.aws.upbound.io_networkinsightspaths.yaml',
   'ec2.aws.upbound.io_networkinterfaceattachments.yaml',
-  'ec2.aws.upbound.io_networkinterfacesgattachments.yaml',
   'ec2.aws.upbound.io_networkinterfaces.yaml',
+  'ec2.aws.upbound.io_networkinterfacesgattachments.yaml',
   'ec2.aws.upbound.io_placementgroups.yaml',
   'ec2.aws.upbound.io_routes.yaml',
   'ec2.aws.upbound.io_routetableassociations.yaml',
@@ -356,20 +356,20 @@
   'ec2.aws.upbound.io_transitgatewayvpcattachmentaccepters.yaml',
   'ec2.aws.upbound.io_transitgatewayvpcattachments.yaml',
   'ec2.aws.upbound.io_volumeattachments.yaml',
-  'ec2.aws.upbound.io_vpcdhcpoptionsassociations.yaml',
   'ec2.aws.upbound.io_vpcdhcpoptions.yaml',
+  'ec2.aws.upbound.io_vpcdhcpoptionsassociations.yaml',
   'ec2.aws.upbound.io_vpcendpointconnectionnotifications.yaml',
   'ec2.aws.upbound.io_vpcendpointroutetableassociations.yaml',
+  'ec2.aws.upbound.io_vpcendpoints.yaml',
   'ec2.aws.upbound.io_vpcendpointsecuritygroupassociations.yaml',
   'ec2.aws.upbound.io_vpcendpointserviceallowedprincipals.yaml',
   'ec2.aws.upbound.io_vpcendpointservices.yaml',
   'ec2.aws.upbound.io_vpcendpointsubnetassociations.yaml',
-  'ec2.aws.upbound.io_vpcendpoints.yaml',
   'ec2.aws.upbound.io_vpcipampoolcidrallocations.yaml',
   'ec2.aws.upbound.io_vpcipampoolcidrs.yaml',
   'ec2.aws.upbound.io_vpcipampools.yaml',
-  'ec2.aws.upbound.io_vpcipamscopes.yaml',
   'ec2.aws.upbound.io_vpcipams.yaml',
+  'ec2.aws.upbound.io_vpcipamscopes.yaml',
   'ec2.aws.upbound.io_vpcipv4cidrblockassociations.yaml',
   'ec2.aws.upbound.io_vpcpeeringconnectionaccepters.yaml',
   'ec2.aws.upbound.io_vpcpeeringconnectionoptions.yaml',
@@ -418,8 +418,8 @@
   'elasticbeanstalk.aws.upbound.io_applicationversions.yaml',
   'elasticbeanstalk.aws.upbound.io_configurationtemplates.yaml',
   'elasticsearch.aws.upbound.io_domainpolicies.yaml',
-  'elasticsearch.aws.upbound.io_domainsamloptions.yaml',
   'elasticsearch.aws.upbound.io_domains.yaml',
+  'elasticsearch.aws.upbound.io_domainsamloptions.yaml',
   'elastictranscoder.aws.upbound.io_pipelines.yaml',
   'elastictranscoder.aws.upbound.io_presets.yaml',
   'elb.aws.upbound.io_appcookiestickinesspolicies.yaml',
@@ -477,8 +477,8 @@
   'grafana.aws.upbound.io_licenseassociations.yaml',
   'grafana.aws.upbound.io_roleassociations.yaml',
   'grafana.aws.upbound.io_workspaceapikeys.yaml',
-  'grafana.aws.upbound.io_workspacesamlconfigurations.yaml',
   'grafana.aws.upbound.io_workspaces.yaml',
+  'grafana.aws.upbound.io_workspacesamlconfigurations.yaml',
   'guardduty.aws.upbound.io_detectors.yaml',
   'guardduty.aws.upbound.io_filters.yaml',
   'guardduty.aws.upbound.io_members.yaml',
@@ -502,8 +502,8 @@
   'iam.aws.upbound.io_usergroupmemberships.yaml',
   'iam.aws.upbound.io_userloginprofiles.yaml',
   'iam.aws.upbound.io_userpolicyattachments.yaml',
-  'iam.aws.upbound.io_usersshkeys.yaml',
   'iam.aws.upbound.io_users.yaml',
+  'iam.aws.upbound.io_usersshkeys.yaml',
   'iam.aws.upbound.io_virtualmfadevices.yaml',
   'identitystore.aws.upbound.io_groupmemberships.yaml',
   'identitystore.aws.upbound.io_groups.yaml',
@@ -515,10 +515,10 @@
   'imagebuilder.aws.upbound.io_imagerecipes.yaml',
   'imagebuilder.aws.upbound.io_images.yaml',
   'imagebuilder.aws.upbound.io_infrastructureconfigurations.yaml',
-  'inspector2.aws.upbound.io_enablers.yaml',
   'inspector.aws.upbound.io_assessmenttargets.yaml',
   'inspector.aws.upbound.io_assessmenttemplates.yaml',
   'inspector.aws.upbound.io_resourcegroups.yaml',
+  'inspector2.aws.upbound.io_enablers.yaml',
   'iot.aws.upbound.io_certificates.yaml',
   'iot.aws.upbound.io_indexingconfigurations.yaml',
   'iot.aws.upbound.io_loggingoptions.yaml',
@@ -549,11 +549,11 @@
   'kendra.aws.upbound.io_thesaurus.yaml',
   'keyspaces.aws.upbound.io_keyspaces.yaml',
   'keyspaces.aws.upbound.io_tables.yaml',
-  'kinesisanalytics.aws.upbound.io_applications.yaml',
-  'kinesisanalyticsv2.aws.upbound.io_applicationsnapshots.yaml',
-  'kinesisanalyticsv2.aws.upbound.io_applications.yaml',
   'kinesis.aws.upbound.io_streamconsumers.yaml',
   'kinesis.aws.upbound.io_streams.yaml',
+  'kinesisanalytics.aws.upbound.io_applications.yaml',
+  'kinesisanalyticsv2.aws.upbound.io_applications.yaml',
+  'kinesisanalyticsv2.aws.upbound.io_applicationsnapshots.yaml',
   'kinesisvideo.aws.upbound.io_streams.yaml',
   'kms.aws.upbound.io_aliases.yaml',
   'kms.aws.upbound.io_ciphertexts.yaml',
@@ -594,8 +594,8 @@
   'lightsail.aws.upbound.io_keypairs.yaml',
   'lightsail.aws.upbound.io_lbattachments.yaml',
   'lightsail.aws.upbound.io_lbcertificates.yaml',
-  'lightsail.aws.upbound.io_lbstickinesspolicies.yaml',
   'lightsail.aws.upbound.io_lbs.yaml',
+  'lightsail.aws.upbound.io_lbstickinesspolicies.yaml',
   'lightsail.aws.upbound.io_staticipattachments.yaml',
   'lightsail.aws.upbound.io_staticips.yaml',
   'location.aws.upbound.io_geofencecollections.yaml',
@@ -611,8 +611,8 @@
   'macie2.aws.upbound.io_members.yaml',
   'mediaconvert.aws.upbound.io_queues.yaml',
   'medialive.aws.upbound.io_channels.yaml',
-  'medialive.aws.upbound.io_inputsecuritygroups.yaml',
   'medialive.aws.upbound.io_inputs.yaml',
+  'medialive.aws.upbound.io_inputsecuritygroups.yaml',
   'medialive.aws.upbound.io_multiplices.yaml',
   'mediapackage.aws.upbound.io_channels.yaml',
   'mediastore.aws.upbound.io_containerpolicies.yaml',
@@ -629,8 +629,8 @@
   'neptune.aws.upbound.io_clusterendpoints.yaml',
   'neptune.aws.upbound.io_clusterinstances.yaml',
   'neptune.aws.upbound.io_clusterparametergroups.yaml',
-  'neptune.aws.upbound.io_clustersnapshots.yaml',
   'neptune.aws.upbound.io_clusters.yaml',
+  'neptune.aws.upbound.io_clustersnapshots.yaml',
   'neptune.aws.upbound.io_eventsubscriptions.yaml',
   'neptune.aws.upbound.io_globalclusters.yaml',
   'neptune.aws.upbound.io_parametergroups.yaml',
@@ -653,8 +653,8 @@
   'networkmanager.aws.upbound.io_transitgatewayregistrations.yaml',
   'networkmanager.aws.upbound.io_vpcattachments.yaml',
   'opensearch.aws.upbound.io_domainpolicies.yaml',
-  'opensearch.aws.upbound.io_domainsamloptions.yaml',
   'opensearch.aws.upbound.io_domains.yaml',
+  'opensearch.aws.upbound.io_domainsamloptions.yaml',
   'opensearchserverless.aws.upbound.io_accesspolicies.yaml',
   'opensearchserverless.aws.upbound.io_collections.yaml',
   'opensearchserverless.aws.upbound.io_lifecyclepolicies.yaml',
@@ -699,8 +699,8 @@
   'rds.aws.upbound.io_clusterinstances.yaml',
   'rds.aws.upbound.io_clusterparametergroups.yaml',
   'rds.aws.upbound.io_clusterroleassociations.yaml',
-  'rds.aws.upbound.io_clustersnapshots.yaml',
   'rds.aws.upbound.io_clusters.yaml',
+  'rds.aws.upbound.io_clustersnapshots.yaml',
   'rds.aws.upbound.io_dbinstanceautomatedbackupsreplications.yaml',
   'rds.aws.upbound.io_dbsnapshotcopies.yaml',
   'rds.aws.upbound.io_eventsubscriptions.yaml',
@@ -776,8 +776,8 @@
   's3.aws.upbound.io_bucketpublicaccessblocks.yaml',
   's3.aws.upbound.io_bucketreplicationconfigurations.yaml',
   's3.aws.upbound.io_bucketrequestpaymentconfigurations.yaml',
-  's3.aws.upbound.io_bucketserversideencryptionconfigurations.yaml',
   's3.aws.upbound.io_buckets.yaml',
+  's3.aws.upbound.io_bucketserversideencryptionconfigurations.yaml',
   's3.aws.upbound.io_bucketversionings.yaml',
   's3.aws.upbound.io_bucketwebsiteconfigurations.yaml',
   's3.aws.upbound.io_objectcopies.yaml',
@@ -832,8 +832,8 @@
   'serverlessrepo.aws.upbound.io_cloudformationstacks.yaml',
   'servicecatalog.aws.upbound.io_budgetresourceassociations.yaml',
   'servicecatalog.aws.upbound.io_constraints.yaml',
-  'servicecatalog.aws.upbound.io_portfolioshares.yaml',
   'servicecatalog.aws.upbound.io_portfolios.yaml',
+  'servicecatalog.aws.upbound.io_portfolioshares.yaml',
   'servicecatalog.aws.upbound.io_principalportfolioassociations.yaml',
   'servicecatalog.aws.upbound.io_productportfolioassociations.yaml',
   'servicecatalog.aws.upbound.io_products.yaml',
@@ -856,8 +856,8 @@
   'ses.aws.upbound.io_identitynotificationtopics.yaml',
   'ses.aws.upbound.io_identitypolicies.yaml',
   'ses.aws.upbound.io_receiptfilters.yaml',
-  'ses.aws.upbound.io_receiptrulesets.yaml',
   'ses.aws.upbound.io_receiptrules.yaml',
+  'ses.aws.upbound.io_receiptrulesets.yaml',
   'ses.aws.upbound.io_templates.yaml',
   'sesv2.aws.upbound.io_configurationseteventdestinations.yaml',
   'sesv2.aws.upbound.io_configurationsets.yaml',
@@ -874,8 +874,8 @@
   'sns.aws.upbound.io_platformapplications.yaml',
   'sns.aws.upbound.io_smspreferences.yaml',
   'sns.aws.upbound.io_topicpolicies.yaml',
-  'sns.aws.upbound.io_topicsubscriptions.yaml',
   'sns.aws.upbound.io_topics.yaml',
+  'sns.aws.upbound.io_topicsubscriptions.yaml',
   'sqs.aws.upbound.io_queuepolicies.yaml',
   'sqs.aws.upbound.io_queueredriveallowpolicies.yaml',
   'sqs.aws.upbound.io_queueredrivepolicies.yaml',