Merge branch 'main' into fix-conversion-typemeta

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,14 +1,14 @@
 name: Bug Report
-description: Help us diagnose and fix bugs in Official AWS Provider
-labels: bug,needs:triage
+description: Help us diagnose and fix bugs in this provider
+labels: ["bug","needs:triage"]
 title: "[Bug]: "
 body:
   - type: markdown
     attributes:
       value: |
-        # Thank you for helping to improve Official AWS Provider!
+        # Thank you for helping to improve this provider!
 
-        - If you're not currently using the most recent version of the Upbound Official AWS Provider, we recommend upgrading. Your issue might have already been addressed in the latest release.
+        - If you're not currently using the most recent version of the provider, we recommend upgrading. Your issue might have already been addressed in the latest release.
 
   - type: checkboxes
     id: existing_issue
@@ -20,7 +20,7 @@ body:
       options:
         - label: I have searched the existing issues
           required: true
- 
+
   - type: textarea
     id: affected
     attributes:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,11 +1,11 @@
 ---
 name: Feature Request
-about: Help us make Official AWS Provider more useful
+about: Help us make this provider more useful
 labels: enhancement,needs:triage
-title: 
 ---
+
 <!--
-Thank you for helping to improve Official AWS Provider!
+Thank you for helping to improve this provider!
 
 Please be sure to search for open issues before raising a new one. We use issues
 for bug reports and feature requests.
@@ -15,11 +15,12 @@ for bug reports and feature requests.
 
 <!--
 Please tell us a little about your use case - it's okay if it's hypothetical!
-Leading with this context helps frame the feature request so we can ensure we
+Leading with this context helps frame the feature request, so we can ensure we
 implement it sensibly.
 --->
 
-### How could Official AWS Provider help solve your problem?
+### What could help solve your problem?
+
 <!--
-Let us know how you think Official AWS Provider could help with your use case. 
+Let us know how you think could help with your use case. 
 -->

.github/ISSUE_TEMPLATE/new_resource_request.md

@@ -5,7 +5,7 @@ labels: new-resource
 title: "Request for `INSERT RESOURCE NAME` resource"
 ---
 <!--
-Thank you for helping to improve Official AWS Provider!
+Thank you for helping to improve this provider!
 
 Please be sure to search for open issues before raising a new one. We use issues
 for bug reports and feature requests.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,6 @@
 <!--
-Thank you for helping to improve Official AWS Provider!
-
 Please read through https://git.io/fj2m9 if this is your first time opening a
-Official AWS Provider pull request. Find us in https://crossplane.slack.com
+pull request to this repo. Find us in https://crossplane.slack.com
 if you need any help contributing.
 -->
 
@@ -12,11 +10,11 @@ if you need any help contributing.
 Briefly describe what this pull request does. Be sure to direct your
 reviewers' attention to anything that needs special consideration.
 
-We love pull requests that resolve an open Official AWS Provider issue. If yours does, you
+We love pull requests that resolve an open issue. If yours does, you
 can uncomment the below line to indicate which issue your PR fixes, for example
 "Fixes #500":
-
 -->
+
 Fixes #
 
 I have:

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }}
 
   detect-noop:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
@@ -37,7 +37,7 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
 
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
@@ -53,12 +53,12 @@ jobs:
           swap-storage: false
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           submodules: true
 
       - name: Setup Go
-        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
+        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
         with:
           go-version: "1.22"
 
@@ -73,21 +73,21 @@ jobs:
           
 
       - name: Cache the Go Build Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: ${{ steps.go_cache.outputs.cache }}
           key: ${{ runner.os }}-build-lint-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-build-lint-
 
       - name: Cache Go Dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: ${{ steps.go_cache.outputs.mod_cache }}
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Cache Linter Analysis
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         id: cache-analysis
         with:
           path: ${{ steps.go_cache.outputs.analysis_cache }}

.github/workflows/scan.yml

@@ -26,7 +26,7 @@ env:
 
 jobs:
   setup-vars:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       supported_releases_number: ${{ steps.setup.outputs.supported_releases_number }}
       images: ${{ steps.setup.outputs.images }}

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   stale:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
       with:

.github/workflows/uptest-all.yml

@@ -14,12 +14,12 @@ env:
 
 jobs:
   detect-api-groups:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       api_groups: ${{ steps.api-groups.outputs.list }}
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           submodules: true
       - name: Detect Api Groups
@@ -38,7 +38,7 @@ jobs:
           echo "list=${OUTPUT}" >> $GITHUB_OUTPUT
 
   uptest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: detect-api-groups
     strategy:
       fail-fast: false
@@ -48,26 +48,26 @@ jobs:
           - api-groups: examples/providerconfig/
     steps:
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3
+        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
         with:
           platforms: all
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
         with:
           version: ${{ env.DOCKER_BUILDX_VERSION }}
           install: true
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           submodules: true
 
       - name: Fetch History
         run: git fetch --prune --unshallow
 
       - name: Setup Go
-        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
+        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -76,14 +76,14 @@ jobs:
         run: echo "cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT
 
       - name: Cache the Go Build Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: ${{ steps.go.outputs.cache }}
           key: ${{ runner.os }}-build-uptest-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-build-uptest-
 
       - name: Cache Go Dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -125,7 +125,7 @@ jobs:
 
       - name: Upload Cluster Dump
         if: always()
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         with:
           name: cluster-dump-aws
           path: ./_output/cluster-dump
@@ -136,14 +136,14 @@ jobs:
           kubectl delete managed --all
 
   report:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: uptest
     if: always()
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           submodules: true
       - name: Manual Intervention Report

Makefile

@@ -11,8 +11,8 @@ PROJECT_NAME := provider-$(PROVIDER_NAME)
 PROJECT_REPO := github.com/upbound/$(PROJECT_NAME)
 
 export TERRAFORM_VERSION := 1.5.5
-export TERRAFORM_PROVIDER_VERSION := 5.50.0
-export TERRAFORM_PROVIDER_RELEASE := v$(TERRAFORM_PROVIDER_VERSION)-upjet.1
+export TERRAFORM_PROVIDER_VERSION := 5.68.0
+export TERRAFORM_PROVIDER_RELEASE := v$(TERRAFORM_PROVIDER_VERSION)-upjet.2
 export TERRAFORM_PROVIDER_SOURCE := hashicorp/aws
 export TERRAFORM_PROVIDER_REPO ?= https://github.com/hashicorp/terraform-provider-aws
 export TERRAFORM_DOCS_PATH ?= website/docs/r
@@ -77,12 +77,12 @@ export SUBPACKAGES := $(SUBPACKAGES)
 # ====================================================================================
 # Setup Kubernetes tools
 
-KIND_VERSION = v0.23.0
-UP_VERSION = v0.31.0
+KIND_VERSION = v0.24.0
+UP_VERSION = v0.34.2
 UP_CHANNEL = stable
 UPTEST_VERSION = v0.11.1
-UPTEST_LOCAL_VERSION = v0.12.0-9.gac371c9
-UPTEST_LOCAL_CHANNEL = main
+UPTEST_LOCAL_VERSION = v0.13.0
+UPTEST_LOCAL_CHANNEL = stable
 KUSTOMIZE_VERSION = v5.3.0
 YQ_VERSION = v4.40.5
 CROSSPLANE_VERSION = 1.14.6
@@ -127,6 +127,12 @@ export XPKG_REG_ORGS_NO_PROMOTE := $(XPKG_REG_ORGS_NO_PROMOTE)
 export XPKG_DIR := $(XPKG_DIR)
 export XPKG_IGNORE := $(XPKG_IGNORE)
 
+CONFIG_CRD_GROUP = $(PROVIDER_NAME)
+PROVIDER_AUTH_GROUP = $(PROVIDER_NAME)
+
+export CONFIG_CRD_GROUP := $(CONFIG_CRD_GROUP)
+export PROVIDER_AUTH_GROUP := $(PROVIDER_AUTH_GROUP)
+
 -include build/makelib/xpkg.mk
 
 # ====================================================================================

README.md

@@ -4,9 +4,9 @@ SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
 SPDX-License-Identifier: CC-BY-4.0
 -->
 
-# Official AWS Provider
+# Upjet-based Crossplane provider for AWS
 
-<div align="center">
+<div style="text-align: center;">
 
 ![CI](https://github.com/crossplane-contrib/provider-upjet-aws/workflows/CI/badge.svg)
 [![GitHub release](https://img.shields.io/github/release/crossplane-contrib/provider-upjet-aws/all.svg)](https://github.com/crossplane-contrib/provider-upjet-aws/releases)
@@ -17,39 +17,42 @@ SPDX-License-Identifier: CC-BY-4.0
 
 </div>
 
-Provider AWS is a [Crossplane](https://crossplane.io/) provider that is
+Provider Upjet-AWS is a [Crossplane](https://crossplane.io/) provider that is
 built using [Upjet](https://github.com/crossplane/upjet) code
 generation tools and exposes XRM-conformant managed resources for
 [Amazon AWS](https://aws.amazon.com/).
 
 ## Getting Started
 
-Follow the quick start guide [here](https://marketplace.upbound.io/providers/upbound/provider-aws/latest/docs/quickstart).
+Follow the quick start
+guide [here](https://marketplace.upbound.io/providers/upbound/provider-aws/latest/docs/quickstart).
 
-You can find a detailed API reference for all the managed resources with examples in the [Upbound Marketplace](https://marketplace.upbound.io/providers/upbound/provider-aws/latest/managed-resources).
+You can find a detailed API reference for all the managed resources with examples in
+the [Upbound Marketplace](https://marketplace.upbound.io/providers/upbound/provider-aws/latest/managed-resources).
 
-For getting more information about resource consumption and monitoring
-the upjet runtime, please see [Sizing Guide](https://github.com/crossplane/upjet/blob/v0.10.0/docs/sizing-guide.md)
-and [Monitoring Guide](https://github.com/crossplane/upjet/blob/main/docs/monitoring.md)
+For more information about monitoring the Upjet runtime, please
+see [Monitoring Guide](https://github.com/crossplane/upjet/blob/main/docs/monitoring.md)
 
 ## Contributing
 
-For the general contribution guide, see [Upjet Contribution Guide](https://github.com/crossplane/upjet/blob/main/CONTRIBUTING.md)
+For the general contribution guide,
+see [Upjet Contribution Guide](https://github.com/crossplane/upjet/blob/main/CONTRIBUTING.md)
 
 If you'd like to learn how to use Upjet, see [Usage Guide](https://github.com/crossplane/upjet/tree/main/docs).
 
 To build this provider locally and run it in a local Kubernetes cluster, run the
-following to build the family provider (`config`) and `ec2`:
+following to build the family config provider (`config`) and the sub-package you are working on e.g. `ec2`:
 
 ```shell
 DOCKERHUB_ORG=<your-docker-name>
 BUILD_ARGS="--load" XPKG_REG_ORGS_NO_PROMOTE="" XPKG_REG_ORGS="index.docker.io/$DOCKERHUB_ORG" make build.all publish BRANCH_NAME=main SUBPACKAGES="config ec2"
 ```
 
-The `BRANCH_NAME` set to `main` (even though you might be on another branch) will
-let make publish the images to your docker hub account.
+The `BRANCH_NAME` is set to `main` (even though you might be on another branch) to allow
+for the publishing of the images to your docker hub account.
 
-To install the provider `provider-aws-ec2` into a local Kubernetes cluster, apply:
+To install the provider, in this example `provider-aws-ec2`, into a local Kubernetes cluster with Crossplane already
+installed, apply:
 
 ```yaml
 apiVersion: pkg.crossplane.io/v1
@@ -62,18 +65,18 @@ spec:
 
 ### Add a New Resource
 
-Follow the guide [here](https://github.com/crossplane/upjet/blob/v0.10.0/docs/add-new-resource-short.md).
+Follow the Upjet guide
+for [adding new resources](https://github.com/crossplane/upjet/blob/main/docs/adding-new-resource.md).
 
-## Report a Bug
+## Getting help
 
-For filing bugs, suggesting improvements, or requesting new features, please
+For filing bugs, suggesting improvements, or requesting new resources or features, please
 open an [issue](https://github.com/crossplane-contrib/provider-upjet-aws/issues/new/choose).
 
-## Contact
-
+For general help on using the provider consider asking the Crossplane community in the
 [#upjet-provider-aws](https://crossplane.slack.com/archives/C05E0UE46S2) channel in
 [Crossplane Slack](https://slack.crossplane.io)
 
-## Licensing
+## License
 
-Provider AWS is under [the Apache 2.0 license](LICENSE) with [notice](NOTICE).
+The provider is released under the [the Apache 2.0 license](LICENSE) with [notice](NOTICE).